levix-bot 3.3.0-rc.2 → 4.0.0

package/scheduler.cjs

@@ -78,7 +78,7 @@ function initializeScheduledJobs(sock) {
         logger.info("[Scheduler] Running periodic media cleanup...");
         trimMediaDirectory();
       },
-      { timezone: settings.get("bot_timezone") }
+      { timezone: settings.get("bot_timezone") },
     );
   }
 
@@ -97,7 +97,7 @@ function scheduleAt(whenMs, run) {
     const remaining = whenMs - Date.now();
     timer = setTimeout(
       remaining > MAX_TIMEOUT_MS ? arm : run,
-      Math.min(Math.max(remaining, 0), MAX_TIMEOUT_MS)
+      Math.min(Math.max(remaining, 0), MAX_TIMEOUT_MS),
     );
   };
   arm();
@@ -140,7 +140,7 @@ function recordDelivery(jobId, status, runAt, error = null) {
   } catch (stateError) {
     logger.error(
       { err: stateError, jobId },
-      "[Scheduler] failed to record scheduled delivery state"
+      "[Scheduler] failed to record scheduled delivery state",
     );
   }
 }
@@ -164,10 +164,7 @@ async function deliverScheduledJob(sock, job) {
   } catch (error) {
     const message = deliveryErrorMessage(error);
     recordDelivery(job.id, "failed", runAt, message);
-    logger.error(
-      { err: error, jobId: job.id },
-      "[Scheduler] failed to send scheduled message"
-    );
+    logger.error({ err: error, jobId: job.id }, "[Scheduler] failed to send scheduled message");
     return { ok: false, reason: "delivery_failed", error: message };
   } finally {
     deliveriesInFlight.delete(job.id);
@@ -183,7 +180,7 @@ async function executeScheduledJob(sock, job) {
     } catch (error) {
       logger.error(
         { err: error, jobId: job.id },
-        "[Scheduler] failed to record one-off schedule status"
+        "[Scheduler] failed to record one-off schedule status",
       );
     }
   }
@@ -197,7 +194,7 @@ function scheduleNewJob(sock, job) {
   if (job.type === "recurring") {
     if (!job.cronString || !cron.validate(job.cronString)) {
       logger.error(
-        `[Scheduler] Job ${job.id} has an invalid cron string (${job.cronString}) — skipping it`
+        `[Scheduler] Job ${job.id} has an invalid cron string (${job.cronString}) — skipping it`,
       );
       updateJobStatus(job.id, "invalid");
       return false;
@@ -207,7 +204,7 @@ function scheduleNewJob(sock, job) {
       job.id,
       cron.schedule(job.cronString, () => executeScheduledJob(sock, job), {
         timezone: settings.get("bot_timezone"),
-      })
+      }),
     );
   } else {
     const when = new Date(job.date).getTime();
@@ -233,7 +230,7 @@ function scheduleNewJob(sock, job) {
         } finally {
           runningTasks.delete(job.id);
         }
-      })
+      }),
     );
   }
 
@@ -247,9 +244,7 @@ async function retryScheduledJob(sock, jobId) {
 
   const retryable =
     job.status === "failed" ||
-    (job.type === "recurring" &&
-      job.status === "active" &&
-      job.lastDeliveryStatus === "failed");
+    (job.type === "recurring" && job.status === "active" && job.lastDeliveryStatus === "failed");
   if (!retryable) return { ok: false, reason: "not_failed", job };
 
   const result = await executeScheduledJob(sock, job);

package/src/auth/use-database-auth-state.js

@@ -55,7 +55,7 @@ export async function useDatabaseAuthState(storageType = null) {
           const key = `${type}-${id}`;
           const val = await readData(key);
           if (val !== null && val !== undefined) out[id] = val;
-        })
+        }),
       );
       return out;
     },
