about summary refs log tree commit diff
path: root/app/services/follow_service.rb
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-02-14 17:37:31 -0600
committermultiple creatures <dev@multiple-creature.party>2020-02-14 17:37:31 -0600
commit92847646cff1effdf42eaa0819d836a663d428c4 (patch)
tree057d47ae953ec2102b65f25345663796a8bed1dc /app/services/follow_service.rb
parent4f7e76a1308cc35f97f47a9f42c197aeca9ee2de (diff)
add options to let admins customize how trusting or strict graylist federation should be
Diffstat (limited to 'app/services/follow_service.rb')
-rw-r--r--app/services/follow_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 7b714bfb2..1d9f1c726 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -15,7 +15,7 @@ class FollowService < BaseService
     raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended?
     raise Mastodon::NotPermittedError  if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved?
 
-    target_account.mark_known! unless !Setting.auto_mark_known || target_account.known?
+    target_account.mark_known! unless !Setting.auto_mark_known || !Setting.mark_known_from_follows || target_account.known?
 
     SyncRemoteAccountWorker.perform_async(target_account.id) unless target_account.local? || target_account.passive_relationships.exists?