diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-25 04:17:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 04:17:35 +0200 |
| commit | 4eeff26533b75b592395e353c6d4506db9958bcf (patch) | |
| tree | cfb3483e2c6d24ed0d6ae0e390cba0e274285700 /app/services/follow_service.rb | |
| parent | 94f5c714f11248df6a2b793f47cdb30028f67fca (diff) | |
Change account domain block to clear out notifications and follows (#11393)
Diffstat (limited to 'app/services/follow_service.rb')
| -rw-r--r-- | app/services/follow_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 8e118f5d3..101acdaf9 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -13,7 +13,7 @@ class FollowService < BaseService target_account = ResolveAccountService.new.call(target_account, skip_webfinger: true) raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended? - raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved? || (!target_account.local? && target_account.ostatus?) + raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved? || (!target_account.local? && target_account.ostatus?) || source_account.domain_blocking?(target_account.domain) if source_account.following?(target_account) # We're already following this account, but we'll call follow! again to |