tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "Add handler for Move activity (#9629)""

Browse Source 
This reverts commit bb96a74637.
This commit is contained in:
Thibaut Girka
2019-01-10 18:46:17 +01:00
parent d1da0a1086
commit fb0c906c71
12 changed files with 136 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/activitypub/activity/follow.rb
View File

@@ -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