diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-15 18:55:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-15 18:55:55 +0100 |
| commit | d13702ac06e2a57d05e5938966ea190f33472fb9 (patch) | |
| tree | b68edd1b74d6a63e637e3f8568ffa3480d5d5af3 | |
| parent | 10370d316ab1f707d1995260d135a485937c0e6d (diff) | |
| download | mastodon-d13702ac06e2a57d05e5938966ea190f33472fb9.tar mastodon-d13702ac06e2a57d05e5938966ea190f33472fb9.tar.gz mastodon-d13702ac06e2a57d05e5938966ea190f33472fb9.tar.bz2 mastodon-d13702ac06e2a57d05e5938966ea190f33472fb9.zip | |
Fix status cache hydration discrepancy (#19879)
| -rw-r--r-- | app/lib/status_cache_hydrator.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/status_cache_hydrator.rb b/app/lib/status_cache_hydrator.rb index 298d7851a..a84d25694 100644 --- a/app/lib/status_cache_hydrator.rb +++ b/app/lib/status_cache_hydrator.rb @@ -11,7 +11,7 @@ class StatusCacheHydrator # If we're delivering to the author who disabled the display of the application used to create the # status, we need to hydrate the application, since it was not rendered for the basic payload - payload[:application] = ActiveModelSerializers::SerializableResource.new(@status.application, serializer: REST::StatusSerializer::ApplicationSerializer).as_json if payload[:application].nil? && @status.account_id == account_id && @status.application.present? + payload[:application] = @status.application.present? ? ActiveModelSerializers::SerializableResource.new(@status.application, serializer: REST::StatusSerializer::ApplicationSerializer).as_json : nil if payload[:application].nil? && @status.account_id == account_id # We take advantage of the fact that some relationships can only occur with an original status, not # the reblog that wraps it, so we can assume that some values are always false @@ -23,7 +23,7 @@ class StatusCacheHydrator # If the reblogged status is being delivered to the author who disabled the display of the application # used to create the status, we need to hydrate it here too - payload[:reblog][:application] = ActiveModelSerializers::SerializableResource.new(@status.reblog.application, serializer: REST::StatusSerializer::ApplicationSerializer).as_json if payload[:reblog][:application].nil? && @status.reblog.account_id == account_id && @status.reblog.application.present? + payload[:reblog][:application] = @status.reblog.application.present? ? ActiveModelSerializers::SerializableResource.new(@status.reblog.application, serializer: REST::StatusSerializer::ApplicationSerializer).as_json : nil if payload[:reblog][:application].nil? && @status.reblog.account_id == account_id payload[:reblog][:favourited] = Favourite.where(account_id: account_id, status_id: @status.reblog_of_id).exists? payload[:reblog][:reblogged] = Status.where(account_id: account_id, reblog_of_id: @status.reblog_of_id).exists? |