techhub/mastodon
2
0
Fork 0
Code Activity

Change display of blocked and muted quoted users (#36619)

Browse Source
This commit is contained in:
Claire
2025-10-29 10:13:12 +01:00
committed by GitHub
parent 4896d2c4c6
commit e437bb919f
5 changed files with 98 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/lib/status_cache_hydrator.rb
View File

@@ -98,12 +98,12 @@ class StatusCacheHydrator
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_for_quote?
payload[nested ? :quoted_status_id : :quoted_status] = nil
payload[:state] = 'unauthorized'
else
payload[:state] = 'accepted'
if nested
filter_state = StatusFilter.new(quote.quoted_status, Account.find_by(id: account_id)).filter_state_for_quote
payload[:state] = filter_state || 'accepted'
if filter_state == 'unauthorized'
payload[nested ? :quoted_status_id : :quoted_status] = nil
elsif 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)