diff options
author | multiple creatures <dev@multiple-creature.party> | 2020-02-14 03:56:02 -0600 |
---|---|---|
committer | multiple creatures <dev@multiple-creature.party> | 2020-02-14 03:56:02 -0600 |
commit | 10c619500af6432b1f1c5f2856be31268a92a50b (patch) | |
tree | f0d6442891aa8e838a3f8d3c9d6e06f281de20fb /app | |
parent | 90a3b2199ab470077d9c3bb9c2fe347bfdf8cc10 (diff) |
mark new remote accounts known if graylist federation is disabled + auto-learn known accounts is enabled
Diffstat (limited to 'app')
-rw-r--r-- | app/services/activitypub/process_account_service.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index c4671a744..f550c4348 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -84,6 +84,7 @@ class ActivityPub::ProcessAccountService < BaseService @account.display_name = @json['name'] || '' @account.note = @json['summary'] || '' @account.locked = @json['manuallyApprovesFollowers'] || false + @account.known = !Setting.auto_reject_unknown && Setting.auto_mark_known @account.froze = @json['froze'] || false @account.adult_content = @json['adultContent'] || (@json['suggestedMinAge'].to_i >= 18) @account.gently = @json['gently'] || false |