gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-06 18:01:05 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Merge 9d2e41a547 into 9a2be25199

Browse Source
This commit is contained in:
Matt Jankowski 2025-09-05 09:07:30 +00:00 committed by GitHub
commit 71fd202a04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/services/unmute_service.rb
View File

@ -6,12 +6,23 @@ class UnmuteService < BaseService
account.unmute!(target_account) account.unmute!(target_account)
if account.following?(target_account) process_merges(account, target_account) if account.following?(target_account)
end
private
def process_merges(account, target_account)
MergeWorker.perform_async(target_account.id, account.id, 'home') MergeWorker.perform_async(target_account.id, account.id, 'home')
MergeWorker.push_bulk(account.owned_lists.with_list_account(target_account).pluck(:id)) do |list_id| MergeWorker.push_bulk(mergeable_list_ids(account, target_account)) do |list_id|
[target_account.id, list_id, 'list'] [target_account.id, list_id, 'list']
end end
end end
def mergeable_list_ids(account, target_account)
account
.owned_lists
.with_list_account(target_account)
.pluck(:id)
end end
end end