From 7bea742c387fc951e5135c6d93307d9e1121273c Mon Sep 17 00:00:00 2001 From: John Parker Date: Fri, 16 Jul 2021 11:21:12 -0500 Subject: [PATCH 1/2] Avoid replying with Generating on Sticker --- lib/whatsapp.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/whatsapp.js b/lib/whatsapp.js index e0f643c..bd51526 100644 --- a/lib/whatsapp.js +++ b/lib/whatsapp.js @@ -111,7 +111,7 @@ class Message_was extends AsyncConstructor { check = await this.checkMessage(); - if (check !== "Command-reject" && check !== "Video-reject" && check !== "Url-Reject" && check !== "Video-Url-Reject" && check !== "Url-No-Detected") { + if (check !== "Command-reject" && check !== "Video-reject" && check !== "Url-Reject" && check !== "Video-Url-Reject" && check !== "Url-No-Detected" && check !== "Sticker") { await this.client.reply( this.message.chatId, _.t("Generating"), @@ -290,6 +290,8 @@ class Message_was extends AsyncConstructor { tools.conlog_info_force(`[${this.id}] Url no detected`); return "Url-No-Detected"; + } else if (this.message.type === "sticker") { + return "Sticker"; } } From ca27546ed17314d4fb0e3ecf623aba6e63c48916 Mon Sep 17 00:00:00 2001 From: Kaiserdj Date: Fri, 16 Jul 2021 19:22:24 +0200 Subject: [PATCH 2/2] Added sticker rejection notification --- lib/whatsapp.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/whatsapp.js b/lib/whatsapp.js index bd51526..318e34e 100644 --- a/lib/whatsapp.js +++ b/lib/whatsapp.js @@ -111,7 +111,7 @@ class Message_was extends AsyncConstructor { check = await this.checkMessage(); - if (check !== "Command-reject" && check !== "Video-reject" && check !== "Url-Reject" && check !== "Video-Url-Reject" && check !== "Url-No-Detected" && check !== "Sticker") { + if (check !== "Sticker-reject" && check !== "Command-reject" && check !== "Video-reject" && check !== "Url-Reject" && check !== "Video-Url-Reject" && check !== "Url-No-Detected") { await this.client.reply( this.message.chatId, _.t("Generating"), @@ -170,6 +170,8 @@ class Message_was extends AsyncConstructor { case "Video-disable": case "Video-Url-disable": break; + case "Sticker-reject": + break; case "Command-reject": case "Video-reject": case "Url-Reject": @@ -192,7 +194,11 @@ class Message_was extends AsyncConstructor { } async checkMessage() { - if (this.message.isMedia || this.message.type === "document") { + if (this.message.type === "sticker") { + tools.conlog_info_force(`[${this.id}] rejected by it's already a sticker`); + + return "Sticker-reject"; + } else if (this.message.isMedia || this.message.type === "document") { if (config.activeCommand) { if (!config.customActiveCommand.includes(this.message.caption)) { @@ -290,8 +296,6 @@ class Message_was extends AsyncConstructor { tools.conlog_info_force(`[${this.id}] Url no detected`); return "Url-No-Detected"; - } else if (this.message.type === "sticker") { - return "Sticker"; } }