diff options
| author | multiple creatures <dev@multiple-creature.party> | 2020-02-15 10:42:01 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-15 10:42:01 -0600 |
| commit | 13de392fc5769114015bb6780dce41e803fa6946 (patch) | |
| tree | bc85ee77a51a0cf324955a6cbde0e15d0e850503 /app/services/follow_service.rb | |
| parent | d1ea02408be8ecaa2b67ff8f219674639999ebba (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/follow_service.rb')
| -rw-r--r-- | app/services/follow_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 1d9f1c726..68dcbda23 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 || !Setting.mark_known_from_follows || target_account.known? + target_account.mark_known! if target_account.can_be_marked_known? && Setting.mark_known_from_follows SyncRemoteAccountWorker.perform_async(target_account.id) unless target_account.local? || target_account.passive_relationships.exists? |