levix-bot 3.3.0-rc.2 → 4.0.0-beta

package/src/commands/group/antiSpam.cjs

@@ -47,38 +47,32 @@ async function handleAntiSpam(sock, msg) {
 
     // 1. فلترة الرسائل القديمة
     userData.messages = userData.messages.filter(
-      (m) => now - m.timestamp < SPAM_TIME_WINDOW_SECONDS
+      (m) => now - m.timestamp < SPAM_TIME_WINDOW_SECONDS,
     );
 
     // 2. إضافة الرسالة الجديدة
     userData.messages.push({ content: messageContent, timestamp: now });
 
     // 3. التحقق من وجود تكرار
-    const repeatedMessages = userData.messages.filter(
-      (m) => m.content === messageContent
-    );
+    const repeatedMessages = userData.messages.filter((m) => m.content === messageContent);
 
     if (repeatedMessages.length >= SPAM_MESSAGE_COUNT) {
       userData.warnCount += 1;
       userData.messages = []; // مسح الرسائل بعد اكتشاف السبام لمنع التحذيرات المتتالية
 
       if (userData.warnCount >= SPAM_WARN_LIMIT) {
-        logger.info(
-          `[AntiSpam] Kicking ${senderId} from ${groupId} for repeated spam.`
-        );
+        logger.info(`[AntiSpam] Kicking ${senderId} from ${groupId} for repeated spam.`);
         // إعادة تعيين العداد بعد الطرد
         antiSpamCache.delete(cacheKey);
 
         await sock.sendMessage(groupId, {
-          text: `🚫 تم طرد المستخدم @${
-            senderId.split("@")[0]
-          } تلقائيًا بسبب الإزعاج.`,
+          text: `🚫 تم طرد المستخدم @${senderId.split("@")[0]} تلقائيًا بسبب الإزعاج.`,
           mentions: [senderId],
         });
         await sock.groupParticipantsUpdate(groupId, [senderId], "remove");
       } else {
         logger.info(
-          `[AntiSpam] Warning ${senderId} in ${groupId}. Warn count: ${userData.warnCount}`
+          `[AntiSpam] Warning ${senderId} in ${groupId}. Warn count: ${userData.warnCount}`,
         );
         await sock.sendMessage(groupId, {
           text: `⚠️ تحذير للمستخدم @${

package/src/commands/group/antilink.cjs

@@ -1,16 +1,15 @@
 // file: /commands/group/antilink.js
 const { getGroupSettings, saveGroupSettings } = require("../../utils/storage.cjs");
 const logger = require("../../utils/logger.cjs");
-const {
-  isOwnerJidSync,
-  isAdminInGroupSync,
-} = require("../../utils/permissions.cjs");
+const { isOwnerJidSync, isAdminInGroupSync } = require("../../utils/permissions.cjs");
+const { visibleText } = require("../../utils/messageContent.cjs");
 
 // --- The Main Command Logic ---
 const command = {
   name: "antilink",
   description: "Advanced control for the anti-link feature.",
-  usage: "antilink [status]\nantilink <on|off>\nantilink mode <ALL|WHITELIST|BLACKLIST>\nantilink <allow|disallow> <دومين>",
+  usage:
+    "antilink [status]\nantilink <on|off>\nantilink mode <ALL|WHITELIST|BLACKLIST>\nantilink <allow|disallow> <دومين>",
   chat: "group",
   userAdminRequired: true,
 
@@ -44,7 +43,7 @@ const command = {
           text: "☑️ تم تعطيل نظام منع الروابط.",
         });
         break;
-      case "mode":
+      case "mode": {
         const mode = args[1] ? args[1].toUpperCase() : "";
         if (!["ALL", "WHITELIST", "BLACKLIST"].includes(mode)) {
           return await sock.sendMessage(groupId, {
@@ -56,7 +55,8 @@ const command = {
           text: `✅ تم تغيير وضع منع الروابط إلى: ${mode}`,
         });
         break;
-      case "allow":
+      }
+      case "allow": {
         const domainToAllow = args[1] ? args[1].toLowerCase() : "";
         if (!domainToAllow)
           return await sock.sendMessage(groupId, {
@@ -69,30 +69,31 @@ const command = {
           text: `✅ تم إضافة '${domainToAllow}' إلى قائمة الدومينات المسموح بها.`,
         });
         break;
-      case "disallow":
+      }
+      case "disallow": {
         const domainToDisallow = args[1] ? args[1].toLowerCase() : "";
         if (!domainToDisallow)
           return await sock.sendMessage(groupId, {
             text: "يرجى تحديد دومين لإزالته.",
           });
         antilinkConfig.allowed_domains = antilinkConfig.allowed_domains.filter(
-          (d) => d !== domainToDisallow
+          (d) => d !== domainToDisallow,
         );
         await sock.sendMessage(groupId, {
           text: `☑️ تم إزالة '${domainToDisallow}' من قائمة الدومينات المسموح بها.`,
         });
         break;
-      default:
+      }
+      default: {
         // Display current status
         let statusReply = `*حالة نظام منع الروابط:*\n\n`;
-        statusReply += `الحالة: ${
-          antilinkConfig.enabled ? "مفعل ✅" : "معطل ☑️"
-        }\n`;
+        statusReply += `الحالة: ${antilinkConfig.enabled ? "مفعل ✅" : "معطل ☑️"}\n`;
         statusReply += `الوضع: ${antilinkConfig.mode}\n`;
         statusReply += `الدومينات المسموح بها: ${
           antilinkConfig.allowed_domains.join(", ") || "لا يوجد"
         }\n`;
         await sock.sendMessage(groupId, { text: statusReply });
+      }
     }
 
     saveGroupSettings(groupId, settings);
@@ -101,37 +102,42 @@ const command = {
 
 // --- The Message Handler Logic ---
 const linkRegex = new RegExp(
-  /(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/[a-zA-Z0-9]+\.[^\s]{2,}|[a-zA-Z0-9]+\.[^\s]{2,})/i
+  /(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/[a-zA-Z0-9]+\.[^\s]{2,}|[a-zA-Z0-9]+\.[^\s]{2,})/i,
 );
 
 async function handleAntiLink(sock, msg, _legacyConfig, _normalizeJid) {
   const isGroup = msg.key.remoteJid.endsWith("@g.us");
-  if (!isGroup) return;
+  if (!isGroup) return false;
 
   const groupId = msg.key.remoteJid;
   const settings = getGroupSettings(groupId);
   const antilinkConfig = settings.antilink;
 
-  if (!antilinkConfig || !antilinkConfig.enabled) return;
+  if (!antilinkConfig || !antilinkConfig.enabled) return false;
 
   const senderId = msg.key.participant || msg.key.remoteJid;
 
   const groupMetadata = await sock.groupMetadata(groupId);
   // Centralized checks — handle LID/PN cross-format and bootstrap roster.
-  const isOwner = isOwnerJidSync(senderId);
-  const isSenderAdmin = isAdminInGroupSync(groupMetadata, senderId);
+  const senderIds = [senderId, msg.key.participantAlt, msg.key.participantPn].filter(Boolean);
+  const isOwner = msg.key.fromMe || senderIds.some(isOwnerJidSync);
+  const isSenderAdmin = senderIds.some((id) => isAdminInGroupSync(groupMetadata, id));
 
-  if (isOwner || isSenderAdmin) return;
+  if (isOwner || isSenderAdmin) return false;
 
-  const body =
-    msg.message.conversation || msg.message.extendedTextMessage?.text || "";
-  if (!linkRegex.test(body)) return; // No link found
+  const body = visibleText(msg.message);
+  if (!linkRegex.test(body)) return false; // No link found
 
   // --- Link Found, Apply Rules ---
   const foundLinks = body.match(linkRegex);
-  const domain = new URL(
-    foundLinks[0].startsWith("http") ? foundLinks[0] : `http://${foundLinks[0]}`
-  ).hostname.replace("www.", "");
+  let domain;
+  try {
+    domain = new URL(
+      foundLinks[0].startsWith("http") ? foundLinks[0] : `http://${foundLinks[0]}`,
+    ).hostname.replace("www.", "");
+  } catch {
+    return false;
+  }
 
   let shouldDelete = false;
 
@@ -152,15 +158,15 @@ async function handleAntiLink(sock, msg, _legacyConfig, _normalizeJid) {
   }
 
   if (shouldDelete) {
-    logger.info(
-      `[Anti-Link] Deleting link from ${senderId} in ${groupId}. Domain: ${domain}`
-    );
+    logger.info(`[Anti-Link] Deleting link from ${senderId} in ${groupId}. Domain: ${domain}`);
     await sock.sendMessage(groupId, { delete: msg.key });
     await sock.sendMessage(groupId, {
       text: `ممنوع إرسال الروابط هنا يا @${senderId.split("@")[0]}!`,
       mentions: [senderId],
     });
+    return true;
   }
+  return false;
 }
 
 // Export both the command and the handler

package/src/commands/group/approveall.cjs

@@ -1,8 +1,5 @@
 // file: /commands/group/approveall.js
-const {
-  getGroupSettings,
-  saveGroupSettings,
-} = require("../../utils/storage.cjs"); // Note the path is ../../
+const { getGroupSettings, saveGroupSettings } = require("../../utils/storage.cjs"); // Note the path is ../../
 const logger = require("../../utils/logger.cjs");
 
 module.exports = {
@@ -36,18 +33,13 @@ module.exports = {
           text: "☑️ تم تعطيل نظام الموافقة التلقائية.",
         });
       } else {
-        const status = settings.join_requests.auto_approve_enabled
-          ? "مفعل ✅"
-          : "معطل ☑️";
+        const status = settings.join_requests.auto_approve_enabled ? "مفعل ✅" : "معطل ☑️";
         return await sock.sendMessage(groupId, {
           text: `حالة الموافقة التلقائية: ${status}.\nاستخدم 'on' أو 'off' للتغيير.`,
         });
       }
     } catch (error) {
-      logger.error(
-        { err: error, command: "approveall" },
-        "Error in !group approveall command"
-      );
+      logger.error({ err: error, command: "approveall" }, "Error in !group approveall command");
       await sock.sendMessage(groupId, { text: "حدث خطأ." });
     }
   },

