about summary refs log tree commit diff
path: root/app/services/follow_service.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-12-29 02:24:36 +0100
committerGitHub <noreply@github.com>2018-12-29 02:24:36 +0100
commit0f938ff29c2e9bf92e3eb9c23be8d4ba3a1b97f7 (patch)
treea7f9cb2672014b95f77f1a9fe802009f889574e0 /app/services/follow_service.rb
parent9b475a4838abc6143e26776816280e16abfc6193 (diff)
Add handler for Move activity (#9629)
Diffstat (limited to 'app/services/follow_service.rb')
-rw-r--r--app/services/follow_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 0020bc9fe..862926260 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -12,7 +12,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