Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2025-10-09 17:59:13 +02:00
21 changed files with 273 additions and 88 deletions

View File

@@ -218,11 +218,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
def process_quote
@quote_uri = @status_parser.quote_uri
return if @quote_uri.blank?
return unless @status_parser.quote?
approval_uri = @status_parser.quote_approval_uri
approval_uri = nil if unsupported_uri_scheme?(approval_uri) || TagManager.instance.local_url?(approval_uri)
@quote = Quote.new(account: @account, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?)
@quote = Quote.new(account: @account, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?, state: @status_parser.deleted_quote? ? :deleted : :pending)
end
def process_hashtag(tag)