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>2019-10-12 22:05:06 -0500
committermultiple creatures <dev@multiple-creature.party>2019-10-12 22:05:06 -0500
commita367ff86982987aa0573d9b375000a909223c3ad (patch)
tree0d9a8560aba33efdf2dbc98398a3df72ecd56781 /app/services/follow_service.rb
parentbc04de8eed0cf0451018f3182af0a24754444f86 (diff)
graylist (reject unknown) federation & known account auto-learning finally have toggle switches in site settings
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 776c4cb9b..1653253f5 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -14,7 +14,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 target_account.known?
+    target_account.mark_known! unless !Setting.auto_mark_known || target_account.known?
 
     if source_account.following?(target_account)
       # We're already following this account, but we'll call follow! again to