CliRemote 1.7.10__tar.gz → 1.7.13__tar.gz

{cliremote-1.7.10 → cliremote-1.7.13}/CliRemote.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CliRemote
-Version: 1.7.10
+Version: 1.7.13
 Summary: Remote client framework for Telegram automation using Pyrogram
 Home-page: https://github.com/MohammadAhmadi-R/CliRemote
 Author: MrAhmadiRad

{cliremote-1.7.10 → cliremote-1.7.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CliRemote
-Version: 1.7.10
+Version: 1.7.13
 Summary: Remote client framework for Telegram automation using Pyrogram
 Home-page: https://github.com/MohammadAhmadi-R/CliRemote
 Author: MrAhmadiRad

{cliremote-1.7.10 → cliremote-1.7.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "CliRemote"
-version = "1.7.10"
+version = "1.7.13"
 description = "Remote client framework for Telegram automation using Pyrogram"
 readme = "README.md"
 license = {text = "MIT"}

cliremote-1.7.13/remote/admin_manager.py

@@ -0,0 +1,187 @@
+# remote/admin_manager.py
+import json
+import os
+import sys
+import logging
+from pathlib import Path
+from pyrogram import filters
+from .config import OWNER_ID
+
+# =============================
+# تنظیم logger فایل
+# =============================
+
+def _project_root() -> Path:
+    """ریشه پروژه = پوشه‌ای که main.py داخلش اجرا شده. در صورت عدم دسترسی، از cwd استفاده می‌شود."""
+    try:
+        main_file = Path(sys.modules["__main__"].__file__).resolve()
+        return main_file.parent
+    except Exception:
+        return Path(os.getcwd()).resolve()
+
+_PROJECT_ROOT = _project_root()
+_LOG_DIR = _PROJECT_ROOT / "logs"
+_LOG_DIR.mkdir(parents=True, exist_ok=True)
+_LOG_PATH = _LOG_DIR / "admins_log.txt"
+
+# logger اختصاصی این ماژول
+logger = logging.getLogger("remote.admin_manager")
+logger.setLevel(logging.DEBUG)
+
+# جلوگیری از افزودن چندباره‌ی هندلر هنگام ریلود
+if not any(isinstance(h, logging.FileHandler) and getattr(h, "_admin_log", False) for h in logger.handlers):
+    fh = logging.FileHandler(_LOG_PATH, encoding="utf-8")
+    fh._admin_log = True  # پرچم داخلی برای تشخیص
+    fh.setLevel(logging.DEBUG)
+    fmt = logging.Formatter(
+        fmt="%(asctime)s | %(levelname)s | %(name)s | %(message)s",
+        datefmt="%Y-%m-%d %H:%M:%S"
+    )
+    fh.setFormatter(fmt)
+    logger.addHandler(fh)
+
+logger.debug(f"Admin manager initialized. Log path: {_LOG_PATH}")
+
+# =============================
+# تنظیمات فایل ادمین‌ها
+# =============================
+
+ADMINS_FILE = "admins.json"  # اگر می‌خواهی کنار main.py باشد: ( _PROJECT_ROOT / "admins.json" ).as_posix()
+
+def load_admins() -> list[int]:
+    """
+    بارگذاری لیست ادمین‌ها از فایل.
+    همیشه OWNER_ID را هم به لیست اضافه می‌کند.
+    """
+    logger.debug(f"Loading admins from file: {ADMINS_FILE} | OWNER_ID: {OWNER_ID}")
+    s = set(OWNER_ID)
+    try:
+        if os.path.exists(ADMINS_FILE):
+            with open(ADMINS_FILE, "r", encoding="utf-8") as f:
+                data = json.load(f)
+                logger.info(f"admins.json loaded. Raw: {data!r}")
+                if isinstance(data, list):
+                    for v in data:
+                        try:
+                            s.add(int(v))
+                        except Exception as conv_err:
+                            logger.warning(f"Skip invalid admin id in file: {v!r} | err={conv_err}")
+        else:
+            logger.info(f"admins.json not found at: {os.path.abspath(ADMINS_FILE)}")
+    except Exception as e:
+        logger.warning(f"Error loading admins: {e}", exc_info=True)
+
+    result = sorted(s)
+    logger.debug(f"Effective ADMINS after merge with OWNER_ID: {result}")
+    return result
+
+
+def save_admins():
+    """
+    ذخیره‌ی ادمین‌ها در فایل.
+    """
+    try:
+        # نکته: در این طراحی، ADMINS شامل OWNER_ID هم می‌تواند باشد؛ مشکلی نیست
+        logger.debug(f"Saving ADMINS to file: {ADMINS_FILE} | Data: {ADMINS}")
+        with open(ADMINS_FILE, "w", encoding="utf-8") as f:
+            json.dump(list(ADMINS), f, ensure_ascii=False, indent=2)
+        logger.info(f"Admins saved to {os.path.abspath(ADMINS_FILE)}")
+    except Exception as e:
+        logger.error(f"Error saving admins: {e}", exc_info=True)
+
+
+ADMINS = load_admins()
+logger.info(f"Loaded admins at import time: {ADMINS}")
+
+# فیلترهای دسترسی برای Pyrogram
+admin_filter = filters.create(
+    lambda _, __, m: bool(getattr(m, "from_user", None)) and int(m.from_user.id) in ADMINS
+)
+owner_filter = filters.create(
+    lambda _, __, m: bool(getattr(m, "from_user", None)) and int(m.from_user.id) in OWNER_ID
+)
+
+# =============================
+# فرمان‌های مدیریتی
+# =============================
+
+async def add_admin_cmd(message):
+    try:
+        uid_display = getattr(getattr(message, "from_user", None), "id", None)
+        logger.debug(f"add_admin_cmd triggered by user_id={uid_display} | text={message.text!r}")
+
+        parts = (message.text or "").split()
+        if len(parts) < 2:
+            logger.debug("add_admin_cmd: missing argument")
+            await message.reply("مثال: addadmin 123456789")
+            return
+
+        uid = int(parts[1])
+        logger.debug(f"add_admin_cmd: parsed target uid={uid}")
+
+        if uid in OWNER_ID:
+            logger.info(f"add_admin_cmd: uid={uid} is OWNER; skip append")
+            await message.reply("ادمین اصلی از قبل وجود دارد")
+            return
+
+        if uid not in ADMINS:
+            ADMINS.append(uid)
+            logger.info(f"Admin appended: {uid} | New ADMINS={sorted(ADMINS)}")
+            save_admins()
+            await message.reply(f"ادمین جدید اضافه شد: {uid}")
+        else:
+            logger.info(f"add_admin_cmd: uid={uid} already in ADMINS")
+            await message.reply("قبلاً ادمین بود")
+    except Exception as e:
+        logger.error(f"add_admin_cmd error: {e}", exc_info=True)
+        await message.reply(f"خطا: {e}")
+
+
+async def del_admin_cmd(message):
+    try:
+        uid_display = getattr(getattr(message, "from_user", None), "id", None)
+        logger.debug(f"del_admin_cmd triggered by user_id={uid_display} | text={message.text!r}")
+
+        parts = (message.text or "").split()
+        if len(parts) < 2:
+            logger.debug("del_admin_cmd: missing argument")
+            await message.reply("مثال: deladmin 123456789")
+            return
+
+        uid = int(parts[1])
+        logger.debug(f"del_admin_cmd: parsed target uid={uid}")
+
+        if uid in OWNER_ID:
+            logger.info(f"del_admin_cmd: attempt to remove OWNER uid={uid} blocked")
+            await message.reply("❌ امکان حذف ادمین اصلی وجود ندارد")
+            return
+
+        if uid in ADMINS:
+            ADMINS.remove(uid)
+            logger.info(f"Admin removed: {uid} | New ADMINS={sorted(ADMINS)}")
+            save_admins()
+            await message.reply(f"ادمین حذف شد: {uid}")
+        else:
+            logger.info(f"del_admin_cmd: uid={uid} not in ADMINS")
+            await message.reply("کاربر ادمین نیست")
+    except Exception as e:
+        logger.error(f"del_admin_cmd error: {e}", exc_info=True)
+        await message.reply(f"خطا: {e}")
+
+
+async def list_admins_cmd(message):
+    try:
+        uid_display = getattr(getattr(message, "from_user", None), "id", None)
+        logger.debug(f"list_admins_cmd triggered by user_id={uid_display}")
+
+        if not ADMINS:
+            logger.info("list_admins_cmd: ADMINS is empty")
+            await message.reply("لیست ادمین‌ها خالی است.")
+            return
+
+        text = "👑 <b>ADMINS:</b>\n" + "\n".join([str(x) for x in sorted(ADMINS)])
+        logger.debug(f"list_admins_cmd: respond with {len(ADMINS)} admins")
+        await message.reply(text)
+    except Exception as e:
+        logger.error(f"list_admins_cmd error: {e}", exc_info=True)
+        await message.reply(f"خطا: {e}")

{cliremote-1.7.10 → cliremote-1.7.13}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", encoding="utf-8") as f:
 
 setup(
     name="CliRemote",
-    version="1.7.10", 
+    version="1.7.13", 
     author="MrAhmadiRad",
     author_email="mohammadahmadirad69@gmail.com",
     description="A precise, async-safe, Telegram automation core (Python 3.8+)",

cliremote-1.7.10/remote/admin_manager.py

@@ -1,125 +0,0 @@
-# remote/admin_manager.py
-import json, os, sys, logging
-from pathlib import Path
-from pyrogram import filters
-from .config import OWNER_ID
-
-logger = logging.getLogger(__name__)
-
-def _project_root() -> Path:
-    """
-    ریشه پروژه = پوشه‌ای که main.py داخلش اجرا شده.
-    """
-    try:
-        main_file = Path(sys.modules["__main__"].__file__).resolve()
-        return main_file.parent
-    except Exception:
-        # fallback: اگر به هر دلیل __main__.__file__ نبود
-        return Path(os.getcwd()).resolve()
-
-PROJECT_ROOT = _project_root()
-ADMINS_FILE = PROJECT_ROOT / "admins.json"   # ✅ کنار main.py
-
-def _load_admins_from_file() -> list[int]:
-    try:
-        if ADMINS_FILE.exists():
-            with ADMINS_FILE.open("r", encoding="utf-8") as f:
-                data = json.load(f)
-                if isinstance(data, list):
-                    out = []
-                    for v in data:
-                        try:
-                            out.append(int(v))
-                        except Exception:
-                            logger.warning(f"Bad admin id in file: {v!r}")
-                    return out
-    except Exception as e:
-        logger.warning(f"Error loading admins from {ADMINS_FILE}: {e}")
-    return []
-
-# لیست ادمین‌های موثر (فایل + Owner)
-ADMINS: list[int] = []
-
-def reload_admins():
-    """فایل را می‌خواند و با OWNER_ID ادغام می‌کند؛ نتیجه در ADMINS."""
-    file_admins = _load_admins_from_file()
-    s = set(file_admins) | set(OWNER_ID)
-    global ADMINS
-    ADMINS = sorted(s)
-    logger.info(f"Loaded admins ({ADMINS_FILE}): {ADMINS}")
-
-def save_admins():
-    """
-    ذخیره در فایل کنار main.py.
-    فقط ادمین‌های غیر-Owner را داخل فایل نگه می‌داریم (Ownerها از config می‌آیند).
-    """
-    try:
-        file_list = [x for x in ADMINS if x not in set(OWNER_ID)]
-        with ADMINS_FILE.open("w", encoding="utf-8") as f:
-            json.dump(file_list, f, ensure_ascii=False, indent=2)
-        logger.info(f"Saved admins to {ADMINS_FILE}: {file_list}")
-    except Exception as e:
-        logger.error(f"Error saving admins: {e}")
-
-# فیلترهای دسترسی
-admin_filter = filters.create(
-    lambda _, __, m: bool(getattr(m, "from_user", None)) and int(m.from_user.id) in ADMINS
-)
-owner_filter = filters.create(
-    lambda _, __, m: bool(getattr(m, "from_user", None)) and int(m.from_user.id) in OWNER_ID
-)
-
-# ===== فرمان‌ها =====
-async def add_admin_cmd(message):
-    try:
-        parts = (message.text or "").split()
-        if len(parts) < 2:
-            await message.reply("مثال: /addadmin 123456789")
-            return
-        uid = int(parts[1])
-        if uid in OWNER_ID:
-            await message.reply("ادمین اصلی از قبل وجود دارد")
-            return
-        if uid not in ADMINS:
-            ADMINS.append(uid)
-            ADMINS[:] = sorted(set(ADMINS) | set(OWNER_ID))
-            save_admins()
-            await message.reply(f"ادمین جدید اضافه شد: <code>{uid}</code>")
-            logger.info(f"Admin added: {uid}")
-        else:
-            await message.reply("قبلاً ادمین بود")
-    except Exception as e:
-        logger.error(f"add_admin_cmd error: {e}", exc_info=True)
-        await message.reply(f"خطا: {e}")
-
-async def del_admin_cmd(message):
-    try:
-        parts = (message.text or "").split()
-        if len(parts) < 2:
-            await message.reply("مثال: /deladmin 123456789")
-            return
-        uid = int(parts[1])
-        if uid in OWNER_ID:
-            await message.reply("❌ امکان حذف ادمین اصلی وجود ندارد")
-            return
-        if uid in ADMINS:
-            ADMINS.remove(uid)
-            save_admins()
-            await message.reply(f"ادمین حذف شد: <code>{uid}</code>")
-            logger.info(f"Admin removed: {uid}")
-        else:
-            await message.reply("کاربر ادمین نیست")
-    except Exception as e:
-        logger.error(f"del_admin_cmd error: {e}", exc_info=True)
-        await message.reply(f"خطا: {e}")
-
-async def list_admins_cmd(message):
-    try:
-        if not ADMINS:
-            await message.reply("لیست ادمین‌ها خالی است.")
-            return
-        text = "👑 <b>ADMINS:</b>\n" + "\n".join([f"<code>{x}</code>" for x in ADMINS])
-        await message.reply(text, disable_web_page_preview=True)
-    except Exception as e:
-        logger.error(f"list_admins_cmd error: {e}", exc_info=True)
-        await message.reply(f"خطا: {e}")