luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-29 08:37:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix alternative relay support regression (#10398)

Browse source 
Fix #10324
This commit is contained in:
Eugen Rochko 2019-03-27 19:58:24 +01:00 committed by GitHub
parent 319bce3d9d
commit e86663b1da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/lib/activitypub/activity/announce.rb
View file

@ -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