diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-01-09 19:35:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 19:35:10 +0100 |
| commit | 35b84985a8b9e57cfd3ffac8a0e3937d3c7a1167 (patch) | |
| tree | 6f2885b2947d2796eed899e0ae9f8820f810b096 | |
| parent | d41f0b66cc9768a0570c54194498a65a0ce0f31c (diff) | |
| download | mastodon-2.1.3.tar mastodon-2.1.3.tar.gz mastodon-2.1.3.tar.bz2 mastodon-2.1.3.zip | |
Skip ActivityPub Announces of non-public objects (#6230)v2.1.3
* Skip ActivityPub Announces of non-public objects
* Skip OStatus reblogs of non-public statuses
| -rw-r--r-- | app/lib/activitypub/activity/announce.rb | 6 | ||||
| -rw-r--r-- | app/lib/ostatus/activity/creation.rb | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb index b84098933..abf2b9b80 100644 --- a/app/lib/activitypub/activity/announce.rb +++ b/app/lib/activitypub/activity/announce.rb @@ -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 diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb index f210e134a..b38407cd3 100644 --- a/app/lib/ostatus/activity/creation.rb +++ b/app/lib/ostatus/activity/creation.rb @@ -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 |