update assistant to latest pyrogram

Author: rking32

assistant/__init__.py

@@ -9,4 +9,4 @@
 from .logger import logging  # noqa
 from .config import Config  # noqa
 from .bot import bot  # noqa
-from . import filters  # noqa
+from . import cus_filters  # noqa

assistant/filters.py assistant/cus_filters.py

@@ -10,15 +10,16 @@
 
 import asyncio
 
-from pyrogram import Filters, Message
+from pyrogram import filters, Client
+from pyrogram.types import Message
 
 from . import Config, logging
 
 _LOG = logging.getLogger(__name__)
 _FETCHING = False
 
 
-async def _is_admin_or_dev(_, msg: Message) -> bool:
+async def _is_admin_or_dev(_, bot: Client, msg: Message) -> bool:
     global _FETCHING  # pylint: disable=global-statement
     if msg.chat.id not in Config.AUTH_CHATS:
         return False
@@ -34,7 +35,7 @@ async def _is_admin_or_dev(_, msg: Message) -> bool:
         admins = []
         _LOG.info("fetching data from [%s] ...", msg.chat.id)
         # pylint: disable=protected-access
-        async for c_m in msg._client.iter_chat_members(msg.chat.id):
+        async for c_m in bot.iter_chat_members(msg.chat.id):
             if c_m.status in ("creator", "administrator"):
                 admins.append(c_m.user.id)
         Config.ADMINS[msg.chat.id] = tuple(admins)
@@ -44,5 +45,5 @@ async def _is_admin_or_dev(_, msg: Message) -> bool:
     return msg.from_user.id in Config.ADMINS[msg.chat.id]
 
 
-auth_chats = Filters.chat(list(Config.AUTH_CHATS))
-auth_users = Filters.create(_is_admin_or_dev)
+auth_chats = filters.chat(list(Config.AUTH_CHATS))
+auth_users = filters.create(_is_admin_or_dev)

assistant/plugins/alive.py

@@ -9,19 +9,20 @@
 import time
 import random
 
-from pyrogram import Message, Filters, InlineKeyboardMarkup, InlineKeyboardButton
+from pyrogram import filters
+from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton
 from pyrogram.errors.exceptions import FileIdInvalid, FileReferenceEmpty
 from pyrogram.errors.exceptions.bad_request_400 import BadRequest
 
-from assistant import bot, filters, versions
+from assistant import bot, cus_filters, versions
 from assistant.bot import START_TIME
 from assistant.utils import time_formatter
 
 LOGO_DATA = []
 MSG_IDS = [499509, 499428, 496502, 496360, 496498]
 
 
-@bot.on_message(Filters.command("alive") & filters.auth_chats)
+@bot.on_message(filters.command("alive") & cus_filters.auth_chats)
 async def _alive(_, message: Message):
     try:
         await _sendit(message.chat.id)

assistant/plugins/antiflood.py

@@ -8,8 +8,9 @@
 
 import time
 
-from pyrogram import Message, Filters
-from assistant import bot, filters
+from pyrogram import filters
+from pyrogram.types import Message
+from assistant import bot, cus_filters
 
 DATA = {}
 
@@ -18,8 +19,8 @@
 MIN_DELAY = 3
 
 
-@bot.on_message(
-    Filters.incoming & ~Filters.edited & filters.auth_chats & ~filters.auth_users, group=1)
+@bot.on_message(filters.incoming & ~filters.edited & cus_filters.auth_chats
+                & ~cus_filters.auth_users, group=1)
 async def _flood(_, message: Message):
     chat_flood = DATA.get(message.chat.id)
     if chat_flood is None:

assistant/plugins/gadmin.py

@@ -9,17 +9,18 @@
 import time
 import asyncio
 
-from pyrogram import Message, Filters, ChatPermissions
+from pyrogram import filters
+from pyrogram.types import Message, ChatPermissions
 from pyrogram.errors import (
     FloodWait, UserAdminInvalid, UsernameInvalid, PeerIdInvalid, UserIdInvalid)
 
-from assistant import bot, filters
+from assistant import bot, cus_filters
 from assistant.utils import (
     is_dev, is_self, is_admin, sed_sticker, check_rights, check_bot_rights)
 
 
 @bot.on_message(  # tban in queue
-    Filters.command("ban") & filters.auth_chats & filters.auth_users)
+    filters.command("ban") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _ban_user(_, msg: Message):
     chat_id = msg.chat.id
     if not await check_rights(chat_id, msg.from_user.id, "can_restrict_members"):
@@ -74,7 +75,7 @@ async def _ban_user(_, msg: Message):
 
 
 @bot.on_message(
-    Filters.command("unban") & filters.auth_chats & filters.auth_users)
+    filters.command("unban") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _unban_user(_, msg: Message):
     chat_id = msg.chat.id
     if not await check_rights(chat_id, msg.from_user.id, "can_restrict_members"):
