Re-Fixes v0.1.1

Co-authored-by: Amit Sharma <[email protected]>
Co-authored-by: New-Dev0 <[email protected]>

assistant/initial.py

@@ -20,6 +20,9 @@ STRINGS = {
 ❣ Made by **@TeamUltroid**""",
     3: """**💡• FAQs •**
 
+-> [Username Tracker](https://t.me/UltroidUpdates/24)
+-> [Keeping Custom Addons Repo](https://t.me/UltroidUpdates/28)
+-> [Disabling Deploy message](https://t.me/UltroidUpdates/27)
 -> [Setting up TimeZone](https://t.me/UltroidUpdates/22)
 -> [About Inline PmPermit](https://t.me/UltroidUpdates/21)
 -> [About Dual Mode](https://t.me/UltroidUpdates/18)

assistant/inlinestuff.py

@@ -11,6 +11,7 @@ from random import choice
 from re import compile as re_compile
 from re import findall
 
+import aiohttp
 import requests
 from bs4 import BeautifulSoup as bs
 from play_scraper import search
@@ -388,11 +389,12 @@ async def xda_dev(event):
             [], switch_pm="Enter Query to Search", switch_pm_param="start"
         )
     le = "https://www.xda-developers.com/search/" + query.replace(" ", "+")
-    ct = requests.get(le).content
+    async with aiohttp.ClientSession() as requests:
+        async with requests.get(le) as out:
+            ct = await out.read()
     ml = bs(ct, "html.parser", from_encoding="utf-8")
     ml = ml.find_all("div", re_compile("layout_post_"), id=re_compile("post-"))
     out = []
-    builder = event.builder
     for on in ml:
         data = on.find_all("img", "xda_image")[0]
         title = data["alt"]
@@ -402,11 +404,11 @@ async def xda_dev(event):
         thumb = wb(thumb, 0, "image/jpeg", [])
         text = f"[{title}]({hre})"
         out.append(
-            await builder.article(
+            await event.builder.article(
                 title=title, description=desc, url=hre, thumb=thumb, text=text
             )
         )
     uppar = "|| XDA Search Results ||"
-    if len(out) == 0:
+    if not out:
         uppar = "No Results Found :("
     await event.answer(out, switch_pm=uppar, switch_pm_param="start")

assistant/manager/_help.py

@@ -115,7 +115,7 @@ async def helpish(event):
 @owner
 async def ehwhshd(e):
     buttons = get_buttons()
-    buttons[-1].append(Button.inline("<< Back", "open"))
+    buttons.append([Button.inline("<< Back", "open")])
     await e.edit(buttons=buttons)
 
 

plugins/_inline.py

@@ -56,32 +56,32 @@ SUP_BUTTONS = [
 # --------------------BUTTONS--------------------#
 
 
-@in_pattern("")
-@in_owner
+@inline
 async def inline_alive(o):
-    if len(o.text) == 0:
-        b = o.builder
-        MSG = "• **Ultroid Userbot •**"
-        WEB0 = InputWebDocument(
-            "https://telegra.ph/file/55dd0f381c70e72557cb1.jpg", 0, "image/jpg", []
+    if o.text or not str(o.sender_id) in owner_and_sudos():
+        return
+    b = o.builder
+    MSG = "• **Ultroid Userbot •**"
+    WEB0 = InputWebDocument(
+        "https://telegra.ph/file/55dd0f381c70e72557cb1.jpg", 0, "image/jpg", []
+    )
+    RES = [
+        InputBotInlineResult(
+            str(o.id),
+            "photo",
+            send_message=await b._message(
+                text=MSG,
+                media=True,
+                buttons=SUP_BUTTONS,
+            ),
+            title="Ultroid Userbot",
+            description="Userbot | Telethon",
+            url=TLINK,
+            thumb=WEB0,
+            content=InputWebDocument(TLINK, 0, "image/jpg", []),
         )
-        RES = [
-            InputBotInlineResult(
-                str(o.id),
-                "photo",
-                send_message=await b._message(
-                    text=MSG,
-                    media=True,
-                    buttons=SUP_BUTTONS,
-                ),
-                title="Ultroid Userbot",
-                description="Userbot | Telethon",
-                url=TLINK,
-                thumb=WEB0,
-                content=InputWebDocument(TLINK, 0, "image/jpg", []),
-            )
-        ]
-        await o.answer(RES, switch_pm="👥 ULTROID PORTAL", switch_pm_param="start")
+    ]
+    await o.answer(RES, switch_pm="👥 ULTROID PORTAL", switch_pm_param="start")
 
 
 @in_pattern("ultd")
@@ -161,7 +161,10 @@ async def on_vc_callback_query_handler(event):
     xhelps = "**Voice Chat Help Menu for {}**\n**Available Commands:** `{}`\n\n@TeamUltroid".format(
         OWNER_NAME, len(VC_HELP)
     )
-    buttons = page_num(0, VC_HELP, "vchelp", "vc")
+    try:
+        buttons = page_num(0, VC_HELP, "vchelp", "vc")
+    except ZeroDivisionError:
+        return await event.answer("Vc not Active.")
     await event.edit(f"{xhelps}", buttons=buttons, link_preview=False)
 
 

plugins/admintools.py

@@ -291,7 +291,6 @@ async def unp(ult):
     type=["official", "manager"],
 )
 async def fastpurger(purg):
-    chat = await purg.get_input_chat()
     match = purg.pattern_match.group(1)
     try:
         ABC = purg.text[6]
@@ -299,9 +298,13 @@ async def fastpurger(purg):
         ABC = None
     if ABC and purg.text[6] in ["m", "a"]:
         return
-    if not purg._client._bot and match and not purg.is_reply:
+    if not purg._client._bot and ((match) or (purg.is_reply and purg.is_private)):
         p = 0
-        async for msg in purg.client.iter_messages(purg.chat_id, limit=int(match)):
+        async for msg in purg.client.iter_messages(
+            purg.chat_id,
+            limit=int(match) if match else None,
+            min_id=purg.reply_to_msg_id if purg.is_reply else None,
+        ):
             await msg.delete()
             p += 0
         return await eor(purg, f"Purged {p} Messages! ", time=5)
@@ -309,13 +312,12 @@ async def fastpurger(purg):
         return await eor(purg, "`Reply to a message to purge from.`", time=10)
     try:
         await purg.client.delete_messages(
-            chat, [a for a in range(purg.reply_to_msg_id, purg.id + 1)]
+            purg.chat_id, [a for a in range(purg.reply_to_msg_id, purg.id + 1)]
         )
     except Exception as er:
         LOGS.info(er)
-    count = purg.id - purg.reply_to_msg_id
     await purg.respond(
-        "__Fast purge complete!__\n**Purged** `" + str(count) + "` **messages.**",
+        "__Fast purge complete!__",
     )
 
 

plugins/audiotools.py

@@ -145,7 +145,7 @@ async def trim_aud(e):
 @ultroid_cmd(pattern="extractaudio$")
 async def ex_aud(e):
     reply = await e.get_reply_message()
-    if not (reply and reply.video):
+    if not (reply and reply.media and mediainfo(reply.media).startswith("video")):
         return await eor(e, "`Reply to Video File..`")
     name = reply.file.name or "video.mp4"
     vfile = reply.media.document
@@ -167,18 +167,23 @@ async def ex_aud(e):
     attributes = [
         DocumentAttributeAudio(
             duration=duration,
-            title=reply.file.name.split(".")[0],
+            title=reply.file.name.split(".")[0]
+            if reply.file.name
+            else "Extracted Audio",
             performer=artist,
         )
     ]
     f_time = time.time()
-    fo = await uploader(
-        out_file,
-        out_file,
-        f_time,
-        msg,
-        "Uploading " + out_file + "...",
-    )
+    try:
+        fo = await uploader(
+            out_file,
+            out_file,
+            f_time,
+            msg,
+            "Uploading " + out_file + "...",
+        )
+    except FileNotFoundError:
+        return await eor(msg, "`No Audio Found...`")
     await e.client.send_file(
         e.chat_id,
         fo,
@@ -187,4 +192,4 @@ async def ex_aud(e):
         attributes=attributes,
         reply_to=e.reply_to_msg_id,
     )
-    await e.delete()
+    await msg.delete()

plugins/bot.py

@@ -126,7 +126,7 @@ async def is_on(ult):
         kk,
     )
     buttons = [
-        Button.inline("Stats", "alive"),
+        [Button.inline("Stats", "alive")],
         [
             Button.url("Repo", "https://github.com/TeamUltroid/Ultroid"),
             Button.url("Support", "t.me/UltroidSupport"),

plugins/converter.py

@@ -79,11 +79,15 @@ async def imak(event):
         if hasattr(reply.media, "document"):
             file = reply.media.document
             image = await downloader(
-                reply.file.name, reply.media.document, xx, t, "Downloading..."
+                reply.file.name if reply.file.name else str(time.time()),
+                reply.media.document,
+                xx,
+                t,
+                "Downloading...",
             )
             file = image.name
         else:
-            file = await event.download_media(reply)
+            file = await event.client.download_media(reply.media)
     os.rename(file, inp)
     k = time.time()
     xxx = await uploader(inp, inp, k, xx, "Uploading...")

plugins/globaltools.py

@@ -371,7 +371,9 @@ async def gcast(event):
     elif event.is_reply:
         msg = await event.get_reply_message()
     else:
-        return eor(event, "`Give some text to Globally Broadcast or reply a message..`")
+        return await eor(
+            event, "`Give some text to Globally Broadcast or reply a message..`"
+        )
     kk = await eor(event, "`Globally Broadcasting Msg...`")
     er = 0
     done = 0
@@ -406,7 +408,9 @@ async def gucast(event):
     elif event.is_reply:
         msg = await event.get_reply_message()
     else:
-        return eor(event, "`Give some text to Globally Broadcast or reply a message..`")
+        return await eor(
+            event, "`Give some text to Globally Broadcast or reply a message..`"
+        )
     kk = await eor(event, "`Globally Broadcasting Msg...`")
     er = 0
     done = 0

plugins/groups.py

@@ -22,7 +22,6 @@
 from telethon.tl.functions.channels import EditPhotoRequest
 from telethon.tl.types import (
     ChannelParticipantsKicked,
-    ChatBannedRights,
     UserStatusEmpty,
     UserStatusLastMonth,
     UserStatusLastWeek,

plugins/image.py

@@ -33,6 +33,7 @@ async def f2i(e):
             html = r.text
     else:
         return await eod(e, "`Either reply to any file or give any text`")
+    html = html.replace("\n", "<br>")
     shot = WebShot(quality=85)
     css = "body {background: white;} p {color: red;}"
     pic = await shot.create_pic_async(html=html, css=css)

plugins/imagetools.py

@@ -595,7 +595,7 @@ async def ok(event):
                 col_ = col.split(";", maxsplit=1)
                 wh = int(col_[1])
                 col = col_[0]
-            col = [float(col) for col in col.split(",")[:2]]
+            col = [int(col) for col in col.split(",")[:2]]
         except ValueError:
             return await eor(event, "`Not a Valid Input...`")
     okla = await hm.download_media()
@@ -605,6 +605,7 @@ async def ok(event):
     await event.client.send_file(event.chat.id, "output.png")
     os.remove("output.png")
     os.remove(okla)
+    await event.delete()
 
 
 @ultroid_cmd(pattern="pixelator ?(.*)")

plugins/instagram.py

@@ -14,7 +14,7 @@
 • `{i}instadata <username>`
   `Get Instagram Data of someone or self`
 
-• Fill `INSTA_USERNAME` and `INSTA_PASS`
+• Fill `INSTA_USERNAME` and `INSTA_PASSWORD`
   before using it..
 
 """

plugins/stickertools.py

@@ -41,11 +41,8 @@ import numpy as np
 import requests
 from carbonnow import Carbon
 from PIL import Image, ImageDraw
-from telethon.errors import (
-    ChatSendStickersForbiddenError,
-    PackShortNameOccupiedError,
-    YouBlockedUserError,
-)
+from telethon.errors import ChatSendStickersForbiddenError, YouBlockedUserError
+from telethon.tl.functions.stickers import SuggestShortNameRequest
 from telethon.tl.types import (
     DocumentAttributeFilename,
     DocumentAttributeSticker,
@@ -148,68 +145,47 @@ async def uconverter(event):
 @ultroid_cmd(pattern="packkang")
 async def pack_kangish(_):
     _e = await _.get_reply_message()
-    if not _e:
+    if not (_e and _e.sticker):
         return await eor(_, "`Reply to Sticker.`")
     if len(_.text) > 9:
         _packname = _.text.split(" ", maxsplit=1)[1]
     else:
         _packname = f"Ultroid Kang Pack By {_.sender_id}"
-    if _e and _e.media and _e.media.document.mime_type == "image/webp":
-        _id = _e.media.document.attributes[1].stickerset.id
-        _hash = _e.media.document.attributes[1].stickerset.access_hash
-        _get_stiks = await _.client(
-            functions.messages.GetStickerSetRequest(
-                stickerset=types.InputStickerSetID(id=_id, access_hash=_hash)
-            )
+    if _e.file.mime_type == "image/webp":
+        return await eor(_, "`Animated Stickers are not Supported...`")
+    _id = _e.media.document.attributes[1].stickerset.id
+    _hash = _e.media.document.attributes[1].stickerset.access_hash
+    _get_stiks = await _.client(
+        functions.messages.GetStickerSetRequest(
+            stickerset=types.InputStickerSetID(id=_id, access_hash=_hash)
         )
-        stiks = []
-        for i in _get_stiks.documents:
-            x = get_input_document(i)
-            stiks.append(
-                types.InputStickerSetItem(
-                    document=x,
-                    emoji=(i.attributes[1]).alt,
-                )
-            )
-        try:
-            eval(udB.get("PACKKANG"))
-        except BaseException:
-            udB.set("PACKKANG", "{}")
-        ok = eval(udB.get("PACKKANG"))
-        try:
-            pack = ok[_.sender_id] + 1
-        except BaseException:
-            pack = 1
-        try:
-            _r_e_s = await asst(
-                functions.stickers.CreateStickerSetRequest(
-                    user_id=_.sender_id,
-                    title=_packname,
-                    short_name=f"u{_.sender_id}_{pack}_by_{(await tgbot.get_me()).username}",
-                    stickers=stiks,
-                )
+    )
+    stiks = []
+    for i in _get_stiks.documents:
+        x = get_input_document(i)
+        stiks.append(
+            types.InputStickerSetItem(
+                document=x,
+                emoji=(i.attributes[1]).alt,
             )
-            ok.update({_.sender_id: pack})
-            udB.set("PACKKANG", str(ok))
-        except PackShortNameOccupiedError:
-            time.sleep(1)
-            pack += 1
-            _r_e_s = await asst(
-                functions.stickers.CreateStickerSetRequest(
-                    user_id=_.sender_id,
-                    title=_packname,
-                    short_name=f"u{_.sender_id}_{pack}_by_{(await tgbot.get_me()).username}",
-                    stickers=stiks,
-                )
+        )
+    try:
+        short_name = (await _.client(SuggestShortNameRequest(_packname))).short_name
+        _r_e_s = await asst(
+            functions.stickers.CreateStickerSetRequest(
+                user_id=_.sender_id,
+                title=_packname,
+                short_name=f"u{short_name}_by_{asst.me.username}",
+                stickers=stiks,
             )
-            ok.update({_.sender_id: pack})
-            udB.set("PACKKANG", str(ok))
-        await eor(
-            _,
-            f"Pack Kanged Successfully.\nKanged Pack: [link](https://t.me/addstickers/{_r_e_s.set.short_name})",
         )
-    else:
-        await eor(_, "Unsupported File")
+    except BaseException as er:
+        LOGS.exception(er)
+        return await eor(_, str(er))
+    await eor(
+        _,
+        f"**Pack Kanged Successfully**.\n**Kanged Pack:** [link](https://t.me/addstickers/{_r_e_s.set.short_name})",
+    )
 
 
 @ultroid_cmd(

requirements.txt

@@ -1,3 +1,3 @@
 https://github.com/New-dev0/Telethon/archive/Crunch.zip
-py-Ultroid==2021.9.13
-pytgcalls==3.0.0.dev19
+py-Ultroid==2021.9.13.1
+pytgcalls==3.0.0.dev19

vcbot/__init__.py

@@ -40,6 +40,7 @@ from pyUltroid.functions.vc_group import get_chats as get_vc
 from pyUltroid.misc import owner_and_sudos, sudoers
 from pyUltroid.misc._assistant import admin_check, in_pattern
 from pyUltroid.misc._wrappers import eod, eor
+from pyUltroid.version import __version__ as UltVer
 from telethon import events
 from telethon.tl import functions, types
 from telethon.utils import get_display_name
@@ -101,7 +102,7 @@ class Player:
             VIDEO_ON.clear()
             await asyncio.sleep(3)
         if self._video:
-            for chats in CLIENTS:
+            for chats in list(CLIENTS):
                 if chats != self._chat:
                     await CLIENTS[chats].stop()
                     del CLIENTS[chats]
@@ -219,7 +220,7 @@ def vc_asst(dec, from_users=VC_AUTHS(), vc_auth=True):
                 LOGS.exception(Exception)
                 await asst.send_message(
                     LOG_CHANNEL,
-                    f"VC Error - <code>{e.chat_id}</code>\n\n<code>{format_exc()}</code>",
+                    f"VC Error - <code>{UltVer}</code>\n\n<code>{e.text}</code>\n\n<code>{format_exc()}</code>",
                     parse_mode="html",
                 )
 

vcbot/_help.py

@@ -9,13 +9,9 @@ from telethon import Button
 
 from . import *
 
-ID_CACHE = []
-
 
 @vc_asst("vchelp")
 async def helper(event):
-    if not ID_CACHE:
-        ID_CACHE.append(str((await vcClient.get_me()).id))
     res = await event.client.inline_query(asst.me.username, "vchelp")
     try:
         await res[0].click(event.chat_id)
@@ -25,10 +21,6 @@ async def helper(event):
 
 @in_pattern("vchelp")
 async def wiqhshd(e):
-    if not ID_CACHE:
-        ID_CACHE.append(str((await vcClient.get_me()).id))
-    if str(e.sender_id) not in [*owner_and_sudos(), *ID_CACHE]:
-        return
     builder = e.builder
     res = [
         await builder.article(

vcbot/radio.py

@@ -9,7 +9,7 @@
 ✘ Commands Available -
 
 • `{i}radio <link>`
-   Stream Live Radio.
+   Stream Live Radio m3u8 links.
 
 • `{i}ytlive <link>`
    Stream Live YouTube.

vcbot/ytplaylist.py

@@ -41,7 +41,7 @@ async def live_stream(e):
     except BaseException:
         return await eor(xx, f"`Only Youtube Playlist please.`")
     await xx.edit("`Keep patience... It'll take some time.`")
-    file, thumb, title, link, duration = await dl_playlist(chat, from_user, song)
+    file, thumb, title, link, duration = await dl_playlist(chat, html_mention(e), song)
     ultSongs = Player(chat, e)
     if not ultSongs.group_call.is_connected:
         if not (await ultSongs.vc_joiner()):
@@ -57,7 +57,7 @@ async def live_stream(e):
         await xx.delete()
         await ultSongs.group_call.start_audio(file)
     else:
-        from_user = html_mention(e.sender)
+        from_user = html_mention(e)
         add_to_queue(chat, file, title, link, thumb, from_user, duration)
         return await eor(
             xx,