Răsfoiți Sursa

added /deezer

TheHamkerCat 5 ani în urmă
părinte
comite
5269eec15b
5 a modificat fișierele cu 45 adăugiri și 18 ștergeri
  1. 8 4
      wbb/modules/misc.py
  2. 32 2
      wbb/modules/music.py
  3. 2 9
      wbb/modules/ping.py
  4. 0 1
      wbb/modules/reddit.py
  5. 3 2
      wbb/modules/search.py

+ 8 - 4
wbb/modules/misc.py

@@ -16,11 +16,11 @@ __MODULE__ = "Misc"
 __HELP__ = '''/commit - Generate Funny Commit Messages
 /runs  - Idk Test Yourself
 /id - Get Chat_ID or User_ID
-/random - Generate Random Complex Passwords
+/random [Length] - Generate Random Complex Passwords
 /encrypt - Encrypt Text [Can Only Be Decrypted By This Bot]
 /decrypt - Decrypt Text
-/cheat - Get Programming Related Help
-/weather - To Get Weather Info
+/cheat [Language] [Query] - Get Programming Related Help
+/weather [City] - To Get Weather Info
 /tr [en] - Translate A Message
 /json [URL] - Get Response From An API or Something. 
 #RTFM - Check it lol'''
@@ -184,7 +184,11 @@ async def tr(_, message):
         return
     if message.reply_to_message.text:
         text = message.reply_to_message.text
-        i = Translator().translate(text, dest=lang)
+        try:
+            i = Translator().translate(text, dest=lang)
+        except ValueError:
+            await message.reply_text("[ERROR]: LANGUAGE NOT FOUND")
+            return
         await message.reply_text(i.text)
     elif message.reply_to_message.caption:
         text = message.reply_to_message.caption

+ 32 - 2
wbb/modules/music.py

@@ -13,8 +13,9 @@ from wbb.utils.errors import capture_err
 
 
 __MODULE__ = "Music"
-__HELP__ = """/ytmusic [link] To Download Music From Various Websites Including Youtube
-/saavn [query] To Download Music From Saavn."""
+__HELP__ = """/ytmusic [link] To Download Music From Various Websites Including Youtube.
+/saavn [query] To Download Music From Saavn.
+/deezer [query] To Download Music From Deezer."""
 
 ydl_opts = {
     'format': 'bestaudio/best',
@@ -109,3 +110,32 @@ async def jssong(_, message):
                               performer=ssingers)
     os.remove(song)
     await m.delete()
+
+
+# Deezer Music
+
+
+@app.on_message(filters.command("deezer"))
+@capture_err
+async def jssong(_, message):
+    if len(message.command) < 2:
+        await message.reply_text("/deezer requires an argument.")
+        return
+    text = message.text.split(None, 1)[1]
+    query = text.replace(" ", "%20")
+    m = await message.reply_text("Searching...")
+    try:
+        r = await fetch(f"{ARQ}deezer?query={query}&count=1")
+    except Exception as e:
+        await m.edit(str(e))
+        return
+    title = r[0]['title']
+    url = r[0]['url']
+    artist = r[0]['artist']
+    await m.edit("Downloading") 
+    song = await download_song(url)
+    await m.edit("Uploading") 
+    await message.reply_audio(audio=song, title=title,
+                              performer=artist)
+    os.remove(song)
+    await m.delete()

+ 2 - 9
wbb/modules/ping.py

@@ -1,17 +1,10 @@
-import requests
 from pyrogram import filters
 from wbb import app
-from wbb.utils.botinfo import BOT_DC_ID
-from wbb.utils.errors import capture_err
 
 __MODULE__ = "Ping"
-__HELP__ = " /ping - To Get Response Time From All TG Datacenters"
+__HELP__ = " /ping - To Check If Bot Is Alive"
 
 
 @app.on_message(filters.command("ping") & ~filters.edited)
-@capture_err
 async def ping(_, message):
-    datacenter = (f"https://cdn{BOT_DC_ID}.telesco.pe")
-    ping1 = round(requests.head(datacenter).elapsed.total_seconds() * 1000)
-    result = f'`DC{BOT_DC_ID} - {ping1}ms`\n'
-    await message.reply_text(result)
+    await message.reply_text("Alive!")

+ 0 - 1
wbb/modules/reddit.py

@@ -1,4 +1,3 @@
-import requests as r
 from pyrogram import filters
 from wbb import app, ARQ
 from wbb.utils.errors import capture_err

+ 3 - 2
wbb/modules/search.py

@@ -24,8 +24,9 @@ async def urbandict(_, message):
     text = message.text.split(None, 1)[1]
     try:
         results = await fetch(f"{ARQ}ud?query={text}")
-        reply_text = f"""Definition: {results["list"][0]["definition"]}
-Example: {results["list"][0]["example"]}"""
+        reply_text = f"""**Definition:** __{results["list"][0]["definition"]}__
+
+**Example:** __{results["list"][0]["example"]}__"""
     except IndexError:
         reply_text = ("Sorry could not find any matching results!")
     ignore_chars = "[]"