diff options
| author | multiple creatures <dev@multiple-creature.party> | 2020-02-14 16:21:51 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-14 16:21:51 -0600 |
| commit | 4f7e76a1308cc35f97f47a9f42c197aeca9ee2de (patch) | |
| tree | 8030ac9944cbd39b7fb3bae2a089bf3d302ea90a /app/models | |
| parent | 803d632ea1063068645d11fca99c0dc624fbb86d (diff) | |
split auto-trust instance actor setting into auto-trust & always trust
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/account.rb | 2 | ||||
| -rw-r--r-- | app/models/form/admin_settings.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 68d23b299..ca298f5d8 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -252,7 +252,7 @@ class Account < ApplicationRecord def mark_known! update!(known: true) - unless local? || domain == username + unless local? || !Setting.auto_mark_instance_actors_known || domain == username _instance_actor = Account.find_remote(domain, domain) return if _instance_actor.nil? || _instance_actor.known? diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 03f6059dc..359271e5d 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -37,6 +37,7 @@ class Form::AdminSettings auto_reject_unknown auto_mark_known auto_mark_instance_actors_known + always_mark_instance_actors_known werewolf_status spam_check_enabled ).freeze @@ -57,6 +58,7 @@ class Form::AdminSettings auto_reject_unknown auto_mark_known auto_mark_instance_actors_known + always_mark_instance_actors_known werewolf_status spam_check_enabled ).freeze |