about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-08-01 14:48:30 -0500
committerFire Demon <firedemon@creature.cafe>2020-08-30 05:45:16 -0500
commit6869d85edebd142271ff7229f95b6ce42bd0c6cb (patch)
tree06c78ba407a21d8121c37f66842a987644dd91d3 /app
parent23c69fbc41104b3f1648531775fd4fbf0ccc3c88 (diff)
[Privacy] Force in-body mentions to have explicit mentions
Diffstat (limited to 'app')
-rw-r--r--app/services/resolve_mentions_service.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/resolve_mentions_service.rb b/app/services/resolve_mentions_service.rb
index cb00b5c19..06238c44e 100644
--- a/app/services/resolve_mentions_service.rb
+++ b/app/services/resolve_mentions_service.rb
@@ -35,7 +35,10 @@ class ResolveMentionsService < 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.where(status: status).first_or_create(status: status, silent: false)
+      mention.update(silent: false) if mention.silent?
+
+      mentions << mention
       implicit_mention_acct_ids.delete(mentioned_account.id)
 
       "@#{mentioned_account.acct}"