about summary refs log tree commit diff
path: root/app/lib/activitypub/activity
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-10-12 22:05:06 -0500
committermultiple creatures <dev@multiple-creature.party>2019-10-12 22:05:06 -0500
commita367ff86982987aa0573d9b375000a909223c3ad (patch)
tree0d9a8560aba33efdf2dbc98398a3df72ecd56781 /app/lib/activitypub/activity
parentbc04de8eed0cf0451018f3182af0a24754444f86 (diff)
graylist (reject unknown) federation & known account auto-learning finally have toggle switches in site settings
Diffstat (limited to 'app/lib/activitypub/activity')
-rw-r--r--app/lib/activitypub/activity/create.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index e7fe19152..4367344ab 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -9,7 +9,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       if @options[:announced_by].nil?
         return reject_payload! if !@options[:requested] && rejecting_unknown?
       else
-        @account.mark_known! if known?(@options[:announced_by])
+        @account.mark_known! if Setting.auto_mark_known && known?(@options[:announced_by])
       end
     end