diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-02-12 14:33:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-12 14:33:01 +0100 |
commit | f61137b7ffb97006ab811f8a4bce017b5f07f85d (patch) | |
tree | ff70b757d86a44665d16c8021cb81f8e04f396a7 /app/workers | |
parent | 28ec7def5869ff1a85f49a070b9575c166a432ee (diff) | |
parent | f4db2e1832e40cbdfd81feda24fcf87c96f6dbd5 (diff) |
Merge pull request #1688 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/local_notification_worker.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/workers/local_notification_worker.rb b/app/workers/local_notification_worker.rb index a22e2834d..749a54b73 100644 --- a/app/workers/local_notification_worker.rb +++ b/app/workers/local_notification_worker.rb @@ -12,7 +12,14 @@ class LocalNotificationWorker activity = activity_class_name.constantize.find(activity_id) end - return if Notification.where(account: receiver, activity: activity).any? + # For most notification types, only one notification should exist, and the older one is + # preferred. For updates, such as when a status is edited, the new notification + # should replace the previous ones. + if type == 'update' + Notification.where(account: receiver, activity: activity, type: 'update').in_batches.delete_all + elsif Notification.where(account: receiver, activity: activity, type: type).any? + return + end NotifyService.new.call(receiver, type || activity_class_name.underscore, activity) rescue ActiveRecord::RecordNotFound |