diff options
| author | multiple creatures <dev@multiple-creature.party> | 2020-03-08 12:38:00 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-03-08 12:38:00 -0500 |
| commit | ca1052059372027d05a6133b95176b40954355d7 (patch) | |
| tree | b861b2cbda14cd47e2b2080529c6b4b587f4a0f4 /app/lib/activitypub/activity | |
| parent | 5dd65e0c6fdd8623af09f545991fb5995fe916c1 (diff) | |
add option to auto-trust accounts (at the time of processing a create note) from servers that don't have a graylist policy set on them
Diffstat (limited to 'app/lib/activitypub/activity')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 8fd429059..2c101c6cb 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -6,7 +6,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity unless known? if @options[:announced_by].nil? - return reject_payload! if !@options[:requested] && rejecting_unknown? + if rejecting_unknown? + return reject_payload! if !@options[:requested] + elsif !@account.manual_only? && Setting.auto_mark_known && Setting.mark_known_from_posts + @account.mark_known! + end elsif !@account.manual_only? && Setting.auto_mark_known && Setting.mark_known_from_boosts && known?(@options[:announced_by]) @account.mark_known! else |