Fix alternative relay support regression (#10398)

Fix #10324
master
Eugen Rochko 6 years ago committed by GitHub
parent 319bce3d9d
commit e86663b1da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      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? followed_by_local_accounts? || requested_through_relay? || reblog_of_local_status?
end end
def requested_through_relay?
super || Relay.find_by(inbox_url: @account.inbox_url)&.enabled?
end
def reblog_of_local_status? def reblog_of_local_status?
status_from_uri(object_uri)&.account&.local? status_from_uri(object_uri)&.account&.local?
end end

Loading…
Cancel
Save