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/lib/activitypub/activity/follow.rb | |
| parent | d1da0a1086fa25f22739277fbf32ba1b3745317d (diff) | |
Revert "Revert "Add handler for Move activity (#9629)""
This reverts commit bb96a7463758687f8187ae4483becd346c2482b3.
Diffstat (limited to 'app/lib/activitypub/activity/follow.rb')
| -rw-r--r-- | app/lib/activitypub/activity/follow.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb index 5e703dc61..1e805c0d1 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) + if target_account.blocking?(@account) || target_account.domain_blocking?(@account.domain) || target_account.moved? reject_follow_request!(target_account) return end |