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

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

Browse Source 
This reverts commit 0f938ff29c.
This commit is contained in:
Thibaut Girka
2019-01-02 13:56:31 +01:00
parent 1b35ca17a9
commit bb96a74637
12 changed files with 3 additions and 136 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) || target_account.moved?
if target_account.blocking?(@account) || target_account.domain_blocking?(@account.domain)
reject_follow_request!(target_account)
return
end