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

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