CliRemote 1.7.9__tar.gz → 1.7.10__tar.gz

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

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

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

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

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

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

{cliremote-1.7.9 → cliremote-1.7.10}/remote/admin_manager.py

@@ -1,44 +1,67 @@
 # remote/admin_manager.py
-import json, os, logging
+import json, os, sys, logging
+from pathlib import Path
 from pyrogram import filters
 from .config import OWNER_ID
 
 logger = logging.getLogger(__name__)
 
-# فایل کنار همین ماژول ذخیره شود، نه نسبت به cwd
-BASE_DIR = os.path.dirname(__file__)
-ADMINS_FILE = os.path.join(BASE_DIR, "admins.json")
-
-def load_admins() -> list[int]:
+def _project_root() -> Path:
     """
-    بارگذاری لیست ادمین‌ها از فایل + اضافه‌کردن OWNER_ID
+    ریشه پروژه = پوشه‌ای که main.py داخلش اجرا شده.
     """
-    s = set(OWNER_ID)  # همیشه Ownerها باشند
     try:
-        if os.path.exists(ADMINS_FILE):
-            with open(ADMINS_FILE, "r", encoding="utf-8") as f:
+        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:
-                            s.add(int(v))
+                            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: {e}")
-    return list(s)
+        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():
-    """ذخیره‌ی ادمین‌ها در فایل (بدون Ownerها، فقط ADMINS پویا)."""
+    """
+    ذخیره در فایل کنار main.py.
+    فقط ادمین‌های غیر-Owner را داخل فایل نگه می‌داریم (Ownerها از config می‌آیند).
+    """
     try:
-        with open(ADMINS_FILE, "w", encoding="utf-8") as f:
-            json.dump(list(ADMINS), f, ensure_ascii=False, indent=2)
+        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}")
 
-ADMINS = load_admins()
-
-# فیلترها (داینامیک: هر بار اجرا، مقدار فعلی لیست‌ها چک می‌شود)
+# فیلترهای دسترسی
 admin_filter = filters.create(
     lambda _, __, m: bool(getattr(m, "from_user", None)) and int(m.from_user.id) in ADMINS
 )
@@ -46,9 +69,7 @@ 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()
@@ -61,6 +82,7 @@ async def add_admin_cmd(message):
             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}")

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

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