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

Fix quote post streaming edge cases (#34957)

Browse source
This commit is contained in:
Claire 2025-06-06 09:32:24 +02:00 • committed by GitHub
parent c09f9a93f1
commit 86627624f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 54 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/lib/status_cache_hydrator.rb
View file

@ -75,25 +75,29 @@ class StatusCacheHydrator
end
def hydrate_quote_payload(empty_payload, quote, account_id, nested: false)
empty_payload.tap do |payload|
# Nothing to do if we're in the shallow (depth limit) case
next unless payload.key?(:quoted_status)
return unless quote&.acceptable?
empty_payload.tap do |payload|
payload.delete(:quoted_status) if nested
# TODO: performance improvements
if quote&.quoted_status.nil?
payload[nested ? :quoted_status_id : :quoted_status] = nil
payload[:state] = 'deleted'
elsif StatusFilter.new(quote.quoted_status, Account.find_by(id: account_id)).filtered?
payload[nested ? :quoted_status_id : :quoted_status] = nil
payload[:state] = 'unauthorized'
elsif payload[:state] == 'accepted'
if nested
payload[:quoted_status_id] = quote.quoted_status_id&.to_s
if quote.accepted?
if quote.quoted_status.nil?
payload[nested ? :quoted_status_id : :quoted_status] = nil
payload[:state] = 'deleted'
elsif StatusFilter.new(quote.quoted_status, Account.find_by(id: account_id)).filtered?
payload[nested ? :quoted_status_id : :quoted_status] = nil
payload[:state] = 'unauthorized'
else
payload[:quoted_status] = StatusCacheHydrator.new(quote.quoted_status).hydrate(account_id, nested: true)
payload[:state] = 'accepted'
if nested
payload[:quoted_status_id] = quote.quoted_status_id&.to_s
else
payload[:quoted_status] = StatusCacheHydrator.new(quote.quoted_status).hydrate(account_id, nested: true)
end
end
else
payload[nested ? :quoted_status_id : :quoted_status] = nil
end
end
end