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/services/update_remote_profile_service.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/services/update_remote_profile_service.rb')
| -rw-r--r-- | app/services/update_remote_profile_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/update_remote_profile_service.rb b/app/services/update_remote_profile_service.rb index 68d36addf..403395a0d 100644 --- a/app/services/update_remote_profile_service.rb +++ b/app/services/update_remote_profile_service.rb @@ -26,7 +26,7 @@ class UpdateRemoteProfileService < BaseService account.note = remote_profile.note || '' account.locked = remote_profile.locked? - if !account.suspended? && !DomainBlock.find_by(domain: account.domain)&.reject_media? + if !account.suspended? && !DomainBlock.reject_media?(account.domain) if remote_profile.avatar.present? account.avatar_remote_url = remote_profile.avatar else @@ -46,7 +46,7 @@ class UpdateRemoteProfileService < BaseService end def save_emojis - do_not_download = DomainBlock.find_by(domain: account.domain)&.reject_media? + do_not_download = DomainBlock.reject_media?(account.domain) return if do_not_download |