Sfoglia il codice sorgente

Beta (#30)

* Fixed many issues and added /upload
TheHamkerCat 5 anni fa
parent
commit
3af2823721
3 ha cambiato i file con 44 aggiunte e 20 eliminazioni
  1. 1 0
      commands.txt
  2. 1 2
      wbb/modules/admin.py
  3. 42 18
      wbb/modules/sudoers.py

+ 1 - 0
commands.txt

@@ -42,6 +42,7 @@ ud - Search For Something In Urban Dictionary
 unban - Unban A User
 unmute - Unmute A User
 unpin - Unpin The Last Pinned Message.
+upload - Upload Files Via Direct Link
 wall - Get Wallpapers
 weather - Get Weather Info
 wiki - Search For Something On Wikipedia

+ 1 - 2
wbb/modules/admin.py

@@ -16,8 +16,7 @@ __HELP__ = '''/ban    - Ban A User
 /pin - Pin A Message
 /unpin - Unpin A Message
 /mute - Mute A User
-/unmute - Unmute A User
-/report - Report To All Admins'''
+/unmute - Unmute A User'''
 
 SUDO = [OWNER_ID, SUDO_USER_ID]
 

+ 42 - 18
wbb/modules/sudoers.py

@@ -3,6 +3,7 @@ import re
 import requests
 import time
 import wget
+from io import BytesIO
 from pyrogram import filters, types
 from pyrogram.types import Message
 import speedtest
@@ -14,7 +15,8 @@ __MODULE__ = "Sudoers"
 __HELP__ = '''/log - To Get Logs From Last Run.
 /speedtest - To Perform A Speedtest.
 /stats - To Check System Status.
-/song - To Download Songs From JioSaavn'''
+/song - To Download Songs From JioSaavn
+/upload - To Upload Files Via Direct Link'''
 
 
 SUDOERS = [OWNER_ID, SUDO_USER_ID]
@@ -135,20 +137,42 @@ async def get_stats(_, message: Message):
     filters.user(SUDOERS) & cust_filter.command(commands=("song"))
 )
 async def song(_, message: Message):
-    text = message.text.replace("/song ", "")
-    query = text.replace(" ", "%20")
-    r = requests.get(f"{JSMAPI}{query}")
-
-    i = 0
-    while i < 2:
-        sname = r.json()[i]['song']
-        slink = r.json()[i]['media_url']
-        ssingers = r.json()[i]['singers']
-        sduration = r.json()[i]['duration']
-        file = wget.download(slink)
-        ffile = file.replace("mp4", "m4a")
-        os.rename(file, ffile)
-        await message.reply_audio(audio=ffile, title=sname,
-                                  performer=ssingers, duration=int(sduration))
-        i += 1
-        os.remove(ffile)
+    text = message.text.replace("/song", "")
+    query = text.replace(" ", "")
+    if text != "":
+        m = await message.reply_text("Searching...")
+        r = requests.get(f"{JSMAPI}{query}")
+
+        i = 0
+        while i < 2:
+            sname = r.json()[i]['song']
+            slink = r.json()[i]['media_url']
+            ssingers = r.json()[i]['singers']
+            file = wget.download(slink)
+            ffile = file.replace("mp4", "m4a")
+            os.rename(file, ffile)
+            await message.reply_audio(audio=ffile, title=sname,
+                                      performer=ssingers)
+            i += 1
+            os.remove(ffile)
+        await m.delete()
+    else:
+        await message.reply_text("/song requires an argument.")
+
+# Upload
+
+
+@app.on_message(
+    filters.user(SUDOERS) & cust_filter.command(commands=("upload"))
+)
+async def upload(_, message: Message):
+    if len(message.command) != 2:
+        await message.reply_text("/upload requires one argument")
+        return
+
+    url = message.command[1]
+    data = BytesIO(requests.get(url).content)
+    data.name = url.split("/")[-1]
+    m = await message.reply_text("Uploading.....")
+    await message.reply_document(data)
+    await m.delete()