mirror of
https://github.com/whippyshou/mastodon
synced 2024-12-15 07:08:58 +09:00
f1f96ebf02
* Fix being able to import more than allowed number of follows Without this commit, if someone tries importing a second list of accounts to follow before the first one has been processed, this will queue imports for the two whole lists, even if they exceed the account's allowed number of outgoing follows. This commit changes it so the individual queued imports aren't exempt from the follow limit check (they remain exempt from the rate-limiting check though). * Catch validation errors to not re-queue failed follows Co-authored-by: Claire <claire.github-309c@sitedethib.com>
23 lines
889 B
Ruby
23 lines
889 B
Ruby
# frozen_string_literal: true
|
|
|
|
class UnfollowFollowWorker
|
|
include Sidekiq::Worker
|
|
|
|
sidekiq_options queue: 'pull'
|
|
|
|
def perform(follower_account_id, old_target_account_id, new_target_account_id, bypass_locked = false)
|
|
follower_account = Account.find(follower_account_id)
|
|
old_target_account = Account.find(old_target_account_id)
|
|
new_target_account = Account.find(new_target_account_id)
|
|
|
|
follow = follower_account.active_relationships.find_by(target_account: old_target_account)
|
|
reblogs = follow&.show_reblogs?
|
|
notify = follow&.notify?
|
|
|
|
FollowService.new.call(follower_account, new_target_account, reblogs: reblogs, notify: notify, bypass_locked: bypass_locked, bypass_limit: true)
|
|
UnfollowService.new.call(follower_account, old_target_account, skip_unmerge: true)
|
|
rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
|
|
true
|
|
end
|
|
end
|