about summary refs log tree commit diff
path: root/app/services/post_status_service.rb
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-02-15 10:42:01 -0600
committermultiple creatures <dev@multiple-creature.party>2020-02-15 10:42:01 -0600
commit13de392fc5769114015bb6780dce41e803fa6946 (patch)
treebc85ee77a51a0cf324955a6cbde0e15d0e850503 /app/services/post_status_service.rb
parentd1ea02408be8ecaa2b67ff8f219674639999ebba (diff)
add admin option to toggle whether service/app accounts should be auto-trusted in graylist mode + give options better descriptions
Diffstat (limited to 'app/services/post_status_service.rb')
-rw-r--r--app/services/post_status_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index a36a1b074..7c36a5941 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -101,7 +101,7 @@ class PostStatusService < BaseService
   end
 
   def mark_recipient_known
-    @in_reply_to.account.mark_known! unless !Setting.auto_mark_known || !Setting.mark_known_from_mentions || @in_reply_to.account.known?
+    @in_reply_to.account.mark_known! if @in_reply_to.account.can_be_marked_known? && Setting.mark_known_from_mentions
   end
 
   def set_footer_from_i_am