Ultroid v0.0.8 | 17-6-21

Co-authored-by: Aditya <[email protected]>
Co-authored-by: Danish <[email protected]>
Co-authored-by: Amit Sharma <[email protected]>
Co-authored-by: sppidy <[email protected]>
Co-authored-by: Arnab Paryali <[email protected]>
Co-authored-by: divkix <[email protected]>
Co-authored-by: hellboi_atul <[email protected]>
Co-authored-by: Programming Error <[email protected]>
Co-authored-by: New-dev0 <[email protected]>

.gitignore

@@ -1,21 +1,24 @@
 .env
-venv/
-__pycache__
-ultroid.session-journal
-ultroid.session
+*.session-journal
+*.session
+build
 *.mp3
 *.webm
 *.webp
 *.mp4
 *.tgs
-.vscode/*
 /*.jpg
 /*.png
 /*.mp4
-addons/
-ultroid.log
+*.log
 target/npmlist.json
+package-lock.json
+# Directories
+addons/
+__pycache__/
+venv/
 node_modules/
 glitch_me/
-.idea
-venv/
+.idea/
+.vscode/
+temp/

Dockerfile

@@ -1,19 +1,18 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
-FROM programmingerror/ultroid:v0.0.2
+FROM programmingerror/ultroid:b0.1
 
 ENV TZ=Asia/Kolkata
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN apt-get autoremove --purge
 
 RUN git clone https://github.com/TeamUltroid/Ultroid.git /root/TeamUltroid/
 
 WORKDIR /root/TeamUltroid/
 
-RUN pip3 install -r requirements.txt
-RUN npm install -g npm@7.12.1 -g
+RUN pip3 install --no-cache-dir -r requirements.txt
+RUN npm install -g npm@7.16.0 -g
 RUN npm install
 RUN npm run build

app.json

@@ -48,13 +48,9 @@
         }
     },
     "formation": {
-        "worker": {
+        "ultroid": {
             "quantity": 1,
             "size": "free"
-        },
-        "web": {
-            "quantity": 0,
-            "size": "free"
         }
     }
 }

assistant/__init__.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

assistant/api_setter.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -16,15 +16,14 @@ async def apiset(event):
     await event.edit(
         get_string("ast_1"),
         buttons=[
-            [Button.inline("Remove.bg", data="rmbg")],
+            [Button.inline("Remove.bg API", data="rmbg")],
+            [Button.inline("DEEP API", data="dapi")],
+            [Button.inline("OCR API", data="oapi")],
             [Button.inline("« Back", data="setter")],
         ],
     )
 
 
-# remove.bg api
-
-
 @callback("rmbg")
 @owner
 async def rmbgapi(event):
@@ -48,3 +47,53 @@ async def rmbgapi(event):
                 f"{name} changed to {themssg}",
                 buttons=get_back_button("apiset"),
             )
+
+
+@callback("dapi")
+@owner
+async def rmbgapi(event):
+    await event.delete()
+    pru = event.sender_id
+    var = "DEEP_API"
+    name = "DEEP AI API Key"
+    async with event.client.conversation(pru) as conv:
+        await conv.send_message("Get Your Deep Api from deepai.org and send here.")
+        response = conv.wait_event(events.NewMessage(chats=pru))
+        response = await response
+        themssg = response.message.message
+        if themssg == "/cancel":
+            return await conv.send_message(
+                "Cancelled!!",
+                buttons=get_back_button("apiset"),
+            )
+        else:
+            await setit(event, var, themssg)
+            await conv.send_message(
+                f"{name} changed to {themssg}",
+                buttons=get_back_button("apiset"),
+            )
+
+
+@callback("oapi")
+@owner
+async def rmbgapi(event):
+    await event.delete()
+    pru = event.sender_id
+    var = "OCR_API"
+    name = "OCR API Key"
+    async with event.client.conversation(pru) as conv:
+        await conv.send_message("Get Your OCR api from ocr.space Send Send Here.")
+        response = conv.wait_event(events.NewMessage(chats=pru))
+        response = await response
+        themssg = response.message.message
+        if themssg == "/cancel":
+            return await conv.send_message(
+                "Cancelled!!",
+                buttons=get_back_button("apiset"),
+            )
+        else:
+            await setit(event, var, themssg)
+            await conv.send_message(
+                f"{name} changed to {themssg}",
+                buttons=get_back_button("apiset"),
+            )

assistant/inlinestuff.py

@@ -1,15 +1,16 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
 import base64
+import os
+import urllib
 from random import choice
 from re import compile as re_compile
 from re import findall
-from urllib.request import urlopen
 
 import requests
 from bs4 import BeautifulSoup
@@ -19,6 +20,8 @@ from search_engine_parser import GoogleSearch, YahooSearch
 from telethon import Button
 from telethon.tl.types import InputWebDocument as wb
 
+from plugins._inline import SUP_BUTTONS
+
 from . import *
 from . import humanbytes as hb
 
@@ -153,15 +156,7 @@ async def repo(e):
             description="Userbot | Telethon",
             thumb=wb(ultpic, 0, "image/jpeg", []),
             text="• **ULTROID USERBOT** •",
-            buttons=[
-                [
-                    Button.url("Repo", url="https://github.com/TeamUltroid/Ultroid"),
-                    Button.url(
-                        "Addons", url="https://github.com/TeamUltroid/UltroidAddons"
-                    ),
-                ],
-                [Button.url("Support", url="t.me/UltroidSupport")],
-            ],
+            buttons=SUP_BUTTONS,
         ),
     ]
     await e.answer(res, switch_pm="Ultroid Repo.", switch_pm_param="start")
@@ -426,22 +421,75 @@ async def _(e):
     await e.answer(modss, switch_pm="Search Mod Applications.", switch_pm_param="start")
 
 
-@in_pattern("clipart")
+@in_pattern("ebooks")
 @in_owner
 async def clip(e):
     try:
         quer = e.text.split(" ", maxsplit=1)[1]
     except IndexError:
-        await e.answer([], switch_pm="ClipArt Search.", switch_pm_param="start")
+        await e.answer(
+            [], switch_pm="Enter Query to Look for EBook", switch_pm_param="start"
+        )
+        return
     quer = quer.replace(" ", "+")
-    sear = f"https://clipartix.com/search/{quer}"
-    html = urlopen(sear)
-    bs = BeautifulSoup(html, "html.parser", from_encoding="utf-8")
-    resul = bs.find_all("img", "attachment-full size-full")
+    sear = f"http://www.gutenberg.org/ebooks/search/?query={quer}&submit_search=Go%21"
+    magma = requests.get(sear).content
+    bs = BeautifulSoup(magma, "html.parser", from_encoding="utf-8")
+    out = bs.find_all("img")
+    Alink = bs.find_all("a", "link")
+    if len(out) == 0:
+        return await e.answer(
+            [], switch_pm="No Results Found !", switch_pm_param="start"
+        )
     buil = e.builder
+    dont_take = [
+        "Authors",
+        "Did you mean",
+        "Sort Alpha",
+        "Sort by",
+        "Subjects",
+        "Bookshelves",
+    ]
     hm = []
-    for res in resul:
-        hm += [buil.photo(include_media=True, file=res["src"])]
-    await e.answer(
-        hm, gallery=True, switch_pm="Clipart Searcher.", switch_pm_param="start"
-    )
+    titles = []
+    for num in Alink:
+        try:
+            rt = num.find("span", "title").text
+            if not rt.startswith(tuple(dont_take)):
+                titles.append(rt)
+        except BaseException:
+            pass
+    for rs in range(len(out)):
+        if "/cache/epub" in out[rs]["src"]:
+            link = out[rs]["src"]
+            num = link.split("/")[3]
+            hm.append(
+                buil.document(
+                    title=titles[rs],
+                    description="GutenBerg Search",
+                    file="https://gutenberg.org" + link.replace("small", "medium"),
+                    text=f"**• Ebook Search**\n\n->> `{titles[rs]}`",
+                    buttons=Button.inline("Get as Doc", data=f"ebk_{num}"),
+                )
+            )
+    await e.answer(hm, switch_pm="Ebooks Search", switch_pm_param="start")
+
+
+@callback(re_compile("ebk_(.*)"))
+async def eupload(event):
+    match = event.pattern_match.group(1).decode("utf-8")
+    await event.answer("Uploading..")
+    try:
+        await event.edit(
+            file=f"https://www.gutenberg.org/files/{match}/{match}-pdf.pdf"
+        )
+    except BaseException:
+        book = "Ultroid-Book.epub"
+        urllib.request.urlretrieve(
+            "https://www.gutenberg.org/ebooks/132.epub.images", book
+        )
+        fn, media, _ = await asst._file_to_media(
+            book, thumb="resources/extras/ultroid.jpg"
+        )
+        await event.edit(file=media)
+        os.remove(book)

assistant/localization.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

assistant/othervars.py

@@ -1,12 +1,14 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
 import re
+from glob import glob
 from os import remove
+from random import choices
 
 import requests
 from telegraph import Telegraph
@@ -24,9 +26,14 @@ auth_url = r["auth_url"]
 TOKEN_FILE = "resources/auths/auth_token.txt"
 
 
-@callback(re.compile("sndplug_(.*)"))
+@callback(
+    re.compile("sndplug_(.*)"),
+)
 async def send(eve):
     name = (eve.data_match.group(1)).decode("UTF-8")
+    thumb = ""
+    for m in choices(sorted(glob("resources/extras/*.jpg"))):
+        thumb += m
     if name.startswith("def"):
         plug_name = name.replace(f"def_plugin_", "")
         plugin = f"plugins/{plug_name}.py"
@@ -57,7 +64,7 @@ async def send(eve):
                 Button.inline("••Cʟᴏꜱᴇ••", data="close"),
             ],
         ]
-    await eve.edit(file=plugin, buttons=buttons)
+    await eve.edit(file=plugin, thumb=thumb, buttons=buttons)
 
 
 @callback("updatenow")
@@ -74,14 +81,12 @@ async def update(eve):
             heroku_app = None
             heroku_applications = heroku.apps()
         except BaseException:
-            return await eve.edit(
-                "`Invalid Heroku credentials for updating userbot dyno.`"
-            )
+            return await eve.edit("`Wrong HEROKU_API.`")
         for app in heroku_applications:
             if app.name == Var.HEROKU_APP_NAME:
                 heroku_app = app
         if not heroku_app:
-            await eve.edit("`Invalid Heroku credentials for updating userbot dyno.`")
+            await eve.edit("`Wrong HEROKU_APP_NAME.`")
             repo.__del__()
             return
         await eve.edit(
@@ -105,6 +110,9 @@ async def update(eve):
             return
         await eve.edit("`Successfully Updated!\nRestarting, please wait...`")
     else:
+        await eve.edit(
+            "`Userbot dyno build in progress, please wait for it to complete.`"
+        )
         try:
             ups_rem.pull(ac_br)
         except GitCommandError:
@@ -143,7 +151,11 @@ async def changes(okk):
         )
 
 
-@callback(re.compile("pasta-(.*)"))
+@callback(
+    re.compile(
+        "pasta-(.*)",
+    ),
+)
 @owner
 async def _(e):
     ok = (e.data_match.group(1)).decode("UTF-8")
@@ -296,6 +308,7 @@ async def otvaar(event):
                 Button.inline("Eᴍᴏᴊɪ ɪɴ Hᴇʟᴘ", data="emoj"),
                 Button.inline("Sᴇᴛ ɢDʀɪᴠᴇ", data="gdrive"),
             ],
+            [Button.inline("Inline Pic", data="inli_pic")],
             [Button.inline("« Bᴀᴄᴋ", data="setter")],
         ],
     )
@@ -405,7 +418,27 @@ async def hndlrr(event):
 
 @callback("taglog")
 @owner
-async def tagloggerr(event):
+async def tagloggrr(e):
+    await e.edit(
+        "Choose Options",
+        buttons=[
+            [Button.inline("SET TAG LOG", data="settag")],
+            [Button.inline("DELETE TAG LOG", data="deltag")],
+            [Button.inline("« Bᴀᴄᴋ", data="otvars")],
+        ],
+    )
+
+
+@callback("deltag")
+@owner
+async def delfuk(e):
+    udB.delete("TAG_LOG")
+    await e.answer("Done!!! TAG lOG Off")
+
+
+@callback("settag")
+@owner
+async def taglogerr(event):
     await event.delete()
     pru = event.sender_id
     var = "TAG_LOG"
@@ -420,13 +453,13 @@ async def tagloggerr(event):
         if themssg == "/cancel":
             return await conv.send_message(
                 "Cancelled!!",
-                buttons=get_back_button("otvars"),
+                buttons=get_back_button("taglog"),
             )
         else:
             await setit(event, var, themssg)
             await conv.send_message(
                 f"{name} changed to {themssg}",
-                buttons=get_back_button("otvars"),
+                buttons=get_back_button("taglog"),
             )
 
 
@@ -1039,3 +1072,48 @@ async def name(event):
                 ),
                 buttons=get_back_button("vcb"),
             )
+
+
+@callback("inli_pic")
+@owner
+async def media(event):
+    await event.delete()
+    pru = event.sender_id
+    var = "INLINE_PIC"
+    name = "Inline Media"
+    async with event.client.conversation(pru) as conv:
+        await conv.send_message(
+            "**Inline Media**\nSend me a pic/gif/ or link  to set as inline media.\n\nUse /cancel to terminate the operation.",
+        )
+        response = await conv.get_response()
+        try:
+            themssg = response.message.message
+            if themssg == "/cancel":
+                return await conv.send_message(
+                    "Operation cancelled!!",
+                    buttons=get_back_button("setter"),
+                )
+        except BaseException:
+            pass
+        media = await event.client.download_media(response, "inlpic")
+        if (
+            not (response.text).startswith("/")
+            and not response.text == ""
+            and not response.media
+        ):
+            url = response.text
+        else:
+            try:
+                x = upl(media)
+                url = f"https://telegra.ph/{x[0]}"
+                remove(media)
+            except BaseException:
+                return await conv.send_message(
+                    "Terminated.",
+                    buttons=get_back_button("setter"),
+                )
+        await setit(event, var, url)
+        await conv.send_message(
+            f"{name} has been set.",
+            buttons=get_back_button("setter"),
+        )

assistant/ping.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -8,7 +8,7 @@
 from datetime import datetime
 
 
-@asst_cmd("ping")
+@asst_cmd("ping$")
 @owner
 async def _(event):
     start = datetime.now()
@@ -16,5 +16,5 @@ async def _(event):
     ms = (end - start).microseconds / 1000
     await asst.send_message(
         event.chat_id,
-        f"**Pong!!**\n `{ms}ms`",
+        f"**Pong!!**\n `{ms} milliseconds`",
     )

assistant/pmbot/banuser.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -7,8 +7,12 @@
 
 from . import *
 
+
 @asst_cmd("ban")
+@owner
 async def banhammer(event):
+    if not event.is_private:
+        return
     x = await event.get_reply_message()
     if x is None:
         return await event.edit("Please reply to someone to ban him.")
@@ -25,7 +29,10 @@ async def banhammer(event):
 
 
 @asst_cmd("unban")
+@owner
 async def banhammer(event):
+    if not event.is_private:
+        return
     x = await event.get_reply_message()
     if x is None:
         return await event.edit("Please reply to someone to ban him.")

assistant/pmbot/incoming.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

assistant/pmbot/outgoing.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -21,9 +21,15 @@ async def on_out_mssg(event):
         return
     who = event.sender_id
     if who == OWNER_ID:
-        if event.text.startswith("/"):
-            return
         to_user = get_who(x.id)
+        if event.text.startswith("/who"):
+            try:
+                k = await asst.get_entity(int(to_user))
+                return await event.reply(f"[{k.first_name}](tg://user?id={k.id})")
+            except BaseException:
+                return
+        elif event.text.startswith("/"):
+                return
         if event.media:
             if event.text:
                 await asst.send_file(int(to_user), event.media, caption=event.text)

assistant/start.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -8,8 +8,8 @@
 from datetime import datetime
 
 from pyUltroid.functions.asst_fns import *
-from pyUltroid.misc._decorators import sed
-from telethon import Button, events
+from pyUltroid.misc import owner_and_sudos
+from telethon import events
 from telethon.utils import get_display_name
 
 from plugins import *
@@ -25,21 +25,63 @@ Owner_info_msg = f"""
 __Ultroid {ultroid_version}, powered by @TeamUltroid__
 """
 
+_settings = [
+    [
+        Button.inline("API Kᴇʏs", data="apiset"),
+        Button.inline("Pᴍ Bᴏᴛ", data="chatbot"),
+    ],
+    [
+        Button.inline("Aʟɪᴠᴇ", data="alvcstm"),
+        Button.inline("PᴍPᴇʀᴍɪᴛ", data="ppmset"),
+    ],
+    [Button.inline("Fᴇᴀᴛᴜʀᴇs", data="otvars")],
+    [Button.inline("VC Sᴏɴɢ Bᴏᴛ", data="vcb")],
+    [Button.inline("« Bᴀᴄᴋ", data="mainmenu")],
+]
+
+_start = [
+    [
+        Button.inline("Lᴀɴɢᴜᴀɢᴇ 🌐", data="lang"),
+        Button.inline("Sᴇᴛᴛɪɴɢs ⚙️", data="setter"),
+    ],
+    [
+        Button.inline("Sᴛᴀᴛs ✨", data="stat"),
+        Button.inline("Bʀᴏᴀᴅᴄᴀsᴛ 📻", data="bcast"),
+    ],
+]
 
-@asst_cmd("start")
-async def assistant(event):
-    if event.is_group and event.sender_id in sed:
-        bnn = (await asst.get_me()).username
-        return await event.reply(
-            "`I dont work in groups`",
-            buttons=[Button.url("⚙️Sᴛᴀʀᴛ⚙️", url=f"https://t.me/{bnn}?start=set")],
-        )
-    else:
-        if not is_added(event.sender_id) and event.sender_id not in sed:
+
+@callback("ownerinfo")
+async def own(event):
+    await event.edit(
+        Owner_info_msg,
+        buttons=[Button.inline("Close", data=f"closeit")],
+    )
+
+
+@callback("closeit")
+async def closet(lol):
+    await lol.delete()
+
+
+@asst_cmd("start ?(.*)")
+async def ultroid(event):
+    if event.is_group:
+        if str(event.sender_id) in owner_and_sudos():
+            return await event.reply(
+                "`I dont work in groups`",
+                buttons=[
+                    Button.url(
+                        "⚙️Sᴛᴀʀᴛ⚙️", url=f"https://t.me/{asst.me.username}?start=set"
+                    )
+                ],
+            )
+        if (
+            not is_added(event.sender_id)
+            and str(event.sender_id) not in owner_and_sudos()
+        ):
             add_user(event.sender_id)
         ok = ""
-        if event.is_private and event.sender_id in sed:
-            return
         u = await event.client.get_entity(event.chat_id)
         if not udB.get("STARTMSG"):
             if udB.get("PMBOT") == "True":
@@ -55,45 +97,20 @@ async def assistant(event):
                 Redis("STARTMSG").format(me=me, mention=mention),
                 buttons=[Button.inline("Info.", data="ownerinfo")],
             )
+    else:
+        name = get_display_name(event.sender_id)
+        if event.pattern_match.group(1) == "set":
+            await event.reply(
+                "Choose from the below options -",
+                buttons=_settings,
+            )
+        else:
+            await event.reply(
+                get_string("ast_3").format(name),
+                buttons=_start,
+            )
 
 
-@callback("ownerinfo")
-async def own(event):
-    await event.edit(Owner_info_msg, buttons=[Button.inline("Close", data="closeit")])
-
-
-@callback("closeit")
-async def closet(lol):
-    await lol.delete()
-
-
-@asst_cmd("start ?(.*)")
-@owner
-async def ultroid(event):
-    if event.pattern_match.group(1):
-        return
-    if event.is_group:
-        return
-    name = event.sender.first_name
-    if event.sender.last_name:
-        name += f" {event.sender.last_name}"
-    await asst.send_message(
-        event.chat_id,
-        get_string("ast_3").format(name),
-        buttons=[
-            [
-                Button.inline("Language 🌐", data="lang"),
-                Button.inline("Sᴇᴛᴛɪɴɢs ⚙️", data="setter"),
-            ],
-            [
-                Button.inline("Sᴛᴀᴛs ✨", data="stat"),
-                Button.inline("Bʀᴏᴀᴅᴄᴀsᴛ 📻", data="bcast"),
-            ],
-        ],
-    )
-
-
-# aah, repeat the codes..
 @callback("mainmenu")
 @owner
 async def ultroid(event):
@@ -101,16 +118,7 @@ async def ultroid(event):
         return
     await event.edit(
         get_string("ast_3").format(OWNER_NAME),
-        buttons=[
-            [
-                Button.inline("Language 🌐", data="lang"),
-                Button.inline("Sᴇᴛᴛɪɴɢs ⚙️", data="setter"),
-            ],
-            [
-                Button.inline("Sᴛᴀᴛs ✨", data="stat"),
-                Button.inline("Bʀᴏᴀᴅᴄᴀsᴛ 📻", data="bcast"),
-            ],
-        ],
+        buttons=_start,
     )
 
 
@@ -166,38 +174,5 @@ Failed for {fail} user(s).""",
 async def setting(event):
     await event.edit(
         "Choose from the below options -",
-        buttons=[
-            [
-                Button.inline("API Kᴇʏs", data="apiset"),
-                Button.inline("Pᴍ Bᴏᴛ", data="chatbot"),
-            ],
-            [
-                Button.inline("Aʟɪᴠᴇ", data="alvcstm"),
-                Button.inline("PᴍPᴇʀᴍɪᴛ", data="ppmset"),
-            ],
-            [Button.inline("Fᴇᴀᴛᴜʀᴇs", data="otvars")],
-            [Button.inline("VC Sᴏɴɢ Bᴏᴛ", data="vcb")],
-            [Button.inline("« Bᴀᴄᴋ", data="mainmenu")],
-        ],
-    )
-
-
-@asst_cmd("start set")
-@owner
-async def set(event):
-    await event.reply(
-        "Choose from the below options -",
-        buttons=[
-            [
-                Button.inline("API Kᴇʏs", data="apiset"),
-                Button.inline("Pᴍ Bᴏᴛ", data="chatbot"),
-            ],
-            [
-                Button.inline("Aʟɪᴠᴇ", data="alvcstm"),
-                Button.inline("PᴍPᴇʀᴍɪᴛ", data="ppmset"),
-            ],
-            [Button.inline("Fᴇᴀᴛᴜʀᴇs", data="otvars")],
-            [Button.inline("VC Sᴏɴɢ Bᴏᴛ", data="vcb")],
-            [Button.inline("« Bᴀᴄᴋ", data="mainmenu")],
-        ],
+        buttons=_settings,
     )

assistant/ytdl.py

@@ -6,19 +6,21 @@
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
 
-import asyncio
 import os
 import re
 import time
+from urllib.request import urlretrieve
 
+from numerize import numerize
 from pyUltroid.functions.all import *
 from telethon import Button
-from telethon.errors import UserNotParticipantError
-from telethon.tl.types import DocumentAttributeAudio
+from telethon.tl.types import DocumentAttributeAudio, DocumentAttributeVideo
 from telethon.tl.types import InputWebDocument as wb
+from youtube_dl import YoutubeDL
 from youtubesearchpython import VideosSearch
 
 ytt = "https://telegra.ph/file/afd04510c13914a06dd03.jpg"
+_yt_base_url = "https://www.youtube.com/watch?v="
 
 
 @in_pattern("yt")
@@ -44,9 +46,9 @@ async def _(event):
     nub = search.result()
     nibba = nub["result"]
     for v in nibba:
-        link = v["link"]
-        title = v["title"]
         ids = v["id"]
+        link = _yt_base_url + ids
+        title = v["title"]
         duration = v["duration"]
         thumb = f"https://img.youtube.com/vi/{ids}/hqdefault.jpg"
         text = f"**•Tɪᴛʟᴇ•** `{title}`\n\n**••[Lɪɴᴋ]({link})••**\n\n**••Dᴜʀᴀᴛɪᴏɴ••** `{duration}`\n\n\n"
@@ -60,8 +62,8 @@ async def _(event):
                 include_media=True,
                 buttons=[
                     [
-                        Button.inline("Audio", data=f"audio{link}"),
-                        Button.inline("Video", data=f"video{link}"),
+                        Button.inline("Audio", data=f"ytdl_audio_{ids}"),
+                        Button.inline("Video", data=f"ytdl_video_{ids}"),
                     ],
                     [
                         Button.switch_inline(
@@ -81,181 +83,120 @@ async def _(event):
     await event.answer(results)
 
 
-@callback(re.compile("audio(.*)"))
+@callback(
+    re.compile(
+        "ytdl_(.*)",
+    ),
+)
 @owner
-async def _(sur):
-    url = sur.pattern_match.group(1).decode("UTF-8")
-    sur.sender_id
-    opts = {
-        "format": "bestaudio",
-        "addmetadata": True,
-        "key": "FFmpegMetadata",
-        "writethumbnail": True,
-        "prefer_ffmpeg": True,
-        "geo_bypass": True,
-        "nocheckcertificate": True,
-        "postprocessors": [
-            {
-                "key": "FFmpegExtractAudio",
-                "preferredcodec": "mp3",
-                "preferredquality": "320",
-            },
-        ],
-        "outtmpl": "%(id)s.mp3",
-        "quiet": True,
-        "logtostderr": False,
-    }
-    song = True
-    ytdl_data = await dler(sur, opts, url)
-    jpg = f"{ytdl_data['id']}.mp3.jpg"
-    png = f"{ytdl_data['id']}.mp3.png"
-    webp = f"{ytdl_data['id']}.mp3.webp"
-    dir = os.listdir()
-
-    if jpg in dir:
-        thumb = jpg
-    elif png in dir:
-        thumb = png
-    elif webp in dir:
-        thumb = webp
-    else:
-        thumb = None
+async def _(e):
+    _e = e.pattern_match.group(1).decode("UTF-8")
+    _lets_split = _e.split("_", maxsplit=1)
+    _ytdl_data = await dler(e, _yt_base_url + _lets_split[1])
+    _data = get_data(_lets_split[0], _ytdl_data)
+    _buttons = get_buttons(
+        "ytdownload_" + _lets_split[0] + "_" + _lets_split[1] + ":", _data
+    )
+    _text = "`Select Your Format.`"
+    if not _buttons:
+        _text = "`Error domwloading from YouTube.\nTry Restarting your bot.`"
+    await e.edit(_text, buttons=_buttons)
 
-    c_time = time.time()
-    if song:
-        await sur.edit(
-            f"`Preparing to upload song:`\
-        \n**{ytdl_data['title']}**\
-        \nby *{ytdl_data['uploader']}*",
-        )
-        MSG = f"**{ytdl_data['title']}** Uploaded Successfully !"
-        chat = sur.chat_id
-        whome = ultroid_bot
-        if sur.is_private and sur.sender_id != ultroid_bot.uid:
-            chat = sur.sender_id
-            whome = asst
-            MSG += f"\nGet at {asst.me.username}"
-        try:
-            await whome.send_file(
-                chat,
-                f"{ytdl_data['id']}.mp3",
-                thumb=thumb,
-                caption=f"**{ytdl_data['title']}\n{time_formatter((ytdl_data['duration'])*1000)}\n{ytdl_data['uploader']}**",
-                supports_streaming=True,
-                attributes=[
-                    DocumentAttributeAudio(
-                        duration=int(ytdl_data["duration"]),
-                        title=str(ytdl_data["title"]),
-                        performer=str(ytdl_data["uploader"]),
-                    ),
-                ],
-                progress_callback=lambda d, t: asyncio.get_event_loop().create_task(
-                    progress(
-                        d,
-                        t,
-                        sur,
-                        c_time,
-                        "Uploading..",
-                        f"{ytdl_data['title']}.mp3",
-                    ),
-                ),
-            )
-        except UserNotParticipantError:
-            await asst.send_file(
-                sur.sender_id,
-                f"{ytdl_data['id']}.mp3",
-                thumb=thumb,
-                caption=f"**{ytdl_data['title']}\n{time_formatter((ytdl_data['duration'])*1000)}\n{ytdl_data['uploader']}**",
-                supports_streaming=True,
-                attributes=[
-                    DocumentAttributeAudio(
-                        duration=int(ytdl_data["duration"]),
-                        title=str(ytdl_data["title"]),
-                        performer=str(ytdl_data["uploader"]),
-                    ),
-                ],
-            )
-        os.system(f"rm {ytdl_data['id']}.mp*")
-        await sur.edit(
-            MSG,
-            buttons=Button.switch_inline("Search More", query="yt ", same_peer=True),
-        )
 
-
-@callback(re.compile("video(.*)"))
+@callback(
+    re.compile(
+        "ytdownload_(.*)",
+    ),
+)
 @owner
-async def _(fuk):
-    url = fuk.pattern_match.group(1).decode("UTF-8")
-    fuk.sender_id
-    event = fuk
-    opts = {
-        "format": "best",
-        "addmetadata": True,
-        "key": "FFmpegMetadata",
-        "writethumbnail": True,
-        "prefer_ffmpeg": True,
-        "geo_bypass": True,
-        "nocheckcertificate": True,
-        "postprocessors": [{"key": "FFmpegVideoConvertor", "preferedformat": "mp4"}],
-        "outtmpl": "%(id)s.mp4",
-        "logtostderr": False,
-        "quiet": True,
-    }
-    video = True
-    ytdl_data = await dler(fuk, opts, url)
-
-    c_time = time.time()
-    if video:
-        await fuk.edit(
-            f"`Preparing to upload video:`\
-        \n**{ytdl_data['title']}**\
-        \nby *{ytdl_data['uploader']}*",
+async def _(event):
+    url = event.pattern_match.group(1).decode("UTF-8")
+    lets_split = url.split("_", maxsplit=1)
+    vid_id = lets_split[1].split(":")[0]
+    link = _yt_base_url + vid_id
+    format = url.split(":")[1]
+    if lets_split[0] == "audio":
+        opts = {
+            "format": str(format),
+            "addmetadata": True,
+            "key": "FFmpegMetadata",
+            "prefer_ffmpeg": True,
+            "geo_bypass": True,
+            "outtmpl": "%(id)s.mp3",
+            "quiet": True,
+            "logtostderr": False,
+        }
+        ytdl_data = await dler(event, link)
+        YoutubeDL(opts).download([link])
+        title = ytdl_data["title"]
+        artist = ytdl_data["uploader"]
+        views = numerize.numerize(ytdl_data["view_count"])
+        urlretrieve(f"https://i.ytimg.com/vi/{vid_id}/hqdefault.jpg", f"{title}.jpg")
+        thumb = f"{title}.jpg"
+        duration = ytdl_data["duration"]
+        os.rename(f"{ytdl_data['id']}.mp3", f"{title}.mp3")
+        c_time = time.time()
+        file = await uploader(
+            f"{title}.mp3", f"{title}.mp3", c_time, event, "Uploading " + title + "..."
         )
-        MSG = f"**{ytdl_data['title']}** Uploaded Successfully !"
-        chat = fuk.chat_id
-        whome = ultroid_bot
-        if event.is_private and event.sender_id != ultroid_bot.uid:
-            chat = fuk.sender_id
-            whome = asst
-            MSG += f"\nGet at {asst.me.username}"
+        attributes = [
+            DocumentAttributeAudio(
+                duration=int(duration),
+                title=title,
+                performer=artist,
+            ),
+        ]
+    elif lets_split[0] == "video":
+        opts = {
+            "format": str(format),
+            "addmetadata": True,
+            "key": "FFmpegMetadata",
+            "prefer_ffmpeg": True,
+            "geo_bypass": True,
+            "outtmpl": "%(id)s.mp4",
+            "logtostderr": False,
+            "quiet": True,
+        }
+        ytdl_data = await dler(event, link)
+        YoutubeDL(opts).download([link])
+        title = ytdl_data["title"]
+        artist = ytdl_data["uploader"]
+        views = numerize.numerize(ytdl_data["view_count"])
+        urlretrieve(f"https://i.ytimg.com/vi/{vid_id}/hqdefault.jpg", f"{title}.jpg")
+        thumb = f"{title}.jpg"
+        duration = ytdl_data["duration"]
         try:
-            await whome.send_file(
-                chat,
-                f"{ytdl_data['id']}.mp4",
-                thumb=f"./resources/extras/ultroid.jpg",
-                caption=f"**{ytdl_data['title']}\n{time_formatter((ytdl_data['duration'])*1000)}\n{ytdl_data['uploader']}**",
-                supports_streaming=True,
-                progress_callback=lambda d, t: asyncio.get_event_loop().create_task(
-                    progress(
-                        d,
-                        t,
-                        fuk,
-                        c_time,
-                        "Uploading..",
-                        f"{ytdl_data['title']}.mp4",
-                    ),
-                ),
-            )
-        except UserNotParticipantError:
-            await asst.send_file(
-                chat,
-                f"{ytdl_data['id']}.mp4",
-                thumb=f"./resources/extras/ultroid.jpg",
-                caption=f"**{ytdl_data['title']}\n{time_formatter((ytdl_data['duration'])*1000)}\n{ytdl_data['uploader']}**",
-                supports_streaming=True,
-                progress_callback=lambda d, t: asyncio.get_event_loop().create_task(
-                    progress(
-                        d,
-                        t,
-                        fuk,
-                        c_time,
-                        "Uploading..",
-                        f"{ytdl_data['title']}.mp4",
-                    ),
-                ),
-            )
-        os.remove(f"{ytdl_data['id']}.mp4")
-        await fuk.edit(
-            MSG,
-            buttons=Button.switch_inline("Search More", query="yt ", same_peer=True),
+            os.rename(f"{ytdl_data['id']}.mp4", f"{title}.mp4")
+        except FileNotFoundError:
+            try:
+                os.rename(f"{ytdl_data['id']}.mkv", f"{title}.mp4")
+            except FileNotFoundError:
+                os.rename(f"{ytdl_data['id']}.webm", f"{title}.mp4")
+        except Exception as ex:
+            return await event.edit(str(ex))
+        wi, _ = await bash(f'mediainfo "{title}.mp4" | grep "Width"')
+        hi, _ = await bash(f'mediainfo "{title}.mp4" | grep "Height"')
+        c_time = time.time()
+        file = await uploader(
+            f"{title}.mp4", f"{title}.mp4", c_time, event, "Uploading " + title + "..."
         )
+        attributes = [
+            DocumentAttributeVideo(
+                duration=int(duration),
+                w=int(wi.split(":")[1].split()[0]),
+                h=int(hi.split(":")[1].split()[0]),
+                supports_streaming=True,
+            ),
+        ]
+    text = f"**Title:** `{title}`\n"
+    text += f"**Duration:** `{time_formatter(int(duration)*1000)}`\n"
+    text += f"**Views:** `{views}`\n"
+    text += f"**Artist:** `{artist}`"
+    await event.edit(
+        text,
+        file=file,
+        attributes=attributes,
+        thumb=thumb,
+        buttons=Button.switch_inline("Search More", query="yt ", same_peer=True),
+    )
+    os.system(f'rm "{title}"*')

heroku.yml

@@ -1,7 +1,5 @@
 build:
   docker:
-      worker: Dockerfile
-      web: Dockerfile
+      ultroid: Dockerfile
 run:
-  worker: bash resources/startup/startup.sh
-  web: python vcstarter.py
+  ultroid: bash resources/startup/startup.sh

package.json

@@ -18,7 +18,7 @@
     "redis": "^3.0.2",
     "telegraf": "^4.3.0",
     "tgcalls": "^0.1.2",
-    "ws": "^7.4.3"
+    "ws": "^7.4.6"
   },
   "devDependencies": {
     "@types/node": "^14.14.25",

plugins/__init__.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -10,14 +10,14 @@ import time
 from pyUltroid.dB import *
 from pyUltroid.dB.core import *
 from pyUltroid.functions.all import *
+from pyUltroid.functions.asstcmd_db import *
 from pyUltroid.functions.broadcast_db import *
 from pyUltroid.functions.gban_mute_db import *
-from pyUltroid.functions.goodbye_db import *
-from pyUltroid.functions.google_image import googleimagesdownload
+from pyUltroid.functions.nsfw_db import *
 from pyUltroid.functions.sudos import *
-from pyUltroid.functions.welcome_db import *
-from pyUltroid.functions.ytdl import *
 from pyUltroid.utils import *
+from telethon import Button
+from telethon.tl import functions, types
 
 from strings import get_string
 
@@ -30,7 +30,7 @@ except ModuleNotFoundError:
 
 
 start_time = time.time()
-ultroid_version = "v0.0.7.2"
+ultroid_version = "v0.0.8"
 OWNER_NAME = ultroid_bot.me.first_name
 OWNER_ID = ultroid_bot.me.id
 
@@ -43,7 +43,7 @@ def grt(seconds: int) -> str:
     count = 0
     up_time = ""
     time_list = []
-    time_suffix_list = ["s", "m", "h", "days"]
+    time_suffix_list = ["s", "m", "h", "d"]
 
     while count < 4:
         count += 1
@@ -67,6 +67,283 @@ def grt(seconds: int) -> str:
     return up_time
 
 
+_default = [
+    "a",
+    "b",
+    "c",
+    "d",
+    "e",
+    "f",
+    "g",
+    "h",
+    "i",
+    "j",
+    "k",
+    "l",
+    "m",
+    "n",
+    "o",
+    "p",
+    "q",
+    "r",
+    "s",
+    "t",
+    "u",
+    "v",
+    "w",
+    "x",
+    "y",
+    "z",
+    "A",
+    "B",
+    "C",
+    "D",
+    "E",
+    "F",
+    "G",
+    "H",
+    "I",
+    "J",
+    "K",
+    "L",
+    "M",
+    "N",
+    "O",
+    "P",
+    "Q",
+    "R",
+    "S",
+    "T",
+    "U",
+    "V",
+    "W",
+    "X",
+    "Y",
+    "Z",
+]
+
+
+_small_caps = [
+    "ᴀ",
+    "ʙ",
+    "ᴄ",
+    "ᴅ",
+    "ᴇ",
+    "ғ",
+    "ɢ",
+    "ʜ",
+    "ɪ",
+    "ᴊ",
+    "ᴋ",
+    "ʟ",
+    "ᴍ",
+    "ɴ",
+    "ᴏ",
+    "ᴘ",
+    "ϙ",
+    "ʀ",
+    "s",
+    "ᴛ",
+    "ᴜ",
+    "ᴠ",
+    "ᴡ",
+    "x",
+    "ʏ",
+    "ᴢ",
+    "A",
+    "B",
+    "C",
+    "D",
+    "E",
+    "F",
+    "G",
+    "H",
+    "I",
+    "J",
+    "K",
+    "L",
+    "M",
+    "N",
+    "O",
+    "P",
+    "Q",
+    "R",
+    "S",
+    "T",
+    "U",
+    "V",
+    "W",
+    "X",
+    "Y",
+    "Z",
+]
+
+_monospace = [
+    "𝚊",
+    "𝚋",
+    "𝚌",
+    "𝚍",
+    "𝚎",
+    "𝚏",
+    "𝚐",
+    "𝚑",
+    "𝚒",
+    "𝚓",
+    "𝚔",
+    "𝚕",
+    "𝚖",
+    "𝚗",
+    "𝚘",
+    "𝚙",
+    "𝚚",
+    "𝚛",
+    "𝚜",
+    "𝚝",
+    "𝚞",
+    "𝚟",
+    "𝚠",
+    "𝚡",
+    "𝚢",
+    "𝚣",
+    "𝙰",
+    "𝙱",
+    "𝙲",
+    "𝙳",
+    "𝙴",
+    "𝙵",
+    "𝙶",
+    "𝙷",
+    "𝙸",
+    "𝙹",
+    "𝙺",
+    "𝙻",
+    "𝙼",
+    "𝙽",
+    "𝙾",
+    "𝙿",
+    "𝚀",
+    "𝚁",
+    "𝚂",
+    "𝚃",
+    "𝚄",
+    "𝚅",
+    "𝚆",
+    "𝚇",
+    "𝚈",
+    "𝚉",
+]
+
+_double_stroke = [
+    "𝕒",
+    "𝕓",
+    "𝕔",
+    "𝕕",
+    "𝕖",
+    "𝕗",
+    "𝕘",
+    "𝕙",
+    "𝕚",
+    "𝕛",
+    "𝕜",
+    "𝕝",
+    "𝕞",
+    "𝕟",
+    "𝕠",
+    "𝕡",
+    "𝕢",
+    "𝕣",
+    "𝕤",
+    "𝕥",
+    "𝕦",
+    "𝕧",
+    "𝕨",
+    "𝕩",
+    "𝕪",
+    "𝕫",
+    "𝔸",
+    "𝔹",
+    "ℂ",
+    "𝔻",
+    "𝔼",
+    "𝔽",
+    "𝔾",
+    "ℍ",
+    "𝕀",
+    "𝕁",
+    "𝕂",
+    "𝕃",
+    "𝕄",
+    "ℕ",
+    "𝕆",
+    "ℙ",
+    "ℚ",
+    "ℝ",
+    "𝕊",
+    "𝕋",
+    "𝕌",
+    "𝕍",
+    "𝕎",
+    "𝕏",
+    "𝕐",
+    "ℤ",
+]
+
+_script_royal = [
+    "𝒶",
+    "𝒷",
+    "𝒸",
+    "𝒹",
+    "𝑒",
+    "𝒻",
+    "𝑔",
+    "𝒽",
+    "𝒾",
+    "𝒿",
+    "𝓀",
+    "𝓁",
+    "𝓂",
+    "𝓃",
+    "𝑜",
+    "𝓅",
+    "𝓆",
+    "𝓇",
+    "𝓈",
+    "𝓉",
+    "𝓊",
+    "𝓋",
+    "𝓌",
+    "𝓍",
+    "𝓎",
+    "𝓏",
+    "𝒜",
+    "ℬ",
+    "𝒞",
+    "𝒟",
+    "ℰ",
+    "ℱ",
+    "𝒢",
+    "ℋ",
+    "ℐ",
+    "𝒥",
+    "𝒦",
+    "ℒ",
+    "ℳ",
+    "𝒩",
+    "𝒪",
+    "𝒫",
+    "𝒬",
+    "ℛ",
+    "𝒮",
+    "𝒯",
+    "𝒰",
+    "𝒱",
+    "𝒲",
+    "𝒳",
+    "𝒴",
+    "𝒵",
+]
+
+
 KANGING_STR = [
     "Using Witchery to kang this sticker...",
     "Plagiarising hehe...",

plugins/_help.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

plugins/_inline.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -10,19 +10,18 @@ import time
 from datetime import datetime
 from math import ceil
 from os import remove
-from platform import python_version as PyVer
 
 from git import Repo
-from pyUltroid import __version__ as UltVer
+from pyUltroid.misc import owner_and_sudos
 from support import *
-from telethon import Button, __version__
-from telethon.tl.types import InputWebDocument
+from telethon.tl.types import InputBotInlineResult, InputWebDocument
 
 from . import *
 
 # ================================================#
 notmine = f"This bot is for {OWNER_NAME}"
-ULTROID_PIC = "https://telegra.ph/file/115f149ed8e154641708b.jpg"
+
+TLINK = "https://telegra.ph/file/d9c9bc13647fa1d96e764.jpg"
 helps = get_string("inline_1")
 
 add_ons = udB.get("ADDONS")
@@ -30,49 +29,74 @@ if add_ons == "True" or add_ons is None:
     zhelps = get_string("inline_2")
 else:
     zhelps = get_string("inline_3")
-if udB.get("INLINE_PIC"):
-    _file_to_replace = udB.get("INLINE_PIC")
+
+C_PIC = udB.get("INLINE_PIC")
+
+if C_PIC:
+    _file_to_replace = C_PIC
+    TLINK = C_PIC
 else:
     _file_to_replace = "resources/extras/inline.jpg"
 # ============================================#
 
 
+# --------------------BUTTONS--------------------#
+
+_main_help_menu = [
+    [
+        Button.inline("• Pʟᴜɢɪɴs", data="hrrrr"),
+        Button.inline("• Aᴅᴅᴏɴs", data="frrr"),
+    ],
+    [
+        Button.inline("Oᴡɴᴇʀ•ᴛᴏᴏʟꜱ", data="ownr"),
+        Button.inline("Iɴʟɪɴᴇ•Pʟᴜɢɪɴs", data="inlone"),
+    ],
+    [
+        Button.url("⚙️Sᴇᴛᴛɪɴɢs⚙️", url=f"https://t.me/{asst.me.username}?start=set"),
+    ],
+    [Button.inline("••Cʟᴏꜱᴇ••", data="close")],
+]
+
+SUP_BUTTONS = [
+    [
+        Button.url("Repo", url="https://github.com/TeamUltroid/Ultroid"),
+        Button.url("Addons", url="https://github.com/TeamUltroid/UltroidAddons"),
+    ],
+    [Button.url("Support", url="t.me/UltroidSupport")],
+]
+
+# --------------------BUTTONS--------------------#
+
+
 @in_pattern("")
 @in_owner
-async def e(o):
+async def inline_alive(o):
     if len(o.text) == 0:
         b = o.builder
+        MSG = "• **Ultroid Userbot •**"
         uptime = grt(time.time() - start_time)
-        header = udB.get("ALIVE_TEXT") if udB.get("ALIVE_TEXT") else "Hey,  I am alive."
-        ALIVEMSG = get_string("alive_1").format(
-            header,
-            OWNER_NAME,
-            ultroid_version,
-            UltVer,
-            uptime,
-            PyVer(),
-            __version__,
-            Repo().active_branch,
+        MSG += f"\n\n• **Uptime** - `{uptime}`\n"
+        MSG += f"• **OWNER** - `{OWNER_NAME}`"
+        WEB0 = InputWebDocument(
+            "https://telegra.ph/file/55dd0f381c70e72557cb1.jpg", 0, "image/jpg", []
         )
-        res = [
-            await b.article(
+        RES = [
+            InputBotInlineResult(
+                str(o.id),
+                "photo",
+                send_message=await b._message(
+                    text=MSG,
+                    media=True,
+                    buttons=SUP_BUTTONS,
+                ),
                 title="Ultroid Userbot",
-                url="https://t.me/TeamUltroid",
-                description="Userbot | Telethon ",
-                text=ALIVEMSG,
-                thumb=InputWebDocument(ULTROID_PIC, 0, "image/jpeg", []),
-                buttons=[
-                    [Button.url(text="Support Group", url="t.me/UltroidSupport")],
-                    [
-                        Button.url(
-                            text="Repo",
-                            url="https://github.com/Teamultroid/Ultroid",
-                        ),
-                    ],
-                ],
-            ),
+                description="Userbot | Telethon",
+                url=TLINK,
+                thumb=WEB0,
+                content=InputWebDocument(TLINK, 0, "image/jpg", []),
+            )
         ]
-        await o.answer(res, switch_pm=f"👥 ULTROID PORTAL", switch_pm_param="start")
+        await o.answer(RES, switch_pm=f"👥 ULTROID PORTAL", switch_pm_param="start")
 
 
 @in_pattern("ultd")
@@ -82,8 +106,6 @@ async def inline_handler(event):
     for x in LIST.values():
         for y in x:
             z.append(y)
-    cmd = len(z)
-    bnn = asst.me.username
     result = event.builder.photo(
         file=_file_to_replace,
         link_preview=False,
@@ -91,37 +113,42 @@ async def inline_handler(event):
             OWNER_NAME,
             len(PLUGINS),
             len(ADDONS),
-            cmd,
+            len(z),
         ),
+        buttons=_main_help_menu,
+    )
+    await event.answer([result], gallery=True)
+
+
+@in_pattern("paste")
+@in_owner
+async def _(event):
+    ok = event.text.split(" ")[1]
+    link = "https://nekobin.com/"
+    result = event.builder.article(
+        title="Paste",
+        text="Pᴀsᴛᴇᴅ Tᴏ Nᴇᴋᴏʙɪɴ!",
         buttons=[
             [
-                Button.inline("• Pʟᴜɢɪɴs", data="hrrrr"),
-                Button.inline("• Aᴅᴅᴏɴs", data="frrr"),
-            ],
-            [
-                Button.inline("Oᴡɴᴇʀ•ᴛᴏᴏʟꜱ", data="ownr"),
-                Button.inline("Iɴʟɪɴᴇ•Pʟᴜɢɪɴs", data="inlone"),
-            ],
-            [
-                Button.url("⚙️Sᴇᴛᴛɪɴɢs⚙️", url=f"https://t.me/{bnn}?start=set"),
+                Button.url("NekoBin", url=f"{link}{ok}"),
+                Button.url("Raw", url=f"{link}raw/{ok}"),
             ],
-            [Button.inline("••Cʟᴏꜱᴇ••", data="close")],
         ],
     )
     await event.answer([result])
 
 
-@in_pattern("paste")
+@in_pattern("dog")
 @in_owner
 async def _(event):
     ok = event.text.split(" ")[1]
-    link = "https://nekobin.com/"
+    link = "https://del.dog/"
     result = event.builder.article(
         title="Paste",
-        text="Pᴀsᴛᴇᴅ Tᴏ Nᴇᴋᴏʙɪɴ!",
+        text="Pᴀsᴛᴇᴅ Tᴏ Dᴏɢʙɪɴ!",
         buttons=[
             [
-                Button.url("NekoBin", url=f"{link}{ok}"),
+                Button.url("DogBin", url=f"{link}{ok}"),
                 Button.url("Raw", url=f"{link}raw/{ok}"),
             ],
         ],
@@ -202,8 +229,8 @@ async def _(event):
 async def _(event):
     start = datetime.now()
     end = datetime.now()
-    ms = (end - start).microseconds / 1000
-    pin = f"🌋Pɪɴɢ = {ms}ms"
+    ms = (end - start).microseconds
+    pin = f"🌋Pɪɴɢ = {ms} microseconds"
     await event.answer(pin, cache_time=0, alert=True)
 
 
@@ -256,8 +283,8 @@ async def _(e):
         ],
         [
             Button.switch_inline(
-                "CʟɪᴘAʀᴛ Sᴇᴀʀᴄʜ",
-                query="clipart frog",
+                "EBᴏᴏᴋs Uᴘʟᴏᴀᴅᴇʀ",
+                query="ebooks India",
                 same_peer=True,
             ),
             Button.switch_inline(
@@ -384,37 +411,18 @@ async def backr(event):
 @callback("open")
 @owner
 async def opner(event):
-    bnn = asst.me.username
-    buttons = [
-        [
-            Button.inline("• Pʟᴜɢɪɴs ", data="hrrrr"),
-            Button.inline("• Aᴅᴅᴏɴs", data="frrr"),
-        ],
-        [
-            Button.inline("Oᴡɴᴇʀ•Tᴏᴏʟꜱ", data="ownr"),
-            Button.inline("Iɴʟɪɴᴇ•Pʟᴜɢɪɴs", data="inlone"),
-        ],
-        [
-            Button.url(
-                "⚙️Sᴇᴛᴛɪɴɢs⚙️",
-                url=f"https://t.me/{bnn}?start={ultroid_bot.me.id}",
-            ),
-        ],
-        [Button.inline("••Cʟᴏꜱᴇ••", data="close")],
-    ]
     z = []
     for x in LIST.values():
         for y in x:
             z.append(y)
-    cmd = len(z) + 10
     await event.edit(
         get_string("inline_4").format(
             OWNER_NAME,
             len(PLUGINS),
             len(ADDONS),
-            cmd,
+            len(z),
         ),
-        buttons=buttons,
+        buttons=_main_help_menu,
         link_preview=False,
     )
 
@@ -425,7 +433,7 @@ async def on_plug_in_callback_query_handler(event):
     await event.edit(
         get_string("inline_5"),
         file=_file_to_replace,
-        buttons=Button.inline("Oᴘᴇɴ Mᴀɪɴ Mᴇɴᴜ Aɢᴀɪɴ", data="open"),
+        buttons=Button.inline("Oᴘᴇɴ Aɢᴀɪɴ", data="open"),
     )
 
 
@@ -461,7 +469,7 @@ async def on_plug_in_callback_query_handler(event):
         ],
     ]
     try:
-        if event.query.user_id in sed:
+        if str(event.query.user_id) in owner_and_sudos():
             await event.edit(
                 reply_pop_up_alert,
                 buttons=buttons,
@@ -520,7 +528,7 @@ async def on_plug_in_callback_query_handler(event):
         ],
     ]
     try:
-        if event.query.user_id in sed:
+        if str(event.query.user_id) in owner_and_sudos():
             await event.edit(
                 reply_pop_up_alert,
                 buttons=buttons,

plugins/_ultroid.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

plugins/_userlogs.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -107,7 +107,11 @@ async def _(e):
 async def when_asst_added_to_chat(event):
     if event.user_added:
         user = await event.get_user()
-        chat = (await event.get_chat()).title
+        chat = await event.get_chat()
+        if chat.username:
+            chat = f"[{chat.title}](https://t.me/{chat.username}/{event.action_message.id})"
+        else:
+            chat = f"[{chat.title}](https://t.me/c/{chat.id}/{event.action_message.id})"
         tmp = event.added_by
         if user.is_self:
             buttons = Button.inline("Leave Chat", data=f"leave_ch_{event.chat_id}|bot")
@@ -125,7 +129,11 @@ async def when_asst_added_to_chat(event):
 async def when_ultd_added_to_chat(event):
     if event.user_added:
         user = await event.get_user()
-        chat = (await event.get_chat()).title
+        chat = await event.get_chat()
+        if chat.username:
+            chat = f"[{chat.title}](https://t.me/{chat.username}/{event.action_message.id})"
+        else:
+            chat = f"[{chat.title}](https://t.me/c/{chat.id}/{event.action_message.id})"
         tmp = event.added_by
         if user.is_self:
             buttons = Button.inline("Leave Chat", data=f"leave_ch_{event.chat_id}|user")
@@ -136,7 +144,11 @@ async def when_ultd_added_to_chat(event):
             )
     elif event.user_joined:
         user = await event.get_user()
-        chat = (await event.get_chat()).title
+        chat = await event.get_chat()
+        if chat.username:
+            chat = f"[{chat.title}](https://t.me/{chat.username}/{event.action_message.id})"
+        else:
+            chat = f"[{chat.title}](https://t.me/c/{chat.id}/{event.action_message.id})"
         if user.is_self:
             buttons = Button.inline("Leave Chat", data=f"leave_ch_{event.chat_id}|user")
             return await asst.send_message(

plugins/_wspr.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -22,7 +22,7 @@ from telethon.tl.types import UserStatusRecently as rec
 from . import *
 
 snap = {}
-buddhhu = []
+buddhhu = {}
 
 
 @ultroid_cmd(
@@ -32,8 +32,7 @@ async def _(e):
     if e.reply_to_msg_id:
         okk = (await e.get_reply_message()).sender_id
         try:
-            zyx = await ultroid_bot(gu(id=okk))
-            put = zyx.user.username
+            put = okk
         except ValueError as ex:
             return await eor(e, str(ex))
         except AttributeError:
@@ -57,16 +56,19 @@ async def _(e):
 
 
 @in_pattern("msg")
+@in_owner
 async def _(e):
     vvv = e.text
     zzz = vvv.split(" ", maxsplit=1)
     try:
         ggg = zzz[1]
         sed = ggg.split(" wspr ", maxsplit=1)
-        query = sed[0]
+        query = sed[0].replace(" ", "")
+        if query.isdigit():
+            query = int(query)
     except IndexError:
         return
-    meme = e.query.user_id
+    iuser = e.query.user_id
     try:
         desc = sed[1]
     except IndexError:
@@ -77,6 +79,7 @@ async def _(e):
             name = logi.user.first_name
             ids = logi.user.id
             username = logi.user.username
+            mention = f"[{name}](tg://user?id={ids})"
             x = logi.user.status
             bio = logi.about
             if isinstance(x, on):
@@ -93,11 +96,16 @@ async def _(e):
                 status = "Can't Tell"
             text = f"**Name:**    `{name}`\n"
             text += f"**Id:**    `{ids}`\n"
-            text += f"**Username:**    `{username}`\n"
+            if username:
+                text += f"**Username:**    `{username}`\n"
+                url = f"https://t.me/{username}"
+            else:
+                text += f"**Mention:**    `{mention}`\n"
+                url = f"tg://user?id={ids}"
             text += f"**Status:**    `{status}`\n"
             text += f"**About:**    `{bio}`"
             button = [
-                Button.url("Private", url=f"t.me/{username}"),
+                Button.url("Private", url=url),
                 Button.switch_inline(
                     "Secret msg",
                     query=f"msg {query} wspr Hello 👋",
@@ -120,8 +128,8 @@ async def _(e):
         try:
             logi = await ultroid_bot.get_entity(query)
             button = [
-                Button.inline("Secret Msg", data=f"dd_{logi.id}"),
-                Button.inline("Delete Msg", data=f"del"),
+                Button.inline("Secret Msg", data=f"dd_{e.id}"),
+                Button.inline("Delete Msg", data=f"del_{e.id}"),
             ]
             us = logi.username
             sur = e.builder.article(
@@ -130,9 +138,8 @@ async def _(e):
                 text=get_string("wspr_1").format(us),
                 buttons=button,
             )
-            buddhhu.append(meme)
-            buddhhu.append(logi.id)
-            snap.update({logi.id: desc})
+            buddhhu.update({e.id: [logi.id, iuser]})
+            snap.update({e.id: desc})
         except ValueError:
             sur = e.builder.article(
                 title="Type ur msg",
@@ -148,21 +155,22 @@ async def _(e):
 )
 async def _(e):
     ids = int(e.pattern_match.group(1).decode("UTF-8"))
-    if e.sender_id in buddhhu:
-        await e.answer(snap[ids], alert=True)
+    if buddhhu.get(ids):
+        if e.sender_id in buddhhu[ids]:
+            await e.answer(snap[ids], alert=True)
+        else:
+            await e.answer("Not For You", alert=True)
     else:
-        await e.answer("Not For You", alert=True)
+        await e.answer("Message Deleted", alert=True)
 
 
-@callback("del")
+@callback(re.compile("del_(.*)"))
 async def _(e):
-    if e.sender_id in buddhhu:
-        for k in buddhhu:
-            try:
-                del snap[k]
-                buddhhu.clear()
-            except KeyError:
-                pass
+    ids = int(e.pattern_match.group(1).decode("UTF-8"))
+    if buddhhu.get(ids):
+        if e.sender_id in buddhhu[ids]:
+            buddhhu.pop(ids)
+            snap.pop(ids)
             try:
                 await e.edit(get_string("wspr_2"))
             except np:

plugins/admintools.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -50,6 +50,7 @@ import asyncio
 from telethon.errors import BadRequestError
 from telethon.errors.rpcerrorlist import ChatNotModifiedError, UserIdInvalidError
 from telethon.tl.functions.channels import DeleteUserHistoryRequest, EditAdminRequest
+from telethon.tl.functions.channels import ExportMessageLinkRequest as ExpLink
 from telethon.tl.functions.messages import SetHistoryTTLRequest
 from telethon.tl.types import ChatAdminRights, InputMessagesFilterPinned
 
@@ -236,10 +237,7 @@ async def kck(ult):
     pattern="pin ?(.*)",
 )
 async def pin(msg):
-    if not msg.is_private:
-        # for pin(s) in private messages
-        await msg.get_chat()
-    cht = await ultroid_bot.get_entity(msg.chat_id)
+    mss = "`Pinned.`"
     xx = msg.reply_to_msg_id
     tt = msg.text
     try:
@@ -250,22 +248,24 @@ async def pin(msg):
         pass
     if not msg.is_reply:
         return
+    if not msg.is_private:
+        link = (await ultroid_bot(ExpLink(msg.chat_id, xx))).link
+        mss = f"`Pinned` [This Message]({link})"
     ch = msg.pattern_match.group(1)
     if ch != "silent":
         slnt = True
-        x = await eor(msg, get_string("com_1"))
         try:
             await ultroid_bot.pin_message(msg.chat_id, xx, notify=slnt)
         except BadRequestError:
-            return await x.edit("`Hmm, I'm have no rights here...`")
+            return await eor(msg, "`Hmm.. Guess I have no rights here!`")
         except Exception as e:
-            return await x.edit(f"**ERROR:**`{str(e)}`")
-        await x.edit(f"`Pinned` [this message](https://t.me/c/{cht.id}/{xx})!")
+            return await eor(msg, f"**ERROR:**`{str(e)}`")
+        await eor(msg, mss)
     else:
         try:
             await ultroid_bot.pin_message(msg.chat_id, xx, notify=False)
         except BadRequestError:
-            return await eor(msg, "`Hmm, I'm have no rights here...`")
+            return await eor(msg, "`Hmm.. Guess I have no rights here!`")
         except Exception as e:
             return await eor(msg, f"**ERROR:**`{str(e)}`")
         try:
@@ -288,14 +288,14 @@ async def unp(ult):
         try:
             await ultroid_bot.unpin_message(ult.chat_id, msg)
         except BadRequestError:
-            return await xx.edit("`Hmm, I'm have no rights here...`")
+            return await xx.edit("`Hmm.. Guess I have no rights here!`")
         except Exception as e:
             return await xx.edit(f"**ERROR:**\n`{str(e)}`")
     elif ch == "all":
         try:
             await ultroid_bot.unpin_message(ult.chat_id)
         except BadRequestError:
-            return await xx.edit("`Hmm, I'm have no rights here...`")
+            return await xx.edit("`Hmm.. Guess I have no rights here!`")
         except Exception as e:
             return await xx.edit(f"**ERROR:**`{str(e)}`")
     else:
@@ -424,7 +424,9 @@ async def _(e):
 async def get_pinned(event):
     x = await eor(event, get_string("com_1"))
     chat_id = (str(event.chat_id)).replace("-100", "")
-    chat_name = (await event.get_chat()).title
+    chat_name = "This Chat"
+    if not event.is_private:
+        chat_name = (await event.get_chat()).title
     tem = ""
     c = 0
 
@@ -480,6 +482,3 @@ async def autodelte(ult):  # Tg Feature
     except ChatNotModifiedError:
         return await eod(ult, f"Auto Delete Setting is Already same to `{match}`")
     await eor(ult, f"Auto Delete Status Changed to {match} !")
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/afk.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -249,6 +249,3 @@ async def _(event):
                 await ultroid_bot.send_message(LOG, get_string("afk_8"))
         except BaseException:
             pass
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/anime.py

@@ -0,0 +1,81 @@
+# Ultroid - UserBot
+# Copyright (C) 2021 TeamUltroid
+#
+# This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
+# PLease read the GNU Affero General Public License in
+# <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
+
+"""
+✘ Commands Available -
+
+• `{i}airing`
+   Get details about currently airing anime.
+
+• `{i}anime <anime name>`
+   Get anime details from anilist.
+
+• `{i}character <character name>`
+   Fetch anime character details.
+"""
+
+from os import remove
+
+import jikanpy
+
+from . import *
+
+
+@ultroid_cmd(pattern="airing")
+async def airing_anime(event):
+    try:
+        await eor(event, airing_eps())
+    except BaseException:
+        info = airing_eps()
+        t = info.replace("*", "").replace("`", "")
+        with open("animes.txt", "w") as f:
+            f.write(t)
+        await event.reply(file="animes.txt")
+        remove("anime.txt")
+        await event.delete()
+
+
+"""
+@ultroid_cmd(pattern="anime ?(.*)")
+async def anilist(event):
+    name = event.pattern_match.group(1)
+    x = await eor(event, get_string("com_1"))
+    if not name:
+        return await eod(x, "`Enter a anime name!`", time=5)
+    banner, title, year, episodes, info = get_anime_src_res(name)
+    msg = f"**{title}**\n{year} | {episodes} Episodes.\n\n{info}"
+    await event.reply(msg, file=banner, link_preview=True)
+    await x.delete()
+"""
+
+
+@ultroid_cmd(pattern="character ?(.*)")
+async def anime_char_search(event):
+    xx = await eor(event, get_string("com_1"))
+    char_name = event.pattern_match.group(1)
+    if not char_name:
+        await eod(xx, "`Enter the name of a character too please!`", time=5)
+    jikan = jikanpy.jikan.Jikan()
+    try:
+        s = jikan.search("character", char_name)
+    except jikanpy.exceptions.APIException:
+        return await eod(xx, "`Couldn't find character!`", time=5)
+    a = s["results"][0]["mal_id"]
+    char_json = jikan.character(a)
+    pic = char_json["image_url"]
+    msg = f"**[{char_json['name']}]({char_json['url']})**"
+    if char_json["name_kanji"] != "Japanese":
+        msg += f" [{char_json['name_kanji']}]\n"
+    else:
+        msg += "\n"
+    if char_json["nicknames"]:
+        nicknames_string = ", ".join(char_json["nicknames"])
+        msg += f"\n**Nicknames** : `{nicknames_string}`\n"
+    about = char_json["about"].split("\n", 1)[0].strip().replace("\n", "")
+    msg += f"\n**About**: __{about}__"
+    await event.reply(msg, file=pic, force_document=False)
+    await xx.delete()

plugins/antiflood.py

@@ -0,0 +1,137 @@
+# Ultroid - UserBot
+# Copyright (C) 2021 TeamUltroid
+#
+# This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
+# PLease read the GNU Affero General Public License in
+# <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
+
+"""
+✘ Commands Available -
+
+• `{i}setflood <integer>`
+    Set flood limit in a chat.
+
+• `{i}remflood`
+    Remove flood limit from a chat.
+
+• `{i}getflood`
+    Get flood limit of a chat.
+"""
+
+
+import re
+
+from pyUltroid.functions.antiflood_db import (
+    get_flood,
+    get_flood_limit,
+    rem_flood,
+    set_flood,
+)
+from telethon.events import NewMessage as NewMsg
+
+from . import *
+
+_check_flood = {}
+
+
+if Redis("ANTIFLOOD") is not (None or ""):
+
+    @ultroid_bot.on(
+        NewMsg(
+            chats=list(get_flood().keys()),
+        ),
+    )
+    async def flood_checm(event):
+        count = 1
+        chat = (await event.get_chat()).title
+        if event.chat_id in _check_flood.keys():
+            if event.sender_id == [x for x in _check_flood[event.chat_id].keys()][0]:
+                count = _check_flood[event.chat_id][event.sender_id]
+                _check_flood[event.chat_id] = {event.sender_id: count + 1}
+            else:
+                _check_flood[event.chat_id] = {event.sender_id: count}
+        else:
+            _check_flood[event.chat_id] = {event.sender_id: count}
+        if await check_if_admin(event) or event.sender.bot:
+            return
+        if str(event.sender_id) in DEVLIST:
+            return
+        if _check_flood[event.chat_id][event.sender_id] >= int(
+            get_flood_limit(event.chat_id)
+        ):
+            try:
+                name = event.sender.first_name
+                await event.client.edit_permissions(
+                    event.chat_id, event.sender_id, send_messages=False
+                )
+                del _check_flood[event.chat_id]
+                await event.reply("#AntiFlood\n\n`You have been muted.`")
+                await asst.send_message(
+                    int(Redis("LOG_CHANNEL")),
+                    f"#Antiflood\n\n`Muted `[{name}](tg://user?id={event.sender_id})` in {chat}`",
+                    buttons=Button.inline(
+                        "Unmute", data=f"anti_{event.sender_id}_{event.chat_id}"
+                    ),
+                )
+            except BaseException:
+                pass
+
+
+@callback(
+    re.compile(
+        "anti_(.*)",
+    ),
+)
+async def unmuting(e):
+    ino = (e.data_match.group(1)).decode("UTF-8").split("_")
+    user = int(ino[0])
+    chat = int(ino[1])
+    user_name = (await ultroid_bot.get_entity(user)).first_name
+    chat_title = (await ultroid_bot.get_entity(chat)).title
+    await ultroid_bot.edit_permissions(chat, user, send_messages=True)
+    await e.edit(
+        f"#Antiflood\n\n`Unmuted `[{user_name}](tg://user?id={user})` in {chat_title}`"
+    )
+
+
+@ultroid_cmd(
+    pattern="setflood ?(\\d+)",
+    admins_only=True,
+)
+async def setflood(e):
+    input = e.pattern_match.group(1)
+    if not input:
+        return await eod(e, "`What?`")
+    if not input.isdigit():
+        return await eod(e, "`Invalid Input`")
+    m = set_flood(e.chat_id, input)
+    if m:
+        return await eod(
+            e, f"`Successfully Updated Antiflood Settings to {input} in this chat.`"
+        )
+
+
+@ultroid_cmd(
+    pattern="remflood$",
+    admins_only=True,
+)
+async def remove_flood(e):
+    hmm = rem_flood(e.chat_id)
+    try:
+        del _check_flood[e.chat_id]
+    except BaseException:
+        pass
+    if hmm:
+        return await eod(e, "`Antiflood Settings Disabled`")
+    await eod(e, "`No flood limits in this chat.`")
+
+
+@ultroid_cmd(
+    pattern="getflood$",
+    admins_only=True,
+)
+async def getflood(e):
+    ok = get_flood_limit(e.chat_id)
+    if ok:
+        return await eod(e, f"`Flood limit for this chat is {ok}.`")
+    await eod(e, "`No flood limits in this chat.`")

plugins/ascii.py

@@ -0,0 +1,39 @@
+# Ultroid - UserBot
+# Copyright (C) 2021 TeamUltroid
+#
+# This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
+# PLease read the GNU Affero General Public License in
+# <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
+
+"""
+✘ Commands Available -
+
+• `{i}ascii <reply image>`
+    Convert replied image into html.
+"""
+
+
+import os
+
+from img2html.converter import Img2HTMLConverter
+
+from . import *
+
+
+@ultroid_cmd(
+    pattern="ascii ?(.*)",
+)
+async def _(e):
+    if not e.reply_to_msg_id:
+        return await eor(e, "`Reply to image.`")
+    m = await eor(e, "`Converting to html...`")
+    img = await (await e.get_reply_message()).download_media()
+    char = "■" if not e.pattern_match.group(1) else e.pattern_match.group(1)
+    converter = Img2HTMLConverter(char=char)
+    html = converter.convert(img)
+    with open("html.html", "w") as t:
+        t.write(html)
+    await e.client.send_file(e.chat_id, "html.html", reply_to=e.reply_to_msg_id)
+    await m.delete()
+    os.remove(img)
+    os.remove("html.html")

plugins/asst_cmd.py

@@ -0,0 +1,95 @@
+# Ultroid - UserBot
+# Copyright (C) 2021 TeamUltroid
+#
+# This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
+# PLease read the GNU Affero General Public License in
+# <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
+
+"""
+✘ Commands Available -
+
+•`{i}addcmd <new cmd> <reply>`
+   It will set new cmd for your assistant bot with that reply message.
+
+•`{i}remcmd <cmd name>`
+   It will remove your cmd.
+
+•`{i}listcmd`
+   To Get list of all your custom cmd.
+"""
+
+import os
+
+from pyUltroid.functions.asstcmd_db import *
+from telegraph import upload_file as uf
+from telethon.utils import pack_bot_file_id
+
+from . import *
+
+
+@ultroid_cmd(pattern="addcmd ?(.*)")
+async def ac(e):
+    wrd = (e.pattern_match.group(1)).lower()
+    wt = await e.get_reply_message()
+    if not (wt and wrd):
+        return await eod(e, "`Use this Command with Reply and word to use a command.`")
+    if "/" in wrd:
+        wrd = wrd.replace("/", "")
+    if wt and wt.media:
+        wut = mediainfo(wt.media)
+        if wut.startswith(("pic", "gif")):
+            dl = await bot.download_media(wt.media)
+            variable = uf(dl)
+            os.remove(dl)
+            m = "https://telegra.ph" + variable[0]
+        elif wut == "video":
+            if wt.media.document.size > 8 * 1000 * 1000:
+                return await eod(x, "`Unsupported Media`")
+            else:
+                dl = await bot.download_media(wt.media)
+                variable = uf(dl)
+                os.remove(dl)
+                m = "https://telegra.ph" + variable[0]
+        else:
+            m = pack_bot_file_id(wt.media)
+        if wt.text:
+            add_cmd(wrd, wt.text, m)
+        else:
+            add_cmd(wrd, None, m)
+    else:
+        add_cmd(wrd, wt.text, None)
+    await eor(e, f"Done Command : `/{wrd}` saved.")
+
+
+@ultroid_cmd(pattern="remcmd ?(.*)")
+async def rc(e):
+    wrd = (e.pattern_match.group(1)).lower()
+    if not wrd:
+        return await eod(e, "`Give me the command which you want to remove.`")
+    if wrd.startswith("/"):
+        wrd = wrd.replace("/", "")
+    rem_cmd(wrd)
+    await eor(e, f"Done Command: `/{wrd}` Removed.")
+
+
+@ultroid_cmd(pattern="listcmd$")
+async def lscmd(e):
+    if list_cmds():
+        ok = "**ALL ASSISTANT CMDS**\n\n"
+        for x in list_cmds():
+            ok += "/" + x + "\n"
+        return await eor(e, ok)
+    return await eor(e, "No commands found")
+
+
+@asst.on(events.NewMessage())
+async def ascmds(e):
+    xx = e.text
+    if not xx.startswith("/"):
+        return
+    xx = (xx.replace("/", "")).lower()
+    if " " in xx:
+        xx = xx.split(" ")[0]
+    if cmd_reply(xx):
+        msg, media = cmd_reply(xx)
+        await e.reply(msg, file=media)

plugins/autocorrect.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -53,6 +53,3 @@ async def gramme(event):
         await event.edit(res)
     except BaseException:
         pass
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/autopic.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -37,6 +37,11 @@ async def autopic(e):
         return await eod(e, get_string("autopic_2").format(search))
     await eor(e, get_string("autopic_3").format(search))
     udB.set("AUTOPIC", "True")
+    ST = udB.get("SLEEP_TIME")
+    if ST:
+        SLEEP_TIME = int(ST)
+    else:
+        SLEEP_TIME = 1221
     while True:
         for lie in clls:
             ge = udB.get("AUTOPIC")
@@ -56,7 +61,7 @@ async def autopic(e):
             file = await ultroid_bot.upload_file(kar)
             await ultroid_bot(UploadProfilePhotoRequest(file))
             os.remove(kar)
-            await asyncio.sleep(1111)
+            await asyncio.sleep(SLEEP_TIME)
 
 
 @ultroid_cmd(pattern="stoppic$")
@@ -66,6 +71,3 @@ async def stoppo(ult):
         return await eod(ult, "AUTOPIC was not in used !!")
     udB.set("AUTOPIC", "None")
     await eod(ult, "AUTOPIC Stopped !!")
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/blacklist.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -27,11 +27,8 @@ from pyUltroid.functions.blacklist_db import *
 from . import *
 
 
-@ultroid_cmd(pattern="blacklist ?(.*)")
+@ultroid_cmd(pattern="blacklist ?(.*)", admins_only=True)
 async def af(e):
-    if e.is_group:
-        if not e._chat.admin_rights:
-            return await eod(e, "`You are Not Admin Here`")
     wrd = e.pattern_match.group(1)
     chat = e.chat_id
     if not (wrd):
@@ -43,11 +40,8 @@ async def af(e):
     await eor(e, f"Done : `{wrd}` Blacklisted here.")
 
 
-@ultroid_cmd(pattern="remblacklist ?(.*)")
+@ultroid_cmd(pattern="remblacklist ?(.*)", admins_only=True)
 async def rf(e):
-    if e.is_group:
-        if not e._chat.admin_rights:
-            return await eod(e, "`You are Not Admin Here`")
     wrd = e.pattern_match.group(1)
     chat = e.chat_id
     if not wrd:
@@ -59,11 +53,8 @@ async def rf(e):
     await eor(e, f"Done : `{wrd}` Removed from Blacklist.")
 
 
-@ultroid_cmd(pattern="listblacklist")
+@ultroid_cmd(pattern="listblacklist$", admins_only=True)
 async def lsnote(e):
-    if e.is_group:
-        if not e._chat.admin_rights:
-            return await eod(e, "`You are Not Admin Here`")
     x = list_blacklist(e.chat_id)
     if x:
         sd = "Blacklist Found In This Chats Are\n\n"
@@ -83,6 +74,3 @@ async def bl(e):
             if z in yy:
                 await e.delete()
                 break
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/bot.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -34,30 +34,13 @@ import time
 from datetime import datetime as dt
 from platform import python_version as pyver
 
-import heroku3
-import re
-import requests
 from git import Repo
-from pyUltroid import __version__ as UltVer
+from pyUltroid.version import __version__ as UltVer
 from telethon import __version__, events
 from telethon.errors.rpcerrorlist import ChatSendMediaForbiddenError
 
 from . import *
 
-HEROKU_API = None
-HEROKU_APP_NAME = None
-
-try:
-    if Var.HEROKU_API and Var.HEROKU_APP_NAME:
-        HEROKU_API = Var.HEROKU_API
-        HEROKU_APP_NAME = Var.HEROKU_APP_NAME
-        Heroku = heroku3.from_key(Var.HEROKU_API)
-        heroku_api = "https://api.heroku.com"
-        app = Heroku.app(Var.HEROKU_APP_NAME)
-except BaseException:
-    HEROKU_API = None
-    HEROKU_APP_NAME = None
-
 
 @ultroid_cmd(
     pattern="alive$",
@@ -99,8 +82,7 @@ async def lol(ult):
             await eor(ult, als, link_preview=False)
 
 
-
-@ultroid_bot.on(events.NewMessage(pattern=re.escape(f"{HNDLR}ping"))) 
+@ultroid_bot.on(events.NewMessage(pattern=f"\\{HNDLR}ping$"))
 async def _(event):
     if event.fwd_from:
         return
@@ -125,32 +107,22 @@ async def cmds(event):
     pattern="restart$",
 )
 async def restartbt(ult):
+    ok = await eor(ult, "`Restarting...`")
     if Var.HEROKU_API:
-        await restart(ult)
+        await restart(ok)
     else:
         await bash("pkill python3 && python3 -m pyUltroid")
 
 
-@ultroid_cmd(pattern="shutdown")
+@ultroid_cmd(pattern="shutdown$")
 async def shutdownbot(ult):
     if not ult.out:
         if not is_fullsudo(ult.sender_id):
             return await eod(ult, "`This Command Is Sudo Restricted.`")
-    try:
-        dyno = ult.text.split(" ", maxsplit=1)[1]
-    except IndexError:
-        dyno = None
-    if dyno:
-        if dyno not in ["userbot", "vcbot", "web", "worker"]:
-            await eor(ult, "Invalid Dyno Type specified !")
-            return
-        await shutdown(ult, dyno)
-    else:
-        await shutdown(ult)
+    await shutdown(ult)
 
 
-
-@ultroid_bot.on(events.NewMessage(pattern=re.escape(f"{HNDLR}logs")))
+@ultroid_bot.on(events.NewMessage(pattern=f"\\{HNDLR}logs$"))
 async def _(event):
     if event.fwd_from:
         return
@@ -166,52 +138,3 @@ async def _(event):
         await def_logs(event)
     else:
         await def_logs(event)
-
-
-async def heroku_logs(event):
-    if HEROKU_API is None and HEROKU_APP_NAME is None:
-        return await eor(
-            event, "Please set `HEROKU_APP_NAME` and `HEROKU_API` in vars."
-        )
-    await eor(event, "`Downloading Logs...`")
-    ok = app.get_log()
-    with open("ultroid-heroku.log", "w") as log:
-        log.write(ok)
-    key = (
-        requests.post("https://nekobin.com/api/documents", json={"content": ok})
-        .json()
-        .get("result")
-        .get("key")
-    )
-    url = f"https://nekobin.com/{key}"
-    await ultroid.send_file(
-        event.chat_id,
-        file="ultroid-heroku.log",
-        thumb="resources/extras/ultroid.jpg",
-        caption=f"**Ultroid Heroku Logs.**\nPasted [here]({url}) too!",
-    )
-    os.remove("ultroid-heroku.log")
-
-
-async def def_logs(ult):
-    xx = await eor(ult, "`Processing...`")
-    with open("ultroid.log") as f:
-        k = f.read()
-    key = (
-        requests.post("https://nekobin.com/api/documents", json={"content": k})
-        .json()
-        .get("result")
-        .get("key")
-    )
-    url = f"https://nekobin.com/{key}"
-    await ultroid.send_file(
-        ult.chat_id,
-        file="ultroid.log",
-        thumb="resources/extras/ultroid.jpg",
-        caption=f"**Ultroid Logs.**\nPasted [here]({url}) too!",
-    )
-    await xx.edit("Done")
-    await xx.delete()
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/broadcast.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -248,6 +248,3 @@ async def sending(event):
                     )
                 except BaseException:
                     pass
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/calculator.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -141,6 +141,3 @@ async def _(e):
     lst = list(zip(tultd[::4], tultd[1::4], tultd[2::4], tultd[3::4]))
     lst.append([Button.inline("=", data="calc=")])
     await e.edit("Noice Inline Calculator", buttons=lst)
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/carbon.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -10,13 +10,14 @@
 
 • `{i}carbon <text/reply to msg/reply to document>`
     Carbonise the text with default settings.
+
 • `{i}rcarbon <text/reply to msg/reply to document>`
     Carbonise the text, with random bg colours.
 """
 
-import os
 import random
 
+import requests
 from carbonnow import Carbon
 
 from . import *
@@ -190,16 +191,19 @@ async def crbn(event):
             code = temp.message
     else:
         code = event.text.split(" ", maxsplit=1)[1]
-    carbon = Carbon(code=code)
-    xx = await carbon.save("ultroid_carbon")
+    webs = requests.get("https://carbonara.vercel.app/api/cook")
+    if webs.status_code == 502:
+        return await eor(
+            event, "`Temporary Server Error has Occured !\nPlease Try Again Later`"
+        )
+    carbon = Carbon(base_url="https://carbonara.vercel.app/api/cook", code=code)
+    xx = await carbon.memorize("ultroid_carbon")
     await xxxx.delete()
     await ultroid_bot.send_file(
         event.chat_id,
         xx,
         caption=f"Carbonised by [{OWNER_NAME}](tg://user?id={OWNER_ID})",
-        force_document=True,
     )
-    os.remove(xx)
 
 
 @ultroid_cmd(
@@ -220,16 +224,18 @@ async def crbn(event):
     else:
         code = event.text.split(" ", maxsplit=1)[1]
     col = random.choice(all_col)
-    carbon = Carbon(code=code, background=col)
-    xx = await carbon.save("ultroid_carbon")
+    webs = requests.get("https://carbonara.vercel.app/api/cook")
+    if webs.status_code == 502:
+        return await eor(
+            event, "`Temporary Server Error has Occured !\nPlease Try Again Later`"
+        )
+    carbon = Carbon(
+        base_url="https://carbonara.vercel.app/api/cook", code=code, background=col
+    )
+    xx = await carbon.memorize("ultroid_carbon")
     await xxxx.delete()
     await ultroid_bot.send_file(
         event.chat_id,
         xx,
         caption=f"Carbonised by [{OWNER_NAME}](tg://user?id={OWNER_ID})",
-        force_document=True,
     )
-    os.remove(xx)
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/channelhacks.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -87,7 +87,7 @@ async def _(e):
             return
     async for msg in ultroid_bot.iter_messages(int(c), reverse=True):
         try:
-            await asyncio.sleep(1.3)
+            await asyncio.sleep(2)
             await ultroid_bot.send_message(int(d), msg)
         except BaseException:
             pass
@@ -260,6 +260,3 @@ async def list_all(event):
             await x.delete()
     else:
         await x.edit(msg)
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/chats.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -38,8 +38,6 @@ from . import *
     groups_only=True,
 )
 async def _(e):
-    if BOT_MODE:
-        return await eor(e, "You Cant Use This Command in BOT_MODE")
     xx = await eor(e, "`Processing...`")
     try:
         await e.client(DeleteChannelRequest(e.chat_id))
@@ -71,8 +69,6 @@ async def _(e):
     pattern="create (b|g|c)(?: |$)(.*)",
 )
 async def _(e):
-    if BOT_MODE:
-        return await eor(e, "You Cant use this Command in BOT_MODE")
     type_of_group = e.pattern_match.group(1)
     group_name = e.pattern_match.group(2)
     xx = await eor(e, "`Processing...`")
@@ -123,6 +119,3 @@ async def _(e):
             )
         except Exception as ex:
             await xx.edit(str(ex))
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/clean_action.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -63,6 +63,3 @@ async def _(event):
             await event.delete()
         except BaseException:
             pass
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/compressor.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -27,6 +27,7 @@ from datetime import datetime as dt
 
 from hachoir.metadata import extractMetadata
 from hachoir.parser import createParser
+from telethon.errors.rpcerrorlist import MessageNotModifiedError
 from telethon.tl.types import DocumentAttributeVideo
 
 from . import *
@@ -74,16 +75,10 @@ async def _(e):
             with open(progress, "w") as fk:
                 pass
             proce = await asyncio.create_subprocess_shell(
-                f'ffmpeg -hide_banner -loglevel quiet -progress {progress} -i """{file.name}""" -preset ultrafast -c:v libx265 -crf {crf} -map 0:v -c:a aac -map 0:a -c:s copy -map 0:s? """{out}""" -y',
+                f'ffmpeg -hide_banner -loglevel quiet -progress {progress} -i """{file.name}""" -preset ultrafast -vcodec libx265 -crf {crf} """{out}""" -y',
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
             )
-            if proce.returncode is None:
-                proce = await asyncio.create_subprocess_shell(
-                    f'ffmpeg -hide_banner -loglevel quiet -progress {progress} -i """{file.name}""" -preset ultrafast -vcodec libx265 -crf {crf} """{out}""" -y',
-                    stdout=asyncio.subprocess.PIPE,
-                    stderr=asyncio.subprocess.PIPE,
-                )
             while proce.returncode != 0:
                 await asyncio.sleep(3)
                 with open(progress, "r+") as fil:
@@ -96,13 +91,31 @@ async def _(e):
                     if len(size):
                         size = int(size[-1])
                         per = elapse * 100 / int(total_frames)
-                        progress_str = "`[{0}{1}] {2}%\n`".format(
+                        time_diff = time.time() - int(d_time)
+                        speed = round(elapse / time_diff, 2)
+                        eta = time_formatter(
+                            ((int(total_frames) - elapse) / speed) * 1000
+                        )
+                        text = f"`Compressing {file_name} at {crf} CRF.\n`"
+                        progress_str = "`[{0}{1}] {2}%\n\n`".format(
                             "".join(["●" for i in range(math.floor(per / 5))]),
                             "".join(["" for i in range(20 - math.floor(per / 5))]),
                             round(per, 2),
                         )
                         e_size = humanbytes(size)
-                        await xxx.edit(progress_str + "\n" + "`" + e_size + "`")
+                        try:
+                            await xxx.edit(
+                                text
+                                + progress_str
+                                + "`"
+                                + e_size
+                                + "`"
+                                + "\n\n`"
+                                + eta
+                                + "`"
+                            )
+                        except MessageNotModifiedError:
+                            pass
             os.remove(file.name)
             c_size = os.path.getsize(out)
             f_time = time.time()
@@ -158,6 +171,3 @@ async def _(e):
             await eod(e, "`Reply To Video File Only`")
     else:
         await eod(e, "`Reply To Video File Only`")
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/converter.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -32,7 +32,6 @@ import os
 import time
 
 import cv2
-import requests
 from PIL import Image
 from telegraph import upload_file as uf
 from telethon.tl.types import MessageMediaDocument as doc
@@ -43,7 +42,9 @@ from . import *
 opn = []
 
 
-@ultroid_cmd(pattern="thumbnail$")
+@ultroid_cmd(
+    pattern="thumbnail$",
+)
 async def _(e):
     r = await e.get_reply_message()
     pop = "`Reply to img or file with thumbnail.`"
@@ -64,7 +65,9 @@ async def _(e):
     await eor(e, f"Added [This]({nn}) As Your Custom Thumbnail", link_preview=False)
 
 
-@ultroid_cmd(pattern="rename ?(.*)")
+@ultroid_cmd(
+    pattern="rename ?(.*)",
+)
 async def imak(event):
     reply = await event.get_reply_message()
     t = time.time()
@@ -100,7 +103,9 @@ async def imak(event):
     await xx.delete()
 
 
-@ultroid_cmd(pattern="mtoi$")
+@ultroid_cmd(
+    pattern="mtoi$",
+)
 async def imak(event):
     reply = await event.get_reply_message()
     if not (reply and (reply.media)):
@@ -122,7 +127,9 @@ async def imak(event):
     os.remove(image)
 
 
-@ultroid_cmd(pattern="mtos$")
+@ultroid_cmd(
+    pattern="mtos$",
+)
 async def smak(event):
     reply = await event.get_reply_message()
     if not (reply and (reply.media)):
@@ -145,10 +152,12 @@ async def smak(event):
 
 
 @ultroid_cmd(
-    pattern="doc",
+    pattern="doc ?(.*)",
 )
 async def _(event):
-    input_str = event.text[5:]
+    input_str = event.pattern_match.group(1)
+    if not input_str:
+        return await eod(event, "`Bsdk Give Name.`")
     xx = await eor(event, get_string("com_1"))
     if event.reply_to_msg_id:
         a = await event.get_reply_message()
@@ -175,28 +184,26 @@ async def _(event):
         a = await event.get_reply_message()
         if a.media:
             b = await a.download_media()
-            c = open(b)
-            d = c.read()
-            c.close()
+            try:
+                c = open(b)
+                d = c.read()
+                c.close()
+            except UnicodeDecodeError:
+                return await eod(xx, "`Not A Readable File.`")
             try:
                 await xx.edit(f"```{d}```")
             except BaseException:
-                key = (
-                    requests.post(
-                        "https://nekobin.com/api/documents", json={"content": d}
+                what, key = get_paste(message)
+                if "neko" in what:
+                    await xx.edit(
+                        f"**MESSAGE EXCEEDS TELEGRAM LIMITS**\n\nSo Pasted It On [NEKOBIN](https://nekobin.com/{key})"
+                    )
+                elif "dog" in what:
+                    await xx.edit(
+                        f"**MESSAGE EXCEEDS TELEGRAM LIMITS**\n\nSo Pasted It On [DOGBIN](https://del.dog/{key})"
                     )
-                    .json()
-                    .get("result")
-                    .get("key")
-                )
-                await xx.edit(
-                    f"**MESSAGE EXCEEDS TELEGRAM LIMITS**\n\nSo Pasted It On [NEKOBIN](https://nekobin.com/{key})"
-                )
             os.remove(b)
         else:
             return await eod(xx, "`Reply to a readable file`", time=5)
     else:
         return await eod(xx, "`Reply to a readable file`", time=5)
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/core.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -108,6 +108,3 @@ async def load(event):
             f"**Could not load** `{shortname}` **because of the following error.**\n`{str(e)}`",
             time=3,
         )
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/dayevents.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -41,6 +41,3 @@ async def diela(e):
     for eve in ml[:5]:
         te += "• " + f'[{eve.text}]({eve["href"]})\n'
     await m.edit(te, link_preview=False)
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/deezer.py

@@ -0,0 +1,13 @@
+# Ultroid - UserBot
+# Copyright (C) 2021 TeamUltroid
+#
+# This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
+# PLease read the GNU Affero General Public License in
+# <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
+
+"""
+✘ Commands Available -
+
+• `{i}deez <search query (| flac)>`
+    Download songs from Deezer
+"""

plugins/devtools.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -37,13 +37,14 @@ from . import *
     pattern="sysinfo$",
 )
 async def _(e):
-    await eor(e, "`Sending...`")
+    xx = await eor(e, "`Sending...`")
     x, y = await bash("neofetch|sed 's/\x1B\\[[0-9;\\?]*[a-zA-Z]//g' >> neo.txt")
     with open("neo.txt", "r") as neo:
         p = (neo.read()).replace("\n\n", "")
-    ok = Carbon(code=p)
+    ok = Carbon(base_url="https://carbonara.vercel.app/api/cook", code=p)
     haa = await ok.save("neofetch")
     await e.client.send_file(e.chat_id, haa)
+    await xx.delete()
     remove("neofetch.jpg")
     remove("neo.txt")
 
@@ -93,7 +94,7 @@ async def _(event):
             )
             await xx.delete()
     else:
-        await eor(xx, OUT)
+        await xx.edit(OUT)
 
 
 p = print  # ignore: pylint
@@ -165,7 +166,7 @@ async def _(event):
             )
             await xx.delete()
     else:
-        await eor(xx, final_output)
+        await xx.edit(final_output)
 
 
 async def aexec(code, event):
@@ -178,6 +179,3 @@ async def aexec(code, event):
     )
 
     return await locals()["__aexec"](event, event.client)
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/dm.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -16,6 +16,8 @@ from . import *
 
 @ultroid_cmd(pattern="dm ?(.*)")
 async def dm(e):
+    if not e.out and not is_fullsudo(e.sender_id):
+        return await eor(e, "`This Command is Full Sudo Restricted..`")
     if len(e.text) > 3:
         if not e.text[3] == " ":  # weird fix
             return
@@ -43,6 +45,3 @@ async def dm(e):
             "`{i}help dm`",
             time=4,
         )
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/download_upload.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -84,7 +84,7 @@ async def download(event):
                     ),
                 ),
             )
-    e = datetime.now()
+    e = dt.now()
     t = time_formatter(((e - s).seconds) * 1000)
     if t != "":
         await eor(xx, get_string("udl_2").format(file_name, t))
@@ -253,7 +253,7 @@ async def download(event):
                 )
         except Exception as ve:
             return await eor(xx, str(ve))
-    e = datetime.now()
+    e = dt.now()
     t = time_formatter(((e - s).seconds) * 1000)
     if t != "":
         if os.path.isdir(kk):
@@ -272,6 +272,3 @@ async def download(event):
             await eor(xx, f"Uploaded `{kk}` in `{t}`")
     else:
         await eor(xx, f"Uploaded `{kk}` in `0 second(s)`")
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/echo.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -93,6 +93,3 @@ async def lstecho(e):
         await eor(e, user)
     else:
         await eod(e, "`List is Empty, For echo`")
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/evaljs.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -79,6 +79,3 @@ async def evaluateJs(event):
                 startTime=start,
             )
         ).start()
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/extra.py

@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2020 TeamUltroid
+# Copyright (C) 2021 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -50,7 +50,7 @@ async def delete_it(delme):
         try:
             await msg_src.delete()
             await delme.delete()
-        except BaseException:
+        except Exception as e:
             await eod(
                 delme,
                 f"Couldn't delete the message.\n\n**ERROR:**\n`{str(e)}`",
@@ -113,6 +113,3 @@ async def _(e):
         )
     else:
         await e.delete()
-
-
-HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})