@@ -110,7 +111,7 @@ async def _unban_user(_, msg: Message):
 
 
 @bot.on_message(
-    Filters.command("kick") & filters.auth_chats & filters.auth_users)
+    filters.command("kick") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _kick_user(_, msg: Message):
     chat_id = msg.chat.id
     if not await check_rights(chat_id, msg.from_user.id, "can_restrict_members"):
@@ -165,7 +166,7 @@ async def _kick_user(_, msg: Message):
 
 
 @bot.on_message(
-    Filters.command("promote") & filters.auth_chats & filters.auth_users)
+    filters.command("promote") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _promote_user(_, msg: Message):
     chat_id = msg.chat.id
     if not await check_rights(chat_id, msg.from_user.id, "can_promote_members"):
@@ -206,7 +207,7 @@ async def _promote_user(_, msg: Message):
 
 
 @bot.on_message(
-    Filters.command("demote") & filters.auth_chats & filters.auth_users)
+    filters.command("demote") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _demote_user(_, msg: Message):
     chat_id = msg.chat.id
     if not await check_rights(chat_id, msg.from_user.id, "can_promote_members"):
@@ -250,7 +251,7 @@ async def _demote_user(_, msg: Message):
 
 
 @bot.on_message(  # tmute in queue
-    Filters.command("mute") & filters.auth_chats & filters.auth_users)
+    filters.command("mute") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _mute_user(_, msg: Message):
     chat_id = msg.chat.id
     if not await check_rights(chat_id, msg.from_user.id, "can_restrict_members"):
@@ -307,7 +308,7 @@ async def _mute_user(_, msg: Message):
 
 
 @bot.on_message(
-    Filters.command("unmute") & filters.auth_chats & filters.auth_users)
+    filters.command("unmute") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _unmute_user(_, msg: Message):
     chat_id = msg.chat.id
     if not await check_rights(chat_id, msg.from_user.id, "can_restrict_members"):
@@ -356,7 +357,7 @@ async def _unmute_user(_, msg: Message):
 
 
 @bot.on_message(
-    Filters.command("zombies") & filters.auth_chats & filters.auth_users)
+    filters.command("zombies") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _zombie_clean(_, msg: Message):
     chat_id = msg.chat.id
     if "clean" in msg.text.lower():
@@ -405,7 +406,7 @@ async def _zombie_clean(_, msg: Message):
 
 
 @bot.on_message(
-    Filters.command("pin") & filters.auth_chats & filters.auth_users)
+    filters.command("pin") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _pin(_, msg: Message):
     chat_id = msg.chat.id
     if not await check_rights(chat_id, msg.from_user.id, "can_pin_messages"):
@@ -433,7 +434,7 @@ async def _pin(_, msg: Message):
 
 
 @bot.on_message(
-    Filters.command("unpin") & filters.auth_chats & filters.auth_users)
+    filters.command("unpin") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _unpin(_, msg: Message):
     chat_id = msg.chat.id
     if not await check_rights(chat_id, msg.from_user.id, "can_pin_messages"):

assistant/plugins/id.py

@@ -6,12 +6,13 @@
 #
 # All rights reserved.
 
-from pyrogram import Message, Filters
+from pyrogram import filters
+from pyrogram.types import Message
 
-from assistant import bot, filters
+from assistant import bot, cus_filters
 
 
-@bot.on_message(Filters.command("id") & filters.auth_chats)
+@bot.on_message(filters.command("id") & cus_filters.auth_chats)
 async def _id(_, message: Message):
     msg = message.reply_to_message or message
     out_str = f"👥 **Chat ID** : `{(msg.forward_from_chat or msg.chat).id}`\n"

assistant/plugins/json.py

@@ -6,12 +6,13 @@
 #
 # All rights reserved.
 
-from pyrogram import Message, Filters
+from pyrogram import filters
+from pyrogram.types import Message
 
