about summary refs log tree commit diff
path: root/app/services/activitypub/process_account_service.rb
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-02-14 16:21:51 -0600
committermultiple creatures <dev@multiple-creature.party>2020-02-14 16:21:51 -0600
commit4f7e76a1308cc35f97f47a9f42c197aeca9ee2de (patch)
tree8030ac9944cbd39b7fb3bae2a089bf3d302ea90a /app/services/activitypub/process_account_service.rb
parent803d632ea1063068645d11fca99c0dc624fbb86d (diff)
split auto-trust instance actor setting into auto-trust & always trust
Diffstat (limited to 'app/services/activitypub/process_account_service.rb')
-rw-r--r--app/services/activitypub/process_account_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 6dd73b112..4067e474f 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -62,7 +62,7 @@ class ActivityPub::ProcessAccountService < BaseService
     @account.silenced_at      = domain_block.created_at if auto_silence?
     @account.force_unlisted   = true if auto_force_unlisted?
     @account.force_sensitive  = true if auto_force_sensitive?
-    @account.known            = @username == @domain ? Setting.auto_mark_instance_actors_known : (!Setting.auto_reject_unknown && Setting.auto_mark_known)
+    @account.known            = @username == @domain ? Setting.always_mark_instance_actors_known : (!Setting.auto_reject_unknown && Setting.auto_mark_known)
   end
 
   def update_account