about summary refs log tree commit diff
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-02-14 17:43:01 -0600
committermultiple creatures <dev@multiple-creature.party>2020-02-14 17:43:01 -0600
commit104fdea06bb175103f6ab298a6a14dbc77184d59 (patch)
treef50cbfd703f7a79ff8219063f5df29a681a92bff
parent92847646cff1effdf42eaa0819d836a663d428c4 (diff)
check `mark_known_from_boosts` setting when processing incoming boosts
-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 a1449a302..03a7739d8 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -8,7 +8,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     unless known?
       if @options[:announced_by].nil?
         return reject_payload! if !@options[:requested] && rejecting_unknown?
-      elsif Setting.auto_mark_known && known?(@options[:announced_by])
+      elsif Setting.auto_mark_known && Setting.mark_known_from_boosts && known?(@options[:announced_by])
         @account.mark_known!
       else
         return reject_payload!