From 44055775cb278ed4720d3008b7b89cef5ea11e92 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 6 Feb 2023 10:11:41 +0100
Subject: [PATCH] fix: not use variables and direct send in send

---
 back/methods/chat/send.js       | 11 +++++++++--
 back/methods/chat/sendQueued.js | 18 +++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/back/methods/chat/send.js b/back/methods/chat/send.js
index 21e25c1f0..5e3821677 100644
--- a/back/methods/chat/send.js
+++ b/back/methods/chat/send.js
@@ -30,16 +30,23 @@ module.exports = Self => {
         const recipient = to.replace('@', '');
 
         if (sender.name != recipient) {
-            await models.Chat.create({
+            const chat = await models.Chat.create({
                 senderFk: sender.id,
                 recipient: to,
                 dated: Date.vnNew(),
                 checkUserStatus: 0,
                 message: message,
-                status: 'pending',
+                status: 'sending',
                 attempts: 0
             });
 
+            try {
+                await Self.sendMessage(chat.senderFk, chat.recipient, chat.message);
+                await updateChat(chat, 'sent');
+            } catch (error) {
+                await updateChat(chat, 'error', error);
+            }
+
             return true;
         }
 
diff --git a/back/methods/chat/sendQueued.js b/back/methods/chat/sendQueued.js
index dcd530873..ad8363627 100644
--- a/back/methods/chat/sendQueued.js
+++ b/back/methods/chat/sendQueued.js
@@ -15,22 +15,18 @@ module.exports = Self => {
 
     Self.sendQueued = async() => {
         const models = Self.app.models;
-        const maxAttempts = 3;
-        const sentStatus = 'sent';
-        const sendingStatus = 'sending';
-        const errorStatus = 'error';
 
         const chats = await models.Chat.find({
             where: {
                 status: {
                     neq: {
                         and: [
-                            sentStatus,
-                            sendingStatus
+                            'sent',
+                            'sending'
                         ]
                     }
                 },
-                attempts: {lt: maxAttempts}
+                attempts: {lt: 3}
             }
         });
 
@@ -38,16 +34,16 @@ module.exports = Self => {
             if (chat.checkUserStatus) {
                 try {
                     await Self.sendCheckingUserStatus(chat);
-                    await updateChat(chat, sentStatus);
+                    await updateChat(chat, 'sent');
                 } catch (error) {
-                    await updateChat(chat, errorStatus, error);
+                    await updateChat(chat, 'error', error);
                 }
             } else {
                 try {
                     await Self.sendMessage(chat.senderFk, chat.recipient, chat.message);
-                    await updateChat(chat, sentStatus);
+                    await updateChat(chat, 'sent');
                 } catch (error) {
-                    await updateChat(chat, errorStatus, error);
+                    await updateChat(chat, 'error', error);
                 }
             }
         }