Fix duplicate notification and delivery of mentions (mastodon#14378)

CrossGate-Pawoo · Jan 14, 2022 · d418aca · d418aca
1 parent e42eead
commit d418aca
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
@@ -36,7 +36,8 @@ def call(status)
 
       next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended?
 
-      mentions << mentioned_account.mentions.where(status: status).first_or_create(status: status)
+      mention = mentioned_account.mentions.new(status: status)
+      mentions << mention if mention.save
 
       "@#{mentioned_account.acct}"
     end