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

Remove deprecated single-argument variation of UnfilterNotificationsWorker (#33353)

Browse source
This commit is contained in:
Matt Jankowski 2025-04-09 09:42:57 -04:00 • committed by GitHub
parent 498372fd06
commit 6deadd596d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/workers/unfilter_notifications_worker.rb
View file

@ -4,25 +4,14 @@ class UnfilterNotificationsWorker
include Sidekiq::Worker
include Redisable
# Earlier versions of the feature passed a `notification_request` ID
# If `to_account_id` is passed, the first argument is an account ID
# TODO for after 4.3.0: drop the single-argument case
def perform(notification_request_or_account_id, from_account_id = nil)
if from_account_id.present?
@notification_request = nil
@from_account = Account.find_by(id: from_account_id)
@recipient = Account.find_by(id: notification_request_or_account_id)
else
@notification_request = NotificationRequest.find_by(id: notification_request_or_account_id)
@from_account = @notification_request&.from_account
@recipient = @notification_request&.account
end
def perform(account_id, from_account_id)
@from_account = Account.find_by(id: from_account_id)
@recipient = Account.find_by(id: account_id)
return if @from_account.nil? || @recipient.nil?
push_to_conversations!
unfilter_notifications!
remove_request!
decrement_worker_count!
end
@ -36,10 +25,6 @@ class UnfilterNotificationsWorker
filtered_notifications.in_batches.update_all(filtered: false)
end
def remove_request!
@notification_request&.destroy!
end
def filtered_notifications
Notification.where(account: @recipient, from_account: @from_account, filtered: true)
end