about summary refs log tree commit diff
path: root/app/lib/activitypub
diff options
context:
space:
mode:
authorStarfall <us@starfall.systems>2022-02-25 12:35:11 -0600
committerStarfall <us@starfall.systems>2022-02-25 12:35:11 -0600
commitad1733ea294c6049336a9aeeb7ff96c8fea22cfa (patch)
tree306ff2d36a8bce82039890c4327f7d7bf37583dc /app/lib/activitypub
parentc5f289e8ef7ec1592d068ac797add7332343820d (diff)
parente48eaf64cc7cb0cfab388331c4823ee5fb580d59 (diff)
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/lib/activitypub')
-rw-r--r--app/lib/activitypub/activity/announce.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb
index 1f9319290..12fad8da4 100644
--- a/app/lib/activitypub/activity/announce.rb
+++ b/app/lib/activitypub/activity/announce.rb
@@ -8,6 +8,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
       original_status = status_from_object
 
       return reject_payload! if original_status.nil? || !announceable?(original_status)
+      return if requested_through_relay?
 
       @status = Status.find_by(account: @account, reblog: original_status)