feat: bug fixes and improvements

Author: mrepol742

README.md

@@ -32,6 +32,7 @@ Canis supports multiple AI providers out of the box:
 - Redis/Valkey
 - WhatsApp Account
 - Chrome browser
+- FFMPEG
 
 ## Getting started
 

package-lock.json

@@ -43,7 +43,7 @@
     "redis": "^5.6.0",
     "systeminformation": "^5.27.7",
     "whatsapp-web.js": "^1.31.0",
-    "youtubei.js": "^14.0.0"
+    "youtubei.js": "^15.0.0"
   },
   "devDependencies": {
     "@types/dotenv": "^6.1.1",

package.json

@@ -1,4 +1,4 @@
-import { Message } from "../../types/message"
+import { Message } from "../../types/message";
 
 export const info = {
   command: "fork",
@@ -12,7 +12,18 @@ export const info = {
 export default async function (msg: Message) {
   if (!/^fork$/i.test(msg.body)) return;
 
-  await msg.reply(
-    "Fork this bot at https://github.com/mrepol742/project-canis or contribute to the project by submitting issues or pull requests."
-  );
+  const text = `
+  \`Canis for WhatsApp\`
+    mrepol742/project-canis
+
+  \`Canis for Telegram\`
+    mrepol742/project-canis-ts
+
+    This bot is not affiliated, endorsed, partner, or connected to Meta.
+    Use it at your own RISK.
+
+    Type \`Legal\` for more information.
+    `;
+
+  await msg.reply(text);
 }

src/commands/fork.ts

@@ -25,6 +25,9 @@ export default async function (msg: Message) {
        \`dcma\`
        Display the DCMA policy of the bot.
 
+       \`license\`
+       Display the License of the bot.
+
        \`contact\`
        mrepol742@gmail.com
     `;

src/commands/legal.ts

@@ -0,0 +1,32 @@
+import { Message } from "../../types/message";
+import log from "../components/utils/log";
+
+export const info = {
+  command: "license",
+  description: "Display the License of the bot.",
+  usage: "license",
+  example: "license",
+  role: "legal",
+  cooldown: 5000,
+};
+
+export default async function (msg: Message) {
+  if (!/^license/i.test(msg.body)) return;
+
+  const text = `
+  \`License\`
+    MIT License with Commons Clause and Commercial Licensing
+
+    Copyright (c) 2025 Melvin Jones Repol
+
+    Permission is hereby granted, free of charge, to use, copy, modify, and distribute the software under the MIT License, with the following additional condition:
+
+    1. **Commercial Use Restriction**: You may not use the software for commercial purposes unless you obtain a commercial license. Commercial use includes, but is not limited to, the use of the software as part of any service offered for a fee, or any use that generates revenue either directly or indirectly.
+
+    2. **Commercial Licensing**: To use this software for commercial purposes, you must obtain a commercial license by paying the required fee. For licensing inquiries, pricing, and terms, please contact mrepol742@gmail.com.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    `;
+
+  await msg.reply(text);
+}

src/commands/license.ts

@@ -1,6 +1,7 @@
 import { MessageMedia } from "whatsapp-web.js";
-import { Message } from "../../types/message"
+import { Message } from "../../types/message";
 import fs from "fs";
+import path from "path";
 import { exec } from "child_process";
 // fallback import for compatibility
 // youtubei.js currently does not support ESM directly
@@ -40,7 +41,7 @@ export default async function play(msg: Message) {
   // Only allow audios shorter than 10 minutes (600 seconds)
   if (audio.length && audio.length.seconds > 600) {
     await msg.reply(
-      "Sorry, only videos shorter than 10 minutes can be downloaded."
+      "Sorry, only videos shorter than 10 minutes can be downloaded.",
     );
     return;
   }
@@ -59,31 +60,29 @@ export default async function play(msg: Message) {
   }
 
   const tempDir = "./.temp";
-  await fs.mkdirSync(tempDir, { recursive: true });
-
-  const tempPath = `${tempDir}/${audio.id}.mp4`;
+  await fs.promises.mkdir(tempDir, { recursive: true });
+  const tempPath = path.join(tempDir, `${audio.id}.mp4`);
   let writeStream = fs.createWriteStream(tempPath);
 
   for await (const chunk of Utils.streamToIterable(stream)) {
     writeStream.write(chunk);
   }
 
   await execPromise(
-    `ffmpeg -y -i "${tempPath}" -vn -ar 44100 -ac 2 -b:a 192k "${tempPath}.mp3"`
+    `ffmpeg -y -i "${tempPath}" -vn -ar 44100 -ac 2 -b:a 192k "${tempPath}.mp3"`,
   );
 
   const audioBuffer = fs.readFileSync(tempPath + ".mp3");
   const media = new MessageMedia(
     "audio/mpeg",
     audioBuffer.toString("base64"),
-    `${audio.title}.mp3`
+    `${audio.title}.mp3`,
   );
 
   await msg.reply(media, msg.from, {
     caption: audio.title,
     sendAudioAsVoice: true,
   });
 
-  await fs.promises.unlink(tempPath);
-  await fs.promises.unlink(tempPath + ".mp3");
+  Promise.all([fs.promises.unlink(tempPath), fs.promises.unlink(tempPath)]);
 }

src/commands/play.ts

@@ -1,9 +1,9 @@
-import { Message } from "../../types/message"
+import { Message } from "../../types/message";
 import axios from "axios";
 import log from "../components/utils/log";
 import fs from "fs";
 import path from "path";
-import { commands } from "../index";
+import { commands, commandDirs } from "../index";
 import Loader from "../components/utils/cmd/loader";
 
 export const info = {
@@ -24,23 +24,13 @@ export default async function (msg: Message) {
       return;
     }
 
-    const basePath = path.join(__dirname, "..", "commands");
-
-    const commandDirs = [
-      basePath,
-      path.join(basePath, "private"),
-    ];
-
     const possibleExtensions = [".ts", ".js"];
     let found = false;
 
     for (const ext of possibleExtensions) {
       for (const dir of commandDirs) {
-        const filePath = path.join(dir, `${query}${ext}`);
-        if (fs.existsSync(filePath)) {
-          Loader(`${query}${ext}`, dir);
-          found = true;
-        }
+        Loader(`${query}${ext}`, dir);
+        found = true;
       }
     }
 
@@ -49,14 +39,14 @@ export default async function (msg: Message) {
         `
     \`Failed to load\`
     ${query}
-    `
+    `,
       );
     if (found)
       await msg.reply(
         `
       \`Successfully reloaded\`
       ${query}
-      `
+      `,
       );
     return;
   }
@@ -65,18 +55,11 @@ export default async function (msg: Message) {
   let count = 0;
   const newCommands: string[] = [];
   const removeCommands: string[] = [];
-  const basePath = path.join(__dirname, "..", "commands");
-
-  const commandDirs = [
-    basePath,
-    path.join(basePath, "private"),
-  ];
 
   for (const dir of commandDirs) {
     const files = fs.readdirSync(dir);
     for (const file of files) {
       if (/\.js$|\.ts$/.test(file)) {
-        const filePath = path.join(dir, file);
         const commandName = file.replace(/\.(js|ts)$/, "");
 
         if (!commands[commandName]) {
@@ -85,7 +68,7 @@ export default async function (msg: Message) {
           removeCommands.push(commandName);
         }
 
-        await Loader(filePath, dir);
+        await Loader(file, dir);
         count++;
       }
     }

src/commands/reload.ts

@@ -82,6 +82,6 @@ export default async function (msg: Message) {
   await msg.reply(media, msg.from, {
     caption: `${video.title}`,
   });
-  await fs.promises.unlink(tempPath);
-  await fs.promises.unlink(tempPath + ".mp4");
+
+  Promise.all([fs.promises.unlink(tempPath), fs.promises.unlink(tempPath)]);
 }

src/commands/video.ts

@@ -23,7 +23,7 @@ export default async function (msg: Message) {
   const execPromise = util.promisify(exec);
 
   const { stdout, stderr } = await execPromise(query, {
-    timeout: 10000,
+    timeout: 60000,
     maxBuffer: 1024 * 1024,
     shell: process.env.SHELL || "/bin/zsh",
   });
@@ -32,13 +32,8 @@ export default async function (msg: Message) {
     response = response.slice(0, 4000) + "\n\n[Output truncated]";
   }
 
-  const text = `
-    \`\`\`
-    ${response}
-    \`\`\
-    `;
   await Promise.all([
-    msg.reply(text),
+    msg.reply(response),
     logService(msg, query, response),
     log.warn("zsh", `Executed command: ${query}`),
   ]);