Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix alternative relay support regression #10398

Merged
merged 1 commit into from
Mar 27, 2019
Merged

Fix alternative relay support regression #10398

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/lib/activitypub/activity/announce.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down