CliRemote 1.7.10__py3-none-any.whl → 1.7.13__py3-none-any.whl

{cliremote-1.7.10.dist-info → cliremote-1.7.13.dist-info}/METADATA

@@ -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.dist-info → cliremote-1.7.13.dist-info}/RECORD

@@ -1,8 +1,8 @@
-cliremote-1.7.10.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+cliremote-1.7.13.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
 remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 remote/account_manager.py,sha256=TepnGIoE2hU-j_NmU5ByoS-JrboE0w3A1bYmQoQX5h8,15176
 remote/account_viewer.py,sha256=j46KSjbgrBmBi7UxFeJ5tCwHIe0QvCvphkirGIbB2oo,5192
-remote/admin_manager.py,sha256=lgpdN3Mo6YzxNNm7eb7fjGuKzzkV39VRGafpavrAp8Y,4802
+remote/admin_manager.py,sha256=JXxZ6dEF5xXUcNmLmxuFAAUE7EyHDf0sLutTQYnTlHY,7392
 remote/analytics_manager.py,sha256=6jPvwt_ELA4RMbQdD8W_ltfAoaSgILnEkOAp6HZAqsU,7382
 remote/batch_manager.py,sha256=jVGhYVwHMKJd7f7JxcWjKlwr03dq0RaGD1KdkyYdb00,1051
 remote/block_manager.py,sha256=R7UaQigr-hTRtjxjG3OvJdKhvp0mDpLaESp3Of1AYhs,5692
@@ -33,7 +33,7 @@ remote/text_manager.py,sha256=C2wNSXPSCDu8NSD3RsfbKmUQMWOYd1B5N4tzy-Jsriw,2195
 remote/username_manager.py,sha256=nMNdke-2FIv86xR1Y6rR-43oUoQu_3Khw8wEo54noXI,3388
 remote/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 remote/utils/sqlite_utils.py,sha256=5i0oUXsBgKC_8qHZPJ-Gyhp9D1TwqKHVvuZRIhKpS6w,1260
-cliremote-1.7.10.dist-info/METADATA,sha256=QTB61ZPptktRQaQTzGvRU5-F5vX4JatOmWdT_STGw1Y,1203
-cliremote-1.7.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cliremote-1.7.10.dist-info/top_level.txt,sha256=yBZidJ6zCix_a2ubGlYaewvlzBFXWbckQt20dudxJ1E,7
-cliremote-1.7.10.dist-info/RECORD,,
+cliremote-1.7.13.dist-info/METADATA,sha256=AGkWN4uIhUNz55bPpKmv6t31CJvf53AS2l3uuMsjlJg,1203
+cliremote-1.7.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cliremote-1.7.13.dist-info/top_level.txt,sha256=yBZidJ6zCix_a2ubGlYaewvlzBFXWbckQt20dudxJ1E,7
+cliremote-1.7.13.dist-info/RECORD,,

remote/admin_manager.py

@@ -1,67 +1,99 @@
 # remote/admin_manager.py
-import json, os, sys, logging
+import json
+import os
+import sys
+import logging
 from pathlib import Path
 from pyrogram import filters
 from .config import OWNER_ID
 
-logger = logging.getLogger(__name__)
+# =============================
+# تنظیم logger فایل
+# =============================
 
 def _project_root() -> Path:
-    """
-    ریشه پروژه = پوشه‌ای که main.py داخلش اجرا شده.
-    """
+    """ریشه پروژه = پوشه‌ای که main.py داخلش اجرا شده. در صورت عدم دسترسی، از cwd استفاده می‌شود."""
     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
+_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_from_file() -> list[int]:
+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 ADMINS_FILE.exists():
-            with ADMINS_FILE.open("r", encoding="utf-8") as f:
+        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):
-                    out = []
                     for v in data:
                         try:
-                            out.append(int(v))
-                        except Exception:
-                            logger.warning(f"Bad admin id in file: {v!r}")
-                    return out
+                            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 from {ADMINS_FILE}: {e}")
-    return []
+        logger.warning(f"Error loading admins: {e}", exc_info=True)
 
-# لیست ادمین‌های موثر (فایل + Owner)
-ADMINS: list[int] = []
+    result = sorted(s)
+    logger.debug(f"Effective ADMINS after merge with OWNER_ID: {result}")
+    return result
 
-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}")
+        # نکته: در این طراحی، 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}")
+        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
 )
@@ -69,57 +101,87 @@ 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:
-            await message.reply("مثال: /addadmin 123456789")
+            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)
-            ADMINS[:] = sorted(set(ADMINS) | set(OWNER_ID))
+            logger.info(f"Admin appended: {uid} | New ADMINS={sorted(ADMINS)}")
             save_admins()
-            await message.reply(f"ادمین جدید اضافه شد: <code>{uid}</code>")
-            logger.info(f"Admin added: {uid}")
+            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:
-            await message.reply("مثال: /deladmin 123456789")
+            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"ادمین حذف شد: <code>{uid}</code>")
-            logger.info(f"Admin removed: {uid}")
+            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([f"<code>{x}</code>" for x in ADMINS])
-        await message.reply(text, disable_web_page_preview=True)
+
+        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}")