Dhivehi

requirements.txt

@@ -8,7 +8,7 @@ pip-chill
 psutil
 ptable
 pymongo
-git+https://github.com/pyrogram/pyrogram@asyncio-dev
+pyrogram
 python-dotenv
 python-git
 requests-async
@@ -20,5 +20,3 @@ thisapidoesnotexist
 aiofiles
 svglib
 reportlab
-opencv-python
-pyzbar

userbot/__init__.py

@@ -89,3 +89,6 @@
 START_TIME = datetime.now()
 
 UserBot = UserBot(name)
+
+
+# from pyrogram import __version__

userbot/database/summon.py

@@ -1,5 +1,5 @@
 from pymongo import ReturnDocument
-from pyrogram import Message
+from pyrogram.types import Message
 
 from userbot.database import database
 

userbot/helpers/PyroHelpers.py

@@ -1,4 +1,4 @@
-from pyrogram import Message, User
+from pyrogram.types import Message, User
 
 
 def ReplyCheck(message: Message):

userbot/helpers/adminHelpers.py

@@ -1,6 +1,6 @@
 from time import sleep, time
 
-from pyrogram import Message
+from pyrogram.types import Message
 
 from userbot import UserBot
 from userbot.helpers.interval import IntervalHelper

userbot/helpers/file_sending_helpers.py

@@ -1,7 +1,7 @@
 import json
 import os.path
 
-from pyrogram import Message
+from pyrogram.types import Message
 
 from userbot import UserBot
 from userbot.helpers.PyroHelpers import ReplyCheck, GetChatID

userbot/helpers/spacex.py

@@ -1,15 +1,16 @@
 import aiohttp
 
 
-async def get_latest():
-    async with aiohttp.ClientSession() as session:
-        async with session.get("https://api.spacexdata.com/v3/launches/latest") as resp:
-            data = await resp.json()
-    return data
-
-
-async def get_next():
-    async with aiohttp.ClientSession() as session:
-        async with session.get("https://api.spacexdata.com/v3/launches/next") as resp:
-            data = await resp.json()
-    return data
+class Spacex:
+    @staticmethod
+    async def get(latest_or_next):
+        async with aiohttp.ClientSession() as session:
+            async with session.get(f"https://api.spacexdata.com/v3/launches/{latest_or_next}") as resp:
+                data = await resp.json()
+        return data
+
+    async def latest(self):
+        return await self.get('latest')
+
+    async def next(self):
+        return await self.get('next')

userbot/plugins/1start.py

@@ -2,14 +2,16 @@
 from datetime import datetime
 from platform import python_version
 
-from pyrogram import Filters, Message, __version__
+from pyrogram import filters
+from pyrogram.types import Message
+from pyrogram import __version__
 
 from userbot import UserBot, START_TIME
 from userbot.helpers.constants import First
 from userbot.plugins.help import add_command_help
 
 
-@UserBot.on_message(Filters.command("alive", ".") & Filters.me)
+@UserBot.on_message(filters.command("alive", ".") & filters.me)
 async def alive(_, message: Message):
     txt = (
         f"**{UserBot.__class__.__name__}** ```RUNNING```\n"
@@ -20,17 +22,17 @@ async def alive(_, message: Message):
     await message.edit(txt)
 
 
-@UserBot.on_message(Filters.command("repo", ".") & Filters.me)
+@UserBot.on_message(filters.command("repo", ".") & filters.me)
 async def repo(_, message: Message):
     await message.edit(First.REPO)
 
 
-@UserBot.on_message(Filters.command("creator", ".") & Filters.me)
+@UserBot.on_message(filters.command("creator", ".") & filters.me)
 async def creator(_, message: Message):
     await message.edit(First.CREATOR)
 
 
-@UserBot.on_message(Filters.command(['uptime', 'up'], ".") & Filters.me)
+@UserBot.on_message(filters.command(['uptime', 'up'], ".") & filters.me)
 async def uptime(_, message: Message):
     now = datetime.now()
     current_uptime = now - START_TIME
@@ -40,7 +42,7 @@ async def uptime(_, message: Message):
     )
 
 
-@UserBot.on_message(Filters.command("id", ".") & Filters.me)
+@UserBot.on_message(filters.command("id", ".") & filters.me)
 async def get_id(_, message: Message):
     file_id = None
     user_id = None
@@ -132,7 +134,7 @@ async def get_id(_, message: Message):
         await message.edit(f"**Chat ID**: `{message.chat.id}`")
 
 
-@UserBot.on_message(Filters.command("restart", '.') & Filters.me)
+@UserBot.on_message(filters.command("restart", '.') & filters.me)
 async def restart(_, message: Message):
     await message.edit(f"Restarting {UserBot.__class__.__name__}.")
     await UserBot.send_message('me', f'#userbot_restart, {message.chat.id}, {message.message_id}')

