nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

* Skip ActivityPub Announces of non-public objects

* Skip OStatus reblogs of non-public statuses
This commit is contained in:
Eugen Rochko 2018-01-09 19:35:10 +01:00 committed by GitHub
parent d41f0b66cc
commit 35b84985a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/activitypub/activity/announce.rb
View File

@ -5,7 +5,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
original_status = status_from_uri(object_uri) original_status = status_from_uri(object_uri)
original_status ||= fetch_remote_original_status 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) status = Status.find_by(account: @account, reblog: original_status)
@ -33,4 +33,8 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
::FetchRemoteStatusService.new.call(@object['url']) ::FetchRemoteStatusService.new.call(@object['url'])
end end
end end
def announceable?(status)
status.public_visibility? || status.unlisted_visibility?
end
end end

3
app/lib/ostatus/activity/creation.rb
View File

@ -26,6 +26,9 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
cached_reblog = reblog cached_reblog = reblog
status = nil 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 media_attachments = save_media
ApplicationRecord.transaction do ApplicationRecord.transaction do