Merge commit '39b22ba91b' into kb_migration

app/lib/activitypub/activity/create.rb

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

app/lib/activitypub/parser/status_parser.rb

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

app/lib/activitypub/tag_manager.rb

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