about summary refs log tree commit diff
path: root/app/models/status.rb
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-07-28 10:03:00 -0500
committerFire Demon <firedemon@creature.cafe>2020-08-30 05:45:16 -0500
commitaa9d09215480d2376d6425b8518092dd4644f5ae (patch)
treea2b32fca181a33839bc40e524c3edb901201f616 /app/models/status.rb
parent8ce1fd6edb8e5dc1335cdac6c46711441220dbf7 (diff)
[Privacy] Add support for matching unmatched domains with * glob in per-domain permissions
Diffstat (limited to 'app/models/status.rb')
-rw-r--r--app/models/status.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index edddffcc6..33e566737 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -305,7 +305,9 @@ class Status < ApplicationRecord
   end
 
   def visibility_for_domain(domain)
-    v = domain_permissions.find_by(domain: domain)&.visibility || visibility.to_s
+    return visibility.to_s if domain.blank?
+
+    v = domain_permissions.find_by(domain: [domain, '*'])&.visibility || visibility.to_s
 
     case max_visibility_for_domain(domain)
     when 'public'