gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix loginonly activitypub spec

Browse source
This commit is contained in:
KMY 2023-05-25 11:20:26 +09:00
parent 9ffe6817e0
commit 279e4465ac
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/activitypub/activity/create.rb
View file

@ -526,7 +526,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
:public :public
elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) } elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) }
:unlisted :unlisted
elsif audience_cc.include?('as:LoginOnly') elsif audience_to.include?('as:LoginOnly')
:login :login
elsif audience_to.include?(@account.followers_url) elsif audience_to.include?(@account.followers_url)
:private :private

2
app/lib/activitypub/parser/status_parser.rb
View file

@ -77,7 +77,7 @@ class ActivityPub::Parser::StatusParser
:public :public
elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) } elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) }
:unlisted :unlisted
elsif audience_cc.include?('as:LoginOnly') elsif audience_to.include?('as:LoginOnly')
:login :login
elsif audience_to.include?(@magic_values[:followers_collection]) elsif audience_to.include?(@magic_values[:followers_collection])
:private :private

6
app/lib/activitypub/tag_manager.rb
View file

@ -86,8 +86,10 @@ class ActivityPub::TagManager
case status.visibility case status.visibility
when 'public' when 'public'
[COLLECTIONS[:public]] [COLLECTIONS[:public]]
when 'unlisted', 'public_unlisted', 'login', 'private' when 'unlisted', 'public_unlisted', 'private'
[account_followers_url(status.account)] [account_followers_url(status.account)]
when 'login'
[account_followers_url(status.account), 'as:LoginOnly']
when 'direct', 'limited' when 'direct', 'limited'
if status.account.silenced? if status.account.silenced?
# Only notify followers if the account is locally silenced # Only notify followers if the account is locally silenced
@ -124,8 +126,6 @@ class ActivityPub::TagManager
cc << account_followers_url(status.account) cc << account_followers_url(status.account)
when 'unlisted', 'public_unlisted' when 'unlisted', 'public_unlisted'
cc << COLLECTIONS[:public] cc << COLLECTIONS[:public]
when 'login'
cc << 'as:LoginOnly'
end end
cc + cc_private_visibility(status) cc + cc_private_visibility(status)