From 76bfd5992cccc4c98ad2b8b2c99c5204666c7100 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 25 Jan 2022 16:58:29 +1100
Subject: [PATCH] use coalesce to merge multiple timestamp for search as one

---
 app/sql.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/sql.js b/app/sql.js
index 7004da794..fda0bf21e 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -1853,9 +1853,10 @@ function searchConversations(query, { limit } = {}) {
   return map(rows, row => jsonToObject(row.json));
 }
 
-function searchMessages(query, limit) {
-  // order by clause is the same as orderByClause but with a table prefix so we cannot reuse it
+// order by clause is the same as orderByClause but with a table prefix so we cannot reuse it
+const orderByMessageCoalesceClause = `ORDER BY COALESCE(${MESSAGES_TABLE}.serverTimestamp, ${MESSAGES_TABLE}.sent_at, ${MESSAGES_TABLE}.received_at) DESC`;
 
+function searchMessages(query, limit) {
   const rows = globalInstance
     .prepare(
       `SELECT
@@ -1865,7 +1866,7 @@ function searchMessages(query, limit) {
     INNER JOIN ${MESSAGES_TABLE} on ${MESSAGES_FTS_TABLE}.id = ${MESSAGES_TABLE}.id
     WHERE
      ${MESSAGES_FTS_TABLE} match $query
-    ORDER BY ${MESSAGES_TABLE}.serverTimestamp DESC, ${MESSAGES_TABLE}.serverId DESC, ${MESSAGES_TABLE}.sent_at DESC, ${MESSAGES_TABLE}.received_at DESC
+    ${orderByMessageCoalesceClause}
     LIMIT $limit;`
     )
     .all({
@@ -1890,7 +1891,7 @@ function searchMessagesInConversation(query, conversationId, limit) {
     WHERE
     ${MESSAGES_FTS_TABLE} match $query AND
       ${MESSAGES_TABLE}.conversationId = $conversationId
-    ORDER BY ${MESSAGES_TABLE}.serverTimestamp DESC, ${MESSAGES_TABLE}.serverId DESC, ${MESSAGES_TABLE}.sent_at DESC, ${MESSAGES_TABLE}.received_at DESC
+    ${orderByMessageCoalesceClause}
       LIMIT $limit;`
     )
     .all({
@@ -2233,8 +2234,7 @@ function getUnreadCountByConversation(conversationId) {
 
 // Note: Sorting here is necessary for getting the last message (with limit 1)
 // be sure to update the sorting order to sort messages on redux too (sortMessages)
-const orderByClause =
-  'ORDER BY serverTimestamp DESC, serverId DESC, sent_at DESC, received_at DESC';
+const orderByClause = 'ORDER BY COALESCE(serverTimestamp, sent_at, received_at) DESC';
 
 function getMessagesByConversation(conversationId, { messageId = null } = {}) {
   const absLimit = 20;