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

Author: mrepol742

src/commands/admin.ts

@@ -1,5 +1,11 @@
 import { Message } from "../types/message";
-import { addBlockUser, deductUserPoints } from "../components/services/user";
+import {
+  addBlockUser,
+  deductUserPoints,
+  getBlockUser,
+  isAdmin,
+} from "../components/services/user";
+import client from "../components/client";
 
 export const info = {
   command: "block",
@@ -16,11 +22,33 @@ export default async function (msg: Message): Promise<void> {
     return;
   }
 
-  for (const userId of msg.mentionedIds) {
-    const lid = userId.split("@")[0];
+  const jid = msg.mentionedIds[0];
+  const lid = jid.split("@")[0];
 
-    await Promise.allSettled([addBlockUser(lid), deductUserPoints(lid, 30)]);
+  const self = (await client()).info.wid._serialized;
+  const isUserAdmin = await isAdmin(lid);
+
+  if (!msg.fromMe && isUserAdmin) {
+    await msg.reply("Unable to block the user.");
+    return;
+  }
+
+  const mentions = await msg.getMentions();
+  const user = mentions[0];
+  if (self.split("@")[0] === user.id._serialized.split("@")[0]) {
+    await msg.reply("Unable to block the user.");
+    return;
+  }
+
+  const isBlocked = await getBlockUser(lid);
+  if (isBlocked) {
+    await msg.reply("The user is already blocked.");
+    return;
   }
 
-  await msg.react("✅");
+  await Promise.allSettled([
+    addBlockUser(lid),
+    deductUserPoints(lid, 30),
+    msg.reply("The user has been blocked."),
+  ]);
 }

src/commands/block.ts

@@ -9,7 +9,7 @@ export const info = {
   description: "Build the bot (optionally clean before building).",
   usage: "build [--clean]",
   example: "build --clean",
-  role: "super-admin",
+  role: "admin",
   cooldown: 5000,
 };
 

src/commands/build.ts

@@ -0,0 +1,51 @@
+import { Message } from "../types/message";
+import log from "../components/utils/log";
+
+export const info = {
+  command: "bylaws",
+  description: "Display the Bylaws of the bot.",
+  usage: "bylaws",
+  example: "bylaws",
+  role: "legal",
+  cooldown: 5000,
+};
+
+export default async function (msg: Message): Promise<void> {
+  const text = `
+  \`Bot Bylaws\`
+  These rules govern the use and responsibilities within this bot system.
+
+  ━━━━━━━━━━━━━━━━━━━━━━━
+  \`SuperAdmin (Bot Owner)\`
+  - Full control over all bot operations and data
+  - Can create, promote, or remove Admins and Legal roles
+  - Has access to all logs, configurations, and override powers
+  - Responsible for bot maintenance, updates, and critical decisions
+
+  \`Admin\`
+  - Moderate bot interactions and enforce rules
+  - Can mute, warn, or restrict users as necessary
+  - Assist in managing bot commands and features
+  - Cannot alter Legal or SuperAdmin permissions
+
+  \`Legal\`
+  - Oversees legal usage, terms of service, and compliance
+  - Handles copyright, data policy, and usage rights
+  - May update the bylaws with SuperAdmin approval
+  - Cannot manage users or bot configuration
+
+  \`User\`
+  - May use commands within defined limitations
+  - Must follow community guidelines and respect others
+  - Misuse or abuse can lead to restrictions
+  - Can report issues or violations to Admins or Legal
+
+  ━━━━━━━━━━━━━━━━━━━━━━━
+  All actions are logged and subject to review.
+  By using this bot, you agree to follow these bylaws.
+
+  Last updated: October 2025
+  `;
+
+  await msg.reply(text);
+}

src/commands/bylaws.ts

@@ -1,4 +1,4 @@
-import { Message } from "../types/message"
+import { Message } from "../types/message";
 import { client } from "../components/client";
 
 export const info = {
@@ -11,13 +11,12 @@ export const info = {
 };
 
 export default async function (msg: Message): Promise<void> {
-  if (!msg.hasQuotedMsg) {
-    await msg.reply("Please reply the message you want to delete.");
-    return;
-  }
+  if (!msg.hasQuotedMsg) return;
+
   const quoted = await msg.getQuotedMessage();
 
   if (quoted.fromMe) {
+    if (!msg.fromMe && /[aeiou]/i.test(quoted.body)) return;
     await quoted.delete(true, true);
   }
 }

src/commands/delete.ts

@@ -1,36 +1,65 @@
-import { Message } from "../types/message"
+import { Message } from "../types/message";
 import log from "../components/utils/log";
+import { isAdmin, setAdmin } from "../components/services/user";
+import client from "../components/client";
 
 export const info = {
   command: "demote",
-  description: "Demote mentioned users from admin.",
+  description: "Demote mentioned users from group or bot admin.",
   usage: "demote <@user>",
   example: "demote @user123",
-  role: "admin",
+  role: "super-admin",
   cooldown: 5000,
 };
 
 export default async function (msg: Message): Promise<void> {
+  const query = msg.body.replace(/^demote\b\s*/i, "").trim();
+
+  const bot = /--bot/i.test(query);
+  const group = /--group/i.test(query);
+
+  if (!bot && !group) {
+    await msg.reply("Please provide a valid flag: `--bot` or `--admin`.");
+    return;
+  }
+
   if (msg.mentionedIds.length === 0) {
     await msg.reply("Please mention a user to demote.");
     return;
   }
 
-  const chat = await msg.getChat();
+  if (group) {
+    const chat = await msg.getChat();
+
+    if (!chat.isGroup) {
+      await msg.reply("This command only works in groups.");
+      return;
+    }
+
+    const groupChat = chat as any;
 
-  if (!chat.isGroup) {
-    await msg.reply("This command only works in groups.");
+    try {
+      for (const userId of msg.mentionedIds) {
+        await groupChat.demoteParticipants([userId]);
+      }
+    } catch (err) {
+      log.error("Demote", err);
+      await msg.reply("Failed to demote user. Make sure I am an admin.");
+    }
     return;
   }
 
-  const groupChat = chat as any;
+  const jid = msg.mentionedIds[0];
+  const lid = jid.split("@")[0];
 
-  try {
-    for (const userId of msg.mentionedIds) {
-      await groupChat.demoteParticipants([userId]);
-    }
-  } catch (err) {
-    log.error("Demote", err);
-    await msg.reply("Failed to demote user. Make sure I am an admin.");
+  const isUserAdmin = await isAdmin(lid);
+  if (isUserAdmin) {
+    await Promise.allSettled([
+      setAdmin(lid, false),
+      msg.reply("The user now demoted as bot admin."),
+    ]);
+    return;
   }
+
+  await msg.reply("The user is not an admin.");
 }

src/commands/demote.ts

@@ -6,6 +6,7 @@ import log from "../components/utils/log";
 import axios from "../components/axios";
 import fs from "fs";
 import he from "he";
+import { fileExists } from "../components/utils/file";
 
 export const info = {
   command: "fbdl",
@@ -16,15 +17,6 @@ export const info = {
   cooldown: 5000,
 };
 
-const fileExists = async (filePath: string) => {
-  try {
-    await fs.promises.access(filePath, fs.constants.F_OK);
-    return true;
-  } catch {
-    return false;
-  }
-};
-
 function md5FromUrl(url: string) {
   return crypto.createHash("md5").update(url).digest("hex");
 }