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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CliRemote
-Version: 1.7.8
+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.8.dist-info → cliremote-1.7.10.dist-info}/RECORD

@@ -1,8 +1,8 @@
-cliremote-1.7.8.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+cliremote-1.7.10.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=WiUUVmSs5JTUdXeSry8PkK_3TRemAdSZjm0G1ilAA-A,3532
+remote/admin_manager.py,sha256=lgpdN3Mo6YzxNNm7eb7fjGuKzzkV39VRGafpavrAp8Y,4802
 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.8.dist-info/METADATA,sha256=JZFhSZPJGlEbUdniGYCIYs-rEzPZYAfLXsv3nhh7FfQ,1202
-cliremote-1.7.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cliremote-1.7.8.dist-info/top_level.txt,sha256=yBZidJ6zCix_a2ubGlYaewvlzBFXWbckQt20dudxJ1E,7
-cliremote-1.7.8.dist-info/RECORD,,
+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,,

remote/admin_manager.py

@@ -1,67 +1,80 @@
 # 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__)
 
-ADMINS_FILE = "admins.json"
-
-
-def load_admins() -> list[int]:
+def _project_root() -> Path:
     """
-    بارگذاری لیست ادمین‌ها از فایل.
-    همیشه OWNER_ID را هم به لیست اضافه می‌کند.
+    ریشه پروژه = پوشه‌ای که main.py داخلش اجرا شده.
     """
-    s = set(OWNER_ID)
     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))
-                        except:
-                            pass
+                            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():
     """
-    ذخیره‌ی ادمین‌ها در فایل.
+    ذخیره در فایل کنار 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()
-
-# فیلترهای دسترسی برای Pyrogram
+# فیلترهای دسترسی
 admin_filter = filters.create(
-    lambda _, __, m: bool(getattr(m, "from_user", None))
-    and int(m.from_user.id) in ADMINS
+    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
+    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.split()
+        parts = (message.text or "").split()
         if len(parts) < 2:
-            await message.reply("مثال: addadmin 123456789")
+            await message.reply("مثال: /addadmin 123456789")
             return
         uid = int(parts[1])
         if uid in OWNER_ID:
@@ -69,20 +82,21 @@ 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"ادمین جدید اضافه شد: {uid}")
+            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}")
+        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.split()
+        parts = (message.text or "").split()
         if len(parts) < 2:
-            await message.reply("مثال: deladmin 123456789")
+            await message.reply("مثال: /deladmin 123456789")
             return
         uid = int(parts[1])
         if uid in OWNER_ID:
@@ -91,21 +105,21 @@ async def del_admin_cmd(message):
         if uid in ADMINS:
             ADMINS.remove(uid)
             save_admins()
-            await message.reply(f"ادمین حذف شد: {uid}")
+            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}")
+        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([str(x) for x in ADMINS])
-        await message.reply(text)
+        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}")
+        logger.error(f"list_admins_cmd error: {e}", exc_info=True)
         await message.reply(f"خطا: {e}")