about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-07-24 12:32:33 +0200
committerGitHub <noreply@github.com>2020-07-24 12:32:33 +0200
commit913141c6780bef463a2fe855aaeb0b429f806ea2 (patch)
tree8d4f600b0f32f85a8863105f91f7862e301f9e3a /app/services
parent16416e940fd803af92377eee9a1756ef27eed199 (diff)
parent5e93c7359d4f75dd4e4b80def2b80ee28938d9d4 (diff)
Merge pull request #1388 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services')
-rw-r--r--app/services/process_mentions_service.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 65a3f64b8..f45422970 100644
--- 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