package/src/commands/group/clearwarns.cjs

@@ -12,8 +12,7 @@ module.exports = {
   async execute(sock, msg) {
     try {
       const groupId = msg.key.remoteJid;
-      const mentionedJid =
-        msg.message?.extendedTextMessage?.contextInfo?.mentionedJid?.[0];
+      const mentionedJid = msg.message?.extendedTextMessage?.contextInfo?.mentionedJid?.[0];
 
       if (!mentionedJid) {
         return await sock.sendMessage(groupId, {
@@ -24,9 +23,7 @@ module.exports = {
       // Call the new function from storage.js to delete the record from the database
       clearUserWarnings(groupId, mentionedJid);
 
-      const replyText = `✅ تم مسح جميع تحذيرات العضو @${
-        mentionedJid.split("@")[0]
-      } بنجاح.`;
+      const replyText = `✅ تم مسح جميع تحذيرات العضو @${mentionedJid.split("@")[0]} بنجاح.`;
       await sock.sendMessage(groupId, {
         text: replyText,
         mentions: [mentionedJid],

package/src/commands/group/demote.cjs

@@ -24,9 +24,7 @@ module.exports = {
     }
 
     // Safety check: Is the target user NOT an admin?
-    const targetUser = groupMetadata.participants.find(
-      (p) => p.id === targetJid
-    );
+    const targetUser = groupMetadata.participants.find((p) => p.id === targetJid);
     if (!targetUser || !targetUser.admin) {
       return await sock.sendMessage(groupId, {
         text: `⚠️ العضو @${targetJid.split("@")[0]} ليس مشرفًا أصلاً.`,
@@ -45,17 +43,14 @@ module.exports = {
       await sock.groupParticipantsUpdate(
         groupId,
         [targetJid],
-        "demote" // The action is 'demote'
+        "demote", // The action is 'demote'
       );
       await sock.sendMessage(groupId, {
         text: `👤 تم عزل @${targetJid.split("@")[0]} من الإشراف.`,
         mentions: [targetJid],
       });
     } catch (error) {
-      logger.error(
-        { err: error, command: "demote" },
-        "Error in !demote command"
-      );
+      logger.error({ err: error, command: "demote" }, "Error in !demote command");
       await sock.sendMessage(groupId, { text: "حدث خطأ أثناء محاولة العزل." });
     }
   },

package/src/commands/group/kick.cjs

@@ -1,6 +1,10 @@
 // file: /commands/kick.js
 const logger = require("../../utils/logger.cjs");
-const { isOwnerJidSync } = require("../../utils/permissions.cjs");
+const {
+  hasBotPrivilegesSync,
+  isAdminInGroupSync,
+  sameUserSync,
+} = require("../../utils/permissions.cjs");
 
 module.exports = {
   name: "kick",
@@ -16,9 +20,7 @@ module.exports = {
 
     // --- Target Identification Logic ---
     // 1. Check for mentions
-    if (
-      msg.message?.extendedTextMessage?.contextInfo?.mentionedJid?.length > 0
-    ) {
+    if (msg.message?.extendedTextMessage?.contextInfo?.mentionedJid?.length > 0) {
       targetJid = msg.message.extendedTextMessage.contextInfo.mentionedJid[0];
     }
     // 2. Check if it's a reply to another message
@@ -32,25 +34,20 @@ module.exports = {
 
     // --- Safety Checks ---
     // Can't kick the bot itself
-    if (targetJid === sock.user.id) {
+    if ([sock.user?.id, sock.user?.lid].filter(Boolean).some((id) => sameUserSync(id, targetJid))) {
       return await sock.sendMessage(groupId, { text: "لا يمكنني طرد نفسي." });
     }
 
-    // Can't kick one of the owners
-    if (isOwnerJidSync(targetJid)) {
+    // Bot owners/admins are privileged across chats and cannot be removed by
+    // a group-only admin through an alternate LID/PN representation.
+    if (hasBotPrivilegesSync(targetJid)) {
       return await sock.sendMessage(groupId, {
-        text: "لا يمكن طرد مالك البوت.",
+        text: "لا يمكن طرد مالك أو مشرف البوت.",
       });
     }
 
     // Check if the target is also an admin
-    const targetUser = groupMetadata.participants.find(
-      (p) => p.id === targetJid
-    );
-    if (
-      targetUser &&
-      (targetUser.admin === "admin" || targetUser.admin === "superadmin")
-    ) {
+    if (isAdminInGroupSync(groupMetadata, targetJid)) {
       return await sock.sendMessage(groupId, {
         text: "لا يمكن للمشرف طرد مشرف آخر.",
       });

package/src/commands/group/media.cjs

@@ -1,10 +1,8 @@
 // file: /commands/group/media.js
 const { getGroupSettings, saveGroupSettings } = require("../../utils/storage.cjs");
 const logger = require("../../utils/logger.cjs");
-const {
-  isOwnerJidSync,
-  isAdminInGroupSync,
-} = require("../../utils/permissions.cjs");
+const { isOwnerJidSync, isAdminInGroupSync } = require("../../utils/permissions.cjs");
+const { mediaType } = require("../../utils/messageContent.cjs");
 
 const VALID_TYPES = ["image", "video", "sticker", "audio"];
 
@@ -39,7 +37,7 @@ const command = {
           text: "☑️ تم تعطيل نظام مراقبة الوسائط.",
         });
         break;
-      case "block":
+      case "block": {
         const typeToBlock = args[1] ? args[1].toLowerCase() : "";
         if (!VALID_TYPES.includes(typeToBlock))
           return await sock.sendMessage(groupId, {
@@ -52,28 +50,26 @@ const command = {
           text: `✅ تم إضافة '${typeToBlock}' للأنواع الممنوعة.`,
         });
         break;
-      case "unblock":
+      }
+      case "unblock": {
         const typeToUnblock = args[1] ? args[1].toLowerCase() : "";
         if (!typeToUnblock)
           return await sock.sendMessage(groupId, {
             text: "يرجى تحديد نوع لإلغاء حظره.",
           });
-        mediaConfig.blocked_types = mediaConfig.blocked_types.filter(
-          (t) => t !== typeToUnblock
-        );
+        mediaConfig.blocked_types = mediaConfig.blocked_types.filter((t) => t !== typeToUnblock);
         await sock.sendMessage(groupId, {
           text: `☑️ تم إزالة '${typeToUnblock}' من الأنواع الممنوعة.`,
         });
         break;
-      default: // 'status'
+      }
+      default: {
+        // 'status'
         let statusReply = `*حالة نظام مراقبة الوسائط:*\n\n`;
-        statusReply += `الحالة: ${
-          mediaConfig.enabled ? "مفعل ✅" : "معطل ☑️"
-        }\n`;
-        statusReply += `الأنواع الممنوعة: ${
-          mediaConfig.blocked_types.join(", ") || "لا يوجد"
-        }`;
+        statusReply += `الحالة: ${mediaConfig.enabled ? "مفعل ✅" : "معطل ☑️"}\n`;
+        statusReply += `الأنواع الممنوعة: ${mediaConfig.blocked_types.join(", ") || "لا يوجد"}`;
         await sock.sendMessage(groupId, { text: statusReply });
+      }
     }
     saveGroupSettings(groupId, settings);
   },
@@ -93,19 +89,16 @@ async function handleMediaControl(sock, msg, _legacyConfig, _normalizeJid) {
   const senderId = msg.key.participant || msg.key.remoteJid;
 
   const groupMetadata = await sock.groupMetadata(groupId);
-  const isOwner = isOwnerJidSync(senderId);
-  const isSenderAdmin = isAdminInGroupSync(groupMetadata, senderId);
+  const senderIds = [senderId, msg.key.participantAlt, msg.key.participantPn].filter(Boolean);
+  const isOwner = msg.key.fromMe || senderIds.some(isOwnerJidSync);
+  const isSenderAdmin = senderIds.some((id) => isAdminInGroupSync(groupMetadata, id));
 
   if (isOwner || isSenderAdmin) return false;
 
-  const messageType = Object.keys(msg.message)[0]
-    .replace("Message", "")
-    .toLowerCase();
+  const messageType = mediaType(msg.message);
 
   if (mediaConfig.blocked_types.includes(messageType)) {
-    logger.info(
-      `[Media Control] Deleting ${messageType} from ${senderId} in ${groupId}.`
-    );
+    logger.info(`[Media Control] Deleting ${messageType} from ${senderId} in ${groupId}.`);
     await sock.sendMessage(groupId, { delete: msg.key });
     await sock.sendMessage(groupId, {
       text: `يا @${senderId.split("@")[0]}، إرسال *${messageType}* ممنوع هنا.`,

package/src/commands/group/members.cjs

@@ -33,8 +33,7 @@ module.exports = {
         const phone = member.id.split("@")[0];
 
         // Check if the member is an admin or superadmin
-        const isAdmin =
-          member.admin === "admin" || member.admin === "superadmin";
+        const isAdmin = member.admin === "admin" || member.admin === "superadmin";
 
         // Add the formatted line to our reply text
         // Using @ will create a "mention link" in the WhatsApp message

package/src/commands/group/promote.cjs

@@ -24,13 +24,8 @@ module.exports = {
     }
 
     // Safety check: Is the target user already an admin?
-    const targetUser = groupMetadata.participants.find(
-      (p) => p.id === targetJid
-    );
-    if (
-      targetUser &&
-      (targetUser.admin === "admin" || targetUser.admin === "superadmin")
-    ) {
+    const targetUser = groupMetadata.participants.find((p) => p.id === targetJid);
+    if (targetUser && (targetUser.admin === "admin" || targetUser.admin === "superadmin")) {
       return await sock.sendMessage(groupId, {
         text: `⚠️ العضو @${targetJid.split("@")[0]} مشرف بالفعل.`,
         mentions: [targetJid],
@@ -41,17 +36,14 @@ module.exports = {
       await sock.groupParticipantsUpdate(
         groupId,
         [targetJid],
-        "promote" // The action is 'promote'
+        "promote", // The action is 'promote'
       );
       await sock.sendMessage(groupId, {
         text: `👑 تم ترقية @${targetJid.split("@")[0]} إلى مشرف بنجاح.`,
         mentions: [targetJid],
       });
     } catch (error) {
-      logger.error(
-        { err: error, command: "promote" },
-        "Error in !promote command"
-      );
+      logger.error({ err: error, command: "promote" }, "Error in !promote command");
       await sock.sendMessage(groupId, {
         text: "حدث خطأ أثناء محاولة الترقية.",
       });

package/src/commands/group/removeall.cjs

@@ -3,8 +3,7 @@ const logger = require("../../utils/logger.cjs");
 
 module.exports = {
   name: "removeall",
-  description:
-    "Removes all non-admin members from the group after confirmation.",
+  description: "Removes all non-admin members from the group after confirmation.",
   usage: "removeall",
   chat: "group",
   userAdminRequired: true,
@@ -33,9 +32,7 @@ module.exports = {
     setTimeout(() => {
       if (confirmationSessions.has(senderId)) {
         confirmationSessions.delete(senderId);
-        logger.info(
-          `[Confirmation] Timed out for ${senderId} on command removeall.`
-        );
+        logger.info(`[Confirmation] Timed out for ${senderId} on command removeall.`);
       }
     }, 30000); // 30 seconds
   },

package/src/commands/group/setpp.cjs

@@ -32,7 +32,7 @@ module.exports = {
           id: msg.message.extendedTextMessage.contextInfo.participant,
         },
         "buffer",
-        {}
+        {},
       );
 
       // Update the group's profile picture using the downloaded image buffer

package/src/commands/group/setrules.cjs

@@ -1,7 +1,4 @@
-const {
-  getGroupSettings,
-  saveGroupSettings,
-} = require("../../utils/storage.cjs");
+const { getGroupSettings, saveGroupSettings } = require("../../utils/storage.cjs");
 const logger = require("../../utils/logger.cjs");
 
 module.exports = {
@@ -36,10 +33,7 @@ module.exports = {
       });
     } catch (error) {
       // Improved logging for better debugging
-      logger.error(
-        { err: error, groupId: groupId },
-        "Error in !setrules command"
-      );
+      logger.error({ err: error, groupId: groupId }, "Error in !setrules command");
       await sock.sendMessage(groupId, { text: "حدث خطأ أثناء حفظ القواعد." });
     }
   },

package/src/commands/group/setwarn.cjs

@@ -21,7 +21,7 @@ module.exports = {
     const warnConfig = settings.warn_system;
 
     switch (subCommand) {
-      case "max":
+      case "max": {
         const max = parseInt(value, 10);
         if (isNaN(max) || max < 1) {
           return await sock.sendMessage(groupId, {
@@ -33,8 +33,9 @@ module.exports = {
           text: `✅ تم تعيين الحد الأقصى للتحذيرات إلى ${max}.`,
         });
         break;
+      }
 
-      case "action":
+      case "action": {
         const action = value?.toUpperCase();
         if (action !== "KICK" && action !== "NONE") {
           return await sock.sendMessage(groupId, {
@@ -46,6 +47,7 @@ module.exports = {
           text: `✅ تم تعيين الإجراء التلقائي إلى ${action}.`,
         });
         break;
+      }
 
       default:
         return await sock.sendMessage(groupId, {

package/src/commands/group/tagadmins.cjs

@@ -13,7 +13,7 @@ module.exports = {
     try {
       // Filter the participants to get only admins and superadmins
       const admins = groupMetadata.participants.filter(
-        (p) => p.admin === "admin" || p.admin === "superadmin"
+        (p) => p.admin === "admin" || p.admin === "superadmin",
       );
 
       if (admins.length === 0) {
@@ -40,10 +40,7 @@ module.exports = {
         mentions: mentions,
       });
     } catch (error) {
-      logger.error(
-        { err: error, command: "tagadmins" },
-        "Error in !tagadmins command"
-      );
+      logger.error({ err: error, command: "tagadmins" }, "Error in !tagadmins command");
       await sock.sendMessage(groupId, { text: "حدث خطأ." });
     }
   },