Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add support for non-public reblogs from ActivityPub (#9841)

Browse source 
Fix #9838
This commit is contained in:
Eugen Rochko 2019-01-18 15:56:21 +01:00 • committed by GitHub
parent 55219f11cc
commit 31f396b57d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/lib/activitypub/activity/announce.rb
View file

@ -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