diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-22 00:13:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-22 00:13:10 +0200 |
| commit | 707ddf7808f90e3ab042d7642d368c2ce8e95e6f (patch) | |
| tree | 2fdc55f43eff9ea113a989520f72020ccdaa6649 /app/models/custom_emoji.rb | |
| parent | 49ebda4d49af50b375126e4a8285686fb6448a60 (diff) | |
Change domain blocks to automatically support subdomains (#11138)
* Change domain blocks to automatically support subdomains If a more authoritative domain is blocked (example.com), then the same block will be applied to a subdomain (foo.example.com) * Match subdomains of existing accounts when blocking/unblocking domains * Improve code style
Diffstat (limited to 'app/models/custom_emoji.rb')
| -rw-r--r-- | app/models/custom_emoji.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index d3cc70504..e73cd9bd2 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -39,6 +39,7 @@ class CustomEmoji < ApplicationRecord scope :local, -> { where(domain: nil) } scope :remote, -> { where.not(domain: nil) } scope :alphabetic, -> { order(domain: :asc, shortcode: :asc) } + scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches('%.' + domain))) } remotable_attachment :image, LIMIT |