From 09a93d0648af8ae419d5183fd7c35b6406313150 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 22 Sep 2020 16:01:30 +1000
Subject: [PATCH] adress reviews

---
 app/sql.js | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/app/sql.js b/app/sql.js
index 12a566fe6..276746a25 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -3111,27 +3111,13 @@ async function removePrefixFromGroupConversations(instance) {
           `countMessagesOld: ${countMessagesOld}, countMessagesNew: ${countMessagesNew}`
         );
 
-        if (countMessagesOld > countMessagesNew) {
-          console.log(
-            'Removing the conversation without the prefix as there are less messages in it'
-          );
-          await instance.run(
-            `DELETE FROM ${CONVERSATIONS_TABLE} WHERE id = $id;`,
-            {
-              $id: newId,
-            }
-          );
-        } else {
-          console.log(
-            'Removing the conversation with the prefix as there are less messages in it'
-          );
-          await instance.run(
-            `DELETE FROM ${CONVERSATIONS_TABLE} WHERE id = $id;`,
-            {
-              $id: oldId,
-            }
-          );
-        }
+        const deleteId = countMessagesOld > countMessagesNew ? newId : oldId;
+        await instance.run(
+          `DELETE FROM ${CONVERSATIONS_TABLE} WHERE id = $id;`,
+          {
+            $id: deleteId,
+          }
+        );
       }
 
       const morphedObject = {