]> cat aescling's git repositories - mastodon.git/commitdiff
Fix alternative relay support regression (#10398)
authorEugen Rochko <eugen@zeonfederated.com>
Wed, 27 Mar 2019 18:58:24 +0000 (19:58 +0100)
committerGitHub <noreply@github.com>
Wed, 27 Mar 2019 18:58:24 +0000 (19:58 +0100)
Fix #10324

app/lib/activitypub/activity/announce.rb

index 9f8ffd9fb77f7a219ea2274281aa0603604d2a82..1aa6ee9ec2dd72679488bc92994cefc0e5ac8d9f 100644 (file)
@@ -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