Fix duplicate notification and delivery of mentions (#14378)

diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 3822b7dc5c1a988bb8eebfa9ca37da204e9e32ea..79af3fc546b898afea4184a7dde7f377ade32384 100644 (file)
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -36,7 +36,8 @@ class ProcessMentionsService < BaseService
 
       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