diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-20 13:56:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 13:56:37 +0100 |
| commit | aa362ab73dc7121104b3c01800152b9fc56ea396 (patch) | |
| tree | f0f5879a51325856887a2e32a4c3f9654af61aab /app/lib/activitypub/activity/announce.rb | |
| parent | 530d29148ca0c5bf29f6fa516b1ef4f91d95894b (diff) | |
| parent | 5145c81620efbd5cf8dc911858d17d1fa888c996 (diff) | |
Merge pull request #888 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub/activity/announce.rb')
| -rw-r--r-- | app/lib/activitypub/activity/announce.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb index 1147a4481..34d1b7cbd 100644 --- a/app/lib/activitypub/activity/announce.rb +++ b/app/lib/activitypub/activity/announce.rb @@ -17,7 +17,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity uri: @json['id'], created_at: @json['published'], override_timestamps: @options[:override_timestamps], - visibility: original_status.visibility + visibility: visibility_from_audience ) distribute(status) @@ -26,6 +26,18 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity private + def visibility_from_audience + if equals_or_includes?(@json['to'], ActivityPub::TagManager::COLLECTIONS[:public]) + :public + elsif equals_or_includes?(@json['cc'], ActivityPub::TagManager::COLLECTIONS[:public]) + :unlisted + elsif equals_or_includes?(@json['to'], @account.followers_url) + :private + else + :direct + end + end + def announceable?(status) status.account_id == @account.id || status.public_visibility? || status.unlisted_visibility? end |