userbot/plugins/admin/administrator.py

@@ -1,6 +1,8 @@
 import time
 
-from pyrogram import Filters, Message, ChatPermissions
+from pyrogram import filters
+from pyrogram.types import Message, ChatPermissions
+
 from pyrogram.errors import UserAdminInvalid
 
 from userbot import UserBot
@@ -11,7 +13,7 @@
 from userbot.plugins.help import add_command_help
 
 
-@UserBot.on_message(Filters.command("ban", '.') & Filters.me)
+@UserBot.on_message(filters.command("ban", '.') & filters.me)
 async def ban_hammer(_, message: Message):
     if await CheckReplyAdmin(message) is True and await CheckAdmin(message) is True:
         try:
@@ -33,7 +35,7 @@ async def ban_hammer(_, message: Message):
             await RestrictFailed(message)
 
 
-@UserBot.on_message(Filters.command("unban", '.') & Filters.me)
+@UserBot.on_message(filters.command("unban", '.') & filters.me)
 async def unban(_, message: Message):
     if await CheckReplyAdmin(message) is True and await CheckAdmin(message) is True:
         try:
@@ -64,7 +66,7 @@ async def unban(_, message: Message):
 )
 
 
-@UserBot.on_message(Filters.command(["mute", "mute 24"], '.') & Filters.me)
+@UserBot.on_message(filters.command(["mute", "mute 24"], '.') & filters.me)
 async def mute_hammer(_, message: Message):
     if await CheckReplyAdmin(message) is True and await CheckAdmin(message) is True:
         try:
@@ -104,7 +106,7 @@ async def mute_hammer(_, message: Message):
 )
 
 
-@UserBot.on_message(Filters.command("unmute", '.') & Filters.me)
+@UserBot.on_message(filters.command("unmute", '.') & filters.me)
 async def unmute(_, message: Message):
     if await CheckReplyAdmin(message) is True and await CheckAdmin(message) is True:
         try:
@@ -119,7 +121,7 @@ async def unmute(_, message: Message):
             await RestrictFailed(message)
 
 
-@UserBot.on_message(Filters.command("kick", '.') & Filters.me)
+@UserBot.on_message(filters.command("kick", '.') & filters.me)
 async def kick_user(_, message: Message):
     if await CheckReplyAdmin(message) is True and await CheckAdmin(message) is True:
         try:

userbot/plugins/admin/pin.py

@@ -1,13 +1,14 @@
 import asyncio
 
-from pyrogram import Filters, Message
-from pyrogram.client.methods.chats.get_chat_members import Filters as ChatMemberFilters
+from pyrogram import filters
+from pyrogram.methods.chats.get_chat_members import Filters as ChatMemberFilters
+from pyrogram.types import Message
 
 from userbot import UserBot
 from userbot.plugins.help import add_command_help
 
 
-@UserBot.on_message(Filters.command('pin', '.') & Filters.me)
+@UserBot.on_message(filters.command('pin', '.') & filters.me)
 async def pin_message(_, message: Message):
     # First of all check if its a group or not
     if message.chat.type in ['group', 'supergroup']:

userbot/plugins/admin/set_group_pic.py

@@ -1,13 +1,14 @@
 import asyncio
 
-from pyrogram import Filters, Message
-from pyrogram.client.methods.chats.get_chat_members import Filters as ChatMemberFilters
+from pyrogram import filters
+from pyrogram.methods.chats.get_chat_members import Filters as ChatMemberFilters
+from pyrogram.types import Message
 
 from userbot import UserBot
 from userbot.plugins.help import add_command_help
 
 
-@UserBot.on_message(Filters.command('setpic', '.') & Filters.me)
+@UserBot.on_message(filters.command('setpic', '.') & filters.me)
 async def set_picture(_, message: Message):
     # First of all check if its a group or not
     if message.chat.type in ['group', 'supergroup']:
@@ -18,13 +19,15 @@ async def set_picture(_, message: Message):
 
         # If you are an admin
         if me.id in admin_ids:
+
+            my_permissions = None
             # Fetch your permissions
             for user in admins:
                 if user.user.id == me.id:
                     my_permissions = user
 
             # If you can change group photo
-            if my_permissions.can_change_info:
+            if my_permissions and my_permissions.can_change_info:
                 # If you replied to a message and it has a photo
                 if message.reply_to_message and message.reply_to_message.media:
                     file_id = message.reply_to_message.photo.file_id

userbot/plugins/afk.py

@@ -2,7 +2,8 @@
 from datetime import datetime
 
 import humanize
