th: Merge branch 'main' into turn-quotes-into-links

app/lib/activitypub/activity/create.rb

@@ -429,8 +429,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def guess_quote_url
-    if @object["quoteUrl"] && !@object["quoteUrl"].empty?
+    if @object["quoteUri"] && !@object["quoteUri"].empty?
+      @object["quoteUri"]
+    elsif @object["quoteUrl"] && !@object["quoteUrl"].empty?
       @object["quoteUrl"]
+    elsif @object["quoteURL"] && !@object["quoteURL"].empty?
+      @object["quoteURL"]
     elsif @object["_misskey_quote"] && !@object["_misskey_quote"].empty?
       @object["_misskey_quote"]
     else

app/lib/activitypub/tag_manager.rb

@@ -77,11 +77,15 @@ class ActivityPub::TagManager
   # Unlisted and private statuses go out primarily to the followers collection
   # Others go out only to the people they mention
   def to(status)
+    to = []
+
+    to << uri_for(status.quote.account) if status.quote?
+
     case status.visibility
     when 'public'
-      [COLLECTIONS[:public]]
+      to << COLLECTIONS[:public]
     when 'unlisted', 'private'
-      [account_followers_url(status.account)]
+      to << account_followers_url(status.account)
     when 'direct', 'limited'
       if status.account.silenced?
         # Only notify followers if the account is locally silenced

app/models/status_edit.rb

@@ -62,6 +62,10 @@ class StatusEdit < ApplicationRecord
     end
   end
 
+  def quote?
+    status.quote?
+  end
+
   def proper
     self
   end