Skip to content

Commit

Permalink
Fix: 連合リレー判定に、フレンドサーバーのチェックを追加 (#670)
Browse files Browse the repository at this point in the history
  • Loading branch information
kmycode authored Apr 16, 2024
1 parent 8c5d3e0 commit 78b2707
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/lib/activitypub/activity.rb
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ def followed_by_local_accounts?
end

def requested_through_relay?
@options[:relayed_through_actor] && Relay.find_by(inbox_url: @options[:relayed_through_actor].inbox_url)&.enabled?
@options[:relayed_through_actor] &&
(Relay.find_by(inbox_url: @options[:relayed_through_actor].inbox_url)&.enabled? || FriendDomain.free_receivings.exists?(inbox_url: @options[:relayed_through_actor].inbox_url))
end

def reject_payload!
Expand Down

0 comments on commit 78b2707

Please sign in to comment.