feat: refractor Message to use the project types for compatibility with canis-tg

mrepol742 · mrepol742 · commit fb0ca01b1316 · 2025-09-11T18:50:45.000+08:00
diff --git a/src/commands/8ball.ts b/src/commands/8ball.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import { ball } from "../components/utils/data";
 
 export const info = {
diff --git a/src/commands/ai.ts b/src/commands/ai.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 import agentHandler from "../components/ai/agentHandler";
 import { greetings } from "../components/utils/data";
diff --git a/src/commands/alert.ts b/src/commands/alert.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
@@ -25,7 +26,7 @@ export default async function (msg: Message) {
       responseType: "arraybuffer",
     }
   );
-  
+
   const tempDir = "./.temp";
   await fs.mkdir(tempDir, { recursive: true });
 
diff --git a/src/commands/bible.ts b/src/commands/bible.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 
diff --git a/src/commands/block.ts b/src/commands/block.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 import { exec } from "child_process";
 import util from "util";
diff --git a/src/commands/cat.ts b/src/commands/cat.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import { cat } from "../components/utils/data";
 
 export const info = {
diff --git a/src/commands/caution.ts b/src/commands/caution.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
@@ -26,7 +27,7 @@ export default async function (msg: Message) {
       responseType: "arraybuffer",
     }
   );
-  
+
   const tempDir = "./.temp";
   await fs.mkdir(tempDir, { recursive: true });
 
diff --git a/src/commands/chad.ts b/src/commands/chad.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 import agentHandler from "../components/ai/agentHandler";
 import { greetings } from "../components/utils/data";
diff --git a/src/commands/dave.ts b/src/commands/dave.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 import agentHandler from "../components/ai/agentHandler";
 import { greetings } from "../components/utils/data";
diff --git a/src/commands/dcma.ts b/src/commands/dcma.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 
 export const info = {
@@ -15,9 +15,9 @@ export default async function (msg: Message) {
 
   const text = `
   \`DCMA\`
-    This bot is intended for educational and entertainment purposes only. 
-    The owner of this bot does not claim ownership of any content shared through it. 
-    If you believe that your content has been used without permission, 
+    This bot is intended for educational and entertainment purposes only.
+    The owner of this bot does not claim ownership of any content shared through it.
+    If you believe that your content has been used without permission,
     please contact us to resolve the issue.
     `;
 
diff --git a/src/commands/docker.ts b/src/commands/docker.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 
diff --git a/src/commands/duckduckgo.ts b/src/commands/duckduckgo.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 
diff --git a/src/commands/dyk.ts b/src/commands/dyk.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import { dyk } from "../components/utils/data";
 
 export const info = {
diff --git a/src/commands/fbdl.ts b/src/commands/fbdl.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message";
 import { getFbVideoInfo } from "fb-downloader-scrapper";
 import log from "../components/utils/log";
 import axios from "axios";
diff --git a/src/commands/fork.ts b/src/commands/fork.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 
 export const info = {
   command: "fork",
diff --git a/src/commands/github.ts b/src/commands/github.ts
@@ -1,4 +1,4 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
@@ -31,7 +31,7 @@ export default async function (msg: Message) {
   const info = `
       \`${user.name || user.login}\
       ${user.bio || ""}
-  
+
       Place: ${user.location || "N/A"}
       Followers: ${user.followers}
       Following: ${user.following}
diff --git a/src/commands/god.ts b/src/commands/god.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
diff --git a/src/commands/google.ts b/src/commands/google.ts
@@ -1,4 +1,4 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
diff --git a/src/commands/help.ts b/src/commands/help.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 import { commands } from "../index";
 
@@ -59,7 +59,7 @@ export default async function (msg: Message) {
     const response = `
     \`${matchCommands.command}\`
     ${matchCommands.description || "No description"}
-    
+
     *Usage:* ${matchCommands.usage || "No usage"}
     *Example:* ${matchCommands.example || "No example"}
     *Role:* ${matchCommands.role || "user"}
diff --git a/src/commands/huggingface.ts b/src/commands/huggingface.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 
diff --git a/src/commands/hwaifu.ts b/src/commands/hwaifu.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
diff --git a/src/commands/joke.ts b/src/commands/joke.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import { joke } from "../components/utils/data";
 
 export const info = {
diff --git a/src/commands/legal.ts b/src/commands/legal.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 
 export const info = {
@@ -12,7 +12,7 @@ export const info = {
 
 export default async function (msg: Message) {
     if (!/^legal$/i.test(msg.body)) return;
-    
+
     const text = `
     \`Legal Commands\`
 
@@ -30,4 +30,4 @@ export default async function (msg: Message) {
     `;
 
     await msg.reply(text);
-}
+}
diff --git a/src/commands/logout.ts b/src/commands/logout.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import { client } from "../components/client";
 import log from "../components/utils/log";
 
diff --git a/src/commands/meme.ts b/src/commands/meme.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
diff --git a/src/commands/mj.ts b/src/commands/mj.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 import Font from "../components/utils/font";
 import { author } from "../../package.json";
diff --git a/src/commands/nano.ts b/src/commands/nano.ts
@@ -1,6 +1,7 @@
 import { GoogleGenAI, Modality } from "@google/genai";
 import fs from "fs/promises";
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 import { gemini } from "../components/ai/gemini";
 
diff --git a/src/commands/npm.ts b/src/commands/npm.ts
@@ -1,4 +1,4 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
diff --git a/src/commands/pickupline.ts b/src/commands/pickupline.ts
@@ -1,4 +1,4 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
@@ -18,6 +18,6 @@ export default async function (msg: Message) {
   if (!/^pickupline$/i.test(msg.body)) return;
 
   const response = await axios.get(`https://api.popcat.xyz/pickuplines`);
-  
+
   await msg.reply(response.data.pickupline);
 }
diff --git a/src/commands/pin.ts b/src/commands/pin.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 
 export const info = {
@@ -12,7 +12,7 @@ export const info = {
 
 export default async function (msg: Message) {
     if (!/^pin$/i.test(msg.body)) return;
-    
+
     if (!msg.hasQuotedMsg) {
         await msg.reply("Please reply to the message you want to pin.");
         return;
@@ -25,4 +25,4 @@ export default async function (msg: Message) {
     }
 
     await quotedMsg.pin(24 * 60 * 60 * 1000 * 1000);
-}
+}
diff --git a/src/commands/ping.ts b/src/commands/ping.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 
 export const info = {
@@ -12,6 +12,6 @@ export const info = {
 
 export default function (msg: Message) {
   if (!/^ping$/i.test(msg.body)) return;
-  
+
   msg.reply("pong");
 }
diff --git a/src/commands/play.ts b/src/commands/play.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import fs from "fs";
 import { exec } from "child_process";
 // fallback import for compatibility
diff --git a/src/commands/poli.ts b/src/commands/poli.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
diff --git a/src/commands/pooh.ts b/src/commands/pooh.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message";
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
@@ -21,19 +22,19 @@ export default async function (msg: Message) {
     .map((s) => s.trim());
   if (args.length < 2 || !args[0] || !args[1]) {
     await msg.reply(
-      "Please provide two texts separated by '|'. Example: pooh text1 | text2"
+      "Please provide two texts separated by '|'. Example: pooh text1 | text2",
     );
     return;
   }
   const [text1, text2] = args;
 
   const response = await axios.get(
     `https://api.popcat.xyz/pooh?text1=${encodeURIComponent(
-      text1
+      text1,
     )}&text2=${encodeURIComponent(text2)}`,
     {
       responseType: "arraybuffer",
-    }
+    },
   );
 
   const tempDir = "./.temp";
diff --git a/src/commands/privacy.ts b/src/commands/privacy.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 
 export const info = {
diff --git a/src/commands/qrcode.ts b/src/commands/qrcode.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
diff --git a/src/commands/quiz.ts b/src/commands/quiz.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import { quiz } from "../components/utils/data";
 import { newQuizAttempt } from "../components/services/quiz";
 import log from "../components/utils/log";
diff --git a/src/commands/randomcolor.ts b/src/commands/randomcolor.ts
@@ -1,4 +1,4 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
diff --git a/src/commands/reload.ts b/src/commands/reload.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs";
diff --git a/src/commands/repo.ts b/src/commands/repo.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 
diff --git a/src/commands/restart.ts b/src/commands/restart.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import fs from "fs/promises";
 import log from "../components/utils/log";
 import logService from "../components/services/log";
diff --git a/src/commands/run.ts b/src/commands/run.ts
@@ -1,4 +1,4 @@
-import { Message } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 import { exec } from "child_process";
 import util from "util";
diff --git a/src/commands/sadcat.ts b/src/commands/sadcat.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs/promises";
diff --git a/src/commands/say.ts b/src/commands/say.ts
@@ -1,4 +1,5 @@
-import { Message, MessageMedia } from "whatsapp-web.js";
+import { MessageMedia } from "whatsapp-web.js";
+import { Message } from "../../types/message"
 import log from "../components/utils/log";
 import * as GoogleTTS from "google-tts-api";
 import fs from "fs";
diff --git a/src/commands/screenshot.ts b/src/commands/screenshot.ts
diff --git a/src/commands/sim.ts b/src/commands/sim.ts
diff --git a/src/commands/sql.ts b/src/commands/sql.ts
diff --git a/src/commands/stalk.ts b/src/commands/stalk.ts
diff --git a/src/commands/stats.ts b/src/commands/stats.ts
diff --git a/src/commands/terms.ts b/src/commands/terms.ts
diff --git a/src/commands/test.ts b/src/commands/test.ts
diff --git a/src/commands/top.ts b/src/commands/top.ts
diff --git a/src/commands/unpin.ts b/src/commands/unpin.ts
diff --git a/src/commands/unsend.ts b/src/commands/unsend.ts
diff --git a/src/commands/uptime.ts b/src/commands/uptime.ts
diff --git a/src/commands/video.ts b/src/commands/video.ts
diff --git a/src/commands/wa.ts b/src/commands/wa.ts
diff --git a/src/commands/waifu.ts b/src/commands/waifu.ts
diff --git a/src/commands/wiki.ts b/src/commands/wiki.ts
diff --git a/src/commands/wyr.ts b/src/commands/wyr.ts
diff --git a/src/commands/zsh.ts b/src/commands/zsh.ts
diff --git a/types/message.d.ts b/types/message.d.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Message } from "whatsapp-web.js";`
	`1`	`+import { Message } from "../../types/message"`
`2`	`2`	`import { ball } from "../components/utils/data";`
`3`	`3`
`4`	`4`	`export const info = {`