Unverified Commit 35b84985 authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

Skip ActivityPub Announces of non-public objects (#6230)

* Skip ActivityPub Announces of non-public objects

* Skip OStatus reblogs of non-public statuses
parent d41f0b66
......@@ -5,7 +5,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
original_status = status_from_uri(object_uri)
original_status ||= fetch_remote_original_status
return if original_status.nil? || delete_arrived_first?(@json['id'])
return if original_status.nil? || delete_arrived_first?(@json['id']) || !announceable?(original_status)
status = Status.find_by(account: @account, reblog: original_status)
......@@ -33,4 +33,8 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
::FetchRemoteStatusService.new.call(@object['url'])
end
end
def announceable?(status)
status.public_visibility? || status.unlisted_visibility?
end
end
......@@ -26,6 +26,9 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
cached_reblog = reblog
status = nil
# Skip if the reblogged status is not public
return if cached_reblog && !(cached_reblog.public_visibility? || cached_reblog.unlisted_visibility?)
media_attachments = save_media
ApplicationRecord.transaction do
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment