Merge pull request Desenvolvimento-de-Software#23 from mleandrojr/master

Removed the nl to br parser and changed the message sending structure.
mleandrojr · Aug 1, 2024 · 4824231 · 4824231
2 parents da2ee81 + 7f4efb4
commit 4824231
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/action/Greetings.ts b/src/action/Greetings.ts
@@ -113,7 +113,6 @@ export default class Greetings extends Action {
         }
 
         text = text.replace("{userid}", this.context.newChatMember!.getId());
-        text = text.replace(/\n/g, "<br>");
         text = text.replace(
             "{username}",
             this.context.newChatMember?.getFirstName() || this.context.newChatMember?.getUsername()

diff --git a/src/command/Rules.ts b/src/command/Rules.ts
@@ -125,7 +125,6 @@ export default class Rules extends Command {
             return this.context.chat.sendMessage(Lang.get("rulesNotFound"));
         }
 
-        const text = result[0].rules.replace(/\n/g, "<br>");
         return this.context.chat.sendMessage(result[0].rules, { parseMode: "HTML" });
     }
 

diff --git a/src/library/telegram/context/Chat.ts b/src/library/telegram/context/Chat.ts
@@ -430,10 +430,16 @@ export default class Chat {
             sendMessage.setOptions(options);
         }
 
-        return sendMessage.post()
-            .then((response) => response.json())
-            .then((json) => new Message(json.result))
-            .catch((error) => console.error(error));
+        try {
+
+            const response = await sendMessage.post();
+            return await response.json();
+
+        } catch (error: any) {
+            Log.save(error.message);
+        }
+
+        return Promise.resolve();
     }
 
     /**
@@ -457,9 +463,16 @@ export default class Chat {
             sendChatAction.setThreadId(this.context.messageThreadId);
         }
 
-        return sendChatAction.post()
-            .then((response) => response.json())
-            .then((json) => new Message(json.result))
-            .catch((error) => console.error(error));
+        try {
+
+            const response = await sendChatAction.post();
+            console.log(response);
+            return await response.json();
+
+        } catch (error: any) {
+            Log.save(error.message);
+        }
+
+        return Promise.resolve();
     }
 }