From 3d6398a558d6d07df7b648fb7aa79dd977fffe6e Mon Sep 17 00:00:00 2001
From: Lizandro Guarnizo <77708265+lizandrogd@users.noreply.github.com>
Date: Sun, 25 Jan 2026 21:12:17 -0500
Subject: [PATCH] Update get_conversations.php

---
 api/get_conversations.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/api/get_conversations.php b/api/get_conversations.php
index d6807fb..744adff 100644
--- a/api/get_conversations.php
+++ b/api/get_conversations.php
@@ -23,6 +23,7 @@ try {
     // Obtener conversaciones agregadas por usuario: último mensaje + conteo de no leídos + avatar
     $filter = isset($_GET['filter']) ? strtolower(trim($_GET['filter'])) : 'all';
 
+    // Prefer last non-reaction message for preview (fallback to last any message)
     $sql = "SELECT 
             u.id AS user_id,
             COALESCE(u.name, u.phone_number) AS name,
@@ -34,20 +35,26 @@ try {
             u.in_service,
             u.in_service_by,
             u.in_service_at,
-            lm.message_id AS last_message_id,
-            lm.content AS last_message,
-            lm.direction AS direction,
-            lm.message_type AS message_type,
-            lm.created_at AS last_time,
+            COALESCE(lm_nr.message_id, lm_any.message_id) AS last_message_id,
+            COALESCE(lm_nr.content, lm_any.content) AS last_message,
+            COALESCE(lm_nr.direction, lm_any.direction) AS direction,
+            COALESCE(lm_nr.message_type, lm_any.message_type) AS message_type,
+            COALESCE(lm_nr.created_at, lm_any.created_at) AS last_time,
             IFNULL(SUM(CASE WHEN c.direction = 'incoming' AND (c.is_read IS NULL OR c.is_read = 0) THEN 1 ELSE 0 END), 0) AS unread_count
          FROM users u
          LEFT JOIN conversations c ON c.user_id = u.id
+         LEFT JOIN (
+             SELECT t1.* FROM conversations t1
+             JOIN (
+                 SELECT user_id, MAX(created_at) AS last_time_non_reaction FROM conversations WHERE message_type != 'reaction' GROUP BY user_id
+             ) tnr ON t1.user_id = tnr.user_id AND t1.created_at = tnr.last_time_non_reaction
+         ) lm_nr ON lm_nr.user_id = u.id
          LEFT JOIN (
              SELECT t1.* FROM conversations t1
              JOIN (
                  SELECT user_id, MAX(created_at) AS last_time FROM conversations GROUP BY user_id
              ) t2 ON t1.user_id = t2.user_id AND t1.created_at = t2.last_time
-         ) lm ON lm.user_id = u.id
+         ) lm_any ON lm_any.user_id = u.id
          GROUP BY u.id";
 
     // Aplicar filtro 'unread' si se solicita