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