Fix alternative relay support regression (mastodon#10398)

Fix mastodon#10324
Origin-Creative · Mar 27, 2019 · 6195871 · 6195871
1 parent 4526516
commit 6195871
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb
@@ -47,6 +47,10 @@ def related_to_local_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