-from assistant import bot, filters, Config
+from assistant import bot, cus_filters, Config
 
 
-@bot.on_message(Filters.command("json") & filters.auth_chats & filters.auth_users)
+@bot.on_message(filters.command("json") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _json(_, message: Message):
     msg = str(message.reply_to_message) if message.reply_to_message else str(message)
     if len(msg) > Config.MAX_MSG_LENGTH:

assistant/plugins/paste.py

@@ -10,16 +10,16 @@
 
 import aiohttp
 from aiohttp import ClientResponseError, ServerTimeoutError, TooManyRedirects
+from pyrogram import filters
+from pyrogram.types import Message
 
-from pyrogram import Message, Filters
-
-from assistant import bot, filters, Config
+from assistant import bot, cus_filters, Config
 
 DOGBIN_URL = "https://del.dog/"
 NEKOBIN_URL = "https://nekobin.com/"
 
 
-@bot.on_message(Filters.command("paste") & filters.auth_chats)
+@bot.on_message(filters.command("paste") & cus_filters.auth_chats)
 async def dogbin_paste(_, message: Message):
     """ pastes the text directly to dogbin  """
     cmd = len(message.text)
@@ -58,7 +58,7 @@ async def dogbin_paste(_, message: Message):
                 await msg.edit("`Failed to reach Dogbin`")
 
 
-@bot.on_message(Filters.command("neko") & filters.auth_chats)
+@bot.on_message(filters.command("neko") & cus_filters.auth_chats)
 async def nekobin_paste(_, message: Message):
     """ pastes the text directly to nekobin  """
     cmd = len(message.text)
@@ -93,7 +93,7 @@ async def nekobin_paste(_, message: Message):
                 await msg.edit("`Failed to reach Nekobin`")
 
 
-@bot.on_message(Filters.command("getpaste") & filters.auth_chats)
+@bot.on_message(filters.command("getpaste") & cus_filters.auth_chats)
 async def get_paste_(_, message: Message):
     """ fetches the content of a dogbin or nekobin URL """
     if message.text and len(message.text) == 9:

assistant/plugins/ping.py

@@ -8,12 +8,13 @@
 
 from datetime import datetime
 
-from pyrogram import Message, Filters
+from pyrogram import filters
+from pyrogram.types import Message
 
-from assistant import bot, filters
+from assistant import bot, cus_filters
 
 
-@bot.on_message(Filters.command("ping") & filters.auth_chats)
+@bot.on_message(filters.command("ping") & cus_filters.auth_chats)
 async def _ping(_, message: Message):
     start = datetime.now()
     replied = await message.reply('`Pong!`')

assistant/plugins/reply.py

@@ -6,12 +6,13 @@
 #
 # All rights reserved.
 
-from pyrogram import Message, Filters
+from pyrogram import filters
+from pyrogram.types import Message
 
-from assistant import bot, filters
+from assistant import bot, cus_filters
 
 
-@bot.on_message(Filters.command("reply") & filters.auth_chats & filters.auth_users)
+@bot.on_message(filters.command("reply") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _reply(_, message: Message):
     replid = message.reply_to_message
     if not replid:

assistant/plugins/warn.py

@@ -8,11 +8,12 @@
 
 import time
 
-from pyrogram import (
-    Message, Filters, CallbackQuery, ChatPermissions,
+from pyrogram import filters
+from pyrogram.types import (
+    Message, CallbackQuery, ChatPermissions,
     InlineKeyboardMarkup, InlineKeyboardButton)
 
-from assistant import bot, filters
+from assistant import bot, cus_filters
 from assistant.utils import is_admin, is_dev, is_self, sed_sticker
 
 WARN_LIMIT = 5
@@ -22,7 +23,7 @@
 
 
 @bot.on_message(
-    Filters.command("warn") & filters.auth_chats & filters.auth_users)
+    filters.command("warn") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _warn_user(_, msg: Message):
     global WARN_MODE, WARN_LIMIT  # pylint: disable=global-statement
 
@@ -109,7 +110,7 @@ async def _warn_user(_, msg: Message):
             await replied.reply_text(r_t, reply_markup=keyboard)
 
 
-@bot.on_callback_query(Filters.regex(pattern=r"rm_warn\((.+?)\)"))
+@bot.on_callback_query(filters.regex(pattern=r"rm_warn\((.+?)\)"))
 async def _remove_warn(_, c_q: CallbackQuery):
     user_id = int(c_q.matches[0].group(1))
     if is_admin(c_q.message.chat.id, c_q.from_user.id, check_devs=True):
@@ -132,7 +133,7 @@ async def _remove_warn(_, c_q: CallbackQuery):
 
 
 @bot.on_message(
-    Filters.command("setwarn") & filters.auth_chats & filters.auth_users)
+    filters.command("setwarn") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _set_warn_mode_and_limit(_, msg: Message):
     global WARN_MODE, WARN_LIMIT  # pylint: disable=global-statement
     cmd = len(msg.text)
@@ -161,7 +162,7 @@ async def _set_warn_mode_and_limit(_, msg: Message):
 
 
 @bot.on_message(
-    Filters.command("resetwarn") & filters.auth_chats & filters.auth_users)
+    filters.command("resetwarn") & cus_filters.auth_chats & cus_filters.auth_users)
 async def _reset_all_warns(_, msg: Message):
     replied = msg.reply_to_message
     if not replied:
@@ -182,7 +183,7 @@ async def _reset_all_warns(_, msg: Message):
         await msg.reply("`User already not have any warn.`")
 
 
-@bot.on_message(Filters.command("warns") & filters.auth_chats)
+@bot.on_message(filters.command("warns") & cus_filters.auth_chats)
 async def _check_warns_of_user(_, msg: Message):
     global WARN_LIMIT  # pylint: disable=global-statement
     replied = msg.reply_to_message

assistant/utils/tools.py

@@ -6,7 +6,7 @@
 #
 # All rights reserved.
 
-from pyrogram import Message
+from pyrogram.types import Message
 
 from assistant import bot, Config
 

requirements.txt

@@ -1,4 +1,4 @@
-git+https://github.com/pyrogram/pyrogram.git@asyncio-dev
 aiofiles
 aiohttp
+pyrogram
 python-dotenv