Fix duplicate notifications being possible after poll expiration (#17697)
This commit is contained in:
parent
04c3ac896a
commit
2ea754b861
8 changed files with 13 additions and 11 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue