diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 18:46:17 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 18:46:17 +0100 |
commit | fb0c906c717f2b21bb63610742a357850142b522 (patch) | |
tree | 696e649bcf15c2a7926e2d6d5f9e08f90aaef058 /app/services/follow_service.rb | |
parent | d1da0a1086fa25f22739277fbf32ba1b3745317d (diff) |
Revert "Revert "Add handler for Move activity (#9629)""
This reverts commit bb96a7463758687f8187ae4483becd346c2482b3.
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 |