From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 27 Mar 2019 18:58:24 +0000 (+0100)
Subject: Fix alternative relay support regression (#10398)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e86663b1da9c31b57baf244effb94c063e10a424;p=mastodon.git

Fix alternative relay support regression (#10398)

Fix #10324
---

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