diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-07-28 10:03:00 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-08-30 05:45:16 -0500 |
| commit | aa9d09215480d2376d6425b8518092dd4644f5ae (patch) | |
| tree | a2b32fca181a33839bc40e524c3edb901201f616 /app/models | |
| parent | 8ce1fd6edb8e5dc1335cdac6c46711441220dbf7 (diff) | |
[Privacy] Add support for matching unmatched domains with * glob in per-domain permissions
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/account.rb | 3 | ||||
| -rw-r--r-- | app/models/account_domain_permission.rb | 2 | ||||
| -rw-r--r-- | app/models/status.rb | 4 | ||||
| -rw-r--r-- | app/models/status_domain_permission.rb | 2 |
4 files changed, 9 insertions, 2 deletions
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' diff --git a/app/models/account_domain_permission.rb b/app/models/account_domain_permission.rb index ffa9cbbec..8048c2d4a 100644 --- a/app/models/account_domain_permission.rb +++ b/app/models/account_domain_permission.rb @@ -15,6 +15,8 @@ class AccountDomainPermission < ApplicationRecord belongs_to :account, inverse_of: :domain_permissions enum visibility: [:public, :unlisted, :private, :direct, :limited], _suffix: :visibility + default_scope { order(domain: :desc) } + class << self def create_by_domains(permissions_list) Array(permissions_list).map(&method(:normalize)).map do |permissions| 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' diff --git a/app/models/status_domain_permission.rb b/app/models/status_domain_permission.rb index f9e5dc55e..ad38dbd52 100644 --- a/app/models/status_domain_permission.rb +++ b/app/models/status_domain_permission.rb @@ -15,6 +15,8 @@ class StatusDomainPermission < ApplicationRecord belongs_to :status, inverse_of: :domain_permissions enum visibility: [:public, :unlisted, :private, :direct, :limited], _suffix: :visibility + default_scope { order(domain: :desc) } + class << self def create_by_domains(permissions_list) Array(permissions_list).map(&method(:normalize)).map do |permissions| |