-from pyrogram import Filters, Message
+from pyrogram import filters
+from pyrogram.types import Message
 
 from userbot import UserBot
 from userbot.helpers.PyroHelpers import GetChatID
@@ -21,7 +22,7 @@ def subtract_time(start, end):
     return str(subtracted)
 
 
-@UserBot.on_message(((Filters.group & Filters.mentioned) | Filters.private) & ~Filters.me, group=3)
+@UserBot.on_message(((filters.group & filters.mentioned) | filters.private) & ~filters.me, group=3)
 async def collect_afk_messages(_, message: Message):
     if AFK:
         last_seen = subtract_time(datetime.now(), AFK_TIME)
@@ -75,7 +76,7 @@ async def collect_afk_messages(_, message: Message):
         CHAT_TYPE[GetChatID(message)] += 1
 
 
-@UserBot.on_message(Filters.command("afk", ".") & Filters.me, group=3)
+@UserBot.on_message(filters.command("afk", ".") & filters.me, group=3)
 async def afk_set(_, message: Message):
     global AFK_REASON, AFK, AFK_TIME
 
@@ -94,7 +95,7 @@ async def afk_set(_, message: Message):
     await message.delete()
 
 
-@UserBot.on_message(Filters.command("afk", "!") & Filters.me, group=3)
+@UserBot.on_message(filters.command("afk", "!") & filters.me, group=3)
 async def afk_unset(_, message: Message):
     global AFK, AFK_TIME, AFK_REASON, USERS, GROUPS
 
@@ -114,7 +115,7 @@ async def afk_unset(_, message: Message):
     await message.delete()
 
 
-@UserBot.on_message(Filters.me, group=3)
+@UserBot.on_message(filters.me, group=3)
 async def auto_afk_unset(_, message: Message):
     global AFK, AFK_TIME, AFK_REASON, USERS, GROUPS
 

userbot/plugins/carbon.py

@@ -1,15 +1,16 @@
 import os
 from asyncio import sleep
 
-from pyrogram import Filters, Message
+from pyrogram import filters
+from pyrogram.types import Message
 
 from userbot import UserBot
 from userbot.plugins.help import add_command_help
 
 CARBON_LANG = "py"
 
 
-@UserBot.on_message(Filters.command("carbon", ".") & Filters.me)
+@UserBot.on_message(filters.command("carbon", ".") & filters.me)
 async def carbon_test(_, message: Message):
     """
     Receives text and makes a carbon image using the text
@@ -31,7 +32,7 @@ async def carbon_test(_, message: Message):
     await message.delete()
 
 
-@UserBot.on_message(Filters.command('carbonlang', '.') & Filters.me)
+@UserBot.on_message(filters.command('carbonlang', '.') & filters.me)
 async def update_carbon_lang(_, message: Message):
     """
     Set language to use Carbon with.
@@ -57,7 +58,7 @@ async def update_carbon_lang(_, message: Message):
     await message.delete()
 
 
-@UserBot.on_message(Filters.command('carbonlang', '!') & Filters.me)
+@UserBot.on_message(filters.command('carbonlang', '!') & filters.me)
 async def send_carbon_lang(_, message: Message):
     """
     Edits message to show current set carbon language

userbot/plugins/corona.py

@@ -2,14 +2,15 @@
 import datetime
 
 from prettytable import PrettyTable
-from pyrogram import Filters, Message
+from pyrogram import filters
+from pyrogram.types import Message
 
 from userbot import UserBot
 from userbot.helpers.aiohttp_helper import AioHttp
 from userbot.plugins.help import add_command_help
 
 
-@UserBot.on_message(Filters.command("c", ".") & Filters.me)
+@UserBot.on_message(filters.command("c", ".") & filters.me)
 async def corona_all(_, message: Message):
     try:
         r = await AioHttp().get_json('https://corona.lmao.ninja/v2/all?yesterday=true')
@@ -39,7 +40,7 @@ async def corona_all(_, message: Message):
         await message.delete()
 
 
-@UserBot.on_message(Filters.command("cs", ".") & Filters.me)
+@UserBot.on_message(filters.command("cs", ".") & filters.me)
 async def corona_search(_, message: Message):
     cmd = message.command
 

userbot/plugins/dictionary.py

@@ -1,13 +1,14 @@
 import asyncio
 
-from pyrogram import Filters, Message
+from pyrogram import filters
+from pyrogram.types import Message
 
 from userbot import UserBot
 from userbot.helpers.aiohttp_helper import AioHttp
 from userbot.plugins.help import add_command_help
 
 
-@UserBot.on_message(Filters.command(['define', 'dict'], '.') & Filters.me)
+@UserBot.on_message(filters.command(['define', 'dict'], '.') & filters.me)
 async def define(_, message: Message):
     """ Thank you Poki!!"""
     cmd = message.command