diff options
| author | multiple creatures <dev@multiple-creature.party> | 2020-02-14 04:56:13 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-14 04:56:13 -0600 |
| commit | d1a887b57a6243dcdbf33f00d4692f25b8f2b270 (patch) | |
| tree | ca0a22bf04a78a6b5d74b135700f8fe316a5d497 /app/services/activitypub | |
| parent | 9d6b593379d1d826391c58585c7f5121323b9410 (diff) | |
add admin option to toggle auto-marking instance actors known & make enabling greylist federation also enable secure mode
Diffstat (limited to 'app/services/activitypub')
| -rw-r--r-- | app/services/activitypub/process_account_service.rb | 2 |
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 f2831fca2..6dd73b112 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 = !Setting.auto_reject_unknown && Setting.auto_mark_known + @account.known = @username == @domain ? Setting.auto_mark_instance_actors_known : (!Setting.auto_reject_unknown && Setting.auto_mark_known) end def update_account |