Merge branch 'master' of github.com:mrepol742/project-canis

Author: mrepol742

src/commands/ai.ts

@@ -38,13 +38,21 @@ export default async function (msg: Message): Promise<void> {
   Available Commands:
   `;
 
-  const excludeAiCommands: string[] = ["mj", "obi", "naij", "chad", "sim"];
+  const excludeCommands: string[] = [
+    ".",
+    "ai",
+    "mj",
+    "obi",
+    "naij",
+    "chad",
+    "sim",
+  ];
 
   for (const key in commands) {
     const cmd = commands[key];
     if (
       cmd.role === "user" &&
-      !excludeAiCommands.includes(cmd.command) &&
+      !excludeCommands.includes(cmd.command) &&
       !(cmd.optOutAI ?? false)
     ) {
       prompt += `\n${cmd.command} - ${cmd.description}\n${cmd.usage}\n`;

src/commands/block.ts

@@ -1,10 +1,5 @@
-import { Message } from "../types/message"
-import log from "../components/utils/log";
-import { exec } from "child_process";
-import util from "util";
-import prisma from "../components/prisma";
-import redis from "../components/redis";
-import { addBlockUser } from "../components/services/user";
+import { Message } from "../types/message";
+import { addBlockUser, deductUserPoints } from "../components/services/user";
 
 export const info = {
   command: "block",
@@ -24,7 +19,7 @@ export default async function (msg: Message): Promise<void> {
   for (const userId of msg.mentionedIds) {
     const lid = userId.split("@")[0];
 
-    await addBlockUser(lid);
+    await Promise.allSettled([addBlockUser(lid), deductUserPoints(lid, 30)]);
   }
 
   await msg.react("✅");

src/commands/callreject.ts

@@ -5,7 +5,7 @@ import log from "../components/utils/log";
 export const info = {
   command: "callreject",
   description: "Automatically declined call.",
-  usage: "callreject <--on|--off>",
+  usage: "callreject [--on|--off]",
   example: "callreject --on",
   role: "admin",
   cooldown: 5000,

src/commands/echodelete.ts

@@ -5,7 +5,7 @@ import log from "../components/utils/log";
 export const info = {
   command: "echodelete",
   description: "Echo deleted messages.",
-  usage: "echodelete <--on|--off>",
+  usage: "echodelete [--on|--off]",
   example: "echodelete --on",
   role: "admin",
   cooldown: 5000,

src/commands/echoedit.ts

@@ -5,7 +5,7 @@ import log from "../components/utils/log";
 export const info = {
   command: "echoedit",
   description: "Echo edit messages.",
-  usage: "echoedit <--on|--off>",
+  usage: "echoedit [--on|--off]",
   example: "echoedit --on",
   role: "admin",
   cooldown: 5000,

src/commands/fbdl.ts

@@ -9,8 +9,8 @@ import he from "he";
 
 export const info = {
   command: "fbdl",
-  description: "Download Facebook videos.",
-  usage: "fbdl <facebook_url>",
+  description: "Download facebook video from the provided url.",
+  usage: "fbdl <url>",
   example: "fbdl https://www.facebook.com/watch?v=1234567890",
   role: "user",
   cooldown: 5000,

src/commands/fork.ts

@@ -1,8 +1,8 @@
-import { Message } from "../types/message"
+import { Message } from "../types/message";
 
 export const info = {
   command: "fork",
-  description: "Fork this bot on GitHub.",
+  description: "Display the bot github repository.",
   usage: "fork",
   example: "fork",
   role: "user",

src/commands/googleit.ts

@@ -43,7 +43,10 @@ export default async function (msg: Message): Promise<void> {
       }),
       page.setViewport({ width: 1366, height: 768 }),
     ]);
-    await page.goto(query, { waitUntil: "domcontentloaded", timeout: 15000 });
+    await page.goto(`https://google.com/search?=${query}`, {
+      waitUntil: "domcontentloaded",
+      timeout: 15000,
+    });
 
     const buffer = await page.screenshot();
 

src/commands/help.ts

@@ -1,12 +1,12 @@
-import { Message } from "../types/message"
+import { Message } from "../types/message";
 import log from "../components/utils/log";
 import { commands } from "../components/utils/cmd/loader";
 
 export const info = {
   command: "help",
   description: "List available commands and their usage.",
-  usage: "help [page] | --[role] | [command]",
-  example: "help --admin",
+  usage: "help [page|role|command]",
+  example: "help admin",
   role: "user",
   cooldown: 5000,
 };
@@ -77,7 +77,7 @@ export default async function (msg: Message): Promise<void> {
   }
 
   // help admin
-  if (/^--admin$/i.test(query)) {
+  if (/^admin$/i.test(query)) {
     const adminCommands = Object.values(commands)
       .filter((cmd: CommandType) => cmd.role === "admin")
       .map((cmd: CommandType) => cmd.command)
@@ -103,10 +103,10 @@ export default async function (msg: Message): Promise<void> {
     .map((cmd: CommandType) => cmd.command)
     .sort((a, b) => a.localeCompare(b));
 
-  userCommands.unshift("--admin");
-  userCommands.unshift("--super-admin");
+  userCommands.unshift("admin");
+  userCommands.unshift("super-admin");
 
-  if (userCommands.length == 0) {
+  if (Object.values(commands).length === 0) {
     await msg.reply(`The *${page}* is obviously is not our bot bounds.`);
     return;
   }

src/commands/hwaifu.ts

@@ -20,7 +20,7 @@ const execPromise = util.promisify(exec);
 export const info = {
   command: "hwaifu",
   description: "Generate a waifu image with optional categories.",
-  usage: "hwaifu [type]",
+  usage: "hwaifu [neko|trap|blowjob]",
   example: "hwaifu neko",
   role: "admin",
   cooldown: 5000,