diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js index d72b2a3dd4..677fa1115f 100644 --- a/app/javascript/mastodon/actions/notifications.js +++ b/app/javascript/mastodon/actions/notifications.js @@ -107,8 +107,8 @@ export function updateNotifications(notification, intlMessages, intlLocale) { dispatch(importFetchedAccount(notification.report.target_account)); } - - dispatch(notificationsUpdate(notification, preferPendingItems, playSound && !filtered)); + + dispatch(notificationsUpdate({ notification }, preferPendingItems, playSound && !filtered)); fetchRelatedRelationships(dispatch, [notification]); } else if (playSound && !filtered) { diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx index d0d869e91a..df4b11457b 100644 --- a/app/javascript/mastodon/features/notifications/components/notification.jsx +++ b/app/javascript/mastodon/features/notifications/components/notification.jsx @@ -368,7 +368,7 @@ class Notification extends ImmutablePureComponent { return ( -
+
diff --git a/app/workers/feed_insert_worker.rb b/app/workers/feed_insert_worker.rb index c0a1722c10..add90b23d9 100644 --- a/app/workers/feed_insert_worker.rb +++ b/app/workers/feed_insert_worker.rb @@ -10,6 +10,7 @@ class FeedInsertWorker @status = Status.find(status_id) @options = options.symbolize_keys @antenna = Antenna.find(@options[:antenna_id]) if @options[:antenna_id].present? + @pushed = false case @type when :home, :tags @@ -60,7 +61,7 @@ class FeedInsertWorker end def notify_for_list? - return false unless @type == :list + return false if @type != :list || update? || !@pushed @list.notify? end @@ -69,9 +70,9 @@ class FeedInsertWorker if @antenna.nil? || @antenna.insert_feeds case @type when :home, :tags - FeedManager.instance.push_to_home(@follower, @status, update: update?) + @pushed = FeedManager.instance.push_to_home(@follower, @status, update: update?) when :list - FeedManager.instance.push_to_list(@list, @status, update: update?) + @pushed = FeedManager.instance.push_to_list(@list, @status, update: update?) end end