fix: error running glitch-soc#1

funamitech · Aug 24, 2024 · 3cd5601 · 3cd5601
1 parent 28899f8
commit 3cd5601
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/app/lib/status_cache_hydrator.rb b/app/lib/status_cache_hydrator.rb
@@ -58,11 +58,7 @@ def hydrate_reblog_payload(empty_payload, account_id)
       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 @@ def serialized_filter(filter)
     ).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,