@@ -63,9 +63,7 @@ export async function useDatabaseAuthState(storageType = null) {
     set: async (data) => {
       try {
         const topKeys = Object.keys(data);
-        const looksLikeTyped = topKeys.some(
-          (k) => typeof data[k] === "object" && data[k] !== null
-        );
+        const looksLikeTyped = topKeys.some((k) => typeof data[k] === "object" && data[k] !== null);
 
         if (looksLikeTyped) {
           for (const type of topKeys) {

package/src/bootstrap/core.js

@@ -13,13 +13,10 @@
 
 import { createRequire } from "module";
 import { WhatsAppSession } from "../core/session.js";
-import { loadCommands, getLoadedCommands } from "../handlers/command.handler.js";
 import { initStore } from "../db/store.esm.js";
+import { getLoadedCommands, loadCommands } from "../handlers/command.handler.js";
 import { deleteQrCode } from "../utils/storage.esm.js";
-import {
-  hasPairedCredentials,
-  sessionStartupPolicy,
-} from "./session-startup-policy.js";
+import { hasPairedCredentials, sessionStartupPolicy } from "./session-startup-policy.js";
 
 const require = createRequire(import.meta.url);
 const logger = require("../utils/logger.cjs");

package/src/bootstrap/panel.js

@@ -40,6 +40,7 @@ export async function bootstrapPanel({ core } = {}) {
     requireLoginApi,
     noStore,
     installFinalHandlers,
+    disconnectInvalidPanelSockets,
   } = require("../../app.cjs");
 
   const { default: dashboardApiRoutes, setSession } = await import(
@@ -54,7 +55,13 @@ export async function bootstrapPanel({ core } = {}) {
   // Everything the bot reports goes out to the browsers watching the panel.
   // One direction only: a browser attaching or leaving cannot reach back and
   // change the WhatsApp session's lifecycle. See src/core/session.js.
-  attach((event, payload) => io.emit(event, payload));
+  attach((event, payload) => {
+    // A CLI reset-password runs in another process, so the in-memory session
+    // store cannot receive a destroy call. Revalidate the password epoch before
+    // every server push; stale sockets are removed before QR/pairing data moves.
+    disconnectInvalidPanelSockets();
+    io.emit(event, payload);
+  });
 
   // The routes read the live socket off the session manager, so a reconnect
   // needs no re-wiring here.
@@ -77,7 +84,7 @@ export async function bootstrapPanel({ core } = {}) {
           `Port ${port} is already taken.\n\n` +
             `  Levix is probably already running — open http://localhost:${port}/ and\n` +
             `  check. If something else owns the port, change it in the control panel\n` +
-            `  under Settings -> Server, or start with a different one.`
+            `  under Settings -> Server, or start with a different one.`,
         );
         friendly.code = "EADDRINUSE";
         return reject(friendly);
@@ -119,9 +126,7 @@ export function resolveBindAddress() {
 /** The address a person should type, given how this install is reachable. */
 export function panelUrl({ port, firstRun = false } = {}) {
   const domain = settings.get("public_domain");
-  const host =
-    domain ||
-    (isAndroidHost() ? "127.0.0.1" : "localhost");
+  const host = domain || (isAndroidHost() ? "127.0.0.1" : "localhost");
   const base = domain ? `https://${host}` : `http://${host}:${port}`;
   return firstRun ? `${base}/setup` : base;
 }

package/src/cli.js

@@ -27,7 +27,7 @@ function checkNode() {
       "",
       "  Get it from https://nodejs.org (pick the LTS build).",
       "",
-    ].join("\n")
+    ].join("\n"),
   );
   process.exit(1);
 }
@@ -54,7 +54,7 @@ function help() {
       "  Everything else is configured from the control panel itself,",
       "  which prints its address when the bot starts.",
       "",
-    ].join("\n")
+    ].join("\n"),
   );
 }
 
@@ -110,9 +110,7 @@ export async function main(argv = process.argv) {
       const { close } = await import("./db/db.cjs");
       store.deleteBotSetting("auth:password");
       close();
-      console.log(
-        "\n  Password cleared. Start the bot and open the panel to choose a new one.\n"
-      );
+      console.log("\n  Password cleared. Start the bot and open the panel to choose a new one.\n");
       return 0;
     }
 

package/src/commands/autoschedule.cjs

@@ -1,7 +1,4 @@
-const {
-  scheduleNewJob,
-  saveScheduledJob,
-} = require("../../scheduler.cjs");
+const { scheduleNewJob, saveScheduledJob } = require("../../scheduler.cjs");
 const { randomUUID } = require("node:crypto");
 const { defaultTimezone } = require("../utils/datetime.cjs");
 const { parseRecurringArgs } = require("../utils/recurrence.cjs");

package/src/commands/blacklist.cjs

@@ -2,6 +2,11 @@
 const { getGroupSettings, saveGroupSettings } = require("../utils/storage.cjs");
 const logger = require("../utils/logger.cjs");
 const normalizeJid = require("../utils/normalizeJid.esm.js").default;
+const { isAdminInGroupSync, sameUserSync } = require("../utils/permissions.cjs");
+
+function sameIdentity(a, b) {
+  return normalizeJid(a) === normalizeJid(b) || sameUserSync(a, b);
+}
 
 module.exports = {
   name: "blacklist",
@@ -65,14 +70,20 @@ module.exports = {
       const normalizedTargetJid = normalizeJid(targetJid);
 
       if (action === "add") {
-        const targetUser = groupMetadata.participants.find(
-          (p) => p.id === normalizedTargetJid
-        );
-        if (targetUser?.admin)
+        const targetIsAdmin =
+          isAdminInGroupSync(groupMetadata, normalizedTargetJid) ||
+          groupMetadata.participants.some(
+            (participant) =>
+              participant.admin &&
+              [participant.id, participant.lid, participant.phoneNumber, participant.jid]
+                .filter(Boolean)
+                .some((id) => sameIdentity(id, normalizedTargetJid)),
+          );
+        if (targetIsAdmin)
           return await sock.sendMessage(groupId, {
             text: "لا يمكن حظر المشرفين.",
           });
-        if (settings.blacklist.includes(normalizedTargetJid))
+        if (settings.blacklist.some((jid) => sameIdentity(jid, normalizedTargetJid)))
           return await sock.sendMessage(groupId, {
             text: `العضو @${normalizedTargetJid.split("@")[0]} محظور بالفعل.`,
             mentions: [normalizedTargetJid],
@@ -80,37 +91,28 @@ module.exports = {
 
         settings.blacklist.push(normalizedTargetJid);
         await sock.sendMessage(groupId, {
-          text: `🚫 تم إضافة @${
-            normalizedTargetJid.split("@")[0]
-          } إلى القائمة السوداء بنجاح.`,
+          text: `🚫 تم إضافة @${normalizedTargetJid.split("@")[0]} إلى القائمة السوداء بنجاح.`,
           mentions: [normalizedTargetJid],
         });
       } else if (action === "remove") {
-        if (!settings.blacklist.includes(normalizedTargetJid))
+        if (!settings.blacklist.some((jid) => sameIdentity(jid, normalizedTargetJid)))
           return await sock.sendMessage(groupId, {
-            text: `العضو @${
-              normalizedTargetJid.split("@")[0]
-            } ليس في القائمة السوداء أصلاً.`,
+            text: `العضو @${normalizedTargetJid.split("@")[0]} ليس في القائمة السوداء أصلاً.`,
             mentions: [normalizedTargetJid],
           });
 
         settings.blacklist = settings.blacklist.filter(
-          (jid) => jid !== normalizedTargetJid
+          (jid) => !sameIdentity(jid, normalizedTargetJid),
         );
         await sock.sendMessage(groupId, {
-          text: `✅ تم إزالة @${
-            normalizedTargetJid.split("@")[0]
-          } من القائمة السوداء.`,
+          text: `✅ تم إزالة @${normalizedTargetJid.split("@")[0]} من القائمة السوداء.`,
           mentions: [normalizedTargetJid],
         });
       }
 
       saveGroupSettings(groupId, settings);
     } catch (error) {
-      logger.error(
-        { err: error, command: "blacklist" },
-        "Error in !blacklist command"
-      );
+      logger.error({ err: error, command: "blacklist" }, "Error in !blacklist command");
     }
   },
 };

package/src/commands/block.cjs

@@ -21,10 +21,8 @@ module.exports = {
     }
     // Case 2: A target is specified (mention, reply, or number)
     else {
-      const mentionedJid =
-        msg.message?.extendedTextMessage?.contextInfo?.mentionedJid?.[0];
-      const repliedToJid =
-        msg.message?.extendedTextMessage?.contextInfo?.participant;
+      const mentionedJid = msg.message?.extendedTextMessage?.contextInfo?.mentionedJid?.[0];
+      const repliedToJid = msg.message?.extendedTextMessage?.contextInfo?.participant;
       const numberArg = args[0];
 
       if (mentionedJid) {

package/src/commands/calc.cjs

@@ -50,7 +50,7 @@ const FUNCTIONS = {
   rad: { arity: 1, fn: (x) => x * DEG },
   fact: { arity: 1, fn: (x) => factorial(x) },
   pow: { arity: 2, fn: Math.pow },
-  root: { arity: 2, fn: (x, n) => (n % 2 === 0 || x >= 0 ? Math.pow(x, 1 / n) : -Math.pow(-x, 1 / n)) },
+  root: { arity: 2, fn: (x, n) => (n % 2 === 0 || x >= 0 ? x ** (1 / n) : -((-x) ** (1 / n))) },
   hypot: { arity: -1, fn: (...a) => Math.hypot(...a) },
   min: { arity: -1, fn: (...a) => Math.min(...a) },
   max: { arity: -1, fn: (...a) => Math.max(...a) },
@@ -96,10 +96,7 @@ function normalize(input) {
     .replace(/(?<=\d),(?=\d{3}(?!\d))/g, "");
 
   // «20% من 300» / «20% of 300» -> (20/100)*300, so % stays modulo elsewhere.
-  text = text.replace(
-    /(\d+(?:\.\d+)?)\s*%\s*(?:of|من)\s*/gi,
-    (_, value) => `(${value}/100)*`
-  );
+  text = text.replace(/(\d+(?:\.\d+)?)\s*%\s*(?:of|من)\s*/gi, (_, value) => `(${value}/100)*`);
 
   return text.trim();
 }
@@ -219,7 +216,7 @@ function parse(tokens) {
 
   function parsePower() {
     const base = parsePostfix();
-    if (eat("^")) return Math.pow(base, parseUnary()); // right-associative
+    if (eat("^")) return base ** parseUnary(); // right-associative
     return base;
   }
 
@@ -267,7 +264,7 @@ function parse(tokens) {
         expect(")", `قوس \`${name}\` مقفلش`);
         if (spec.arity !== -1 && args.length !== spec.arity) {
           throw new CalcError(
-            `الدالة \`${name}\` بتاخد ${spec.arity} ${spec.arity === 1 ? "قيمة" : "قيم"}`
+            `الدالة \`${name}\` بتاخد ${spec.arity} ${spec.arity === 1 ? "قيمة" : "قيم"}`,
           );
         }
         if (!args.length) throw new CalcError(`الدالة \`${name}\` من غير قيم`);
@@ -348,8 +345,7 @@ module.exports = {
 
     // Fall back to the quoted message so «رد على الرقم واكتب !calc» works.
     const quoted = msg.message?.extendedTextMessage?.contextInfo?.quotedMessage;
-    const quotedText =
-      quoted?.conversation || quoted?.extendedTextMessage?.text || "";
+    const quotedText = quoted?.conversation || quoted?.extendedTextMessage?.text || "";
 
     const expression = args.join(" ").trim() || quotedText.trim();
 
@@ -363,20 +359,17 @@ module.exports = {
         sock,
         chatId,
         {
-          text:
-            `🧮 \`${normalized}\`\n` +
-            `*=* ${formatNumber(value)}`,
+          text: `🧮 \`${normalized}\`\n` + `*=* ${formatNumber(value)}`,
         },
-        { replyTo: msg }
+        { replyTo: msg },
       );
     } catch (error) {
-      const reason =
-        error instanceof CalcError ? error.message : "المعادلة مش مفهومة";
+      const reason = error instanceof CalcError ? error.message : "المعادلة مش مفهومة";
       return sendBotMessage(
         sock,
         chatId,
         { text: `❌ ${reason}\n\nاكتب \`!calc\` لوحده عشان تشوف الأمثلة.` },
-        { replyTo: msg }
+        { replyTo: msg },
       );
     }
   },

package/src/commands/digit.cjs

@@ -0,0 +1,97 @@
+// Convert digits between Western 0-9 and Eastern Arabic / Persian numerals.
+const runtimeConfig = require("../config/runtime-config.cjs");
+const {
+  classifyNumerals,
+  convertNumerals,
+  getQuotedText,
+  isExplicitAr,
+  isExplicitEn,
+  oppositeNumeralLang,
+} = require("../utils/numerals.cjs");
+
+function mixedDigitsNotice(prefix) {
+  return `⚠️ الأرقام مختلطة (عربي وإنجليزي). حدد الاتجاه:\n\`${prefix}digit ar ...\` أو \`${prefix}digit en ...\`.\nDigits are mixed Arabic and English. Specify \`${prefix}digit ar\` or \`${prefix}digit en\`.`;
+}
+
+function helpText(prefix) {
+  return `🔢 *تحويل الأرقام / Digit converter*
+
+• \`${prefix}digit 12345\` ➔ ١٢٣٤٥  (يُكتشف تلقائياً / auto-detected)
+• \`${prefix}digit ١٢٣٤٥\` ➔ 12345
+• \`${prefix}digit ar 12345\` ➔ ١٢٣٤٥
+• \`${prefix}digit en ١٢٣٤٥\` ➔ 12345
+_أو رد على رسالة فيها أرقام بـ \`${prefix}digit\` — يحوّل للاتجاه المعاكس._
+_إذا اختلطت الأرقام العربية والإنجليزية يجب تحديد الاتجاه: \`${prefix}digit ar\` أو \`${prefix}digit en\`._`;
+}
+
+module.exports = {
+  name: "digit",
+  aliases: ["digits", "num", "numbers", "numeral", "ارقام", "رقم"],
+  description: "Convert numbers between Arabic and English digits",
+  usage: "digit [en|ar] [number/text] (or reply to a message)",
+  chat: "all",
+
+  async execute(sock, msg, args) {
+    const chatId = msg.key.remoteJid;
+    const prefix = runtimeConfig.getPrefix();
+    const quotedText = getQuotedText(msg);
+    const firstArg = args?.[0] ? String(args[0]).toLowerCase().trim() : "";
+    const targetAr = isExplicitAr(firstArg);
+    const targetEn = isExplicitEn(firstArg);
+    const hasExplicitTarget = targetAr || targetEn;
+
+    if (!args || args.length === 0) {
+      if (quotedText && classifyNumerals(quotedText) !== "none") {
+        const kind = classifyNumerals(quotedText);
+        if (kind === "mixed") {
+          await sock.sendMessage(chatId, { text: mixedDigitsNotice(prefix) }, { quoted: msg });
+          return;
+        }
+        const converted = convertNumerals(quotedText, oppositeNumeralLang(kind));
+        await sock.sendMessage(chatId, { text: converted }, { quoted: msg });
+        return;
+      }
+      await sock.sendMessage(chatId, { text: helpText(prefix) }, { quoted: msg });
+      return;
+    }
+
+    const inlineText = hasExplicitTarget ? args.slice(1).join(" ").trim() : args.join(" ").trim();
+    const textToConvert = inlineText || quotedText;
+
+    if (!textToConvert) {
+      await sock.sendMessage(
+        chatId,
+        {
+          text: `❌ اكتب رقماً بعد الأمر، أو رد على رسالة.\nType a number after the command, or reply to a message.\nمثال: \`${prefix}digit 12345\` أو \`${prefix}digit ar 12345\``,
+        },
+        { quoted: msg },
+      );
+      return;
+    }
+
+    if (hasExplicitTarget) {
+      const converted = convertNumerals(textToConvert, targetAr ? "ar" : "en");
+      await sock.sendMessage(chatId, { text: converted }, { quoted: msg });
+      return;
+    }
+
+    const kind = classifyNumerals(textToConvert);
+    if (kind === "mixed") {
+      await sock.sendMessage(chatId, { text: mixedDigitsNotice(prefix) }, { quoted: msg });
+      return;
+    }
+    if (kind === "none") {
+      await sock.sendMessage(
+        chatId,
+        {
+          text: `❌ لا توجد أرقام للتحويل.\nNo digits found to convert.\nاستخدم:\n• \`${prefix}digit 12345\`\n• \`${prefix}digit ar\` / \`${prefix}digit en\` مع النص أو بالرد على رسالة.`,
+        },
+        { quoted: msg },
+      );
+      return;
+    }
+
+    const converted = convertNumerals(textToConvert, oppositeNumeralLang(kind));
+    await sock.sendMessage(chatId, { text: converted }, { quoted: msg });
+  },
+};