Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
d13702ac
Unverified
Commit
d13702ac
authored
2 years ago
by
Claire
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix status cache hydration discrepancy (#19879)
parent
10370d31
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/lib/status_cache_hydrator.rb
+2
-2
2 additions, 2 deletions
app/lib/status_cache_hydrator.rb
with
2 additions
and
2 deletions
app/lib/status_cache_hydrator.rb
+
2
−
2
View file @
d13702ac
...
...
@@ -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?
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment