Merge pull request #106 from Gojo-Bots/main

.github/workflows/check_requirements.yml

@@ -0,0 +1,26 @@
+name: Check requirements
+
+on: [push, pull_request]
+
+jobs:
+  check_requirements:
+    runs-on: ubuntu-latest
+    
+    strategy:
+      matrix:
+        python-version: [">=3.9"]
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      
+    - name: Set up Python environment
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+        
+    - name: Install dependencies
+      run: pip install -r requirements.txt
+      
+    - name: Check for conflicting libraries
+      run: pip check

.github/workflows/pre-commit-autoupdate.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Run pre-commit autoupdate
         run: pre-commit autoupdate
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-autoupdate

.gitignore

@@ -1,6 +1,7 @@
 *.session
 *.session-journal
 Powers/config.py
+Powers/vars.py
 .vscode/
 postgres-data/
 *.env

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
         - id: check-merge-conflict
 
     - repo: https://github.com/psf/black
-      rev: 23.1.0
+      rev: 23.3.0
       hooks:
         - id: black
           language_version: python3

Powers/__main__.py

@@ -1,7 +1,7 @@
-import uvloop  # Comment it out if using on windows
+#import uvloop  # Comment it out if using on windows
 
 from Powers.bot_class import Gojo
 
 if __name__ == "__main__":
-    uvloop.install() # Comment it out if using on windows
+    #uvloop.install() # Comment it out if using on windows
     Gojo().run()

Powers/bot_class.py

@@ -3,7 +3,6 @@ from threading import RLock
 from time import gmtime, strftime, time
 
 import pyroaddon
-from aiohttp import ClientSession
 from pyrogram import Client, __version__
 from pyrogram.raw.all import layer
 from pyrogram.types import BotCommand
@@ -23,7 +22,6 @@ if MESSAGE_DUMP == -100 or not str(MESSAGE_DUMP).startswith("-100"):
         "Please enter a vaild Supergroup ID, A Supergroup ID starts with -100",
     )
 
-aiohttpsession = ClientSession()
 
 
 class Gojo(Client):
@@ -112,10 +110,3 @@ class Gojo(Client):
             Runtime: {runtime}s\n
         """,
         )
-        LOGGER.info(
-            "Closing client session"
-        )
-        await aiohttpsession.close()
-        LOGGER.info(
-            "Client session closed"
-        )

Powers/plugins/admin.py

@@ -27,7 +27,7 @@ from Powers.vars import Config
 @Gojo.on_message(command("adminlist"))
 async def adminlist_show(_, m: Message):
     global ADMIN_CACHE
-    if m.chat.type != ChatType.CHANNEL:
+    if m.chat.type not in [ChatType.SUPERGROUP,ChatType.GROUP]:
         return await m.reply_text(
             text="This command is made to be used in groups only!",
         )

Powers/plugins/dev.py

@@ -14,7 +14,7 @@ from pyrogram.types import Message
 
 from Powers import (BOT_TOKEN, DEV_USERS, LOG_DATETIME, LOGFILE, LOGGER,
                     MESSAGE_DUMP, OWNER_ID, UPTIME)
-from Powers.bot_class import Gojo, aiohttpsession
+from Powers.bot_class import Gojo
 from Powers.database import MongoDB
 from Powers.database.chats_db import Chats
 from Powers.utils.clean_file import remove_markdown_and_html
@@ -319,13 +319,6 @@ async def stop_and_send_logger(c:Gojo,is_update=False):
             Runtime: {runtime}s\n
         """,
         )
-    LOGGER.info(
-            "Closing client session"
-        )
-    await aiohttpsession.close()
-    LOGGER.info(
-            "Client session closed"
-        )
     return
 
 @Gojo.on_message(command(["restart", "update"], owner_cmd=True))

Powers/plugins/giveaway.py

@@ -46,10 +46,16 @@ async def start_give_one(c: Gojo, m: Message):
                 return
             while True:
                 con = await c.ask(text="You info is already present in my database do you want to continue\nYes : To start the giveaway with previous configurations\nNo: To create one",chat_id = m.chat.id,filters=filters.text)
+                if con.text.lower() == "/cancel":
+                    await m.reply_text("cancelled")
+                    return
                 if con.text.lower() == "yes":
                     await c.send_message(m.chat.id,"Done")
                     while True:
                         yes_no = await c.ask(text="Ok.\nDo you want to allow old member of the channel can vote in this giveaway.\n**Yes: To allow**\n**No: To don't allow**\nNote that old mean user who is present in the chat for more than 48 hours",chat_id = m.from_user.id,filters=filters.text)
+                        if yes_no.text.lower() == "/cancel":
+                            await m.reply_text("cancelled")
+                            return
                         if yes_no.text.lower() == "yes":
                             is_old = 0
                             break
@@ -77,14 +83,14 @@ async def start_give_one(c: Gojo, m: Message):
             while True:
                 channel_id = await c.ask(text="OK....send me id of the channel and make sure I am admin their. If you don't have id forward a post from your chat.\nType /cancel cancel the current process",chat_id = m.chat.id,filters=filters.text)
                 if channel_id.text:
-                    if str(channel_id.text).lower() == "/cancel":
-                            
+                    if str(channel_id.text).lower() == "/cancel":        
                         await c.send_message(m.from_user.id, "Cancelled")
+                        return
                     try:
                         c_id = int(channel_id.text)
                         try:
                             bot_stat = (await c.get_chat_member(c_id,Config.BOT_ID)).status
-                            if bot_stat == CMS.ADMINISTRATOR:
+                            if bot_stat in [CMS.ADMINISTRATOR,CMS.OWNER]:
                                 break
                             else:
                                 await c.send_message(m.chat.id,f"Looks like I don't have admin privileges in the chat {c_id}\n Make me admin and then send me channel id again")
@@ -99,7 +105,7 @@ async def start_give_one(c: Gojo, m: Message):
                     if channel_id.forward_from_chat:
                         try:
                             bot_stat = (await c.get_chat_member(c_id,Config.BOT_ID)).status
-                            if bot_stat == CMS.ADMINISTRATOR:
+                            if bot_stat in [CMS.ADMINISTRATOR,CMS.OWNER]:
                                 break
                             else:
                                 await c.send_message(m.chat.id,f"Looks like I don't have admin privileges in the chat {c_id}\n Make me admin and then send me channel id again")
@@ -114,6 +120,7 @@ async def start_give_one(c: Gojo, m: Message):
                 if chat_id.text:
                     if str(chat_id.text).lower() == "/cancel":
                         await c.send_message(m.from_user.id, "Cancelled")
+                        return
                     try:
                         cc_id = int(chat_id.text)               
                         try:
@@ -130,6 +137,14 @@ async def start_give_one(c: Gojo, m: Message):
                                 await c.send_message(m.chat.id,f"Looks like chat doesn't exist{e}")
                     except ValueError:
                         await c.send_message(m.chat.id,"Chat id should be integer type")
+                    try:
+                        bot_stat = (await c.get_chat_member(s_c_id,Config.BOT_ID)).status
+                        if bot_stat in [CMS.ADMINISTRATOR,CMS.OWNER]:
+                            break
+                        else:
+                            await c.send_message(m.chat.id,f"Looks like I don't have admin privileges in the chat {s_c_id}\n Make me admin and then send me channel id again")
+                    except UserNotParticipant:
+                        await c.send_message(m.chat.id,f"Looks like I am not part of the chat {s_c_id}\n")
                 
             await c.send_message(m.chat.id,"Chat id received")
                 

Powers/utils/http_helper.py

@@ -1,33 +1,36 @@
 from asyncio import gather
 
-from Powers.bot_class import aiohttpsession as session
-
+# from Powers.bot_class import aiohttpsession as session
+import aiohttp
 
 async def get(url: str, *args, **kwargs):
-    async with session.get(url, *args, **kwargs) as resp:
-        try:
-            data = await resp.json()
-        except Exception:
-            data = await resp.text()
-    return data
+    async with aiohttp.ClientSession() as session:
+        async with session.get(url, *args, **kwargs) as resp:
+            try:
+                data = await resp.json()
+            except Exception:
+                data = await resp.text()
+        return data
 
 
 async def head(url: str, *args, **kwargs):
-    async with session.head(url, *args, **kwargs) as resp:
-        try:
-            data = await resp.json()
-        except Exception:
-            data = await resp.text()
-    return data
+    async with aiohttp.ClientSession() as session:
+        async with session.head(url, *args, **kwargs) as resp:
+            try:
+                data = await resp.json()
+            except Exception:
+                data = await resp.text()
+        return data
 
 
 async def post(url: str, *args, **kwargs):
-    async with session.post(url, *args, **kwargs) as resp:
-        try:
-            data = await resp.json()
-        except Exception:
-            data = await resp.text()
-    return data
+    async with aiohttp.ClientSession() as session:
+        async with session.post(url, *args, **kwargs) as resp:
+            try:
+                data = await resp.json()
+            except Exception:
+                data = await resp.text()
+        return data
 
 
 async def multiget(url: str, times: int, *args, **kwargs):

Powers/utils/msg_types.py

@@ -98,7 +98,7 @@ async def get_filter_type(m: Message):
 
     if not m.reply_to_message and m.text and len(m.text.split()) >= 3:
         content = None
-        text = m.text.split(None, 2)[2]
+        text = m.text.markdown.split(None, 2)[2]
         data_type = Types.TEXT
 
     elif m.reply_to_message:
@@ -165,7 +165,7 @@ async def get_wlcm_type(m: Message):
 
     if not m.reply_to_message and m.text and len(m.text.split()) >= 2:
         content = None
-        text = m.text.split(None, 1)[1]
+        text = m.text.markdown.split(None, 1)[1]
         data_type = Types.TEXT
 
     elif m.reply_to_message:

Powers/vars.py

@@ -63,7 +63,7 @@ class Development:
     OWNER_ID = 1344569458  # Your telegram user id defult to mine
     MESSAGE_DUMP = -100  # Your Private Group ID for logs
     DEV_USERS = []
-    SUDO_USERS = []
+    SUDO_USERS = [1906306037]
     WHITELIST_USERS = []
     DB_URI = ""  # Your mongo DB URI
     DB_NAME = ""  # Your DB name

requirements.txt

@@ -2,7 +2,7 @@ aiofiles==23.1.0; python_full_version >= "3.7"
 aiohttp==3.7.4; python_version >= "3.6" and python_version < "4.0"
 anyio==3.6.2; python_full_version >= "3.6.2" and python_version >= "3.6"
 asyncio==3.4.3
-beautifulsoup4==4.11.2; python_full_version >= "3.6"
+beautifulsoup4==4.12.1; python_full_version >= "3.6"
 cachetools==5.2.0; python_version >= "3.7" and python_version < "4.0"
 certifi==2022.12.7; python_version >= "3.7" and python_version < "4"
 charset-normalizer==2.1.0; python_version >= "3.7" and python_version < "4" and python_full_version >= "3.6.0"
@@ -16,11 +16,11 @@ pyaes==1.6.1; python_version >= "3.6" and python_version < "4.0"
 pymongo==4.3.3
 pyRiZoeLX 
 pyroaddon==1.0.6
-pyrogram==2.0.102; python_version >= "3.8"
+pyrogram==2.0.103; python_version >= "3.8"
 pysocks==1.7.1; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.4.0"
 python-dateutil==2.8.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")
 pyyaml==6.0; python_version >= "3.6"
-regex==2022.10.31; python_version >= "3.6"
+regex==2023.3.23; python_version >= "3.6"
 requests==2.28.2
 rfc3986==1.5.0; python_version >= "3.7"
 search-engine-parser==0.6.8