OpenSource/mastodon
OpenSource/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-03-13 14:08:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change ActivityPub processing code to not forward blocked replies

Browse source
This commit is contained in:
Claire 2022-05-02 16:27:15 +02:00
parent 2195bd5a90
commit 2cb12220dd
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/lib/activitypub/activity/create.rb
View file

@ -377,6 +377,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
!replied_to_status.nil? && replied_to_status.account.local?
end
def reply_blocked?
!replied_to_status.account.blocking?(@account) && !replied_to_status.account.domain_blocking?(@account.domain)
end
def related_to_local_activity?
fetch? || followed_by_local_accounts? || requested_through_relay? ||
responds_to_followed_account? || addresses_local_accounts?
@ -401,7 +405,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end
def forward_for_reply
return unless @status.distributable? && @json['signature'].present? && reply_to_local?
return unless @status.distributable? && @json['signature'].present? && reply_to_local? && !reply_blocked?
ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), replied_to_status.account_id, [@account.preferred_inbox_url])
end