Merge branch 'master' into glitch-soc/master

2020-07-24 11:26:40 +02:00
parent 16416e940f 956473142c
commit 4d950c71e9
3 changed files with 267 additions and 72 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