diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-11 10:53:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 10:53:58 +0100 |
| commit | 2cfa55185a5fc7d93a160a4e9a4730aae6725b0f (patch) | |
| tree | c57169b5a3d717f4e68b8ec5d2d6e220d1456434 /app/services/follow_service.rb | |
| parent | d1da0a1086fa25f22739277fbf32ba1b3745317d (diff) | |
| parent | 394525e32994e605093c87d3a9fad2a4202f3401 (diff) | |
Merge pull request #885 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 24b3e1f70..9d36a1449 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -10,7 +10,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) + raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved? if source_account.following?(target_account) # We're already following this account, but we'll call follow! again to |