about summary refs log tree commit diff
path: root/app/lib/activitypub/activity/follow.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-01-02 13:56:31 +0100
committerThibaut Girka <thib@sitedethib.com>2019-01-02 15:36:59 +0100
commitbb96a7463758687f8187ae4483becd346c2482b3 (patch)
tree348a9c54f0152a73fd7753de3bbe9fe02ab28fe2 /app/lib/activitypub/activity/follow.rb
parent1b35ca17a9f214bbc4fc577baa7a86b567b2f629 (diff)
Revert "Add handler for Move activity (#9629)"
This reverts commit 0f938ff29c2e9bf92e3eb9c23be8d4ba3a1b97f7.
Diffstat (limited to 'app/lib/activitypub/activity/follow.rb')
-rw-r--r--app/lib/activitypub/activity/follow.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb
index 1e805c0d1..5e703dc61 100644
--- a/app/lib/activitypub/activity/follow.rb
+++ b/app/lib/activitypub/activity/follow.rb
@@ -6,7 +6,7 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
 
     return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) || @account.requested?(target_account)
 
-    if target_account.blocking?(@account) || target_account.domain_blocking?(@account.domain) || target_account.moved?
+    if target_account.blocking?(@account) || target_account.domain_blocking?(@account.domain)
       reject_follow_request!(target_account)
       return
     end