Various fixes

wbb/modules/images.py

@@ -42,8 +42,11 @@ async def dog(_, message: Message):
 @app.on_message(cust_filter.command(commands=("wall")) & ~filters.edited)
 async def wall(_, message: Message):
     app.set_parse_mode("markdown")
+    if len(message.command) > 2:
+        await message.reply_text("/wall needs an argument")
+        return
     m = await message.reply_text("Searching!")
-    initial_term = (message.text.replace('/wall ', ''))
+    initial_term = message.text.split(None, 1)[1]
     term = initial_term.replace(' ', '%20')
     api = "https://wall.alphacoders.com/api2.0/get.php?auth=" + \
         "{}&method=search&term={}".format(WALL_API_KEY, term)
@@ -66,4 +69,4 @@ async def wall(_, message: Message):
         wallpaper = wallpaper.get("url_image")
         wallpaper = wallpaper.replace("\\", "")
         await message.reply_document(wallpaper)
-    await delete_message_with_delay(10, m)
+    await delete_message_with_delay(5, m)

wbb/modules/music.py

@@ -18,39 +18,43 @@ ydl_opts = {
 
 @app.on_message(cust_filter.command(commands=("music")) & ~filters.edited)
 async def music(_, message: Message):
-    await message.reply_chat_action("typing")
-    app.set_parse_mode("html")
-    try:
-        link = (message.text.split(None, 1)[1])
-    except IndexError:
+    if len(message.command) != 2:
         await message.reply_text(
-            "<code>\"/music\" needs a keyword argument</code>")
-
-    with youtube_dl.YoutubeDL(ydl_opts) as ydl:
-        info_dict = ydl.extract_info(link, download=False)
-        audio_file = ydl.prepare_filename(info_dict)
-        ydl.process_info(info_dict)
-        # .webm -> .weba
-        basename = audio_file.rsplit(".", 1)[-2]
-        thumbnail_url = info_dict['thumbnail']
-        thumbnail_file = basename + "." + \
-            get_file_extension_from_url(thumbnail_url)
-        if info_dict['ext'] == 'webm':
-            audio_file_weba = basename + ".weba"
-            os.rename(audio_file, audio_file_weba)
-            audio_file = audio_file_weba
+            "`/music` needs a link as argument")
+        return
+    link = message.text.split(None, 1)[1]
+    m = await message.reply_text(f"Downloading {link}",
+                                 disable_web_page_preview=True)
+    try:
+        with youtube_dl.YoutubeDL(ydl_opts) as ydl:
+            info_dict = ydl.extract_info(link, download=False)
+            audio_file = ydl.prepare_filename(info_dict)
+            ydl.process_info(info_dict)
+            # .webm -> .weba
+            basename = audio_file.rsplit(".", 1)[-2]
+            thumbnail_url = info_dict['thumbnail']
+            thumbnail_file = basename + "." + \
+                get_file_extension_from_url(thumbnail_url)
+            if info_dict['ext'] == 'webm':
+                audio_file_weba = basename + ".weba"
+                os.rename(audio_file, audio_file_weba)
+                audio_file = audio_file_weba
+    except Exception as e:
+        await m.edit(str(e))
+        return
         # info
-        title = info_dict['title']
-        webpage_url = info_dict['webpage_url']
-        performer = info_dict['uploader']
-        duration = int(float(info_dict['duration']))
-        caption = f"<b><a href=\"{webpage_url}\">{title}</a></b>"
-        await message.reply_chat_action("upload_document")
-        await message.reply_audio(audio_file, caption=caption,
-                                  duration=duration, performer=performer,
-                                  title=title, thumb=thumbnail_file)
-        os.remove(audio_file)
-        os.remove(thumbnail_file)
+    title = info_dict['title']
+    webpage_url = info_dict['webpage_url']
+    performer = info_dict['uploader']
+    duration = int(float(info_dict['duration']))
+    caption = f"[{title}]({webpage_url})"
+    await m.delete()
+    await message.reply_chat_action("upload_document")
+    await message.reply_audio(audio_file, caption=caption,
+                              duration=duration, performer=performer,
+                              title=title, thumb=thumbnail_file)
+    os.remove(audio_file)
+    os.remove(thumbnail_file)
 
 
 def get_file_extension_from_url(url):

wbb/modules/rice.py

@@ -8,7 +8,7 @@ RICE_CHANNEL = "RiceGallery"
 
 
 @app.on_message(filters.chat(RICE_GROUP)
-                & (filters.photo | filters.video)
+                & (filters.photo | filters.video | filters.document)
                 & filters.regex(r"^\[RICE\] ")
                 & ~filters.forwarded
                 & ~filters.edited)

wbb/modules/succ.py

@@ -1,4 +1,3 @@
-import random
 import requests as r
 from pyrogram.types import Message
 from pyrogram import filters
@@ -28,7 +27,7 @@ def suck(text):
             'femnnism': f'message.reply_photo({feminism})',
             'tehc': 'message.reply_photo("https://i.ibb.co/gdSvHSr/n.jpg")',
             'stonks': 'message.reply_photo("https://i.ibb.co/TtZ144x/h.png")',
-            'sekuriti': 'message.reply_photo({security})',
+            'sekuriti': f'message.reply_photo({security})',
             'phijiks': 'message.reply_photo("https://i.ibb.co/Zz4wBnc/g.png")',
             'welth': 'message.reply_photo("https://i.ibb.co/JxFm4pW/k.jpg")',
             'smrt': 'message.reply_photo("https://i.ibb.co/7bVkyC7/l.jpg")',
@@ -39,13 +38,11 @@ def suck(text):
 @app.on_message(cust_filter.command(commands=("succ")) & ~filters.edited)
 def succ(_, message: Message):
     result = suck(message.text.replace('/succ ', ''))
-    print(result)
     if result is None:
         message.reply_text('''"/succ" Needs And Argument
 Args - `komidi, kemist, ejucation, helth, nothelth,
 femnnism, tehc, hacc, stonks, sekuriti,
 phijiks, welth, smrt`''')
-    print(random)
     exec(result)