gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge commit '15fd712464' into kb_migration

Browse source
This commit is contained in:
KMY 2023-05-01 15:05:34 +09:00
commit 3a1a6ba39e
289 changed files with 1339 additions and 1337 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/workers/activitypub/migrated_follow_delivery_worker.rb
View file

@ -11,7 +11,7 @@ class ActivityPub::MigratedFollowDeliveryWorker < ActivityPub::DeliveryWorker
def unfollow_old_account!(old_target_account_id)
old_target_account = Account.find(old_target_account_id)
UnfollowService.new.call(@source_account, old_target_account, skip_unmerge: true)
rescue StandardError
rescue
true
end
end

8
app/workers/activitypub/raw_distribution_worker.rb
View file

@ -29,10 +29,10 @@ class ActivityPub::RawDistributionWorker
end
end
unless inboxes_for_misskey.empty?
ActivityPub::DeliveryWorker.push_bulk(inboxes_for_misskey, limit: 1_000) do |inbox_url|
[payload_for_misskey, source_account_id, inbox_url, options]
end
return if inboxes_for_misskey.empty?
ActivityPub::DeliveryWorker.push_bulk(inboxes_for_misskey, limit: 1_000) do |inbox_url|
[payload_for_misskey, source_account_id, inbox_url, options]
end
end