Fix duplicate notification and delivery of mentions (#14378)

2020-07-23 22:41:49 +09:00 · 2020-07-23 22:41:49 +09:00 · 652f872bf1
parent e98979b643
commit 652f872bf1
1 changed files with 2 additions and 1 deletions
--- 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