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/services/follow_service.rb
View File

@@ -10,7 +10,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) || target_account.moved?
raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account)
if source_account.following?(target_account)
# We're already following this account, but we'll call follow! again to