diff options
| author | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
| commit | 3fa90982efda2109ddf90d81f5ed3449f8282642 (patch) | |
| tree | e5514f4c72c9ffb44059a2afb7fdf24d0348bbd4 /app/services/block_domain_service.rb | |
| parent | 714940de498e93a8bf40dcda1835217df18741bf (diff) | |
| parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/services/block_domain_service.rb')
| -rw-r--r-- | app/services/block_domain_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb index 497f0394b..c6eef04d4 100644 --- a/app/services/block_domain_service.rb +++ b/app/services/block_domain_service.rb @@ -76,7 +76,7 @@ class BlockDomainService < BaseService end def blocked_domain_accounts - Account.where(domain: blocked_domain) + Account.by_domain_and_subdomains(blocked_domain) end def media_from_blocked_domain @@ -84,6 +84,6 @@ class BlockDomainService < BaseService end def emojis_from_blocked_domains - CustomEmoji.where(domain: blocked_domain) + CustomEmoji.by_domain_and_subdomains(blocked_domain) end end |