From aa9d09215480d2376d6425b8518092dd4644f5ae Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Tue, 28 Jul 2020 10:03:00 -0500 Subject: [Privacy] Add support for matching unmatched domains with * glob in per-domain permissions --- app/models/account.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/models/account.rb') diff --git a/app/models/account.rb b/app/models/account.rb index f7de58776..860f93f03 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -363,11 +363,12 @@ class Account < ApplicationRecord def max_visibility_for_domain(domain) return 'public' if domain.blank? - domain_permissions.find_by(domain: domain)&.visibility || 'public' + domain_permissions.find_by(domain: [domain, '*'])&.visibility || 'public' end def visibility_for_domain(domain) v = visibility.to_s + return v if domain.blank? case max_visibility_for_domain(domain) when 'public' -- cgit