about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-03-27 19:58:24 +0100
committerGitHub <noreply@github.com>2019-03-27 19:58:24 +0100
commite86663b1da9c31b57baf244effb94c063e10a424 (patch)
tree168ec3882f3bfba59006deb39efaf0816b2f1db9 /app/lib
parent319bce3d9da552ffa5b153f723bb0b78076b2a1c (diff)
Fix alternative relay support regression (#10398)
Fix #10324
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/activitypub/activity/announce.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb
index 9f8ffd9fb..1aa6ee9ec 100644
--- a/app/lib/activitypub/activity/announce.rb
+++ b/app/lib/activitypub/activity/announce.rb
@@ -47,6 +47,10 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
     followed_by_local_accounts? || requested_through_relay? || reblog_of_local_status?
   end
 
+  def requested_through_relay?
+    super || Relay.find_by(inbox_url: @account.inbox_url)&.enabled?
+  end
+
   def reblog_of_local_status?
     status_from_uri(object_uri)&.account&.local?
   end