diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-07-28 16:28:05 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-28 16:28:05 +0200 |
commit | bca3825c17dd2087f826d9269bb80537bd4ff395 (patch) | |
tree | 51043b99ec56d263f9d126091afb923292a9e301 /app/services/follow_service.rb | |
parent | 91da921dbb51f55bc926c3997ae558d735292a67 (diff) | |
parent | cfb2ed78231758a79af038a964ab7f7b7b35274e (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
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 |