Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2022-03-04 01:07:49 +01:00
24 changed files with 66 additions and 57 deletions

View File

@@ -18,7 +18,7 @@ class BootstrapTimelineService < BaseService
def notify_staff!
User.staff.includes(:account).find_each do |user|
NotifyService.new.call(user.account, :'admin.sign_up', @source_account)
LocalNotificationWorker.perform_async(user.account_id, @source_account.id, 'Account', 'admin.sign_up')
end
end
end

View File

@@ -31,7 +31,7 @@ class FavouriteService < BaseService
status = favourite.status
if status.account.local?
NotifyService.new.call(status.account, :favourite, favourite)
LocalNotificationWorker.perform_async(status.account_id, favourite.id, 'Favourite', 'favourite')
elsif status.account.activitypub?
ActivityPub::DeliveryWorker.perform_async(build_json(favourite), favourite.account_id, status.account.inbox_url)
end