Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix Move handler queuing jobs that will fail if account is suspended (#11864)

Browse source 
Don't put Move handler on cooldown if it didn't run. Skip unmerging
from timelines to save unnecessary work.
This commit is contained in:
Eugen Rochko 2019-09-17 08:44:45 +02:00 • committed by GitHub
parent c21386cff5
commit 38dc51b2d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/lib/activitypub/activity/move.rb
View file

@ -10,10 +10,13 @@ class ActivityPub::Activity::Move < ActivityPub::Activity
target_account = ActivityPub::FetchRemoteAccountService.new.call(target_uri)
return if target_account.nil? || !target_account.also_known_as.include?(origin_account.uri)
if target_account.nil? || target_account.suspended? || !target_account.also_known_as.include?(origin_account.uri)
unmark_as_processing!
return
end
# In case for some reason we didn't have a redirect for the profile already, set it
origin_account.update(moved_to_account: target_account) if origin_account.moved_to_account_id.nil?
origin_account.update(moved_to_account: target_account)
# Initiate a re-follow for each follower
origin_account.followers.local.select(:id).find_in_batches do |follower_accounts|
@ -40,4 +43,8 @@ class ActivityPub::Activity::Move < ActivityPub::Activity
def mark_as_processing!
redis.setex("move_in_progress:#{@account.id}", PROCESSING_COOLDOWN, true)
end
def unmark_as_processing!
redis.del("move_in_progress:#{@account.id}")
end
end