CloudToys/puyopuyotetr.is
1
0
Fork 0
Code

fix: error running #1

Browse Source
This commit is contained in:
Noa Himesaka 2024-08-24 23:12:32 +09:00
parent 28899f8c3e
commit 3cd560117e
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/lib/status_cache_hydrator.rb
View File

@ -58,11 +58,7 @@ class StatusCacheHydrator
payload[:reblog][:bookmarked] = Bookmark.exists?(account_id: account_id, status_id: @status.reblog_of_id)
payload[:reblog][:pinned] = StatusPin.exists?(account_id: account_id, status_id: @status.reblog_of_id) if @status.reblog.account_id == account_id
payload[:reblog][:filtered] = payload[:filtered]
<<<<<<< HEAD
payload[:reblog][:reactions] = serialized_reactions(account_id)
=======
payload[:reblog][:reactions] = serialized_reactions(account_id, @status.reblog)
>>>>>>> e3dbd2e6489b90f68b5a207c7561ebf7435f967c
if payload[:reblog][:poll]
if @status.reblog.account_id == account_id
@ -94,13 +90,8 @@ class StatusCacheHydrator
).as_json
end
<<<<<<< HEAD
def serialized_reactions(account_id)
reactions = @status.reactions(account_id)
=======
def serialized_reactions(account_id, status)
reactions = status.reactions(account_id)
>>>>>>> e3dbd2e6489b90f68b5a207c7561ebf7435f967c
ActiveModelSerializers::SerializableResource.new(
reactions,
each_serializer: REST::ReactionSerializer,