mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-10 00:46:12 +00:00
b0893291ef
When failing to fetch the target account, the ProcessingWorker fails as expected, but since it hasn't cleared the `move_in_progress` flag, the next attempt at processing skips the `Move` activity altogether. This commit changes it to clear the flag when encountering any unexpected error on fetching the target account. This is likely to occur because, of, e.g., a timeout, when many instances query the same actor at the same time.
50 lines
1.1 KiB
Ruby
50 lines
1.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class ActivityPub::Activity::Move < ActivityPub::Activity
|
|
PROCESSING_COOLDOWN = 7.days.seconds
|
|
|
|
def perform
|
|
return if origin_account.uri != object_uri || processed?
|
|
|
|
mark_as_processing!
|
|
|
|
target_account = ActivityPub::FetchRemoteAccountService.new.call(target_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)
|
|
|
|
# Initiate a re-follow for each follower
|
|
MoveWorker.perform_async(origin_account.id, target_account.id)
|
|
rescue
|
|
unmark_as_processing!
|
|
raise
|
|
end
|
|
|
|
private
|
|
|
|
def origin_account
|
|
@account
|
|
end
|
|
|
|
def target_uri
|
|
value_or_id(@json['target'])
|
|
end
|
|
|
|
def processed?
|
|
redis.exists?("move_in_progress:#{@account.id}")
|
|
end
|
|
|
|
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
|