Ultroid v0.1 Updates 13.09.2021

Co-authored-by: Danish <[email protected]>
Co-authored-by: Aditya <[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]>

.env.sample

@@ -4,4 +4,9 @@ API_ID=
 API_HASH=
 SESSION=
 REDIS_URI=
-REDIS_PASSWORD=
+REDIS_PASSWORD=
+
+# [OPTIONAL]
+
+LOG_CHANNEL=
+BOT_TOKEN=

.github/ISSUE_TEMPLATE/bug-reports.yml

@@ -1,6 +1,6 @@
 name: Bug Report
 description: File a bug report
-title: "[BUG REPORT]: "
+title: "[BUG REPORT]"
 labels: [bug]
 assignees:
   - xditya

.github/workflows/greetings.yml

@@ -0,0 +1,16 @@
+name: Greetings
+
+on: [pull_request, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-message: 'Thanks for Opening This Issue, we will look into it soon!'
+        pr-message: 'Thanks for Your Contribution. It will be reviewed soon, Useless Prs are Closed Immediately'

.gitignore

@@ -13,12 +13,29 @@ build
 *.log
 target/npmlist.json
 package-lock.json
+
 # Directories
 addons/
+pyUltroid/
 __pycache__/
 venv/
 node_modules/
 glitch_me/
+src/glitch-me
 .idea/
 .vscode/
-temp/
+temp/
+bin-debug/
+bin-release/
+[Oo]bj/
+[Bb]in/
+.settings/
+*.swf
+*.air
+*.ipa
+*.apk
+
+# temporary files
+*.raw
+tplugins
+tassistant

Dockerfile

@@ -3,7 +3,7 @@
 # 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:b0.1
+FROM theteamultroid/ultroid:main
 
 # set timezone
 ENV TZ=Asia/Kolkata
@@ -14,12 +14,8 @@ RUN git clone https://github.com/TeamUltroid/Ultroid.git /root/TeamUltroid/
 WORKDIR /root/TeamUltroid/
 
 # install main requirements.
-COPY requirements.txt /deploy/
-RUN pip3 install --no-cache-dir -r /deploy/requirements.txt
-
-# install addons requirements
-RUN wget -O /deploy/addons.txt https://git.io/JWdOk
-RUN pip3 install --no-cache-dir -r /deploy/addons.txt
+RUN pip3 install --no-cache-dir -r requirements.txt
+RUN pip3 uninstall av -y && pip3 install av --no-binary av
 
 # start the bot
 CMD ["bash", "resources/startup/startup.sh"]

README.md

@@ -5,20 +5,20 @@
   <b>Ultroid - UserBot</b>
 </h1>
 
-<b>A stable pluggable Telegram userbot + vc music bot, based on Telethon.</b>   
+<b>A stable pluggable Telegram userbot + Voice & Video Call music bot, based on Telethon.</b>   
 
 [![Stars](https://img.shields.io/github/stars/TeamUltroid/Ultroid?style=flat-square&color=yellow)](https://github.com/TeamUltroid/Ultroid/stargazers)
 [![Forks](https://img.shields.io/github/forks/TeamUltroid/Ultroid?style=flat-square&color=orange)](https://github.com/TeamUltroid/Ultroid/fork)
 [![Size](https://img.shields.io/github/repo-size/TeamUltroid/Ultroid?style=flat-square&color=green)](https://github.com/TeamUltroid/Ultroid/)   
-[![Python](https://img.shields.io/badge/Python-v3.9-blue)](https://www.python.org/)
+[![Python](https://img.shields.io/badge/Python-v3.9.7-blue)](https://www.python.org/)
+[![CodeFactor](https://www.codefactor.io/repository/github/teamultroid/ultroid/badge/main)](https://www.codefactor.io/repository/github/teamultroid/ultroid/overview/main)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/TeamUltroid/Ultroid/graphs/commit-activity)
-[![Docker Pulls](https://img.shields.io/docker/pulls/programmingerror/ultroid?style=flat-square)](https://img.shields.io/docker/pulls/programmingerror/ultroid?style=flat-square)
+[![Docker Pulls](https://img.shields.io/docker/pulls/theteamultroid/ultroid?style=flat-square)](https://img.shields.io/docker/pulls/theteamultroid/ultroid?style=flat-square)
 [![Open Source Love svg2](https://badges.frapsoft.com/os/v2/open-source.svg?v=103)](https://github.com/TeamUltroid/Ultroid)   
 [![Contributors](https://img.shields.io/github/contributors/TeamUltroid/Ultroid?style=flat-square&color=green)](https://github.com/TeamUltroid/Ultroid/graphs/contributors)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://makeapullrequest.com)
 [![License](https://img.shields.io/badge/License-AGPL-blue)](https://github.com/TeamUltroid/Ultroid/blob/main/LICENSE)
 [![Sparkline](https://stars.medv.io/Teamultroid/Ultroid.svg)](https://stars.medv.io/TeamUltroid/Ultroid)
-
 ----
 
 # Deploy
@@ -53,10 +53,10 @@ Get the [Necessary Variables](#Necessary-Variables) and then click the button be
 
 ### Local Deploy - Latest Method
 This is the latest and most fastest method currently.<br>
-First, goto [This Project](https://github.com/BLUE-DEVIL1134/UltroidCli) and install the latest release from the Github Releases.<br>
-Then, do as its given in the `README.md` to add the executable to your system path.
+First, go to [This Project](https://github.com/BLUE-DEVIL1134/UltroidCli) and install the latest release from the Github Releases.<br>
+Then, do as it's given in the `README.md` to add the executable to your system path.
 
-Further, take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli/) to get more information on this.
+Further, take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli/) to get more information.
 
 
 ### Local Deploy - Easy Method
@@ -93,8 +93,6 @@ Further, take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli
     `python(3) -m pyUltroid`
 
 ## Necessary Variables
-- `API_ID` - Your API_ID from [my.telegram.org](https://my.telegram.org/)
-- `API_HASH` - Your API_HASH from [my.telegram.org](https://my.telegram.org/)
 - `SESSION` - SessionString for your accounts login session. Get it from [here](#Session-String)
 - `REDIS_URI` - Redis endpoint URL, from [redislabs](http://redislabs.com/), tutorial [here.](./resources/extras/redistut.md)
 - `REDIS_PASSWORD ` - Redis endpoint Password, from [redislabs](http://redislabs.com/), tutorial [here.](./resources/extras/redistut.md)
@@ -117,6 +115,5 @@ Ultroid is licensed under [GNU Affero General Public License](https://www.gnu.or
 # Credits
 * [![TeamUltroid-Devs](https://img.shields.io/static/v1?label=Teamultroid&message=devs&color=critical)](https://t.me/UltroidDevs)
 * [Lonami](https://github.com/LonamiWebs/) for [Telethon.](https://github.com/LonamiWebs/Telethon)
-* [Dan](https://github.com/delivrance) for [Pyrogram.](https://github.com/pyrogram/pyrogram)
-* [Pytgcalls](https://github.com/pytgcalls) for [PyTgCalls.](https://github.com/pytgcalls/pytgcalls)
+* [MarshalX](https://github.com/MarshalX) for [PyTgCalls.](https://github.com/MarshalX/tgcalls)
 

app.json

@@ -37,12 +37,12 @@
             "value": ""
         },
         "HEROKU_API": {
-            "description": "Heroku API token. Needed if deploying on heroku ONLY.",
+            "description": "Heroku API token. Mandatory for Heroku Deploy...",
             "value": "",
             "required": false
         },
         "HEROKU_APP_NAME": {
-            "description": "Name of your heroku app, given in the first blank on this page. To be added if deploying to heroku ONLY.",
+            "description": "Name of your Heroku app, given in the first blank on this page. To be added if deploying to heroku ONLY.",
             "value": "",
             "required": false
         }

assistant/__init__.py

@@ -24,5 +24,4 @@ async def setit(event, name, value):
 
 
 def get_back_button(name):
-    button = [Button.inline("« Bᴀᴄᴋ", data=f"{name}")]
-    return button
+    return [Button.inline("« Bᴀᴄᴋ", data=f"{name}")]

assistant/api_setter.py

@@ -41,12 +41,11 @@ async def rmbgapi(event):
                 "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"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            f"{name} changed to {themssg}",
+            buttons=get_back_button("apiset"),
+        )
 
 
 @callback("dapi")
@@ -66,12 +65,11 @@ async def rmbgapi(event):
                 "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"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            f"{name} changed to {themssg}",
+            buttons=get_back_button("apiset"),
+        )
 
 
 @callback("oapi")
@@ -91,9 +89,8 @@ async def rmbgapi(event):
                 "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"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            f"{name} changed to {themssg}",
+            buttons=get_back_button("apiset"),
+        )

assistant/callbackstuffs.py

@@ -6,10 +6,8 @@
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
 import re
-import urllib
-from glob import glob
-from os import remove
-from random import choices
+import sys
+from os import execl, remove
 
 from telegraph import Telegraph
 from telegraph import upload_file as upl
@@ -26,90 +24,63 @@ auth_url = r["auth_url"]
 TOKEN_FILE = "resources/auths/auth_token.txt"
 
 
-@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)
-        remove(book)
-
-
 @callback(
     re.compile(
         "sndplug_(.*)",
     ),
 )
+@owner
 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
+    thumb = "resources/extras/inline.jpg"
+    await eve.answer("■ Sending ■")
     if name.startswith("def"):
-        plug_name = name.replace(f"def_plugin_", "")
+        plug_name = name.replace("def_plugin_", "")
         plugin = f"plugins/{plug_name}.py"
-        buttons = [
-            [
-                Button.inline(
-                    "« Pᴀsᴛᴇ »",
-                    data=f"pasta-{plugin}",
-                )
-            ],
-            [
-                Button.inline("« Bᴀᴄᴋ", data="back"),
-                Button.inline("••Cʟᴏꜱᴇ••", data="close"),
-            ],
-        ]
-    else:
-        plug_name = name.replace(f"add_plugin_", "")
+        data = "back"
+    elif name.startswith("add"):
+        plug_name = name.replace("add_plugin_", "")
         plugin = f"addons/{plug_name}.py"
-        buttons = [
-            [
-                Button.inline(
-                    "« Pᴀsᴛᴇ »",
-                    data=f"pasta-{plugin}",
-                )
-            ],
-            [
-                Button.inline("« Bᴀᴄᴋ", data="buck"),
-                Button.inline("••Cʟᴏꜱᴇ••", data="close"),
-            ],
-        ]
+        data = "buck"
+    else:
+        plug_name = name.replace("vc_plugin_", "")
+        plugin = f"vcbot/{plug_name}.py"
+        data = "vc_helper"
+    buttons = [
+        [
+            Button.inline(
+                "« Pᴀsᴛᴇ »",
+                data=f"pasta-{plugin}",
+            )
+        ],
+        [
+            Button.inline("« Bᴀᴄᴋ", data=data),
+            Button.inline("••Cʟᴏꜱᴇ••", data="close"),
+        ],
+    ]
     await eve.edit(file=plugin, thumb=thumb, buttons=buttons)
 
 
+heroku_api, app_name = Var.HEROKU_API, Var.HEROKU_APP_NAME
+
+
 @callback("updatenow")
 @owner
 async def update(eve):
     repo = Repo()
     ac_br = repo.active_branch
     ups_rem = repo.remote("upstream")
-    if Var.HEROKU_API:
+    if heroku_api:
         import heroku3
 
         try:
-            heroku = heroku3.from_key(Var.HEROKU_API)
+            heroku = heroku3.from_key(heroku_api)
             heroku_app = None
             heroku_applications = heroku.apps()
         except BaseException:
             return await eve.edit("`Wrong HEROKU_API.`")
         for app in heroku_applications:
-            if app.name == Var.HEROKU_APP_NAME:
+            if app.name == app_name:
                 heroku_app = app
         if not heroku_app:
             await eve.edit("`Wrong HEROKU_APP_NAME.`")
@@ -121,7 +92,7 @@ async def update(eve):
         ups_rem.fetch(ac_br)
         repo.git.reset("--hard", "FETCH_HEAD")
         heroku_git_url = heroku_app.git_url.replace(
-            "https://", "https://api:" + Var.HEROKU_API + "@"
+            "https://", "https://api:" + heroku_api + "@"
         )
         if "heroku" in repo.remotes:
             remote = repo.remote("heroku")
@@ -139,42 +110,36 @@ async def update(eve):
         await eve.edit(
             "`Userbot dyno build in progress, please wait for it to complete.`"
         )
-        try:
-            ups_rem.pull(ac_br)
-        except GitCommandError:
-            repo.git.reset("--hard", "FETCH_HEAD")
-        await updateme_requirements()
-        await eve.edit(
-            "`Successfully Updated!\nBot is restarting... Wait for a second!`"
-        )
+        call_back()
+        await bash("git pull && pip3 install -r requirements.txt")
         execl(sys.executable, sys.executable, "-m", "pyUltroid")
 
 
 @callback("changes")
 @owner
 async def changes(okk):
+    await okk.answer("■ Generating Changelogs...")
     repo = Repo.init()
     ac_br = repo.active_branch
-    changelog, tl_chnglog = await gen_chlog(repo, f"HEAD..upstream/{ac_br}")
-    changelog_str = changelog + f"\n\nClick the below button to update!"
+    changelog, tl_chnglog = gen_chlog(repo, f"HEAD..upstream/{ac_br}")
+    changelog_str = changelog + "\n\nClick the below button to update!"
     if len(changelog_str) > 1024:
         await okk.edit(get_string("upd_4"))
         await asyncio.sleep(2)
-        with open(f"ultroid_updates.txt", "w+") as file:
+        with open("ultroid_updates.txt", "w+") as file:
             file.write(tl_chnglog)
         await okk.edit(
             get_string("upd_5"),
             file="ultroid_updates.txt",
             buttons=Button.inline("Update Now", data="updatenow"),
         )
-        remove(f"ultroid_updates.txt")
+        remove("ultroid_updates.txt")
         return
-    else:
-        await okk.edit(
-            changelog_str,
-            buttons=Button.inline("Update Now", data="updatenow"),
-            parse_mode="html",
-        )
+    await okk.edit(
+        changelog_str,
+        buttons=Button.inline("Update Now", data="updatenow"),
+        parse_mode="html",
+    )
 
 
 @callback(
@@ -186,25 +151,20 @@ async def changes(okk):
 async def _(e):
     ok = (e.data_match.group(1)).decode("UTF-8")
     with open(ok, "r") as hmm:
-        _, key = get_paste(hmm.read())
-    if _ == "dog":
-        link = "https://del.dog/" + key
-        raw = "https://del.dog/raw/" + key
-    else:
-        link = "https://nekobin.com/" + key
-        raw = "https://nekobin.com/raw/" + key
+        _, key = await get_paste(hmm.read())
+    link = "https://spaceb.in/" + key
+    raw = f"https://spaceb.in/api/v1/documents/{key}/raw"
+    if not _:
+        return await e.answer(key[:30], alert=True)
+    data = "buck"
     if ok.startswith("plugins"):
-        buttons = [
-            Button.inline("« Bᴀᴄᴋ", data="back"),
-            Button.inline("••Cʟᴏꜱᴇ••", data="close"),
-        ]
-    else:
-        buttons = [
-            Button.inline("« Bᴀᴄᴋ", data="buck"),
-            Button.inline("••Cʟᴏꜱᴇ••", data="close"),
-        ]
+        data = "back"
+    buttons = [
+        Button.inline("« Bᴀᴄᴋ", data=data),
+        Button.inline("••Cʟᴏꜱᴇ••", data="close"),
+    ]
     await e.edit(
-        f"<strong>Pasted\n     👉<a href={link}>[Link]</a>\n     👉<a href={raw}>[Raw Link]</a></strong>",
+        f"<strong>Pasted\n👉 <a href={link}>[Link]</a>\n👉 <a href={raw}>[Raw Link]</a></strong>",
         buttons=buttons,
         link_preview=False,
         parse_mode="html",
@@ -334,12 +294,77 @@ 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("Iɴʟɪɴᴇ Pɪᴄ", data="inli_pic"),
+                Button.inline("Sᴜᴅᴏ HNDLR", data="shndlr"),
+            ],
+            [Button.inline("Dᴜᴀʟ Mᴏᴅᴇ", "oofdm")],
             [Button.inline("« Bᴀᴄᴋ", data="setter")],
         ],
     )
 
 
+@callback("oofdm")
+@owner
+async def euwhe(event):
+    BT = [
+        [Button.inline("Dᴜᴀʟ Mᴏᴅᴇ Oɴ", "dmof")],
+        [Button.inline("Dᴜᴀʟ Mᴏᴅᴇ Oғғ", "dmof")],
+        [Button.inline("Dᴜᴀʟ Mᴏᴅᴇ Hɴᴅʟʀ", "dmhn")],
+    ]
+    await event.edit(
+        "About [Dual Mode](https://t.me/UltroidUpdates/18)",
+        buttons=BT,
+        link_preview=False,
+    )
+
+
+@callback("dmof")
+@owner
+async def rhwhe(e):
+    if udB.get("DUAL_MODE"):
+        udB.delete("DUAL_MODE")
+        key = "Off"
+    else:
+        udB.set("DUAL_MODE", "True")
+        key = "On"
+    Msg = "Dual Mode : " + key
+    await e.edit(Msg, buttons=get_back_button("otvars"))
+
+
+@callback("dmhn")
+@owner
+async def hndlrr(event):
+    await event.delete()
+    pru = event.sender_id
+    var = "DUAL_HNDLR"
+    name = "Dual Handler"
+    CH = udB.get(var) or "/"
+    async with event.client.conversation(pru) as conv:
+        await conv.send_message(
+            f"Send The Symbol Which u want as Handler/Trigger to use your Assistant bot\nUr Current Handler is [ `{CH}` ]\n\n use /cancel to cancel.",
+        )
+        response = conv.wait_event(events.NewMessage(chats=pru))
+        response = await response
+        themssg = response.message.message
+        if themssg == "/cancel":
+            await conv.send_message(
+                "Cancelled!!",
+                buttons=get_back_button("otvars"),
+            )
+        elif len(themssg) > 1:
+            await conv.send_message(
+                "Incorrect Handler",
+                buttons=get_back_button("otvars"),
+            )
+        else:
+            await setit(event, var, themssg)
+            await conv.send_message(
+                f"{name} changed to {themssg}",
+                buttons=get_back_button("otvars"),
+            )
+
+
 @callback("emoj")
 @owner
 async def emoji(event):
@@ -353,12 +378,12 @@ async def emoji(event):
         response = await response
         themssg = response.message.message
         if themssg == "/cancel":
-            return await conv.send_message(
+            await conv.send_message(
                 "Cancelled!!",
                 buttons=get_back_button("otvars"),
             )
         elif themssg.startswith(("/", HNDLR)):
-            return await conv.send_message(
+            await conv.send_message(
                 "Incorrect Emoji",
                 buttons=get_back_button("otvars"),
             )
@@ -385,12 +410,12 @@ async def pluginch(event):
         response = await response
         themssg = response.message.message
         if themssg == "/cancel":
-            return await conv.send_message(
+            await conv.send_message(
                 "Cancelled!!",
                 buttons=get_back_button("otvars"),
             )
         elif themssg.startswith(("/", HNDLR)):
-            return await conv.send_message(
+            await conv.send_message(
                 "Incorrect channel",
                 buttons=get_back_button("otvars"),
             )
@@ -420,17 +445,55 @@ async def hndlrr(event):
         response = await response
         themssg = response.message.message
         if themssg == "/cancel":
-            return await conv.send_message(
+            await conv.send_message(
                 "Cancelled!!",
                 buttons=get_back_button("otvars"),
             )
         elif len(themssg) > 1:
-            return await conv.send_message(
+            await conv.send_message(
                 "Incorrect Handler",
                 buttons=get_back_button("otvars"),
             )
         elif themssg.startswith(("/", "#", "@")):
-            return await conv.send_message(
+            await conv.send_message(
+                "This cannot be used as handler",
+                buttons=get_back_button("otvars"),
+            )
+        else:
+            await setit(event, var, themssg)
+            await conv.send_message(
+                f"{name} changed to {themssg}",
+                buttons=get_back_button("otvars"),
+            )
+
+
+@callback("shndlr")
+@owner
+async def hndlrr(event):
+    await event.delete()
+    pru = event.sender_id
+    var = "SUDO_HNDLR"
+    name = "Sudo Handler"
+    async with event.client.conversation(pru) as conv:
+        await conv.send_message(
+            "Send The Symbol Which u want as Sudo Handler/Trigger to use bot\n\n use /cancel to cancel."
+        )
+
+        response = conv.wait_event(events.NewMessage(chats=pru))
+        response = await response
+        themssg = response.message.message
+        if themssg == "/cancel":
+            await conv.send_message(
+                "Cancelled!!",
+                buttons=get_back_button("otvars"),
+            )
+        elif len(themssg) > 1:
+            await conv.send_message(
+                "Incorrect Handler",
+                buttons=get_back_button("otvars"),
+            )
+        elif themssg.startswith(("/", "#", "@")):
+            await conv.send_message(
                 "This cannot be used as handler",
                 buttons=get_back_button("otvars"),
             )
@@ -445,13 +508,13 @@ async def hndlrr(event):
 @callback("taglog")
 @owner
 async def tagloggrr(e):
+    if not udB.get("TAG_LOG"):
+        BUTTON = [Button.inline("SET TAG LOG", data="settag")]
+    else:
+        BUTTON = [Button.inline("DELETE TAG LOG", data="deltag")]
     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")],
-        ],
+        buttons=[BUTTON, [Button.inline("« Bᴀᴄᴋ", data="otvars")]],
     )
 
 
@@ -481,22 +544,24 @@ async def taglogerr(event):
                 "Cancelled!!",
                 buttons=get_back_button("taglog"),
             )
-        else:
-            await setit(event, var, themssg)
-            await conv.send_message(
-                f"{name} changed to {themssg}",
-                buttons=get_back_button("taglog"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            f"{name} changed to {themssg}",
+            buttons=get_back_button("taglog"),
+        )
 
 
 @callback("eaddon")
 @owner
 async def pmset(event):
+    if not udB.get("ADDONS"):
+        BT = [Button.inline("Aᴅᴅᴏɴs  Oɴ", data="edon")]
+    else:
+        BT = [Button.inline("Aᴅᴅᴏɴs  Oғғ", data="edof")]
     await event.edit(
         "ADDONS~ Extra Plugins:",
         buttons=[
-            [Button.inline("Aᴅᴅᴏɴs  Oɴ", data="edon")],
-            [Button.inline("Aᴅᴅᴏɴs  Oғғ", data="edof")],
+            BT,
             [Button.inline("« Bᴀᴄᴋ", data="otvars")],
         ],
     )
@@ -516,8 +581,7 @@ async def eddon(event):
 @callback("edof")
 @owner
 async def eddof(event):
-    var = "ADDONS"
-    await setit(event, var, "False")
+    udB.set("ADDONS", "False")
     await event.edit(
         "Done! ADDONS has been turned off!! After Setting All Things Do Restart",
         buttons=get_back_button("eaddon"),
@@ -527,11 +591,14 @@ async def eddof(event):
 @callback("sudo")
 @owner
 async def pmset(event):
+    if not udB.get("SUDO"):
+        BT = [Button.inline("Sᴜᴅᴏ Mᴏᴅᴇ  Oɴ", data="onsudo")]
+    else:
+        BT = [Button.inline("Sᴜᴅᴏ Mᴏᴅᴇ  Oғғ", data="ofsudo")]
     await event.edit(
         f"SUDO MODE ~ Some peoples can use ur Bot which u selected. To know More use `{HNDLR}help sudo`",
         buttons=[
-            [Button.inline("Sᴜᴅᴏ Mᴏᴅᴇ  Oɴ", data="onsudo")],
-            [Button.inline("Sᴜᴅᴏ Mᴏᴅᴇ  Oғғ", data="ofsudo")],
+            BT,
             [Button.inline("« Bᴀᴄᴋ", data="otvars")],
         ],
     )
@@ -591,12 +658,11 @@ async def sfgrp(event):
                 "Cancelled!!",
                 buttons=get_back_button("sfban"),
             )
-        else:
-            await setit(event, var, themssg)
-            await conv.send_message(
-                f"{name} changed to {themssg}",
-                buttons=get_back_button("sfban"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            f"{name} changed to {themssg}",
+            buttons=get_back_button("sfban"),
+        )
 
 
 @callback("sfexf")
@@ -608,8 +674,9 @@ async def sfexf(event):
     pru = event.sender_id
     async with asst.conversation(pru) as conv:
         await conv.send_message(
-            f"Send the Fed IDs you want to exclude in the ban. Split by a space.\neg`id1 id2 id3`\nSet is as `None` if you dont want any.\nUse /cancel to go back.",
+            "Send the Fed IDs you want to exclude in the ban. Split by a space.\neg`id1 id2 id3`\nSet is as `None` if you dont want any.\nUse /cancel to go back."
         )
+
         response = conv.wait_event(events.NewMessage(chats=pru))
         response = await response
         themssg = response.message.message
@@ -618,12 +685,11 @@ async def sfexf(event):
                 "Cancelled!!",
                 buttons=get_back_button("sfban"),
             )
-        else:
-            await setit(event, var, themssg)
-            await conv.send_message(
-                f"{name} changed to {themssg}",
-                buttons=get_back_button("sfban"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            f"{name} changed to {themssg}",
+            buttons=get_back_button("sfban"),
+        )
 
 
 @callback("alvcstm")
@@ -659,15 +725,14 @@ async def name(event):
                 "Cancelled!!",
                 buttons=get_back_button("alvcstm"),
             )
-        else:
-            await setit(event, var, themssg)
-            await conv.send_message(
-                "{} changed to {}\n\nAfter Setting All Things Do restart".format(
-                    name,
-                    themssg,
-                ),
-                buttons=get_back_button("alvcstm"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            "{} changed to {}\n\nAfter Setting All Things Do restart".format(
+                name,
+                themssg,
+            ),
+            buttons=get_back_button("alvcstm"),
+        )
 
 
 @callback("alvmed")
@@ -679,7 +744,7 @@ async def media(event):
     name = "Alive Media"
     async with event.client.conversation(pru) as conv:
         await conv.send_message(
-            "**Alive Media**\nSend me a pic/gif/bot api id of sticker to set as alive media.\n\nUse /cancel to terminate the operation.",
+            "**Alive Media**\nSend me a pic/gif/media to set as alive media.\n\nUse /cancel to terminate the operation.",
         )
         response = await conv.get_response()
         try:
@@ -694,10 +759,12 @@ async def media(event):
         media = await event.client.download_media(response, "alvpc")
         if (
             not (response.text).startswith("/")
-            and not response.text == ""
+            and response.text != ""
             and not response.media
         ):
             url = response.text
+        elif response.sticker:
+            url = response.file.id
         else:
             try:
                 x = upl(media)
@@ -771,7 +838,7 @@ async def inl_on(event):
     var = "INLINE_PM"
     await setit(event, var, "True")
     await event.edit(
-        f"Done!! PMPermit type has been set to inline!",
+        "Done!! PMPermit type has been set to inline!",
         buttons=[[Button.inline("« Bᴀᴄᴋ", data="pmtype")]],
     )
 
@@ -782,7 +849,7 @@ async def inl_on(event):
     var = "INLINE_PM"
     await setit(event, var, "False")
     await event.edit(
-        f"Done!! PMPermit type has been set to normal!",
+        "Done!! PMPermit type has been set to normal!",
         buttons=[[Button.inline("« Bᴀᴄᴋ", data="pmtype")]],
     )
 
@@ -806,20 +873,19 @@ async def name(event):
                 "Cancelled!!",
                 buttons=get_back_button("pmcstm"),
             )
-        else:
-            if len(themssg) > 4090:
-                return await conv.send_message(
-                    "Message too long!\nGive a shorter message please!!",
-                    buttons=get_back_button("pmcstm"),
-                )
-            await setit(event, var, themssg)
-            await conv.send_message(
-                "{} changed to {}\n\nAfter Setting All Things Do restart".format(
-                    name,
-                    themssg,
-                ),
+        if len(themssg) > 4090:
+            return await conv.send_message(
+                "Message too long!\nGive a shorter message please!!",
                 buttons=get_back_button("pmcstm"),
             )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            "{} changed to {}\n\nAfter Setting All Things Do restart".format(
+                name,
+                themssg,
+            ),
+            buttons=get_back_button("pmcstm"),
+        )
 
 
 @callback("swarn")
@@ -861,7 +927,7 @@ async def media(event):
     name = "PM Media"
     async with event.client.conversation(pru) as conv:
         await conv.send_message(
-            "**PM Media**\nSend me a pic/gif/ or link  to set as pmpermit media.\n\nUse /cancel to terminate the operation.",
+            "**PM Media**\nSend me a pic/gif/sticker/link  to set as pmpermit media.\n\nUse /cancel to terminate the operation.",
         )
         response = await conv.get_response()
         try:
@@ -876,10 +942,12 @@ async def media(event):
         media = await event.client.download_media(response, "pmpc")
         if (
             not (response.text).startswith("/")
-            and not response.text == ""
+            and response.text != ""
             and not response.media
         ):
             url = response.text
+        elif response.sticker:
+            url = response.file.id
         else:
             try:
                 x = upl(media)
@@ -929,7 +997,7 @@ async def apon(event):
     var = "AUTOAPPROVE"
     await setit(event, var, "True")
     await event.edit(
-        f"Done!! AUTOAPPROVE  Started!!",
+        "Done!! AUTOAPPROVE  Started!!",
         buttons=[[Button.inline("« Bᴀᴄᴋ", data="apauto")]],
     )
 
@@ -953,23 +1021,59 @@ async def apof(event):
 @callback("pml")
 @owner
 async def alvcs(event):
+    if not udB.get("PMLOG"):
+        BT = [Button.inline("PMLOGGER ON", data="pmlog")]
+    else:
+        BT = [Button.inline("PMLOGGER OFF", data="pmlogof")]
     await event.edit(
         "PMLOGGER This Will Forward Ur Pm to Ur Private Group -",
         buttons=[
-            [Button.inline("PMLOGGER ON", data="pmlog")],
-            [Button.inline("PMLOGGER OFF", data="pmlogof")],
+            BT,
+            [Button.inline("PᴍLᴏɢɢᴇʀ Gʀᴏᴜᴘ", "pmlgg")],
             [Button.inline("« Bᴀᴄᴋ", data="pmcstm")],
         ],
     )
 
 
+@callback("pmlgg")
+@owner
+async def disus(event):
+    await event.delete()
+    pru = event.sender_id
+    var = "PMLOGGROUP"
+    name = "Pm Logger Group"
+    async with event.client.conversation(pru) as conv:
+        await conv.send_message(
+            f"Send The Symbol Which u want as your {name}\n\n use /cancel to cancel.",
+        )
+        response = conv.wait_event(events.NewMessage(chats=pru))
+        response = await response
+        themssg = response.message.message
+        if themssg == "/cancel":
+            await conv.send_message(
+                "Cancelled!!",
+                buttons=get_back_button("pml"),
+            )
+        elif len(themssg) > 1:
+            await conv.send_message(
+                "Incorrect Value",
+                buttons=get_back_button("pml"),
+            )
+        else:
+            await setit(event, var, themssg)
+            await conv.send_message(
+                f"{name} changed to `{themssg}`",
+                buttons=get_back_button("pml"),
+            )
+
+
 @callback("pmlog")
 @owner
 async def pmlog(event):
     var = "PMLOG"
     await setit(event, var, "True")
     await event.edit(
-        f"Done!! PMLOGGER  Started!!",
+        "Done!! PMLOGGER  Started!!",
         buttons=[[Button.inline("« Bᴀᴄᴋ", data="pml")]],
     )
 
@@ -1010,7 +1114,7 @@ async def pmonn(event):
     var = "PMSETTING"
     await setit(event, var, "True")
     await event.edit(
-        f"Done! PMPermit has been turned on!!",
+        "Done! PMPermit has been turned on!!",
         buttons=[[Button.inline("« Bᴀᴄᴋ", data="ppmset")]],
     )
 
@@ -1021,7 +1125,7 @@ async def pmofff(event):
     var = "PMSETTING"
     await setit(event, var, "False")
     await event.edit(
-        f"Done! PMPermit has been turned off!!",
+        "Done! PMPermit has been turned off!!",
         buttons=[[Button.inline("« Bᴀᴄᴋ", data="ppmset")]],
     )
 
@@ -1030,7 +1134,7 @@ async def pmofff(event):
 @owner
 async def chbot(event):
     await event.edit(
-        f"From This Feature U can chat with ppls Via ur Assistant Bot.\n[More info](https://t.me/UltroidUpdates/2)",
+        "From This Feature U can chat with ppls Via ur Assistant Bot.\n[More info](https://t.me/UltroidUpdates/2)",
         buttons=[
             [Button.inline("Cʜᴀᴛ Bᴏᴛ  Oɴ", data="onchbot")],
             [Button.inline("Cʜᴀᴛ Bᴏᴛ  Oғғ", data="ofchbot")],
@@ -1060,15 +1164,14 @@ async def name(event):
                 "Cancelled!!",
                 buttons=get_back_button("chatbot"),
             )
-        else:
-            await setit(event, var, themssg)
-            await conv.send_message(
-                "{} changed to {}".format(
-                    name,
-                    themssg,
-                ),
-                buttons=get_back_button("chatbot"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            "{} changed to {}".format(
+                name,
+                themssg,
+            ),
+            buttons=get_back_button("chatbot"),
+        )
 
 
 @callback("onchbot")
@@ -1097,7 +1200,7 @@ async def chon(event):
 @owner
 async def vcb(event):
     await event.edit(
-        f"From This Feature U can play songs in group voice chat\n\n[moreinfo](https://t.me/UltroidUpdates/4)",
+        "From This Feature U can play songs in group voice chat\n\n[moreinfo](https://t.me/UltroidUpdates/4)",
         buttons=[
             [Button.inline("VC Sᴇssɪᴏɴ", data="vcs")],
             [Button.inline("« Bᴀᴄᴋ", data="setter")],
@@ -1125,15 +1228,14 @@ async def name(event):
                 "Cancelled!!",
                 buttons=get_back_button("vcb"),
             )
-        else:
-            await setit(event, var, themssg)
-            await conv.send_message(
-                "{} changed to {}\n\nAfter Setting All Things Do restart".format(
-                    name,
-                    themssg,
-                ),
-                buttons=get_back_button("vcb"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            "{} changed to {}\n\nAfter Setting All Things Do restart".format(
+                name,
+                themssg,
+            ),
+            buttons=get_back_button("vcb"),
+        )
 
 
 @callback("inli_pic")
@@ -1160,7 +1262,7 @@ async def media(event):
         media = await event.client.download_media(response, "inlpic")
         if (
             not (response.text).startswith("/")
-            and not response.text == ""
+            and response.text != ""
             and not response.media
         ):
             url = response.text

assistant/initial.py

@@ -0,0 +1,79 @@
+# 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/>.
+
+import re
+
+from . import *
+
+STRINGS = {
+    1: """🎇 **Thanks for Deploying Ultroid Userbot!**
+
+• Here, are the Some Basic stuff from, where you can Know, about its Usage.""",
+    2: """🎉** About Ultroid**
+
+🧿 Ultroid is Pluggable and powerful Telethon Userbot, made in Python from Scratch. It is Aimed to Increase Security along with Addition of Other Useful Features.
+
+❣ Made by **@TeamUltroid**""",
+    3: """**💡• FAQs •**
+
+-> [Setting up TimeZone](https://t.me/UltroidUpdates/22)
+-> [About Inline PmPermit](https://t.me/UltroidUpdates/21)
+-> [About Dual Mode](https://t.me/UltroidUpdates/18)
+-> [Custom Thumbnail](https://t.me/UltroidUpdates/13)
+-> [About FullSudo](https://t.me/UltroidUpdates/11)
+-> [Setting Up PmBot](https://t.me/UltroidUpdates/2)
+-> [Also Check](https://t.me/UltroidUpdates/14)
+
+**• To Know About Updates**
+  - Join @TheUltroid.""",
+    4: f"""• `To Know All Available Commands`
+
+  - `{HNDLR}help`
+  - `{HNDLR}cmds`""",
+    5: """• **For Any Other Query or Suggestion**
+  - Move to **@UltroidSupport**.
+
+• Thanks for Reaching till END.""",
+}
+
+
+@callback(re.compile("initft_(\\d+)"))
+async def init_depl(e):
+    CURRENT = int(e.data_match.group(1))
+    if CURRENT == 5:
+        return await e.edit(
+            STRINGS[5],
+            buttons=Button.inline("<< Back", "initbk_" + str(4)),
+            link_preview=False,
+        )
+    await e.edit(
+        STRINGS[CURRENT],
+        buttons=[
+            Button.inline("<<", "initbk_" + str(CURRENT - 1)),
+            Button.inline(">>", "initft_" + str(CURRENT + 1)),
+        ],
+        link_preview=False,
+    )
+
+
+@callback(re.compile("initbk_(\\d+)"))
+async def ineiq(e):
+    CURRENT = int(e.data_match.group(1))
+    if CURRENT == 1:
+        return await e.edit(
+            STRINGS[1],
+            buttons=Button.inline("Start Back >>", "initft_" + str(2)),
+            link_preview=False,
+        )
+    await e.edit(
+        STRINGS[CURRENT],
+        buttons=[
+            Button.inline("<<", "initbk_" + str(CURRENT - 1)),
+            Button.inline(">>", "initft_" + str(CURRENT + 1)),
+        ],
+        link_preview=False,
+    )

assistant/inlinestuff.py

@@ -6,13 +6,13 @@
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
 import base64
+from datetime import datetime
 from random import choice
 from re import compile as re_compile
 from re import findall
 
 import requests
-from bs4 import BeautifulSoup
-from orangefoxapi import OrangeFoxAPI
+from bs4 import BeautifulSoup as bs
 from play_scraper import search
 from search_engine_parser import GoogleSearch, YahooSearch
 from telethon import Button
@@ -21,16 +21,12 @@ from telethon.tl.types import InputWebDocument as wb
 from plugins._inline import SUP_BUTTONS
 
 from . import *
-from . import humanbytes as hb
 
 ofox = "https://telegra.ph/file/231f0049fcd722824f13b.jpg"
 gugirl = "https://telegra.ph/file/0df54ae4541abca96aa11.jpg"
 yeah = "https://telegra.ph/file/e3c67885e16a194937516.jpg"
-ps = "https://telegra.ph/file/de0b8d9c858c62fae3b6e.jpg"
 ultpic = "https://telegra.ph/file/4136aa1650bc9d4109cc5.jpg"
 
-ofox_api = OrangeFoxAPI()
-
 api1 = base64.b64decode("QUl6YVN5QXlEQnNZM1dSdEI1WVBDNmFCX3c4SkF5NlpkWE5jNkZV").decode(
     "ascii"
 )
@@ -45,6 +41,7 @@ api3 = base64.b64decode("QUl6YVN5RGRPS253blB3VklRX2xiSDVzWUU0Rm9YakFLSVFWMERR").
 @in_pattern("ofox")
 @in_owner
 async def _(e):
+    match = None
     try:
         match = e.text.split(" ", maxsplit=1)[1]
     except IndexError:
@@ -54,39 +51,43 @@ async def _(e):
             text="**OFᴏx🦊Rᴇᴄᴏᴠᴇʀʏ**\n\nYou didn't search anything",
             buttons=Button.switch_inline("Sᴇᴀʀᴄʜ Aɢᴀɪɴ", query="ofox ", same_peer=True),
         )
-        await e.answer([kkkk])
-    a = ofox_api.releases(codename=match)
-    c = ofox_api.devices(codename=match)
-    if len(a.data) > 0:
+        return await e.answer([kkkk])
+    device, releases = await get_ofox(match)
+    if device.get("detail") is None:
         fox = []
-        for b in a.data:
-            ver = b.version
-            release = b.type
-            size = hb(b.size)
-            for z in c.data:
-                fullname = z.full_name
-                code = z.codename
-                link = f"https://orangefox.download/device/{code}"
-                text = f"**••OʀᴀɴɢᴇFᴏx Rᴇᴄᴏᴠᴇʀʏ Fᴏʀ•[•]({ofox})** {fullname}\n"
-                text += f"**••Cᴏᴅᴇɴᴀᴍᴇ••** {code}\n"
-                text += f"**••Bᴜɪʟᴅ Tʏᴘᴇ••** {release}\n"
-                text += f"**••Vᴇʀsɪᴏɴ••** {ver}\n"
-                text += f"**••Sɪᴢᴇ••** {size}\n"
-                fox.append(
-                    await e.builder.article(
-                        title=f"{fullname}",
-                        description=f"{ver}\n{release}",
-                        text=text,
-                        thumb=wb(ofox, 0, "image/jpeg", []),
-                        link_preview=True,
-                        buttons=[
-                            Button.url("Dᴏᴡɴʟᴏᴀᴅ", url=f"{link}"),
-                            Button.switch_inline(
-                                "Sᴇᴀʀᴄʜ Aɢᴀɪɴ", query="ofox ", same_peer=True
-                            ),
-                        ],
-                    )
+        fullname = device["full_name"]
+        codename = device["codename"]
+        str(device["supported"])
+        maintainer = device["maintainer"]["name"]
+        link = f"https://orangefox.download/device/{codename}"
+        for data in releases["data"]:
+            release = data["type"]
+            version = data["version"]
+            size = humanbytes(data["size"])
+            release_date = datetime.utcfromtimestamp(data["date"]).strftime("%Y-%m-%d")
+            text = f"[\xad]({ofox})**OʀᴀɴɢᴇFᴏx Rᴇᴄᴏᴠᴇʀʏ Fᴏʀ**\n\n"
+            text += f"`  Fᴜʟʟ Nᴀᴍᴇ: {fullname}`\n"
+            text += f"`  Cᴏᴅᴇɴᴀᴍᴇ: {codename}`\n"
+            text += f"`  Mᴀɪɴᴛᴀɪɴᴇʀ: {maintainer}`\n"
+            text += f"`  Bᴜɪʟᴅ Tʏᴘᴇ: {release}`\n"
+            text += f"`  Vᴇʀsɪᴏɴ: {version}`\n"
+            text += f"`  Sɪᴢᴇ: {size}`\n"
+            text += f"`  Bᴜɪʟᴅ Dᴀᴛᴇ: {release_date}`"
+            fox.append(
+                await e.builder.article(
+                    title=f"{fullname}",
+                    description=f"{version}\n{release_date}",
+                    text=text,
+                    thumb=wb(ofox, 0, "image/jpeg", []),
+                    link_preview=True,
+                    buttons=[
+                        Button.url("Dᴏᴡɴʟᴏᴀᴅ", url=f"{link}"),
+                        Button.switch_inline(
+                            "Sᴇᴀʀᴄʜ Aɢᴀɪɴ", query="ofox ", same_peer=True
+                        ),
+                    ],
                 )
+            )
         await e.answer(
             fox, switch_pm="OrangeFox Recovery Search.", switch_pm_param="start"
         )
@@ -301,7 +302,7 @@ async def _(e):
             await e.builder.article(
                 title=name,
                 description=ids,
-                thumb=wb(ps, 0, "image/jpeg", []),
+                thumb=wb(icon, 0, "image/jpeg", []),
                 text=text,
                 link_preview=True,
                 buttons=[
@@ -373,60 +374,39 @@ async def _(e):
     await e.answer(modss, switch_pm="Search Mod Applications.", switch_pm_param="start")
 
 
-@in_pattern("ebooks")
+# Inspired by @FindXDaBot
+
+
+@in_pattern("xda")
 @in_owner
-async def clip(e):
+async def xda_dev(event):
+    QUERY = event.text.split(" ", maxsplit=1)
     try:
-        quer = e.text.split(" ", maxsplit=1)[1]
+        query = QUERY[1]
     except IndexError:
-        await e.answer(
-            [], switch_pm="Enter Query to Look for EBook", switch_pm_param="start"
-        )
-        return
-    quer = quer.replace(" ", "+")
-    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"
+        return await event.answer(
+            [], switch_pm="Enter Query to Search", switch_pm_param="start"
         )
-    buil = e.builder
-    dont_take = [
-        "Authors",
-        "Did you mean",
-        "Sort Alpha",
-        "Sort by",
-        "Subjects",
-        "Bookshelves",
-    ]
-    hm = []
-    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]
-            link = "https://gutenberg.org" + link.replace("small", "medium")
-            file = wb(link, 0, "image/jpeg", [])
-            hm.append(
-                buil.article(
-                    title=titles[rs],
-                    type="photo",
-                    description="GutenBerg Search",
-                    thumb=file,
-                    content=file,
-                    include_media=True,
-                    text=f"**• Ebook Search**\n\n->> `{titles[rs]}`",
-                    buttons=Button.inline("Get as Doc", data=f"ebk_{num}"),
-                )
+    le = "https://www.xda-developers.com/search/" + query.replace(" ", "+")
+    ct = requests.get(le).content
+    ml = bs(ct, "html.parser", from_encoding="utf-8")
+    ml = ml.find_all("div", re_compile("layout_post_"), id=re_compile("post-"))
+    out = []
+    builder = event.builder
+    for on in ml:
+        data = on.find_all("img", "xda_image")[0]
+        title = data["alt"]
+        thumb = data["src"]
+        hre = on.find_all("div", "item_content")[0].find("h4").find("a")["href"]
+        desc = on.find_all("div", "item_meta clearfix")[0].text
+        thumb = wb(thumb, 0, "image/jpeg", [])
+        text = f"[{title}]({hre})"
+        out.append(
+            await builder.article(
+                title=title, description=desc, url=hre, thumb=thumb, text=text
             )
-    await e.answer(hm, switch_pm="Ebooks Search", switch_pm_param="start")
+        )
+    uppar = "|| XDA Search Results ||"
+    if len(out) == 0:
+        uppar = "No Results Found :("
+    await event.answer(out, switch_pm=uppar, switch_pm_param="start")

assistant/manager/__init__.py

@@ -7,5 +7,3 @@
 
 
 from plugins import *
-
-asst = asst

assistant/manager/_help.py

@@ -0,0 +1,130 @@
+# 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/>.
+
+from . import *
+
+START = """
+🪅 **Help Menu** 🪅
+
+✘  /start : Check I am Alive or not.
+✘  /help : Get This Message.
+✘  /repo : Get Bot's Repo..
+
+🧑‍💻 Join **@TheUltroid**
+"""
+
+ADMINTOOLS = """✘ **AdminTools** ✘
+
+• /pin : Pins the Replied Message
+• /pinned : Get Pinned message in chat.
+• /unpin : Unpin the Replied message
+• /unpin all : Unpin all Pinned Messages.
+
+• /ban (username/id/reply) : Ban the User
+• /unban (username/id/reply) : UnBan the User.
+
+• /mute (username/id/reply) : Mute the User.
+• /unmute (username/id/reply) : Unmute the User.
+
+• /tban (username/id/reply) (time) : Temporary ban a user
+• /tmute (username/id/reply) (time) : temporary Mutes a User.
+
+• /purge (purge messages)
+
+• /setgpic (reply photo) : keep Chat Photo of Group.
+• /delgpic : remove current chat Photo."""
+
+UTILITIES = """
+✘ ** Utilities ** ✘
+
+• /info (reply/username/id) : get detailed info of user.
+• /id : get chat/user id.
+• /tr : Translate Languages..
+
+• /paste (reply file/text) : paste content on Spaceb.in
+• /meaning (text) : Get Meaning of that Word.
+• /google (query) : Search Something on Google..
+
+• /suggest (query/reply) : Creates a Yes / No Poll.
+"""
+
+LOCKS = """
+✘ ** Locks ** ✘
+
+• /lock (query) : lock particular content in chat.
+• /unlock (query) : Unlock some content.
+
+• All Queries
+- `msgs` : for messages.
+- `inlines` : for inline queries.
+- `media` : for all medias.
+- `games` : for games.
+- `sticker` : for stickers.
+- `polls` : for polls.
+- `gif` : for gifs.
+- `pin` : for pins.
+- `changeinfo` : for change info right.
+"""
+
+MISC = """
+✘  **Misc**  ✘
+
+• /joke : Get Random Jokes.
+"""
+
+STRINGS = {"Admintools": ADMINTOOLS, "locks": LOCKS, "Utils": UTILITIES, "Misc": MISC}
+
+MNGE = udB.get("MNGR_EMOJI") or "•"
+
+
+def get_buttons():
+    BTTS = []
+    keys = STRINGS.copy()
+    while keys:
+        BT = []
+        for i in list(keys)[:2]:
+            text = MNGE + " " + i + " " + MNGE
+            BT.append(Button.inline(text, "hlp_" + i))
+            del keys[i]
+        BTTS.append(BT)
+    url = "https://t.me/" + asst.me.username + "?startgroup=true"
+    BTTS.append([Button.url("Add me to Group", url)])
+    return BTTS
+
+
+@asst_cmd("help")
+async def helpish(event):
+    if not event.is_private:
+        url = "https://t.me/" + asst.me.username + "?start=start"
+        return await event.reply(
+            "Contact me in PM for help!", buttons=Button.url("Click me for Help", url)
+        )
+    if str(event.sender_id) in owner_and_sudos() and (
+        udB.get("DUAL_MODE") and (udB.get("DUAL_HNDLR") == "/")
+    ):
+        return
+    BTTS = get_buttons()
+    await event.reply(START, buttons=BTTS)
+
+
+@callback("mngbtn")
+@owner
+async def ehwhshd(e):
+    buttons = get_buttons()
+    buttons[-1].append(Button.inline("<< Back", "open"))
+    await e.edit(buttons=buttons)
+
+
+@callback("mnghome")
+async def home_aja(e):
+    await e.edit(START, buttons=get_buttons())
+
+
+@callback(re.compile("hlp_(.*)"))
+async def do_something(event):
+    match = event.pattern_match.group(1).decode("utf-8")
+    await event.edit(STRINGS[match], buttons=Button.inline("<< Back", "mnghome"))

vcbot/vchelp.py → assistant/manager/_on_adds.py

@@ -7,23 +7,17 @@
 
 from . import *
 
-HELP_TEXT = "**View All Vc Commands Here :**\nhttps://telegra.ph/Vc-Commands-07-17-2"
 
-
-@asst.on_message(
-    filters.command(["vchelp", f"vchelp@{vcusername}"])
-    & filters.user(VC_AUTHS())
-    & ~filters.edited
-    & filters.group
-)
-async def pass_it(_, message):
-    await eor(message, HELP_TEXT)
-
-
-@Client.on_message(
-    filters.command("vchelp", HNDLR)
-    & filters.outgoing
-    & ~(filters.edited | filters.forwarded)
-)
-async def always(_, message):
-    await eor(message, HELP_TEXT)
+@asst.on(events.ChatAction())
+async def dueha(e):
+    if not e.user_added:
+        return
+    user = await e.get_user()
+    if not user.is_self:
+        return
+    sm = udB.get("ON_MNGR_ADD")
+    if sm == "OFF":
+        return
+    if not sm:
+        sm = "Thanks for Adding me :)"
+    await e.reply(sm, link_preview=False)

assistant/manager/admins.py

@@ -0,0 +1,38 @@
+# 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/>.
+
+from . import *
+
+
+@ultroid_cmd(pattern="dkick", type=["manager", "official"])
+async def dowj(e):
+    replied = await e.get_reply_message()
+    if replied:
+        user = replied.sender_id
+    else:
+        return await eor(e, "Reply to a message...")
+    try:
+        await replied.delete()
+        await e.client.kick_participant(e.chat_id, user)
+        await eor(e, "Kicked Successfully!")
+    except Exception as E:
+        await eor(e, str(E))
+
+
+@ultroid_cmd(pattern="dban", type=["manager", "official"])
+async def dowj(e):
+    replied = await e.get_reply_message()
+    if replied:
+        user = replied.sender_id
+    else:
+        return await eor(e, "Reply to a message...")
+    try:
+        await replied.delete()
+        await e.client.edit_permissions(e.chat_id, user, view_messages=False)
+        await eor(e, "Banned Successfully!")
+    except Exception as E:
+        await eor(e, str(E))

assistant/manager/misc.py

@@ -0,0 +1,46 @@
+# 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/>.
+
+
+import aiohttp
+
+from . import *
+
+
+@ultroid_cmd(pattern="echo ?(.*)", type=["manager"])
+async def oqha(e):
+    match = e.pattern_match.group(1)
+    if match:
+        text = match
+        reply_to = e
+    elif e.is_reply:
+        text = (await e.get_reply_message()).text
+        reply_to = e.reply_to_msg_id
+    else:
+        return await eor(e, "What to Echo?", time=5)
+    await e.client.send_message(e.chat_id, text, reply_to=reply_to)
+
+
+@ultroid_cmd(pattern="kickme$", type=["manager"], allow_all=True)
+async def doit(e):
+    if e.sender_id in DEVLIST:
+        return await eod(e, "`I will Not Kick You, my Developer..`")
+    try:
+        await e.client.kick_participant(e.chat_id, e.sender_id)
+    except Exception as Fe:
+        return await eor(e, str(Fe), time=5)
+    await eor(e, "Yes, You are right, get out.", time=5)
+
+
+@ultroid_cmd(pattern="joke$", type=["manager"])
+async def do_joke(e):
+    e = await e.get_reply_message() if e.is_reply else e
+    link = "https://v2.jokeapi.dev/joke/Any?blacklistFlags=nsfw,religious,political,racist,sexist,explicit&type=single"
+    async with aiohttp.ClientSession() as ses:
+        async with ses.get(link) as out:
+            out = await out.json()
+    await e.reply(out["joke"])

assistant/ping.py

@@ -12,9 +12,7 @@ from datetime import datetime
 @owner
 async def _(event):
     start = datetime.now()
+    msg = await event.reply("Pong!")
     end = datetime.now()
     ms = (end - start).microseconds / 1000
-    await asst.send_message(
-        event.chat_id,
-        f"**Pong!!**\n `{ms} milliseconds`",
-    )
+    await msg.edit(f"**Pong!!**\n `{ms} ms`")

assistant/piston.py

@@ -0,0 +1,45 @@
+# 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/>.
+
+from pistonapi import PistonAPI
+
+from . import *
+
+
+@in_pattern("run")
+async def piston_run(event):
+    piston = PistonAPI()
+    version = None
+    try:
+        lang = event.text.split()[1]
+        code = event.text.split(maxsplit=2)[2]
+    except IndexError:
+        result = await event.builder.article(
+            title="Bad Query",
+            description="Usage: [Language] [code]",
+            text=f'**Inline Usage**\n\n`@{asst.me.username} run python print("hello world")`\n\n[Language List](https://telegra.ph/Ultroid-09-01-6)',
+        )
+        return await event.answer([result])
+    if lang in piston.languages.keys():
+        version = piston.languages[lang]["version"]
+    if not version:
+        result = await event.builder.article(
+            title="Unsupported Language",
+            description="Usage: [Language] [code]",
+            text=f'**Inline Usage**\n\n`@{asst.me.username} run python print("hello world")`\n\n[Language List](https://telegra.ph/Ultroid-09-01-6)',
+        )
+        return await event.answer([result])
+    output = piston.execute(language=lang, version=version, code=code) or "Success"
+    if len(output) > 3000:
+        output = output[:3000] + "..."
+    result = await event.builder.article(
+        title="Result",
+        description=output,
+        text=f"• **Language:**\n`{lang}`\n\n• **Code:**\n`{code}`\n\n• **Result:**\n`{output}`",
+        buttons=Button.switch_inline("Fork", query=event.text, same_peer=True),
+    )
+    await event.answer([result], switch_pm="• Piston •", switch_pm_param="start")

assistant/pmbot/banuser.py

@@ -17,15 +17,15 @@ async def banhammer(event):
     if x is None:
         return await event.edit("Please reply to someone to ban him.")
     target = get_who(x.id)
-    if not is_blacklisted(target):
-        blacklist_user(target)
-        await asst.send_message(event.chat_id, f"#BAN\nUser - {target}")
-        await asst.send_message(
-            target,
-            "`GoodBye! You have been banned.`\n**Further messages you send will not be forwarded.**",
-        )
-    else:
-        return await asst.send_message(event.chat_id, f"User is already banned!")
+    if is_blacklisted(target):
+        return await asst.send_message(event.chat_id, "User is already banned!")
+
+    blacklist_user(target)
+    await asst.send_message(event.chat_id, f"#BAN\nUser - {target}")
+    await asst.send_message(
+        target,
+        "`GoodBye! You have been banned.`\n**Further messages you send will not be forwarded.**",
+    )
 
 
 @asst_cmd("unban")
@@ -37,9 +37,9 @@ async def banhammer(event):
     if x is None:
         return await event.edit("Please reply to someone to ban him.")
     target = get_who(x.id)
-    if is_blacklisted(target):
-        rem_blacklist(target)
-        await asst.send_message(event.chat_id, f"#UNBAN\nUser - {target}")
-        await asst.send_message(target, "`Congrats! You have been unbanned.`")
-    else:
-        return await asst.send_message(event.chat_id, f"User was never banned!")
+    if not is_blacklisted(target):
+        return await asst.send_message(event.chat_id, "User was never banned!")
+
+    rem_blacklist(target)
+    await asst.send_message(event.chat_id, f"#UNBAN\nUser - {target}")
+    await asst.send_message(target, "`Congrats! You have been unbanned.`")

assistant/pmbot/incoming.py

@@ -19,15 +19,11 @@ from . import *
 
 @asst.on(events.NewMessage(incoming=True, func=lambda e: e.is_private))
 async def on_new_mssg(event):
-    incoming = event.raw_text
     who = event.sender_id
     if is_blacklisted(who):
         return
     # doesn't reply to that user anymore
-    if incoming.startswith("/"):
-        pass
-    elif who == OWNER_ID:
+    if event.text.startswith("/") or who == OWNER_ID:
         return
-    else:
-        xx = await event.forward_to(OWNER_ID)
-        add_stuff(xx.id, who)
+    xx = await event.forward_to(OWNER_ID)
+    add_stuff(xx.id, who)

assistant/pmbot/outgoing.py

@@ -17,23 +17,18 @@ from . import *
 @asst.on(events.NewMessage(incoming=True, func=lambda e: e.is_private))
 async def on_out_mssg(event):
     x = await event.get_reply_message()
-    if x is None:
+    if not x:
         return
     who = event.sender_id
     if who == OWNER_ID:
         to_user = get_who(x.id)
         if event.text.startswith("/who"):
             try:
-                k = await asst.get_entity(int(to_user))
+                k = await asst.get_entity(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)
-            else:
-                await asst.send_file(int(to_user), event.media)
-        else:
-            await asst.send_message(int(to_user), event.text)
+        if to_user:
+            await asst.send_message(to_user, event.message)

assistant/start.py

@@ -19,11 +19,11 @@ from . import *
 
 Owner_info_msg = f"""
 <strong>Owner</strong> - {OWNER_NAME}
-<stong>OwnerID</strong> - <code>{OWNER_ID}</code>
+<strong>OwnerID</strong> - <code>{OWNER_ID}</code>
 
 <strong>Message Forwards</strong> - {udB.get("PMBOT")}
 
-<stong>Ultroid <a href=https://github.com/TeamUltroid/Ultroid>[v{ultroid_version}]</a>, powered by @TeamUltroid</strong>
+<strong>Ultroid <a href=https://github.com/TeamUltroid/Ultroid>[v{ultroid_version}]</a>, powered by @TeamUltroid</strong>
 """
 
 _settings = [
@@ -35,8 +35,10 @@ _settings = [
         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("Fᴇᴀᴛᴜʀᴇs", data="otvars"),
+        Button.inline("VC Sᴏɴɢ Bᴏᴛ", data="vcb"),
+    ],
     [Button.inline("« Bᴀᴄᴋ", data="mainmenu")],
 ]
 
@@ -57,7 +59,7 @@ _start = [
 async def own(event):
     await event.edit(
         Owner_info_msg,
-        buttons=[Button.inline("Close", data=f"closeit")],
+        buttons=[Button.inline("Close", data="closeit")],
         link_preview=False,
         parse_mode="html",
     )
@@ -72,41 +74,37 @@ async def closet(lol):
 async def ultroid(event):
     if event.is_group:
         return
+    if not is_added(event.sender_id) and str(event.sender_id) not in owner_and_sudos():
+        add_user(event.sender_id)
+    if str(event.sender_id) not in owner_and_sudos():
+        ok = ""
+        u = await event.client.get_entity(event.chat_id)
+        if not udB.get("STARTMSG"):
+            if udB.get("PMBOT") == "True":
+                ok = "You can contact my master using this bot!!\n\nSend your Message, I will Deliver it To Master."
+            await event.reply(
+                f"Hey there [{get_display_name(u)}](tg://user?id={u.id}), this is Ultroid Assistant of [{ultroid_bot.me.first_name}](tg://user?id={ultroid_bot.uid})!\n\n{ok}",
+                buttons=[Button.inline("Info.", data="ownerinfo")],
+            )
+        else:
+            me = f"[{ultroid_bot.me.first_name}](tg://user?id={ultroid_bot.uid})"
+            mention = f"[{get_display_name(u)}](tg://user?id={u.id})"
+            await event.reply(
+                Redis("STARTMSG").format(me=me, mention=mention),
+                buttons=[Button.inline("Info.", data="ownerinfo")],
+            )
     else:
-        if (
-            not is_added(event.sender_id)
-            and str(event.sender_id) not in owner_and_sudos()
-        ):
-            add_user(event.sender_id)
-        if str(event.sender_id) not in owner_and_sudos():
-            ok = ""
-            u = await event.client.get_entity(event.chat_id)
-            if not udB.get("STARTMSG"):
-                if udB.get("PMBOT") == "True":
-                    ok = "You can contact my master using this bot!!\n\nSend your Message, I will Deliver it To Master."
-                await event.reply(
-                    f"Hey there [{get_display_name(u)}](tg://user?id={u.id}), this is Ultroid Assistant of [{ultroid_bot.me.first_name}](tg://user?id={ultroid_bot.uid})!\n\n{ok}",
-                    buttons=[Button.inline("Info.", data="ownerinfo")],
-                )
-            else:
-                me = f"[{ultroid_bot.me.first_name}](tg://user?id={ultroid_bot.uid})"
-                mention = f"[{get_display_name(u)}](tg://user?id={u.id})"
-                await event.reply(
-                    Redis("STARTMSG").format(me=me, mention=mention),
-                    buttons=[Button.inline("Info.", data="ownerinfo")],
-                )
+        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:
-            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,
-                )
+            await event.reply(
+                get_string("ast_3").format(name),
+                buttons=_start,
+            )
 
 
 @callback("mainmenu")
@@ -145,26 +143,25 @@ async def bdcast(event):
         themssg = response.message.message
         if themssg == "/cancel":
             return await conv.send_message("Cancelled!!")
-        else:
-            success = 0
-            fail = 0
-            await conv.send_message(f"Starting a broadcast to {len(ok)} users...")
-            start = datetime.now()
-            for i in ok:
-                try:
-                    await asst.send_message(int(i), f"{themssg}")
-                    success += 1
-                except BaseException:
-                    fail += 1
-            end = datetime.now()
-            time_taken = (end - start).seconds
-            await conv.send_message(
-                f"""
+        success = 0
+        fail = 0
+        await conv.send_message(f"Starting a broadcast to {len(ok)} users...")
+        start = datetime.now()
+        for i in ok:
+            try:
+                await asst.send_message(int(i), f"{themssg}")
+                success += 1
+            except BaseException:
+                fail += 1
+        end = datetime.now()
+        time_taken = (end - start).seconds
+        await conv.send_message(
+            f"""
 Broadcast completed in {time_taken} seconds.
 Total Users in Bot - {len(ok)}
 Sent to {success} users.
 Failed for {fail} user(s).""",
-            )
+        )
 
 
 @callback("setter")
@@ -195,16 +192,15 @@ async def timezone_(event):
                 "Cancelled!!",
                 buttons=get_back_button("mainmenu"),
             )
-        else:
-            try:
-                tz(themssg)
-                await setit(event, var, themssg)
-                await conv.send_message(
-                    f"{name} changed to {themssg}\n",
-                    buttons=get_back_button("mainmenu"),
-                )
-            except BaseException:
-                await conv.send_message(
-                    "Wrong TimeZone, Try again",
-                    buttons=get_back_button("mainmenu"),
-                )
+        try:
+            tz(themssg)
+            await setit(event, var, themssg)
+            await conv.send_message(
+                f"{name} changed to {themssg}\n",
+                buttons=get_back_button("mainmenu"),
+            )
+        except BaseException:
+            await conv.send_message(
+                "Wrong TimeZone, Try again",
+                buttons=get_back_button("mainmenu"),
+            )

assistant/ytdl.py

@@ -9,14 +9,12 @@
 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.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"
@@ -24,6 +22,7 @@ _yt_base_url = "https://www.youtube.com/watch?v="
 
 
 @in_pattern("yt")
+@in_owner
 async def _(event):
     try:
         string = event.text.split(" ", maxsplit=1)[1]
@@ -128,12 +127,18 @@ async def _(event):
             "quiet": True,
             "logtostderr": False,
         }
-        ytdl_data = await dler(event, link)
-        YoutubeDL(opts).download([link])
+        ytdl_data = await dler(event, link, opts, True)
         title = ytdl_data["title"]
-        artist = ytdl_data["uploader"]
+        if ytdl_data.get("artist"):
+            artist = ytdl_data["artist"]
+        elif ytdl_data.get("creator"):
+            artist = ytdl_data["creator"]
+        elif ytdl_data.get("channel"):
+            artist = ytdl_data["channel"]
         views = numerize.numerize(ytdl_data["view_count"])
-        urlretrieve(f"https://i.ytimg.com/vi/{vid_id}/hqdefault.jpg", f"{title}.jpg")
+        await download_file(
+            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")
@@ -159,13 +164,19 @@ async def _(event):
             "logtostderr": False,
             "quiet": True,
         }
-        ytdl_data = await dler(event, link)
-        YoutubeDL(opts).download([link])
+        ytdl_data = await dler(event, link, opts, True)
         title = ytdl_data["title"]
-        artist = ytdl_data["uploader"]
+        if ytdl_data.get("artist"):
+            artist = ytdl_data["artist"]
+        elif ytdl_data.get("creator"):
+            artist = ytdl_data["creator"]
+        elif ytdl_data.get("channel"):
+            artist = ytdl_data["channel"]
         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"
+        thumb = await fast_download(
+            f"https://i.ytimg.com/vi/{vid_id}/hqdefault.jpg", filename=f"{title}.jpg"
+        )
+        hi, wi = ytdl_data["height"], ytdl_data["width"]
         duration = ytdl_data["duration"]
         try:
             os.rename(f"{ytdl_data['id']}.mp4", f"{title}.mp4")
@@ -173,11 +184,9 @@ async def _(event):
             try:
                 os.rename(f"{ytdl_data['id']}.mkv", f"{title}.mp4")
             except FileNotFoundError:
-                os.rename(f"{ytdl_data['id']}.webm", f"{title}.mp4")
+                os.rename(f"{ytdl_data['id']}.mp4.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 + "..."
@@ -185,8 +194,8 @@ async def _(event):
         attributes = [
             DocumentAttributeVideo(
                 duration=int(duration),
-                w=int(wi.split(":")[1].split()[0]),
-                h=int(hi.split(":")[1].split()[0]),
+                w=wi,
+                h=hi,
                 supports_streaming=True,
             ),
         ]
@@ -201,4 +210,4 @@ async def _(event):
         attributes=attributes,
         thumb=thumb,
     )
-    os.system(f'rm "{title}"*')
+    await bash(f'rm "{title}"*')

plugins/_ChatActions.py

@@ -1,9 +1,18 @@
+# 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/>.
+
+
 from pyUltroid.functions.all import get_chatbot_reply
 from pyUltroid.functions.chatBot_db import chatbot_stats
 from pyUltroid.functions.clean_db import *
 from pyUltroid.functions.forcesub_db import *
 from pyUltroid.functions.gban_mute_db import *
 from pyUltroid.functions.greetings_db import *
+from pyUltroid.functions.username_db import *
 from telethon.errors.rpcerrorlist import UserNotParticipantError
 from telethon.tl.functions.channels import GetParticipantRequest
 from telethon.utils import get_display_name
@@ -48,21 +57,20 @@ async def ChatActionsHandler(ult):  # sourcery no-metrics
                 await res[0].click(ult.chat_id, reply_to=ult.action_message.id)
 
     # gban checks
-    if ult.user_joined and ult.added_by:
+    if ult.user_joined or ult.added_by:
         user = await ult.get_user()
         chat = await ult.get_chat()
-        if is_gbanned(str(user.id)) and chat.admin_rights:
+        reason = is_gbanned(user.id)
+        if reason and chat.admin_rights:
             try:
                 await ultroid_bot.edit_permissions(
                     chat.id,
                     user.id,
                     view_messages=False,
                 )
-                reason = get_gban_reason(user.id)
                 gban_watch = f"#GBanned_User Joined.\n\n**User** - [{user.first_name}](tg://user?id={user.id})\n"
-                if reason is not None:
-                    gban_watch += f"**Reason**: {reason}\n\n"
-                gban_watch += f"`User Banned.`"
+                gban_watch += f"**Reason**: {reason}\n\n"
+                gban_watch += "`User Banned.`"
                 await ult.reply(gban_watch)
             except BaseException:
                 pass
@@ -80,6 +88,7 @@ async def ChatActionsHandler(ult):  # sourcery no-metrics
             fullname = f"{name} {last}" if last else name
             uu = user.username
             username = f"@{uu}" if uu else mention
+            wel = get_welcome(ult.chat_id)
             msgg = wel["welcome"]
             med = wel["media"]
             userid = user.id
@@ -98,7 +107,7 @@ async def ChatActionsHandler(ult):  # sourcery no-metrics
                 )
                 await asyncio.sleep(150)
                 await send.delete()
-            elif not is_gbanned(str(user.id)):
+            elif not is_gbanned(user.id):
                 await ult.reply(file=med)
     if (ult.user_left or ult.user_kicked) and get_goodbye(ult.chat_id):
         user = await ult.get_user()
@@ -112,6 +121,7 @@ async def ChatActionsHandler(ult):  # sourcery no-metrics
         fullname = f"{name} {last}" if last else name
         uu = user.username
         username = f"@{uu}" if uu else mention
+        wel = get_goodbye(ult.chat_id)
         msgg = wel["goodbye"]
         med = wel["media"]
         userid = user.id
@@ -135,8 +145,47 @@ async def ChatActionsHandler(ult):  # sourcery no-metrics
 
 
 @ultroid_bot.on(events.NewMessage(incoming=True))
-async def chatBot_replies(event):
-    if event.sender_id and chatbot_stats(event.chat_id, event.sender_id) and not event.media:
-        msg = get_chatbot_reply(event, event.text)
+async def chatBot_replies(e):
+    sender = await e.get_sender()
+    if not isinstance(sender, types.User):
+        return
+    if e.text and chatbot_stats(e.chat_id, e.sender_id):
+        msg = get_chatbot_reply(e, e.message.message)
         if msg:
-            await event.reply(msg)
+            await e.reply(msg)
+    chat = await e.get_chat()
+    if e.is_group and not sender.bot:
+        if sender.username:
+            await uname_stuff(e.sender_id, sender.username, sender.first_name)
+    elif e.is_private and not sender.bot:
+        if chat.username:
+            await uname_stuff(e.sender_id, chat.username, chat.first_name)
+
+
+@ultroid_bot.on(events.Raw(types.UpdateUserName))
+async def uname_change(e):
+    await uname_stuff(e.user_id, e.username, e.first_name)
+
+
+async def uname_stuff(id, uname, name):
+    if udB.get("USERNAME_LOG") == "True":
+        old = get_username(id)
+        # Ignore Name Logs
+        if old and old == uname:
+            return
+        if old and uname:
+            await asst.send_message(
+                LOG_CHANNEL,
+                f"∆ #UsernameUpdate\n\n@{old} changed username to @{uname}",
+            )
+        elif old and not uname:
+            await asst.send_message(
+                LOG_CHANNEL,
+                f"∆ #UsernameUpdate\n\n[{name}](tg://user?id={id}) removed its username. (@{old})",
+            )
+        elif not old and uname:
+            await asst.send_message(
+                LOG_CHANNEL,
+                f"∆ #UsernameUpdate\n\n[{name}](tg://user?id={id})'s new username --> @{uname}",
+            )
+        update_username(id, uname)

plugins/__init__.py

@@ -6,6 +6,7 @@
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
 import asyncio
+import os
 import time
 
 from pyUltroid import *
@@ -15,6 +16,7 @@ from pyUltroid.functions.sudos import *
 from pyUltroid.version import ultroid_version
 from telethon import Button
 from telethon.tl import functions, types
+from telethon.utils import get_display_name
 
 from strings import get_string
 
@@ -30,16 +32,22 @@ start_time = time.time()
 
 OWNER_NAME = ultroid_bot.me.first_name
 OWNER_ID = ultroid_bot.me.id
+LOG_CHANNEL = int(udB.get("LOG_CHANNEL"))
 
 List = []
 Dict = {}
 N = 0
 
+# Chats, which needs to be ignore for some cases
+# Considerably, there can be many
+# Feel Free to Add Any other...
+
 NOSPAM_CHAT = [
-    -1001387666944,  # @PyrogramChat
-    -1001109500936,  # @TelethonChat
-    -1001050982793,  # @Python
-    -1001256902287,  # @DurovsChat
+    -1001327032795,  # UltroidSupport
+    -1001387666944,  # PyrogramChat
+    -1001109500936,  # TelethonChat
+    -1001050982793,  # Python
+    -1001256902287,  # DurovsChat
 ]
 
 KANGING_STR = [

plugins/_help.py

@@ -12,6 +12,25 @@ from telethon.errors.rpcerrorlist import BotResponseTimeoutError as rep
 
 from . import *
 
+C_PIC = udB.get("INLINE_PIC")
+_file_to_replace = C_PIC or "resources/extras/inline.jpg"
+
+_main_help_menu = [
+    [
+        Button.inline("• Plugins", data="hrrrr"),
+        Button.inline("• Addons", data="frrr"),
+    ],
+    [
+        Button.inline("••Voice Chat", data="vc_helper"),
+        Button.inline("Inline Plugins••", data="inlone"),
+    ],
+    [
+        Button.inline("⚙️ Owner Tools", data="ownr"),
+        Button.url("Settings ⚙️", url=f"https://t.me/{asst.me.username}?start=set"),
+    ],
+    [Button.inline("••Cʟᴏꜱᴇ••", data="close")],
+]
+
 
 @ultroid_cmd(pattern="help ?(.*)")
 async def _help(ult):
@@ -37,7 +56,7 @@ async def _help(ult):
                     x += "\n© @TeamUltroid"
                     await eor(ult, x)
                 except BaseException:
-                    await eod(ult, get_string("help_1").format(plug), time=5)
+                    await eor(ult, get_string("help_1").format(plug), time=5)
         except BaseException:
             await eor(ult, "Error 🤔 occured.")
     else:
@@ -50,30 +69,17 @@ async def _help(ult):
                 for y in x:
                     z.append(y)
             cmd = len(z) + 10
-            return await ult.client.send_message(
-                ult.chat_id,
+            if udB.get("MANAGER") and udB.get("DUAL_HNDLR") == "/":
+                _main_help_menu[2:3] = [[Button.inline("• Manager Help •", "mngbtn")]]
+            return await ult.reply(
                 get_string("inline_4").format(
                     OWNER_NAME,
                     len(PLUGINS) - 5,
                     len(ADDONS),
                     cmd,
                 ),
-                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/{tgbot}?start=set"
-                        ),
-                    ],
-                    [Button.inline("••Cʟᴏꜱᴇ••", data="close")],
-                ],
+                file=_file_to_replace,
+                buttons=_main_help_menu,
             )
         except rep:
             return await eor(

plugins/_inline.py

@@ -18,6 +18,7 @@ from support import *
 from telethon.tl.types import InputBotInlineResult, InputWebDocument
 
 from . import *
+from ._help import _main_help_menu
 
 # ================================================#
 notmine = f"This bot is for {OWNER_NAME}"
@@ -38,32 +39,18 @@ if C_PIC:
     TLINK = C_PIC
 else:
     _file_to_replace = "resources/extras/inline.jpg"
+
+upage = 0
 # ============================================#
 
 
 # --------------------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("• Repo •", url="https://github.com/TeamUltroid/Ultroid"),
+        Button.url("• Support •", url="t.me/UltroidSupport"),
     ],
-    [Button.url("Support", url="t.me/UltroidSupport")],
 ]
 
 # --------------------BUTTONS--------------------#
@@ -75,9 +62,6 @@ async def inline_alive(o):
     if len(o.text) == 0:
         b = o.builder
         MSG = "• **Ultroid Userbot •**"
-        uptime = time_formatter((time.time() - start_time) * 1000)
-        MSG += f"\n\n• **Uptime** - `{uptime}`\n"
-        MSG += f"• **OWNER** - `{OWNER_NAME}`"
         WEB0 = InputWebDocument(
             "https://telegra.ph/file/55dd0f381c70e72557cb1.jpg", 0, "image/jpg", []
         )
@@ -97,7 +81,7 @@ async def inline_alive(o):
                 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="👥 ULTROID PORTAL", switch_pm_param="start")
 
 
 @in_pattern("ultd")
@@ -121,18 +105,19 @@ async def inline_handler(event):
     await event.answer([result], gallery=True)
 
 
-@in_pattern("haste")
+@in_pattern("pasta")
 @in_owner
 async def _(event):
-    ok = event.text.split(" ")[1]
-    link = "https://hastebin.com/"
-    result = event.builder.article(
+    ok = event.text.split("-")[1]
+    link = "https://spaceb.in/" + ok
+    raw = f"https://spaceb.in/api/v1/documents/{ok}/raw"
+    result = await event.builder.article(
         title="Paste",
-        text="Pᴀsᴛᴇᴅ Tᴏ Hᴀsᴛᴇʙɪɴ!",
+        text="Pasted to Spacebin 🌌",
         buttons=[
             [
-                Button.url("HasteBin", url=f"{link}{ok}"),
-                Button.url("Raw", url=f"{link}raw/{ok}"),
+                Button.url("SpaceBin", url=link),
+                Button.url("Raw", url=raw),
             ],
         ],
     )
@@ -170,23 +155,32 @@ async def setting(event):
     )
 
 
+@callback("vc_helper")
+@owner
+async def on_vc_callback_query_handler(event):
+    xhelps = "**Voice Chat Help Menu for {}**\n**Available Commands:** `{}`\n\n@TeamUltroid".format(
+        OWNER_NAME, len(VC_HELP)
+    )
+    buttons = page_num(0, VC_HELP, "vchelp", "vc")
+    await event.edit(f"{xhelps}", buttons=buttons, link_preview=False)
+
+
 @callback("doupdate")
 @owner
 async def _(event):
-    check = await updater()
+    check = updater()
     if not check:
         return await event.answer(
             "You Are Already On Latest Version", cache_time=0, alert=True
         )
     repo = Repo.init()
     ac_br = repo.active_branch
-    changelog, tl_chnglog = await gen_chlog(repo, f"HEAD..upstream/{ac_br}")
-    changelog_str = changelog + f"\n\nClick the below button to update!"
+    changelog, tl_chnglog = gen_chlog(repo, f"HEAD..upstream/{ac_br}")
+    changelog_str = changelog + "\n\nClick the below button to update!"
     if len(changelog_str) > 1024:
         await event.edit(get_string("upd_4"))
-        file = open(f"ultroid_updates.txt", "w+")
-        file.write(tl_chnglog)
-        file.close()
+        with open("ultroid_updates.txt", "w+") as file:
+            file.write(tl_chnglog)
         await event.edit(
             get_string("upd_5"),
             file="ultroid_updates.txt",
@@ -195,8 +189,7 @@ async def _(event):
                 [Button.inline("« Bᴀᴄᴋ", data="ownr")],
             ],
         )
-        remove(f"ultroid_updates.txt")
-        return
+        remove("ultroid_updates.txt")
     else:
         await event.edit(
             changelog_str,
@@ -266,8 +259,8 @@ async def _(e):
         ],
         [
             Button.switch_inline(
-                "EBᴏᴏᴋs Uᴘʟᴏᴀᴅᴇʀ",
-                query="ebooks India",
+                "Piston Eval",
+                query="run javascript console.log('Hello Ultroid')",
                 same_peer=True,
             ),
             Button.switch_inline(
@@ -276,6 +269,7 @@ async def _(e):
                 same_peer=True,
             ),
         ],
+        [Button.switch_inline("xda Search", query="xda telegram", same_peer=True)],
         [
             Button.inline(
                 "« Bᴀᴄᴋ",
@@ -339,6 +333,30 @@ async def on_plug_in_callback_query_handler(event):
     await event.edit(buttons=buttons, link_preview=False)
 
 
+@callback(
+    re.compile(
+        rb"vchelp_next\((.+?)\)",
+    ),
+)
+@owner
+async def on_vc_callback_query_handler(event):
+    current_page_number = int(event.data_match.group(1).decode("UTF-8"))
+    buttons = page_num(current_page_number + 1, VC_HELP, "vchelp", "vc")
+    await event.edit(buttons=buttons, link_preview=False)
+
+
+@callback(
+    re.compile(
+        rb"vchelp_prev\((.+?)\)",
+    ),
+)
+@owner
+async def on_vc_callback_query_handler(event):
+    current_page_number = int(event.data_match.group(1).decode("UTF-8"))
+    buttons = page_num(current_page_number - 1, VC_HELP, "vchelp", "vc")
+    await event.edit(buttons=buttons, link_preview=False)
+
+
 @callback(
     re.compile(
         rb"addon_next\((.+?)\)",
@@ -391,6 +409,22 @@ async def backr(event):
     )
 
 
+@callback("bvck")
+@owner
+async def bvckr(event):
+    xhelps = "**Voice Chat Help Menu for {}**\n**Available Commands:** `{}`\n\n@TeamUltroid".format(
+        OWNER_NAME, len(VC_HELP)
+    )
+    current_page_number = int(upage)
+    buttons = page_num(current_page_number, VC_HELP, "vchelp", "vc")
+    await event.edit(
+        f"{xhelps}",
+        file=_file_to_replace,
+        buttons=buttons,
+        link_preview=False,
+    )
+
+
 @callback("open")
 @owner
 async def opner(event):
@@ -465,6 +499,51 @@ async def on_plug_in_callback_query_handler(event):
         await event.edit(halps, buttons=buttons)
 
 
+@callback(
+    re.compile(
+        b"vc_plugin_(.*)",
+    ),
+)
+@owner
+async def on_vc_plg_callback_query_handler(event):
+    plugin_name = event.data_match.group(1).decode("UTF-8")
+    help_string = f"Plugin Name - `{plugin_name}`\n"
+    try:
+        for i in VC_HELP[plugin_name]:
+            help_string += i
+    except BaseException:
+        pass
+    if help_string == "**Commands Available:**\n\n":
+        reply_pop_up_alert = f"{plugin_name} has no detailed help..."
+    else:
+        reply_pop_up_alert = help_string
+    reply_pop_up_alert += "\n© @TeamUltroid"
+    buttons = [
+        [
+            Button.inline(
+                "« Sᴇɴᴅ Pʟᴜɢɪɴ »",
+                data=f"sndplug_{(event.data).decode('UTF-8')}",
+            )
+        ],
+        [
+            Button.inline("« Bᴀᴄᴋ", data="bvck"),
+            Button.inline("••Cʟᴏꜱᴇ••", data="close"),
+        ],
+    ]
+    try:
+        if str(event.query.user_id) in owner_and_sudos():
+            await event.edit(
+                reply_pop_up_alert,
+                buttons=buttons,
+            )
+        else:
+            reply_pop_up_alert = notmine
+            await event.answer(reply_pop_up_alert, cache_time=0)
+    except BaseException:
+        halps = f"Do .help {plugin_name} to get the list of commands."
+        await event.edit(halps, buttons=buttons)
+
+
 @callback(
     re.compile(
         b"add_plugin_(.*)",
@@ -524,19 +603,14 @@ async def on_plug_in_callback_query_handler(event):
         await event.edit(halps, buttons=buttons)
 
 
-def page_num(page_number, loaded_plugins, prefix, type):
+def page_num(page_number, loaded_plugins, prefix, type_):
     number_of_rows = 5
     number_of_cols = 2
     emoji = Redis("EMOJI_IN_HELP")
-    if emoji:
-        multi = emoji
-    else:
-        multi = "✘"
-    helpable_plugins = []
+    multi = emoji or "✘"
     global upage
     upage = page_number
-    for p in loaded_plugins:
-        helpable_plugins.append(p)
+    helpable_plugins = [p for p in loaded_plugins]
     helpable_plugins = sorted(helpable_plugins)
     modules = [
         Button.inline(
@@ -545,7 +619,7 @@ def page_num(page_number, loaded_plugins, prefix, type):
                 x,
                 multi,
             ),
-            data=f"{type}_plugin_{x}",
+            data=f"{type_}_plugin_{x}",
         )
         for x in helpable_plugins
     ]

plugins/_ultroid.py

@@ -4,8 +4,12 @@
 # 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 telethon.errors import ChatSendInlineForbiddenError
-from telethon.errors.rpcerrorlist import BotMethodInvalidError as bmi
+
+from telethon.errors import (
+    BotMethodInvalidError,
+    ChatSendInlineForbiddenError,
+    ChatSendMediaForbiddenError,
+)
 
 from . import *
 
@@ -16,13 +20,46 @@ REPOMSG = """
 • Support - @UltroidSupport
 """
 
+RP_BUTTONS = [
+    [
+        Button.url("Repo", "https://github.com/TeamUltroid/Ultroid"),
+        Button.url("Addons", "https://github.com/TeamUltroid/UltroidAddons"),
+    ],
+    [Button.url("Support Group", "t.me/ultroidsupport")],
+]
+
+ULTSTRING = """🎇 **Thanks for Deploying Ultroid Userbot!**
+
+• Here, are the Some Basic stuff from, where you can Know, about its Usage."""
 
-@ultroid_cmd(pattern="repo$", type=["official", "manager"], ignore_dualmode=True)
+
+@ultroid_cmd(
+    pattern="repo$",
+    type=["official", "manager"],
+)
 async def repify(e):
     try:
-        q = await e.client.inline_query(asst.me.username, "repo")
+        q = await e.client.inline_query(asst.me.username, "")
         await q[0].click(e.chat_id)
-        if e.out:
-            await e.delete()
-    except (ChatSendInlineForbiddenError, bmi):
-        await eor(e, REPOMSG)
+        return await e.delete()
+    except (
+        ChatSendInlineForbiddenError,
+        ChatSendMediaForbiddenError,
+        BotMethodInvalidError,
+    ):
+        pass
+    except Exception as er:
+        LOGS.info("Error while repo command : " + str(er))
+    await eor(e, REPOMSG)
+
+
+@ultroid_cmd(pattern="ultroid")
+async def useUltroid(rs):
+    button = Button.inline("Start >>", "initft_2")
+    msg = await asst.send_message(
+        LOG_CHANNEL,
+        ULTSTRING,
+        file="https://telegra.ph/file/54a917cc9dbb94733ea5f.jpg",
+        buttons=button,
+    )
+    await eor(rs, f"**[Click Here]({msg.message_link})**")

plugins/_userlogs.py

@@ -5,18 +5,21 @@
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
+import os
 import re
 
+from pyUltroid.functions.botchat_db import tag_add, who_tag
 from telethon.errors.rpcerrorlist import (
     ChatWriteForbiddenError,
     MediaEmptyError,
     PeerIdInvalidError,
+    UserNotParticipantError,
 )
 from telethon.utils import get_display_name
 
 from . import *
 
-# taglogger
+CACHE_SPAM = {}
 
 
 @ultroid_bot.on(
@@ -32,65 +35,78 @@ async def all_messages_catcher(e):
         NEEDTOLOG = int(udB.get("TAG_LOG"))
     except Exception:
         return LOGS.info("you given Wrong Grp/Channel ID in TAG_LOG.")
-    x = e.sender
-    if x.bot or x.verified:
+    x = await e.get_sender()
+    if isinstance(x, types.User) and (x.bot or x.verified):
         return
     y = e.chat
     where_n = get_display_name(y)
     who_n = get_display_name(x)
-    where_l = f"https://t.me/c/{y.id}/{e.id}"
-    send = await ultroid_bot.get_messages(e.chat_id, ids=e.id)
+    where_l = e.message.message_link
+    buttons = [[Button.url(where_n, where_l)]]
+    if x.username:
+        who_l = f"https://t.me/{x.username}"
+        buttons.append([Button.url(who_n, who_l)])
+    else:
+        buttons.append([Button.inline(who_n, data=f"who{x.id}")])
     try:
-        if x.username:
-            who_l = f"https://t.me/{x.username}"
-            await asst.send_message(
-                NEEDTOLOG,
-                send,
-                buttons=[
-                    [Button.url(who_n, who_l)],
-                    [Button.url(where_n, where_l)],
-                ],
-            )
-        else:
-            await asst.send_message(
-                NEEDTOLOG,
-                send,
-                buttons=[
-                    [Button.inline(who_n, data=f"who{x.id}")],
-                    [Button.url(where_n, where_l)],
-                ],
-            )
+        sent = await asst.send_message(NEEDTOLOG, e.message, buttons=buttons)
+        tag_add(sent.id, e.chat_id, e.id)
     except MediaEmptyError:
-        if x.username:
-            who_l = f"https://t.me/{x.username}"
-            await asst.send_message(
-                NEEDTOLOG,
-                "`Unsupported Media`",
-                buttons=[
-                    [Button.url(who_n, who_l)],
-                    [Button.url(where_n, where_l)],
-                ],
-            )
-        else:
-            await asst.send_message(
-                NEEDTOLOG,
-                "`Unsupported Media`",
-                buttons=[
-                    [Button.inline(who_n, data=f"who{x.id}")],
-                    [Button.url(where_n, where_l)],
-                ],
-            )
-    except PeerIdInvalidError:
-        await ultroid_bot.send_message(
+        try:
+            msg = await asst.get_messages(e.chat_id, ids=e.id)
+            sent = await asst.send_message(NEEDTOLOG, msg, buttons=buttons)
+            tag_add(sent.id, e.chat_id, e.id)
+        except Exception as me:
+            LOGS.info(me)
+            if e.photo or e.sticker or e.gif:
+                try:
+                    media = await e.download_media()
+                    await asst.send_message(
+                        NEEDTOLOG, e.message.text, file=media, buttons=buttons
+                    )
+                    return os.remove(media)
+                except Exception as er:
+                    LOGS.info(er)
+            await asst.send_message(NEEDTOLOG, "`Unsupported Media`", buttons=buttons)
+    except (PeerIdInvalidError, ValueError):
+        await asst.send_message(
             int(udB.get("LOG_CHANNEL")),
             "The Chat Id You Set In Tag Logger Is Wrong , Please Correct It",
         )
     except ChatWriteForbiddenError:
-        await ultroid_bot.send_message(NEEDTOLOG, "Please Give Your Assistant Bot")
+        try:
+            await asst.get_permissions(NEEDTOLOG, "me")
+            MSG = "Your Asst Cant Send Messages in Tag Log Chat."
+            MSG += "\n\nPlease Review the case or you can off"
+            MSG += "Your TagLogger, if you dont want to use it"
+        except UserNotParticipantError:
+            MSG = "Add me to Your Tag Logger Chat to Log Tags"
+        try:
+            CACHE_SPAM[NEEDTOLOG]
+        except KeyError:
+            await asst.send_message(LOG_CHANNEL, MSG)
+            CACHE_SPAM.update({NEEDTOLOG: True})
     except Exception as er:
         LOGS.info(str(er))
 
 
+if udB.get("TAG_LOG"):
+
+    @ultroid_bot.on(
+        events.NewMessage(
+            outgoing=True, chats=[int(udB["TAG_LOG"])], func=lambda e: e.reply_to
+        )
+    )
+    async def idk(e):
+        id = e.reply_to_msg_id
+        chat, msg = who_tag(id)
+        if chat and msg:
+            try:
+                await ultroid_bot.send_message(chat, e.message, reply_to=msg)
+            except BaseException:
+                pass
+
+
 @callback(re.compile("who(.*)"))
 async def _(e):
     wah = e.pattern_match.group(1).decode("UTF-8")
@@ -112,7 +128,7 @@ async def when_asst_added_to_chat(event):
         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:
+    if user and user.is_self:
         tmp = event.added_by
         buttons = Button.inline("Leave Chat", data=f"leave_ch_{event.chat_id}|bot")
         return await asst.send_message(
@@ -127,35 +143,23 @@ async def when_asst_added_to_chat(event):
 
 @ultroid.on(events.ChatAction)
 async def when_ultd_added_to_chat(event):
+    user = await event.get_user()
+    chat = await event.get_chat()
+    if not (user and user.is_self):
+        return
+    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})"
+    buttons = Button.inline("Leave Chat", data=f"leave_ch_{event.chat_id}|user")
     if event.user_added:
-        user = await event.get_user()
-        chat = await event.get_chat()
-        if hasattr(chat, "username") and 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:
-            tmp = event.added_by
-            buttons = Button.inline("Leave Chat", data=f"leave_ch_{event.chat_id}|user")
-            return await asst.send_message(
-                int(udB.get("LOG_CHANNEL")),
-                f"#ADD_LOG\n\n{inline_mention(tmp)} just added {inline_mention(user)} to {chat}.",
-                buttons=buttons,
-            )
+        tmp = event.added_by
+        text = f"#ADD_LOG\n\n{inline_mention(tmp)} just added {inline_mention(user)} to {chat}."
     elif event.user_joined:
-        user = await event.get_user()
-        chat = await event.get_chat()
-        if hasattr(chat, "username") and 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(
-                int(udB.get("LOG_CHANNEL")),
-                f"#JOIN_LOG\n\n[{user.first_name}](tg://user?id={user.id}) just joined {chat}.",
-                buttons=buttons,
-            )
+        text = f"#JOIN_LOG\n\n[{user.first_name}](tg://user?id={user.id}) just joined {chat}."
+    else:
+        return
+    await asst.send_message(int(udB["LOG_CHANNEL"]), text, buttons=buttons)
 
 
 @callback(

plugins/_wspr.py

@@ -142,8 +142,7 @@ async def _(e):
             snap.update({e.id: desc})
         except ValueError:
             sur = e.builder.article(
-                title="Type ur msg",
-                text=f"You Didn't Type Your Msg",
+                title="Type ur msg", text="You Didn't Type Your Msg"
             )
     await e.answer([sur])
 

plugins/admintools.py

@@ -18,6 +18,11 @@
 • `{i}kick <reply to user/userid/username> <reason>`
     Kick the user from the chat.
 
+• `{i}tban <time> <reply to msg/ use id>`
+    s- seconds | m- minutes
+    h- hours |  d- days
+    Ban user in current chat with time.
+
 • `{i}pin <reply to message>`
     Pin the message in the chat
     for silent pin use ({i}pin silent).
@@ -28,7 +33,7 @@
 • `{i}pinned`
    Get pinned message in the current chat.
 
-• `{i}autodelete <24h/7d/off>`
+• `{i}autodelete <24h/7d/1m/off>`
    Enable Auto Delete Messages in Chat.
 
 • `{i}listpinned`
@@ -43,24 +48,20 @@
 • `{i}purgeall`
     Delete all msgs of replied user.
 """
-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 Chat, ChatAdminRights, InputMessagesFilterPinned
+from telethon.tl.functions.channels import (
+    DeleteUserHistoryRequest,
+    GetFullChannelRequest,
+)
+from telethon.tl.functions.messages import GetFullChatRequest, SetHistoryTTLRequest
+from telethon.tl.types import InputMessagesFilterPinned
 
 from . import *
 
 
-@ultroid_cmd(
-    pattern="promote ?(.*)",
-    admins_only=True,
-    type=["official", "manager"],
-    ignore_dualmode=True,
-)
+@ultroid_cmd(pattern="promote ?(.*)", admins_only=True, type=["official", "manager"])
 async def prmte(ult):
     xx = await eor(ult, get_string("com_1"))
     await ult.get_chat()
@@ -70,35 +71,28 @@ async def prmte(ult):
     if not user:
         return await xx.edit("`Reply to a user to promote him!`")
     try:
-        await ult.client(
-            EditAdminRequest(
-                ult.chat_id,
-                user.id,
-                ChatAdminRights(
-                    add_admins=False,
-                    invite_users=True,
-                    change_info=False,
-                    ban_users=True,
-                    delete_messages=True,
-                    pin_messages=True,
-                ),
-                rank,
-            ),
+        await ult.client.edit_admin(
+            ult.chat_id,
+            user.id,
+            invite_users=True,
+            ban_users=True,
+            delete_messages=True,
+            pin_messages=True,
+            manage_call=True,
+            title=rank,
         )
-        await xx.edit(
+        await eod(
+            xx,
             f"{inline_mention(user)} `is now an admin in {ult.chat.title} with title {rank}.`",
         )
-    except BadRequestError:
-        return await xx.edit("`I don't have the right to promote you.`")
-    await asyncio.sleep(5)
-    await xx.delete()
+    except Exception as ex:
+        return await xx.edit("`" + str(ex) + "`")
 
 
 @ultroid_cmd(
     pattern="demote ?(.*)",
     admins_only=True,
     type=["official", "manager"],
-    ignore_dualmode=True,
 )
 async def dmote(ult):
     xx = await eor(ult, get_string("com_1"))
@@ -109,62 +103,50 @@ async def dmote(ult):
     if not user:
         return await xx.edit("`Reply to a user to demote him!`")
     try:
-        await ult.client(
-            EditAdminRequest(
-                ult.chat_id,
-                user.id,
-                ChatAdminRights(
-                    add_admins=None,
-                    invite_users=None,
-                    change_info=None,
-                    ban_users=None,
-                    delete_messages=None,
-                    pin_messages=None,
-                ),
-                rank,
-            ),
+        await ult.client.edit_admin(
+            ult.chat_id,
+            user.id,
+            invite_users=None,
+            ban_users=None,
+            delete_messages=None,
+            pin_messages=None,
+            manage_call=None,
+            title=rank,
         )
-        await xx.edit(
-            f"{inline_mention(user)} `is no longer an admin in {ult.chat.title}`",
+        await eod(
+            xx, f"{inline_mention(user)} `is no longer an admin in {ult.chat.title}`"
         )
-    except BadRequestError:
-        return await xx.edit("`I don't have the right to demote you.`")
-    await asyncio.sleep(5)
-    await xx.delete()
+    except Exception as ex:
+        return await xx.edit("`" + str(ex) + "`")
 
 
-@ultroid_cmd(
-    pattern="ban ?(.*)",
-    admins_only=True,
-    type=["official", "manager"],
-    ignore_dualmode=True,
-)
+@ultroid_cmd(pattern="ban ?(.*)", admins_only=True, type=["official", "manager"])
 async def bban(ult):
     xx = await eor(ult, get_string("com_1"))
     user, reason = await get_user_info(ult)
     if not user:
         return await xx.edit("`Reply to a user or give username to ban him!`")
-    if str(user.id) in DEVLIST:
+    if user.id in DEVLIST:
         return await xx.edit(" `LoL, I can't Ban my Developer 😂`")
     try:
         await ult.client.edit_permissions(ult.chat_id, user.id, view_messages=False)
     except BadRequestError:
-        return await xx.edit("`I don't have the right to ban a user.`")
+        return await xx.edit(f"`I don't have the right to ban a user.`")
     except UserIdInvalidError:
         return await xx.edit("`I couldn't get who he is!`")
+    senderme = inline_mention(await ult.get_sender())
     try:
         reply = await ult.get_reply_message()
         if reply:
             await reply.delete()
     except BadRequestError:
         return await xx.edit(
-            f"{inline_mention(user)}**was banned by** {inline_mention(ult.sender)} **in** `{ult.chat.title}`\n**Reason**: `{reason}`\n**Messages Deleted**: `False`",
+            f"{inline_mention(user)}**was banned by** {senderme} **in** `{ult.chat.title}`\n**Reason**: `{reason}`\n**Messages Deleted**: `False`",
         )
     userme = inline_mention(user)
-    senderme = inline_mention(ult.sender)
     if reason:
         await xx.edit(
-            f"{userme} **was banned by** {senderme}**in** `{ult.chat.title}`\n**Reason**: `{reason}`",
+            f"{userme} **was banned by** {senderme} **in** `{ult.chat.title}`\n**Reason**: `{reason}`",
         )
     else:
         await xx.edit(
@@ -176,7 +158,6 @@ async def bban(ult):
     pattern="unban ?(.*)",
     admins_only=True,
     type=["official", "manager"],
-    ignore_dualmode=True,
 )
 async def uunban(ult):
     xx = await eor(ult, get_string("com_1"))
@@ -189,7 +170,10 @@ async def uunban(ult):
         return await xx.edit("`I don't have the right to unban a user.`")
     except UserIdInvalidError:
         await xx.edit("`I couldn't get who he is!`")
-    text = f"{inline_mention(user)} **was unbanned by** {inline_mention(ult.sender)} **in** `{ult.chat.title}`"
+    sender = inline_mention(await ult.get_sender())
+    text = (
+        f"{inline_mention(user)} **was unbanned by** {sender} **in** `{ult.chat.title}`"
+    )
     if reason:
         text += f"\n**Reason**: `{reason}`"
     await xx.edit(text)
@@ -199,97 +183,113 @@ async def uunban(ult):
     pattern="kick ?(.*)",
     admins_only=True,
     type=["official", "manager"],
-    ignore_dualmode=True,
 )
 async def kck(ult):
-    if ult.text == f"{HNDLR}kickme":
+    ml = ult.text.split(" ", maxsplit=1)[0]
+    if "kickme" in ult.text:
         return
     xx = await eor(ult, get_string("com_1"))
-    await ult.get_chat()
     user, reason = await get_user_info(ult)
     if not user:
         return await xx.edit("`Kick? Whom? I couldn't get his info...`")
-    if str(user.id) in DEVLIST:
+    if user.id in DEVLIST:
         return await xx.edit(" `Lol, I can't Kick my Developer`😂")
-    if user.id in [ultroid_bot.uid, asst.me.id]:
-        return await xx.edit("`You Can't kick that powerhouse`")
+    if user.is_self:
+        return await xx.edit("`I Cant kick him ever...`")
     try:
         await ult.client.kick_participant(ult.chat_id, user.id)
-        await asyncio.sleep(0.5)
     except BadRequestError:
         return await xx.edit("`I don't have the right to kick a user.`")
     except Exception as e:
         return await xx.edit(
             f"`I don't have the right to kick a user.`\n\n**ERROR**:\n`{str(e)}`",
         )
-    text = f"{inline_mention(user)} **was kicked by** {inline_mention(ult.sender)} **in** `{ult.chat.title}`"
+    text = f"{inline_mention(user)} **was kicked by** {inline_mention(await ult.get_sender())} **in** `{ult.chat.title}`"
     if reason:
         text += f"\n**Reason**: `{reason}`"
     await xx.edit(text)
 
 
-@ultroid_cmd(pattern="pin ?(.*)", type=["official", "manager"], ignore_dualmode=True)
-async def pin(msg):
-    xx = msg.reply_to_msg_id
-    tt = msg.text
+@ultroid_cmd(pattern="tban ?(.*)", type=["official", "manager"])
+async def tkicki(e):
+    huh = e.text.split(" ")
     try:
-        kk = tt[4]
-        if kk:
-            return
-    except BaseException:
+        tme = huh[1]
+    except IndexError:
+        return await eor(e, "`Time till kick?`", time=15)
+    try:
+        inputt = huh[2]
+    except IndexError:
         pass
+    chat = await e.get_chat()
+    if e.is_reply:
+        replied = await e.get_reply_message()
+        userid = replied.sender_id
+        fn = (await e.get_sender()).first_name
+    elif inputt:
+        userid = await get_user_id(inputt)
+        fn = (await e.client.get_entity(userid)).first_name
+    else:
+        return await eor(e, "`Reply to someone or use its id...`", time=3)
+    try:
+        bun = await ban_time(e, tme)
+        await e.client.edit_permissions(
+            e.chat_id, userid, until_date=bun, view_messages=False
+        )
+        await eod(
+            e,
+            f"`Successfully Banned` `{fn}` `in {chat.title} for {tme}`",
+            time=15,
+        )
+    except Exception as m:
+        return await eor(e, str(m))
+
+
+@ultroid_cmd(pattern="pin$", type=["official", "manager"])
+async def pin(msg):
     if not msg.is_reply:
         return await eor(msg, "Reply a Message to Pin !")
-    if not msg.client._bot and not msg.is_private and not isinstance(msg.chat, Chat):
-        link = (await msg.client(ExpLink(msg.chat_id, xx))).link
-        f"`Pinned` [This Message]({link})"
-    ch = msg.pattern_match.group(1)
-    if ch != "silent":
-        pass
+    me = await msg.get_reply_message()
+    if me.is_private:
+        text = "`Pinned.`"
     else:
-        pass
+        text = f"Pinned [This Message]({me.message_link}) !"
     try:
-        await msg.client.pin_message(msg.chat_id, xx, notify=False)
+        await msg.client.pin_message(msg.chat_id, me.id, notify=False)
     except BadRequestError:
         return await eor(msg, "`Hmm.. Guess I have no rights here!`")
     except Exception as e:
-        return await eor(msg, f"**ERROR:**`{str(e)}`")
-    if msg.out:
-        await msg.delete()
+        return await eor(msg, f"**ERROR:**`{e}`")
+    await eor(msg, text)
 
 
 @ultroid_cmd(
-    pattern="unpin($| (.*))", type=["official", "manager"], ignore_dualmode=True
+    pattern="unpin($| (.*))",
+    type=["official", "manager"],
 )
 async def unp(ult):
     xx = await eor(ult, get_string("com_1"))
-    if not ult.is_private:
-        # for (un)pin(s) in private messages
-        await ult.get_chat()
     ch = (ult.pattern_match.group(1)).strip()
     msg = ult.reply_to_msg_id
-    if msg and not ch:
-        try:
-            await ult.client.unpin_message(ult.chat_id, msg)
-        except BadRequestError:
-            return await xx.edit("`Hmm.. Guess I have no rights here!`")
-        except Exception as e:
-            return await xx.edit(f"**ERROR:**\n`{str(e)}`")
+    if msg:
+        pass
     elif ch == "all":
-        try:
-            await ult.client.unpin_message(ult.chat_id)
-        except BadRequestError:
-            return await xx.edit("`Hmm.. Guess I have no rights here!`")
-        except Exception as e:
-            return await xx.edit(f"**ERROR:**`{str(e)}`")
+        msg = None
     else:
         return await xx.edit(f"Either reply to a message, or, use `{hndlr}unpin all`")
-    if not msg and ch != "all":
-        return await xx.edit(f"Either reply to a message, or, use `{hndlr}unpin all`")
+    try:
+        await ult.client.unpin_message(ult.chat_id, msg)
+    except BadRequestError:
+        return await xx.edit("`Hmm.. Guess I have no rights here!`")
+    except Exception as e:
+        return await xx.edit(f"**ERROR:**`{e}`")
     await xx.edit("`Unpinned!`")
 
 
-@ultroid_cmd(pattern="purge ?(.*)", type=["official", "manager"], ignore_dualmode=True)
+@ultroid_cmd(
+    pattern="purge ?(.*)",
+    type=["official", "manager"],
+)
 async def fastpurger(purg):
     chat = await purg.get_input_chat()
     match = purg.pattern_match.group(1)
@@ -299,32 +299,22 @@ async def fastpurger(purg):
         ABC = None
     if ABC and purg.text[6] in ["m", "a"]:
         return
-    if purg.client._bot:
-        return await purg.client.delete_messages(
-            purg.chat_id, [a for a in range(purg.reply_to_msg_id, purg.id)]
-        )
-    if match and not purg.is_reply:
+    if not purg._client._bot and match and not purg.is_reply:
         p = 0
         async for msg in purg.client.iter_messages(purg.chat_id, limit=int(match)):
             await msg.delete()
             p += 0
-        return await eod(purg, f"Purged {p} Messages! ")
-    msgs = []
-    count = 0
-    if not (purg.reply_to_msg_id or match):
-        return await eod(purg, "`Reply to a message to purge from.`", time=10)
-    async for msg in purg.client.iter_messages(chat, min_id=purg.reply_to_msg_id):
-        msgs.append(msg)
-        count = count + 1
-        msgs.append(purg.reply_to_msg_id)
-        if len(msgs) == 100:
-            await purg.client.delete_messages(chat, msgs)
-            msgs = []
-
-    if msgs:
-        await purg.client.delete_messages(chat, msgs)
-    await eod(
-        purg,
+        return await eor(purg, f"Purged {p} Messages! ", time=5)
+    if not purg.reply_to_msg_id:
+        return await eor(purg, "`Reply to a message to purge from.`", time=10)
+    try:
+        await purg.client.delete_messages(
+            chat, [a for a in range(purg.reply_to_msg_id, purg.id + 1)]
+        )
+    except Exception as er:
+        LOGS.info(er)
+    count = purg.id - purg.reply_to_msg_id
+    await purg.respond(
         "__Fast purge complete!__\n**Purged** `" + str(count) + "` **messages.**",
     )
 
@@ -338,7 +328,7 @@ async def fastpurgerme(purg):
         try:
             nnt = int(num)
         except BaseException:
-            await eod(purg, "`Give a Valid Input.. `")
+            await eor(purg, "`Give a Valid Input.. `", time=5)
             return
         mp = 0
         async for mm in purg.client.iter_messages(
@@ -346,7 +336,7 @@ async def fastpurgerme(purg):
         ):
             await mm.delete()
             mp += 1
-        await eod(purg, f"Purged {mp} Messages!")
+        await eor(purg, f"Purged {mp} Messages!", time=5)
         return
     chat = await purg.get_input_chat()
     msgs = []
@@ -363,7 +353,7 @@ async def fastpurgerme(purg):
         min_id=purg.reply_to_msg_id,
     ):
         msgs.append(msg)
-        count = count + 1
+        count += 1
         msgs.append(purg.reply_to_msg_id)
         if len(msgs) == 100:
             await ultroid_bot.delete_messages(chat, msgs)
@@ -381,20 +371,35 @@ async def fastpurgerme(purg):
     pattern="purgeall$",
 )
 async def _(e):
-    xx = await eor(e, get_string("com_1"))
-    if e.reply_to_msg_id:
-        name = (await e.get_reply_message()).sender
-        try:
-            await e.client(DeleteUserHistoryRequest(e.chat_id, name.id))
-            await eod(e, f"Successfully Purged All Messages from {name.first_name}")
-        except Exception as er:
-            return await eod(xx, str(er))
-    else:
+    if not e.is_reply:
         return await eod(
-            xx,
+            e,
             "`Reply to someone's msg to delete.`",
         )
 
+    name = (await e.get_reply_message()).sender
+    try:
+        await e.client(DeleteUserHistoryRequest(e.chat_id, name.id))
+        await eor(e, f"Successfully Purged All Messages from {name.first_name}", time=5)
+    except Exception as er:
+        return await eor(e, str(er), time=5)
+
+
+@ultroid_cmd(pattern="pinned", type=["official", "manager"], groups_only=True)
+async def djshsh(event):
+    chat = await event.get_chat()
+    if isinstance(chat, types.Chat):
+        FChat = await event.client(GetFullChatRequest(chat.id))
+    elif isinstance(chat, types.Channel):
+        FChat = await event.client(GetFullChannelRequest(chat.id))
+    else:
+        return
+    msg_id = FChat.full_chat.pinned_msg_id
+    if not msg_id:
+        return await eor(event, "No Pinned Message Found!")
+    msg = await event.client.get_messages(chat.id, ids=msg_id)
+    await eor(event, f"Pinned Message in Current chat is [here]({msg.message_link}).")
+
 
 @ultroid_cmd(
     pattern="listpinned$",
@@ -422,7 +427,7 @@ async def get_all_pinned(event):
         m = f"<b>List of pinned message(s) in {chat_name}:</b>\n\n"
 
     if a == "":
-        return await eod(x, "There is no message pinned in this group!")
+        return await eor(x, "There is no message pinned in this group!", time=5)
 
     await x.edit(m + a, parse_mode="html")
 
@@ -431,18 +436,22 @@ async def get_all_pinned(event):
     pattern="autodelete ?(.*)",
     admins_only=True,
 )
-async def autodelte(ult):  # Tg Feature
+async def autodelte(ult):
     match = ult.pattern_match.group(1)
-    if not match or match not in ["24h", "7d", "off"]:
-        return await eod(ult, "`Please Use Proper Format..`")
+    if not match or match not in ["24h", "7d", "1m", "off"]:
+        return await eor(ult, "`Please Use Proper Format..`", time=5)
     if match == "24h":
         tt = 3600 * 24
     elif match == "7d":
         tt = 3600 * 24 * 7
+    elif match == "1m":
+        tt = 3600 * 24 * 31
     else:
         tt = 0
     try:
         await ult.client(SetHistoryTTLRequest(ult.chat_id, period=tt))
     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} !")
+        return await eor(
+            ult, f"Auto Delete Setting is Already same to `{match}`", time=5
+        )
+    await eor(ult, f"Auto Delete Status Changed to `{match}` !")

plugins/afk.py

@@ -10,245 +10,146 @@
 
 • `{i}afk <optional reason>`
     AFK means away from keyboard,
-
     After u active this if Someone tag or msg u then It auto Reply Him/her,
+
     (Note : By Reply To any media U can set media afk too).
 
 """
 
 import asyncio
-from datetime import datetime
 
+from pyUltroid.functions.afk_db import *
 from pyUltroid.functions.pmpermit_db import *
+from telegraph import upload_file as uf
 from telethon import events
-from telethon.tl.functions.account import GetPrivacyRequest
-from telethon.tl.types import InputPrivacyKeyStatusTimestamp, PrivacyValueAllowAll
 
 from . import *
 
-global USER_AFK
-global afk_time
-global last_afk_message
-global last_afk_msg
-global afk_start
-global afk_end
-USER_AFK = {}
-afk_time = None
-last_afk_message = {}
-last_afk_msg = {}
-afk_start = {}
-
-LOG = int(udB.get("LOG_CHANNEL"))
+old_afk_msg = []
 
 
-@ultroid_bot.on(events.NewMessage(outgoing=True))
-@ultroid_bot.on(events.MessageEdited(outgoing=True))
-async def set_not_afk(event):
-    if event.is_private:
-        if Redis("PMSETTING") == "True":
-            if not is_approved(event.chat_id):
-                return
-    global USER_AFK
-    global afk_time
-    global last_afk_message
-    global afk_start
-    global afk_end
-    back_alive = datetime.now()
-    afk_end = back_alive.replace(microsecond=0)
-    if afk_start != {}:
-        total_afk_time = str(afk_end - afk_start)
-    current_message = event.message.message
-    if "afk" not in current_message and "yes" in USER_AFK:
-        try:
-            if pic.endswith((".tgs", ".webp")):
-                shite = await ultroid_bot.send_message(event.chat_id, file=pic)
-                shites = await ultroid_bot.send_message(
-                    event.chat_id,
-                    get_string("afk_1").format(total_afk_time),
-                )
+@ultroid_cmd(pattern="afk ?(.*)", fullsudo=True)
+async def set_afk(event):
+    if event.client._bot:
+        await eor(event, "Master, I am a Bot, I cant go AFK..")
+    elif is_afk():
+        return
+    text, media, media_type = None, None, None
+    if event.pattern_match.group(1):
+        text = event.text.split(maxsplit=1)[1]
+    reply = await event.get_reply_message()
+    if reply:
+        if reply.text and not text:
+            text = reply.text
+        if reply.media:
+            media_type = mediainfo(reply.media)
+            if media_type.startswith(("pic", "gif")):
+                file = await event.client.download_media(reply.media)
+                iurl = uf(file)
+                media = f"https://telegra.ph{iurl[0]}"
+            elif "sticker" in media_type:
+                media = reply.file.id
             else:
-                shite = await ultroid_bot.send_message(
-                    event.chat_id,
-                    get_string("afk_1").format(total_afk_time),
-                    file=pic,
-                )
-        except BaseException:
-            shite = await ultroid_bot.send_message(
-                event.chat_id,
-                get_string("afk_1").format(total_afk_time),
+                return await eor(event, "`Unsupported media`", time=5)
+    await eor(event, "`Done`", time=2)
+    add_afk(text, media_type, media)
+    msg1, msg2 = None, None
+    if text and media:
+        if "sticker" in media_type:
+            msg1 = await ultroid_bot.send_file(event.chat_id, file=media)
+            msg2 = await ultroid_bot.send_message(
+                event.chat_id, get_string("afk_5").format(text)
             )
-        try:
+        else:
+            msg1 = await ultroid_bot.send_message(
+                event.chat_id, get_string("afk_5").format(text), file=media
+            )
+    elif media:
+        if "sticker" in media_type:
+            msg1 = await ultroid_bot.send_file(event.chat_id, file=media)
+            msg2 = await ultroid_bot.send_message(event.chat_id, get_string("afk_6"))
+        else:
+            msg1 = await ultroid_bot.send_message(
+                event.chat_id, get_string("afk_6"), file=media
+            )
+    elif text:
+        msg1 = await ultroid_bot.send_message(
+            event.chat_id, get_string("afk_5").format(text)
+        )
+    else:
+        msg1 = await ultroid_bot.send_message(event.chat_id, get_string("afk_6"))
+    old_afk_msg.append(msg1)
+    if msg2:
+        old_afk_msg.append(msg2)
+        return await asst.send_message(LOG_CHANNEL, msg2.text)
+    await asst.send_message(LOG_CHANNEL, msg1.text)
+
+
+@ultroid_bot.on(events.NewMessage(outgoing=True))
+async def remove_afk(event):
+    if (
+        event.is_private
+        and Redis("PMSETTING") == "True"
+        and not is_approved(event.chat_id)
+    ):
+        return
+    elif "afk" in event.text.lower():
+        return
+    if is_afk():
+        _, _, _, afk_time = is_afk()
+        del_afk()
+        off = await event.reply(get_string("afk_1").format(afk_time))
+        await asst.send_message(LOG_CHANNEL, get_string("afk_2").format(afk_time))
+        for x in old_afk_msg:
             try:
-                if pic.endswith((".tgs", ".webp")):
-                    await ultroid_bot.send_message(LOG, file=pic)
-                    await ultroid_bot.send_message(
-                        LOG,
-                        get_string("afk_2").format(total_afk_time),
-                    )
-                else:
-                    await ultroid_bot.send_message(
-                        LOG,
-                        get_string("afk_2").format(total_afk_time),
-                        file=pic,
-                    )
+                await x.delete()
             except BaseException:
-                await ultroid_bot.send_message(
-                    LOG,
-                    get_string("afk_2").format(total_afk_time),
-                )
-        except BaseException:
-            pass
+                pass
         await asyncio.sleep(3)
-        await shite.delete()
-        try:
-            await shites.delete()
-        except BaseException:
-            pass
-        USER_AFK = {}
-        afk_time = None
+        await off.delete()
 
 
 @ultroid_bot.on(
     events.NewMessage(incoming=True, func=lambda e: bool(e.mentioned or e.is_private)),
 )
 async def on_afk(event):
-    if event.is_private:
-        if Redis("PMSETTING") == "True":
-            if not is_approved(event.chat_id):
-                return
-    global USER_AFK
-    global afk_time
-    global last_afk_message
-    global afk_start
-    global afk_end
-    back_alivee = datetime.now()
-    afk_end = back_alivee.replace(microsecond=0)
-    if afk_start != {}:
-        total_afk_time = str(afk_end - afk_start)
-    current_message_text = event.message.message.lower()
-    if "afk" in current_message_text:
-        return False
-    sender = await event.get_sender()
-    if USER_AFK and not (sender.bot or sender.verified):
-        msg = None
-        if reason:
-            message_to_reply = get_string("afk_3").format(total_afk_time, reason)
+    if (
+        event.is_private
+        and Redis("PMSETTING") == "True"
+        and not is_approved(event.chat_id)
+    ):
+        return
+    elif "afk" in event.text.lower():
+        return
+    elif not is_afk():
+        return
+    elif event.chat_id in NOSPAM_CHAT:
+        return
+    text, media_type, media, afk_time = is_afk()
+    msg1, msg2 = None, None
+    if text and media:
+        if "sticker" in media_type:
+            msg1 = await event.reply(file=media)
+            msg2 = await event.reply(get_string("afk_3").format(afk_time, text))
         else:
-            message_to_reply = get_string("afk_4").format(total_afk_time)
-        try:
-            if pic.endswith((".tgs", ".webp")):
-                msg = await event.reply(file=pic)
-                msgs = await event.reply(message_to_reply)
-            else:
-                msg = await event.reply(message_to_reply, file=pic)
-        except BaseException:
-            msg = await event.reply(message_to_reply)
-        await asyncio.sleep(2.5)
-        if event.chat_id in last_afk_message:
-            await last_afk_message[event.chat_id].delete()
-        try:
-            if event.chat_id in last_afk_msg:
-                await last_afk_msg[event.chat_id].delete()
-        except BaseException:
-            pass
-        last_afk_message[event.chat_id] = msg
-        try:
-            if msgs:
-                last_afk_msg[event.chat_id] = msgs
-        except BaseException:
-            pass
-
-
-@ultroid_cmd(pattern=r"afk ?(.*)")
-async def _(event):
-    if not event.out and not is_fullsudo(event.sender_id):
-        return await eor(event, "`This Command Is Full Sudo Restricted.`")
-    reply = await event.get_reply_message()
-    if event.client._bot:
-        return await eor(event, "Master, I am a Bot, I cant go AFK..")
-    global USER_AFK
-    global afk_time
-    global last_afk_message
-    global last_afk_msg
-    global afk_start
-    global afk_end
-    global reason
-    global pic
-    USER_AFK = {}
-    afk_time = None
-    last_afk_message = {}
-    last_afk_msg = {}
-    afk_end = {}
-    start_1 = datetime.now()
-    afk_start = start_1.replace(microsecond=0)
-    reason = event.pattern_match.group(1)
-    if reply:
-        pic = await event.client.download_media(reply)
-    else:
-        pic = None
-    if not USER_AFK:
-        last_seen_status = await ultroid_bot(
-            GetPrivacyRequest(InputPrivacyKeyStatusTimestamp()),
-        )
-        if isinstance(last_seen_status.rules, PrivacyValueAllowAll):
-            afk_time = datetime.datetime.now()
-        USER_AFK = f"yes: {reason} {pic}"
-        if reason:
-            try:
-                if pic.endswith((".tgs", ".webp")):
-                    await ultroid_bot.send_message(event.chat_id, file=pic)
-                    await ultroid_bot.send_message(
-                        event.chat_id,
-                        get_string("afk_5").format(reason),
-                    )
-                else:
-                    await ultroid_bot.send_message(
-                        event.chat_id,
-                        get_string("afk_5").format(reason),
-                        file=pic,
-                    )
-            except BaseException:
-                await ultroid_bot.send_message(
-                    event.chat_id,
-                    get_string("afk_5").format(reason),
-                )
+            msg1 = await event.reply(
+                get_string("afk_3").format(afk_time, text), file=media
+            )
+    elif media:
+        if "sticker" in media_type:
+            msg1 = await event.reply(file=media)
+            msg2 = await event.reply(get_string("afk_4").format(afk_time))
         else:
-            try:
-                if pic.endswith((".tgs", ".webp")):
-                    await ultroid_bot.send_message(event.chat_id, file=pic)
-                    await ultroid_bot.send_message(event.chat_id, get_string("afk_6"))
-                else:
-                    await ultroid_bot.send_message(
-                        event.chat_id,
-                        get_string("afk_6"),
-                        file=pic,
-                    )
-            except BaseException:
-                await ultroid_bot.send_message(event.chat_id, get_string("afk_6"))
-        await event.delete()
+            msg1 = await event.reply(get_string("afk_4").format(afk_time), file=media)
+    elif text:
+        msg1 = await event.reply(get_string("afk_3").format(afk_time, text))
+    else:
+        msg1 = await event.reply(get_string("afk_4").format(afk_time))
+    for x in old_afk_msg:
         try:
-            if reason and pic:
-                if pic.endswith((".tgs", ".webp")):
-                    await ultroid_bot.send_message(LOG, file=pic)
-                    await ultroid_bot.send_message(
-                        LOG,
-                        get_string("afk_7").format(reason),
-                    )
-                else:
-                    await ultroid_bot.send_message(
-                        LOG,
-                        get_string("afk_7").format(reason),
-                        file=pic,
-                    )
-            elif reason:
-                await ultroid_bot.send_message(LOG, get_string("afk_7").format(reason))
-            elif pic:
-                if pic.endswith((".tgs", ".webp")):
-                    await ultroid_bot.send_message(LOG, file=pic)
-                    await ultroid_bot.send_message(LOG, get_string("afk_8"))
-                else:
-                    await ultroid_bot.send_message(LOG, get_string("afk_8"), file=pic)
-            else:
-                await ultroid_bot.send_message(LOG, get_string("afk_8"))
+            await x.delete()
         except BaseException:
             pass
+    old_afk_msg.append(msg1)
+    if msg2:
+        old_afk_msg.append(msg2)

plugins/akinator.py

@@ -0,0 +1,106 @@
+# 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}akinator`
+    `Start Akinator Game`.
+
+"""
+
+import akinator
+from telethon.errors import BotMethodInvalidError
+
+from . import *
+
+games = {}
+aki_photo = "https://telegra.ph/file/b0ff07069e8637783fdae.jpg"
+
+
+@ultroid_cmd(pattern="akinator")
+async def doit(e):
+    sta = akinator.Akinator()
+    games.update({e.chat_id: {e.id: sta}})
+    try:
+        m = await e.client.inline_query(asst.me.username, f"aki_{e.chat_id}_{e.id}")
+        await m[0].click(e.chat_id)
+    except BotMethodInvalidError:
+        return await asst.send_file(
+            e.chat_id,
+            aki_photo,
+            buttons=Button.inline("Start Game", data=f"aki_{e.chat_id}_{e.id}"),
+        )
+    if e.out:
+        await e.delete()
+
+
+@callback(re.compile("aki_?(.*)"))
+@owner
+async def doai(e):
+    adt = e.pattern_match.group(1).decode("utf-8")
+    dt = adt.split("_")
+    ch = int(dt[0])
+    mid = int(dt[1])
+    await e.edit("Processing... ")
+    try:
+        qu = games[ch][mid].start_game(child_mode=True)
+        # child mode should be promoted
+    except KeyError:
+        return await e.answer("Game has been Terminated....", alert=True)
+    bts = [Button.inline(o, f"aka_{adt}_{o}") for o in ["Yes", "No", "Idk"]]
+    cts = [Button.inline(o, f"aka_{adt}_{o}") for o in ["Probably", "Probably Not"]]
+
+    bts = [bts, cts]
+    # ignored Back Button since it makes the Pagination looks Bad
+    await e.edit("Q. " + qu, buttons=bts)
+
+
+@callback(re.compile("aka_?(.*)"))
+@owner
+async def okah(e):
+    mk = e.pattern_match.group(1).decode("utf-8").split("_")
+    ch = int(mk[0])
+    mid = int(mk[1])
+    ans = mk[2]
+    try:
+        gm = games[ch][mid]
+    except KeyError:
+        await e.answer("Timeout !")
+        return
+    text = gm.answer(ans)
+    if gm.progression >= 80:
+        gm.win()
+        gs = gm.first_guess
+        text = "It's " + gs["name"] + "\n " + gs["description"]
+        return await e.edit(text, file=gs["absolute_picture_path"])
+    bts = [Button.inline(o, f"aka_{ch}_{mid}_{o}") for o in ["Yes", "No", "Idk"]]
+    cts = [
+        Button.inline(o, f"aka_{ch}_{mid}_{o}") for o in ["Probably", "Probably Not"]
+    ]
+
+    bts = [bts, cts]
+    await e.edit(text, buttons=bts)
+
+
+@in_pattern(re.compile("aki_?(.*)"))
+@in_owner
+async def eiagx(e):
+    bts = Button.inline("Start Game", data=e.text)
+    ci = types.InputWebDocument(aki_photo, 0, "image/jpeg", [])
+    ans = [
+        await e.builder.article(
+            "Akinator",
+            type="photo",
+            content=ci,
+            text="Akinator",
+            thumb=ci,
+            buttons=bts,
+            include_media=True,
+        )
+    ]
+    await e.answer(ans)

plugins/anime.py

@@ -27,10 +27,16 @@ from . import *
 @ultroid_cmd(pattern="airing")
 async def airing_anime(event):
     try:
-        await eor(event, airing_eps())
+        await eor(event, airing_eps(), link_preview=False)
     except BaseException:
         info = airing_eps()
-        t = info.replace("*", "").replace("`", "")
+        t = (
+            info.replace("*", "")
+            .replace("[", "")
+            .replace("]", "")
+            .replace("(", "  ")
+            .replace(")", "")
+        )
         with open("animes.txt", "w") as f:
             f.write(t)
         await event.reply(file="animes.txt")
@@ -43,7 +49,7 @@ 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)
+        return await eor(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}"
     try:
@@ -74,12 +80,12 @@ 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)
+        await eor(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)
+        return await eor(xx, "`Couldn't find character!`", time=5)
     a = s["results"][0]["mal_id"]
     char_json = jikan.character(a)
     pic = char_json["image_url"]

plugins/antiflood.py

@@ -54,7 +54,7 @@ if Redis("ANTIFLOOD") is not (None or ""):
             _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:
+        if event.sender_id in DEVLIST:
             return
         if _check_flood[event.chat_id][event.sender_id] >= int(
             get_flood_limit(event.chat_id)
@@ -97,14 +97,13 @@ async def unmuting(e):
 @ultroid_cmd(
     pattern="setflood ?(\\d+)",
     admins_only=True,
-    ignore_dualmode=True,
 )
 async def setflood(e):
     input = e.pattern_match.group(1)
     if not input:
-        return await eod(e, "`What?`")
+        return await eor(e, "`What?`", time=5)
     if not input.isdigit():
-        return await eod(e, "`Invalid Input`")
+        return await eor(e, "`Invalid Input`", time=5)
     m = set_flood(e.chat_id, input)
     if m:
         return await eod(
@@ -115,7 +114,6 @@ async def setflood(e):
 @ultroid_cmd(
     pattern="remflood$",
     admins_only=True,
-    ignore_dualmode=True,
 )
 async def remove_flood(e):
     hmm = rem_flood(e.chat_id)
@@ -124,17 +122,16 @@ async def remove_flood(e):
     except BaseException:
         pass
     if hmm:
-        return await eod(e, "`Antiflood Settings Disabled`")
-    await eod(e, "`No flood limits in this chat.`")
+        return await eor(e, "`Antiflood Settings Disabled`", time=5)
+    await eor(e, "`No flood limits in this chat.`", time=5)
 
 
 @ultroid_cmd(
     pattern="getflood$",
     admins_only=True,
-    ignore_dualmode=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.`")
+        return await eor(e, f"`Flood limit for this chat is {ok}.`", time=5)
+    await eor(e, "`No flood limits in this chat.`", time=5)

plugins/ascii.py

@@ -12,6 +12,7 @@
 """
 import os
 
+from htmlwebshot import WebShot
 from img2html.converter import Img2HTMLConverter
 
 from . import *
@@ -28,9 +29,9 @@ async def _(e):
     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.reply(file="html.html")
+    shot = WebShot(quality=85)
+    pic = await shot.create_pic_async(html=html)
     await m.delete()
+    await e.reply(file=pic)
+    os.remove(pic)
     os.remove(img)
-    os.remove("html.html")

plugins/asst_cmd.py

@@ -30,7 +30,9 @@ 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.`")
+        return await eor(
+            e, "`Use this Command with Reply and word to use a command.`", time=5
+        )
     if "/" in wrd:
         wrd = wrd.replace("/", "")
     if wt and wt.media:
@@ -42,12 +44,11 @@ async def ac(e):
             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 e.client.download_media(wt.media)
-                variable = uf(dl)
-                os.remove(dl)
-                m = "https://telegra.ph" + variable[0]
+                return await eor(x, "`Unsupported Media`", time=5)
+            dl = await e.client.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:
@@ -63,7 +64,7 @@ async def ac(e):
 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.`")
+        return await eor(e, "`Give me the command which you want to remove.`", time=5)
     if wrd.startswith("/"):
         wrd = wrd.replace("/", "")
     rem_cmd(wrd)

plugins/audiotools.py

@@ -0,0 +1,190 @@
+# 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}makevoice <reply to audio>`
+   creates a voice note from Audio.
+
+`{i}atrim <from time> - <to time>`
+   trim audio as per given time.
+   time must be in seconds. `{i}atrim 50-70`
+
+`{i}extractaudio <reply to media>`
+   To extract the audio from it.
+
+"""
+
+import os
+import time
+from datetime import datetime as dt
+
+from hachoir.metadata import extractMetadata
+from hachoir.parser import createParser
+from telethon.tl.types import DocumentAttributeAudio
+
+from . import *
+
+
+@ultroid_cmd(pattern="makevoice$")
+async def vnc(e):
+    if not e.reply_to:
+        return await eod(e, "Reply To Audio or video")
+    r = await e.get_reply_message()
+    if not mediainfo(r.media).startswith(("audio", "video")):
+        return await eod(e, "Reply To Audio or video")
+    xxx = await eor(e, "`processing...`")
+    dl = r.file.name
+    c_time = time.time()
+    file = await downloader(
+        "resources/downloads/" + dl,
+        r.media.document,
+        xxx,
+        c_time,
+        "Downloading " + dl + "...",
+    )
+    await xxx.edit(f"Downloaded Successfully, Now Converting to voice")
+    await bash(
+        f"ffmpeg -i '{file.name}' -map 0:a -codec:a libopus -b:a 100k -vbr on out.opus"
+    )
+    await e.client.send_message(
+        e.chat_id, file="out.opus", force_document=False, reply_to=r
+    )
+    await xxx.delete()
+    os.remove(file.name)
+    os.remove("out.opus")
+
+
+@ultroid_cmd(pattern="atrim ?(.*)")
+async def trim_aud(e):
+    sec = e.pattern_match.group(1)
+    if not sec or "-" not in sec:
+        return await eod(e, "`Give time in format to trim`")
+    a, b = sec.split("-")
+    if int(a) >= int(b):
+        return await eod(e, "`Incorrect Data`")
+    vido = await e.get_reply_message()
+    if vido and vido.media and mediainfo(vido.media).startswith(("video", "audio")):
+        if hasattr(vido.media, "document"):
+            vfile = vido.media.document
+            name = vido.file.name
+        else:
+            vfile = vido.media
+            name = ""
+        if not name:
+            name = dt.now().isoformat("_", "seconds") + ".mp4"
+        xxx = await eor(e, "`Trying To Download...`")
+        c_time = time.time()
+        file = await downloader(
+            "resources/downloads/" + name,
+            vfile,
+            xxx,
+            c_time,
+            "Downloading " + name + "...",
+        )
+        o_size = os.path.getsize(file.name)
+        d_time = time.time()
+        diff = time_formatter((d_time - c_time) * 1000)
+        file_name = (file.name).split("/")[-1]
+        out = file_name.replace(file_name.split(".")[-1], "_trimmed.aac")
+        if int(b) > int(genss(file.name)):
+            os.remove(file.name)
+            return await eod(xxx, "`Wrong trim duration`")
+        ss, dd = stdr(int(a)), stdr(int(b))
+        xxx = await xxx.edit(
+            f"Downloaded `{file.name}` of `{humanbytes(o_size)}` in `{diff}`.\n\nNow Trimming Audio from `{ss}` to `{dd}`..."
+        )
+        cmd = f'ffmpeg -i "{file.name}" -preset ultrafast -ss {ss} -to {dd} -vn -acodec copy "{out}" -y'
+        await bash(cmd)
+        os.remove(file.name)
+        f_time = time.time()
+        mmmm = await uploader(
+            out,
+            out,
+            f_time,
+            xxx,
+            "Uploading " + out + "...",
+        )
+        metadata = extractMetadata(createParser(out))
+        duration = vido.file.duration or 0
+        artist = udB.get("artist") or ultroid_bot.first_name
+        try:
+            if metadata.has("duration"):
+                duration = metadata.get("duration").seconds
+            if metadata.has("artist"):
+                artist = metadata.get("artist")
+        except BaseException:
+            pass
+        attributes = [
+            DocumentAttributeAudio(
+                duration=duration,
+                title=out.split(".")[0],
+                performer=artist,
+            )
+        ]
+        caption = f"Trimmed Audio From `{ss}` To `{dd}`"
+        await e.client.send_file(
+            e.chat_id,
+            mmmm,
+            thumb="resources/extras/ultroid.jpg",
+            caption=caption,
+            attributes=attributes,
+            force_document=False,
+            reply_to=e.reply_to_msg_id,
+        )
+        await xxx.delete()
+    else:
+        await eor(e, "`Reply To Video\\Audio File Only`", time=5)
+
+
+@ultroid_cmd(pattern="extractaudio$")
+async def ex_aud(e):
+    reply = await e.get_reply_message()
+    if not (reply and reply.video):
+        return await eor(e, "`Reply to Video File..`")
+    name = reply.file.name or "video.mp4"
+    vfile = reply.media.document
+    msg = await eor(e, "`Processing...`")
+    c_time = time.time()
+    file = await downloader(
+        "resources/downloads/" + name,
+        vfile,
+        msg,
+        c_time,
+        "Downloading " + name + "...",
+    )
+    out_file = file.name + ".aac"
+    cmd = f"ffmpeg -i {file.name} -vn -acodec copy {out_file}"
+    o, err = await bash(cmd)
+    os.remove(file.name)
+    duration = reply.file.duration
+    artist = ultroid_bot.me.first_name
+    attributes = [
+        DocumentAttributeAudio(
+            duration=duration,
+            title=reply.file.name.split(".")[0],
+            performer=artist,
+        )
+    ]
+    f_time = time.time()
+    fo = await uploader(
+        out_file,
+        out_file,
+        f_time,
+        msg,
+        "Uploading " + out_file + "...",
+    )
+    await e.client.send_file(
+        e.chat_id,
+        fo,
+        caption="`Extracted Audio from Video...`",
+        thumb="resources/extras/ultroid.jpg",
+        attributes=attributes,
+        reply_to=e.reply_to_msg_id,
+    )
+    await e.delete()

plugins/autocorrect.py

@@ -14,24 +14,20 @@
 """
 
 from gingerit.gingerit import GingerIt
-from googletrans import Translator
+from google_trans_new import google_translator
 from telethon import events
 
 from . import *
 
-tr = Translator()
 
-
-@ultroid_cmd(pattern="autocorrect")
+@ultroid_cmd(pattern="autocorrect", fullsudo=True)
 async def acc(e):
-    if not is_fullsudo(e.sender_id):
-        return await eod(ult, "`This Command Is Sudo Restricted.`")
     if Redis("AUTOCORRECT") != "True":
         udB.set("AUTOCORRECT", "True")
-        await eod(e, "AUTOCORRECT Feature On")
+        await eor(e, "AUTOCORRECT Feature On", time=5)
     else:
         udB.delete("AUTOCORRECT")
-        await eod(e, "AUTOCORRECT Feature Off")
+        await eor(e, "AUTOCORRECT Feature Off", time=5)
 
 
 @ultroid_bot.on(events.NewMessage(outgoing=True))
@@ -39,12 +35,12 @@ async def gramme(event):
     if Redis("AUTOCORRECT") != "True":
         return
     t = event.text
-    tt = tr.translate(t)
     if t.startswith((HNDLR, ".", "?", "#", "_", "*", "'", "@", "[", "(", "+")):
         return
     if t.endswith(".."):
         return
-    if tt.src != "en":
+    tt = google_translator().detect(t)
+    if tt[0] != "en":
         return
     xx = GingerIt()
     x = xx.parse(t)

plugins/autopic.py

@@ -16,11 +16,9 @@
 """
 import asyncio
 import os
-import urllib
 
 import requests as r
 from bs4 import BeautifulSoup as bs
-from telethon.tl.functions.messages import GetWebPagePreviewRequest as getweb
 from telethon.tl.functions.photos import UploadProfilePhotoRequest
 
 from . import *
@@ -30,33 +28,26 @@ from . import *
 async def autopic(e):
     search = e.pattern_match.group(1)
     if not search:
-        return await eod(e, get_string("autopic_1"))
+        return await eor(e, get_string("autopic_1"), time=5)
     clls = autopicsearch(search)
     if len(clls) == 0:
-        return await eod(e, get_string("autopic_2").format(search))
+        return await eor(e, get_string("autopic_2").format(search), time=5)
     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
+    SLEEP_TIME = int(ST) if ST else 1221
     while True:
         for lie in clls:
             ge = udB.get("AUTOPIC")
-            if not ge == "True":
+            if ge != "True":
                 return
             au = "https://unsplash.com" + lie["href"]
-            et = await e.client(getweb(au))
-            try:
-                kar = await e.client.download_media(et.webpage.photo)
-            except AttributeError:
-                ct = r.get(au).content
-                bsc = bs(ct, "html.parser", from_encoding="utf-8")
-                ft = bsc.find_all("img", "_2UpQX")
-                li = ft[0]["src"]
-                kar = "autopic.png"
-                urllib.request.urlretrieve(li, kar)
+            ct = r.get(au).content
+            bsc = bs(ct, "html.parser", from_encoding="utf-8")
+            ft = bsc.find_all("img", "oCCRx")
+            li = ft[0]["src"]
+            kar = "autopic.png"
+            await download_file(li, kar)
             file = await e.client.upload_file(kar)
             await e.client(UploadProfilePhotoRequest(file))
             os.remove(kar)
@@ -66,7 +57,7 @@ async def autopic(e):
 @ultroid_cmd(pattern="stoppic$")
 async def stoppo(ult):
     gt = udB.get("AUTOPIC")
-    if not gt == "True":
-        return await eod(ult, "AUTOPIC was not in used !!")
+    if gt != "True":
+        return await eor(ult, "AUTOPIC was not in use !!", time=5)
     udB.set("AUTOPIC", "None")
-    await eod(ult, "AUTOPIC Stopped !!")
+    await eor(ult, "AUTOPIC Stopped !!", time=5)

plugins/blacklist.py

@@ -32,7 +32,7 @@ async def af(e):
     wrd = e.pattern_match.group(1)
     chat = e.chat_id
     if not (wrd):
-        return await eod(e, "`Give the word to blacklist..`")
+        return await eor(e, "`Give the word to blacklist..`", time=5)
     wrd = e.text[11:]
     heh = wrd.split(" ")
     for z in heh:
@@ -45,7 +45,7 @@ async def rf(e):
     wrd = e.pattern_match.group(1)
     chat = e.chat_id
     if not wrd:
-        return await eod(e, "`Give the word to remove from blacklist..`")
+        return await eor(e, "`Give the word to remove from blacklist..`", time=5)
     wrd = e.text[14:]
     heh = wrd.split(" ")
     for z in heh:
@@ -65,12 +65,13 @@ async def lsnote(e):
 
 @ultroid_bot.on(events.NewMessage(incoming=True))
 async def bl(e):
-    chat = e.chat_id
-    x = get_blacklist(int(chat))
-    if x and e.text:
-        xx = ((e.text).lower()).split()
-        yy = x.split("$|")
-        for z in xx:
-            if z in yy:
-                await e.delete()
-                break
+    x = get_blacklist(e.chat_id)
+    if x:
+        for z in e.text.lower().split():
+            for zz in x:
+                if z == zz:
+                    try:
+                        await e.delete()
+                        break
+                    except BaseException:
+                        break

plugins/bot.py

@@ -7,7 +7,7 @@
 """
 ✘ Commands Available
 
-• `{i}alive`
+• `{i}alive` | `{i}ialive`
     Check if your bot is working.
 
 • `{i}ping`
@@ -28,17 +28,35 @@
 • `{i}shutdown`
     Turn off your bot.
 """
+import os
+import sys
 import time
 from datetime import datetime as dt
 from platform import python_version as pyver
 
 from git import Repo
 from pyUltroid.version import __version__ as UltVer
-from telethon import __version__, events
+from telethon import __version__
 from telethon.errors.rpcerrorlist import ChatSendMediaForbiddenError
+from telethon.utils import resolve_bot_file_id
 
 from . import *
 
+# Will move to strings
+alive_txt = """
+The Ultroid Userbot
+
+  ◍ Version - {}
+  ◍ Py-Ultroid - {}
+  ◍ Telethon - {}
+"""
+
+
+@callback("alive")
+async def alive(event):
+    text = alive_txt.format(ultroid_version, UltVer, __version__)
+    await event.answer(text, alert=True)
+
 
 @ultroid_cmd(
     pattern="alive$",
@@ -46,7 +64,7 @@ from . import *
 async def lol(ult):
     pic = udB.get("ALIVE_PIC")
     uptime = time_formatter((time.time() - start_time) * 1000)
-    header = udB.get("ALIVE_TEXT") if udB.get("ALIVE_TEXT") else "Hey,  I am alive."
+    header = udB.get("ALIVE_TEXT") or "Hey,  I am alive."
     y = Repo().active_branch
     xx = Repo().remotes[0].config_reader.get("url")
     rep = xx.replace(".git", f"/tree/{y}")
@@ -62,8 +80,8 @@ async def lol(ult):
         kk,
     )
     if pic is None:
-        return await eor(ult, als)
-    elif pic is not None and "telegra" in pic:
+        await eor(ult, als)
+    elif "telegra" in pic:
         try:
             await ult.reply(als, file=pic, link_preview=False)
             await ult.delete()
@@ -78,12 +96,50 @@ async def lol(ult):
             await eor(ult, als, link_preview=False)
 
 
-@ultroid_bot.on(events.NewMessage(pattern=f"\\{HNDLR}ping$"))
-async def _(event):
-    if event.fwd_from:
-        return
-    if not event.out and not is_sudo(event.sender_id):
+@ultroid_cmd(
+    pattern="ialive$",
+)
+async def is_on(ult):
+    if not ult.client._bot:
+        await ult.delete()
+        try:
+            res = await ult.client.inline_query(asst.me.username, "alive")
+            return await res[0].click(ult.chat_id)
+        except Exception as er:
+            LOGS.info(er)
         return
+    pic = udB.get("ALIVE_PIC")
+    uptime = time_formatter((time.time() - start_time) * 1000)
+    header = udB.get("ALIVE_TEXT") or "Hey,  I am alive."
+    y = Repo().active_branch
+    xx = Repo().remotes[0].config_reader.get("url")
+    rep = xx.replace(".git", f"/tree/{y}")
+    kk = f" `[{y}]({rep})` "
+    als = (get_string("alive_1")).format(
+        header,
+        OWNER_NAME,
+        ultroid_version,
+        UltVer,
+        uptime,
+        pyver(),
+        __version__,
+        kk,
+    )
+    buttons = [
+        Button.inline("Stats", "alive"),
+        [
+            Button.url("Repo", "https://github.com/TeamUltroid/Ultroid"),
+            Button.url("Support", "t.me/UltroidSupport"),
+        ],
+    ]
+    await ult.client.send_message(ult.chat_id, als, file=pic, buttons=buttons)
+
+
+@ultroid_cmd(
+    pattern="ping$",
+    chats=[],
+)
+async def _(event):
     start = dt.now()
     x = await eor(event, "`Pong !`")
     end = dt.now()
@@ -99,38 +155,90 @@ async def cmds(event):
     await allcmds(event)
 
 
+heroku_api = Var.HEROKU_API
+
+
 @ultroid_cmd(
     pattern="restart$",
+    fullsudo=True,
 )
 async def restartbt(ult):
-    ok = await eor(ult, "`Restarting...`")
-    if Var.HEROKU_API:
-        await restart(ok)
-    else:
-        await bash("pkill python3 && python3 -m pyUltroid")
+    ok = await eor(ult, "• `Restarting...`")
+    call_back()
+    if heroku_api:
+        return await restart(ok)
+    await bash("git pull && pip3 install -r requirements.txt")
+    os.execl(sys.executable, sys.executable, "-m", "pyUltroid")
 
 
-@ultroid_cmd(pattern="shutdown$")
+@ultroid_cmd(
+    pattern="shutdown$",
+    fullsudo=True,
+)
 async def shutdownbot(ult):
-    if not ult.out and not is_fullsudo(ult.sender_id):
-        return await eod(ult, "`This Command Is Sudo Restricted.`")
     await shutdown(ult)
 
 
-@ultroid_bot.on(events.NewMessage(pattern=f"\\{HNDLR}logs ?(.*)"))
-@asst.on(events.NewMessage(pattern="^/{HNDLR}logs ?(.*)"))
+@ultroid_cmd(
+    pattern="logs ?(|heroku|sys)",
+    chats=[],
+)
 async def _(event):
-    if event.fwd_from:
-        return
-    if not event.out and not is_sudo(event.sender_id):
-        return
-    try:
-        opt = event.text.split(" ", maxsplit=1)[1]
-    except IndexError:
-        return await def_logs(event)
+    opt = event.pattern_match.group(1)
     if opt == "heroku":
         await heroku_logs(event)
     else:
         await def_logs(event)
-    if event.out:
-        await event.delete()
+
+
+@in_pattern("alive")
+@in_owner
+async def inline_alive(ult):
+    pic = udB.get("ALIVE_PIC")
+    uptime = time_formatter((time.time() - start_time) * 1000)
+    header = udB.get("ALIVE_TEXT") or "Hey,  I am alive."
+    y = Repo().active_branch
+    xx = Repo().remotes[0].config_reader.get("url")
+    rep = xx.replace(".git", f"/tree/{y}")
+    kk = f" `[{y}]({rep})` "
+    als = (get_string("alive_1")).format(
+        header,
+        OWNER_NAME,
+        ultroid_version,
+        UltVer,
+        uptime,
+        pyver(),
+        __version__,
+        kk,
+    )
+    buttons = [
+        [
+            Button.url("Repo", "https://github.com/TeamUltroid/Ultroid"),
+            Button.url("Support", "t.me/UltroidSupport"),
+        ]
+    ]
+    builder = ult.builder
+    if pic:
+        try:
+            if ".jpg" in pic:
+                results = [await builder.photo(pic, text=als, buttons=buttons)]
+            else:
+                _pic = resolve_bot_file_id(pic)
+                if _pic:
+                    pic = _pic
+                    buttons.insert(0, [Button.inline("Stats", data="alive")])
+                results = [
+                    await builder.document(
+                        pic,
+                        title="Inline Alive",
+                        description="@TheUltroid",
+                        buttons=buttons,
+                    )
+                ]
+            return await ult.answer(results)
+        except BaseException as er:
+            LOGS.info(er)
+    result = [
+        await builder.article("Alive", text=als, link_preview=False, buttons=buttons)
+    ]
+    await ult.answer(result)

plugins/botecho.py

@@ -57,4 +57,4 @@ async def button_parser(event):
         await asst.send_message(event.chat_id, text, buttons=buttons)
         await eor(event, "Done. Message sent.")
     except Exception as e:
-        await eod(event, "**ERROR:**\n{}".format(str(e)), time=5)
+        await eor(event, "**ERROR:**\n{}".format(str(e)), time=5)

plugins/broadcast.py

@@ -47,12 +47,14 @@ async def broadcast_adder(event):
         ]
         for i in chats:
             try:
-                if i.broadcast:
-                    if i.creator or i.admin_rights:
-                        if not is_channel_added(i.id):
-                            new += 1
-                            cid = f"-100{i.id}"
-                            add_channel(int(cid))
+                if (
+                    i.broadcast
+                    and (i.creator or i.admin_rights)
+                    and not is_channel_added(i.id)
+                ):
+                    new += 1
+                    cid = f"-100{i.id}"
+                    add_channel(int(cid))
             except Exception as Ex:
                 LOGS.info(Ex)
         await x.edit(get_string("bd_3").format(get_no_channels(), new))
@@ -123,7 +125,7 @@ async def list_all(event):
     channels = get_channels()
     num = get_no_channels()
     if num == 0:
-        return await eod(x, "No chats were added.", time=5)
+        return await eor(x, "No chats were added.", time=5)
     msg = "Channels in database:\n"
     for channel in channels:
         name = ""
@@ -194,15 +196,12 @@ async def forw(event):
 @ultroid_cmd(
     pattern="broadcast ?(.*)",
     allow_sudo=False,
-    ignore_dualmode=True,
 )
 async def sending(event):
     x = await eor(event, "`Processing...`")
     if not event.is_reply:
         return await x.edit("Reply to a message to broadcast.")
     channels = get_channels()
-    error_count = 0
-    sent_count = 0
     if get_no_channels() == 0:
         return await x.edit(f"Please add channels by using `{hndlr}add` in them.")
     await x.edit("Sending....")
@@ -211,6 +210,8 @@ async def sending(event):
         if previous_message.poll:
             return await x.edit(f"Reply `{hndlr}forward` for polls.")
         if previous_message:
+            error_count = 0
+            sent_count = 0
             for channel in channels:
                 try:
                     await ultroid_bot.send_message(int(channel), previous_message)

plugins/calculator.py

@@ -14,10 +14,38 @@ import re
 
 from . import *
 
+m = [
+    "AC",
+    "C",
+    "⌫",
+    "%",
+    "7",
+    "8",
+    "9",
+    "+",
+    "4",
+    "5",
+    "6",
+    "-",
+    "1",
+    "2",
+    "3",
+    "x",
+    "00",
+    "0",
+    ".",
+    "÷",
+]
+tultd = [Button.inline(f"{x}", data=f"calc{x}") for x in m]
+lst = list(zip(tultd[::4], tultd[1::4], tultd[2::4], tultd[3::4]))
+lst.append([Button.inline("=", data="calc=")])
+
 
 @ultroid_cmd(pattern="calc")
 async def icalc(e):
     udB.delete("calc")
+    if e.client._bot:
+        return await e.reply("• Ultroid Inline Calculator •", buttons=lst)
     results = await e.client.inline_query(asst.me.username, "calc")
     await results[0].click(e.chat_id, silent=True, hide_via=True)
     await e.delete()
@@ -26,31 +54,6 @@ async def icalc(e):
 @in_pattern("calc")
 @in_owner
 async def _(e):
-    m = [
-        "AC",
-        "C",
-        "⌫",
-        "%",
-        "7",
-        "8",
-        "9",
-        "+",
-        "4",
-        "5",
-        "6",
-        "-",
-        "1",
-        "2",
-        "3",
-        "x",
-        "00",
-        "0",
-        ".",
-        "÷",
-    ]
-    tultd = [Button.inline(f"{x}", data=f"calc{x}") for x in m]
-    lst = list(zip(tultd[::4], tultd[1::4], tultd[2::4], tultd[3::4]))
-    lst.append([Button.inline("=", data="calc=")])
     calc = e.builder.article("Calc", text="• Ultroid Inline Calculator •", buttons=lst)
     await e.answer([calc])
 
@@ -61,33 +64,33 @@ async def _(e):
     x = (e.data_match.group(1)).decode()
     if x == "AC":
         udB.delete("calc")
-        return await e.edit(
+        await e.edit(
             "• Ultroid Inline Calculator •",
             buttons=[Button.inline("Open Calculator Again", data="recalc")],
         )
     elif x == "C":
         udB.delete("calc")
-        return await e.answer("cleared")
+        await e.answer("cleared")
     elif x == "⌫":
         get = udB.get("calc")
         if get:
             udB.set("calc", get[:-1])
-            return await e.answer(str(get[:-1]))
+            await e.answer(str(get[:-1]))
     elif x == "%":
         get = udB.get("calc")
         if get:
             udB.set("calc", get + "/100")
-            return await e.answer(str(get + "/100"))
+            await e.answer(str(get + "/100"))
     elif x == "÷":
         get = udB.get("calc")
         if get:
             udB.set("calc", get + "/")
-            return await e.answer(str(get + "/"))
+            await e.answer(str(get + "/"))
     elif x == "x":
         get = udB.get("calc")
         if get:
             udB.set("calc", get + "*")
-            return await e.answer(str(get + "*"))
+            await e.answer(str(get + "*"))
     elif x == "=":
         get = udB.get("calc")
         if get:
@@ -96,18 +99,18 @@ async def _(e):
             out = await calcc(get, e)
             try:
                 num = float(out)
-                return await e.answer(f"Answer : {num}", cache_time=0, alert=True)
+                await e.answer(f"Answer : {num}", cache_time=0, alert=True)
             except BaseException:
                 udB.delete("calc")
-                return await e.answer("Error", cache_time=0, alert=True)
-        return await e.answer("None")
+                await e.answer("Error", cache_time=0, alert=True)
+        await e.answer("None")
     else:
         get = udB.get("calc")
         if get:
             udB.set("calc", get + x)
-            return await e.answer(str(get + x))
+            await e.answer(str(get + x))
         udB.set("calc", x)
-        return await e.answer(str(x))
+        await e.answer(str(x))
 
 
 @callback("recalc")

plugins/carbon.py

@@ -12,10 +12,12 @@
 
 • `{i}rcarbon <text/reply to msg/reply to document>`
     Carbonise the text, with random bg colours.
+
+• `{i}ccarbon <color ><text/reply to msg/reply to document>`
+    Carbonise the text, with custom bg colours.
 """
 import random
 
-import requests
 from carbonnow import Carbon
 
 from . import *
@@ -173,28 +175,33 @@ all_col = [
 
 
 @ultroid_cmd(
-    pattern="carbon",
+    pattern="^(rc|c)arbon",
 )
 async def crbn(event):
-    xxxx = await eor(event, get_string("com_1"))
+    xxxx = await eor(event, "Processing")
+    te = event.text
+    if te[1] == "r":
+        col = random.choice(all_col)
+    else:
+        col = None
     if event.reply_to_msg_id:
         temp = await event.get_reply_message()
         if temp.media:
             b = await event.client.download_media(temp)
-            a = open(b)
-            code = a.read()
-            a.close()
+            with open(b) as a:
+                code = a.read()
             os.remove(b)
         else:
             code = temp.message
     else:
-        code = event.text.split(" ", maxsplit=1)[1]
-    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)
+        try:
+            code = event.text.split(" ", maxsplit=1)[1]
+        except IndexError:
+            return await eor(xxxx, "`Reply to Message or readable file..`")
+    col = random.choice(all_col)
+    carbon = Carbon(
+        base_url="https://carbonara.vercel.app/api/cook", code=code, background=col
+    )
     xx = await carbon.memorize("ultroid_carbon")
     await xxxx.delete()
     await event.reply(
@@ -204,33 +211,37 @@ async def crbn(event):
 
 
 @ultroid_cmd(
-    pattern="rcarbon",
+    pattern="ccarbon ?(.*)",
 )
 async def crbn(event):
-    xxxx = await eor(event, "Processing")
+    match = event.pattern_match.group(1)
+    if not match:
+        return await eor(event, "`Give Custom Color to Create Carbon...`")
+    msg = await eor(event, "Processing")
     if event.reply_to_msg_id:
         temp = await event.get_reply_message()
         if temp.media:
             b = await event.client.download_media(temp)
-            a = open(b)
-            code = a.read()
-            a.close()
+            with open(b) as a:
+                code = a.read()
             os.remove(b)
         else:
             code = temp.message
     else:
-        code = event.text.split(" ", maxsplit=1)[1]
-    col = random.choice(all_col)
-    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`"
-        )
+        try:
+            match = match.split(" ", maxsplit=1)
+            code = match[1]
+            match = match[0]
+        except IndexError:
+            return await eor(msg, "`Reply to Message or readable file..`")
     carbon = Carbon(
-        base_url="https://carbonara.vercel.app/api/cook", code=code, background=col
+        base_url="https://carbonara.vercel.app/api/cook", code=code, background=match
     )
-    xx = await carbon.memorize("ultroid_carbon")
-    await xxxx.delete()
+    try:
+        xx = await carbon.memorize("ultroid_carbon")
+    except Exception as er:
+        return await msg.edit(str(er))
+    await msg.delete()
     await event.reply(
         f"Carbonised by {inline_mention(event.sender)}",
         file=xx,

plugins/channelhacks.py

@@ -45,7 +45,7 @@ from . import *
 
 @ultroid_bot.on(events.NewMessage())
 async def _(e):
-    if not udB.get("AUTOPOST") == "True":
+    if udB.get("AUTOPOST") != "True":
         return
     x = get_source_channels()
     th = await e.get_chat()
@@ -54,14 +54,9 @@ async def _(e):
     y = get_destinations()
     for ys in y:
         try:
-            if e.text and not e.media:
-                await ultroid_bot.send_message(int(ys), e.text)
-            elif e.media and e.text:
-                await ultroid_bot.send_file(int(ys), e.media, caption=e.text)
-            else:
-                await ultroid_bot.send_file(int(ys), e.media)
-        except Exception as e:
-            await ultroid_bot.send_message(bot.me.id, str(e))
+            await ultroid_bot.send_message(int(ys), e.message)
+        except Exception as ex:
+            await asst.send_message(int(udB["LOG_CHANNEL"]), str(ex))
 
 
 @ultroid_cmd(pattern="shift (.*)")
@@ -131,12 +126,12 @@ async def dd(event):
             return
     if is_source_channel_added(y):
         rem_source_channel(y)
-        await eod(x, "Source removed from database", time=3)
+        await eor(x, "Source removed from database", time=3)
     elif is_source_channel_added(y):
         rem_source_channel(y)
-        await eod(x, "Source removed from database")
+        await eor(x, "Source removed from database", time=5)
     elif not is_source_channel_added(y):
-        await eod(x, "Source channel is already removed from database. ", time=3)
+        await eor(x, "Source channel is already removed from database. ", time=3)
 
 
 @ultroid_cmd(pattern="listsource")
@@ -145,7 +140,7 @@ async def list_all(event):
     channels = get_source_channels()
     num = get_no_source_channels()
     if num == 0:
-        return await eod(x, "No chats were added.", time=5)
+        return await eor(x, "No chats were added.", time=5)
     msg = "Source channels in database:\n"
     for channel in channels:
         name = ""
@@ -212,9 +207,9 @@ async def dd(event):
         await eor(x, "Destination removed from database")
     elif is_destination_added(y):
         rem_destination(y)
-        await eod(x, "Destination removed from database")
+        await eor(x, "Destination removed from database", time=5)
     elif not is_destination_added(y):
-        await eod(x, "Destination channel is already removed from database. ")
+        await eor(x, "Destination channel is already removed from database. ", time=5)
 
 
 @ultroid_cmd(pattern="listdest")
@@ -224,7 +219,7 @@ async def list_all(event):
     channels = get_destinations()
     num = get_no_destinations()
     if num == 0:
-        return await eod(x, "No chats were added.", time=5)
+        return await eor(x, "No chats were added.", time=5)
     msg = "Destination channels in database:\n"
     for channel in channels:
         name = ""

plugins/chat_bot.py

@@ -52,9 +52,9 @@ async def rem_chatBot(event):
 
 @ultroid_cmd(pattern="listai")
 async def lister(event):
-    users = get_all_added()
+    users = get_all_added(event.chat.id)
     if udB.get("CHATBOT_USERS") is None:
-        return await eod(event, "`No user has AI added.`")
+        return await eor(event, "`No user has AI added.`", time=5)
     msg = ""
     for i in users:
         try:
@@ -70,19 +70,21 @@ async def chat_bot_fn(event, type_):
     if event.reply_to_msg_id:
         user = (await event.get_reply_message()).sender
     else:
-        temp = event.text.split(" ", 1)
+        temp = event.text.split(maxsplit=1)
         try:
-            usr = temp[1]
-        except IndexError:
-            return await eod(
-                event,
-                "Reply to a user or give me his id/username to add an AI ChatBot!",
-            )
-        user = await event.client.get_entity(usr)
+            user = await event.client.get_entity(temp[1])
+        except BaseException:
+            if event.is_private:
+                user = event.chat
+            else:
+                return await eod(
+                    event,
+                    "Reply to a user or give me his id/username to add an AI ChatBot!",
+                )
     if type_ == "add":
-        add_chatbot(event.chat.id, user.id)
+        add_chatbot(event.chat_id, user.id)
     if type_ == "remov":
-        rem_chatbot(event.chat.id, user.id)
+        rem_chatbot(event.chat_id, user.id)
     await eor(
-        event, f"**ChatBot:**\n{type_}ed [{user.first_name}](tg://user?id={user.id})`"
+        event, f"**ChatBot:**\n{type_}ed [{user.first_name}](tg://user?id={user.id})"
     )

plugins/chats.py

@@ -8,13 +8,13 @@
 """
 ✘ Commands Available -
 
-• `{i}delchat`
+• `{i}delchat <optional- username/id>`
     Delete the group this cmd is used in.
 
 • `{i}getlink`
     Get link of group this cmd is used in.
 
-• `{i}create (g|b|c) <group_name>`
+• `{i}create (g|b|c) <group_name> ; <optional-username>`
     Create group woth a specific name.
     g - megagroup/supergroup
     b - small group
@@ -23,28 +23,39 @@
 
 
 from telethon.errors import ChatAdminRequiredError as no_admin
-from telethon.tl.functions.channels import CreateChannelRequest, DeleteChannelRequest
+from telethon.tl.functions.channels import (
+    CreateChannelRequest,
+    DeleteChannelRequest,
+    GetFullChannelRequest,
+    UpdateUsernameRequest,
+)
 from telethon.tl.functions.messages import (
     CreateChatRequest,
     DeleteChatUserRequest,
     ExportChatInviteRequest,
+    GetFullChatRequest,
 )
 
 from . import *
 
 
 @ultroid_cmd(
-    pattern="delchat$",
+    pattern="delchat",
     groups_only=True,
 )
 async def _(e):
     xx = await eor(e, "`Processing...`")
     try:
-        await e.client(DeleteChannelRequest(e.chat_id))
+        match = e.text.split(" ", maxsplit=1)[1]
+        chat = "-100" + str(await get_user_id(match))
+    except IndexError:
+        chat = e.chat_id
+    try:
+        await e.client(DeleteChannelRequest(chat))
     except TypeError:
-        return await eod(xx, "`Cant delete this chat`", time=10)
+        return await eor(xx, "`Cant delete this chat`", time=10)
     except no_admin:
-        return await eod(xx, "`I m not an admin`", time=10)
+        return await eor(xx, "`I m not an admin`", time=10)
     await e.client.send_message(
         int(udB.get("LOG_CHANNEL")), f"#Deleted\nDeleted {e.chat_id}"
     )
@@ -54,17 +65,27 @@ async def _(e):
     pattern="getlink$",
     groups_only=True,
     type=["official", "manager"],
-    ignore_dualmode=True,
 )
 async def _(e):
-    xx = await eor(e, "`Processing...`")
-    try:
-        r = await e.client(
-            ExportChatInviteRequest(e.chat_id),
-        )
-    except no_admin:
-        return await eod(xx, "`I m not an admin`", time=10)
-    await eod(xx, f"Link:- {r.link}")
+    chat = await e.get_chat()
+    if chat.username:
+        return await eor(e, f"Username: @{chat.username}")
+    if isinstance(chat, types.Chat):
+        FC = await e.client(GetFullChatRequest(chat.id))
+    elif isinstance(chat, types.Channel):
+        FC = await e.client(GetFullChannelRequest(chat.id))
+    Inv = FC.full_chat.exported_invite
+    if Inv and not Inv.revoked:
+        link = Inv.link
+    else:
+        try:
+            r = await e.client(
+                ExportChatInviteRequest(e.chat_id),
+            )
+        except no_admin:
+            return await eor(e, "`I m not an admin`", time=10)
+        link = r.link
+    await eor(e, f"Link:- {link}")
 
 
 @ultroid_cmd(
@@ -73,6 +94,11 @@ async def _(e):
 async def _(e):
     type_of_group = e.pattern_match.group(1)
     group_name = e.pattern_match.group(2)
+    username = None
+    if " ; " in group_name:
+        group_ = group_name.split(" ; ", maxsplit=1)
+        group_name = group_[0]
+        username = group_[1]
     xx = await eor(e, "`Processing...`")
     if type_of_group == "b":
         try:
@@ -100,23 +126,30 @@ async def _(e):
             )
         except Exception as ex:
             await xx.edit(str(ex))
-    elif type_of_group == "g" or type_of_group == "c":
+    elif type_of_group in ["g", "c"]:
         try:
             r = await e.client(
                 CreateChannelRequest(
                     title=group_name,
                     about="Join @TeamUltroid",
-                    megagroup=False if type_of_group == "c" else True,
-                ),
+                    megagroup=type_of_group != "c",
+                )
             )
+
             created_chat_id = r.chats[0].id
-            result = await e.client(
-                ExportChatInviteRequest(
-                    peer=created_chat_id,
-                ),
-            )
+            if username:
+                await e.client(UpdateUsernameRequest(created_chat_id, username))
+                result = "https://t.me/" + username
+            else:
+                result = (
+                    await e.client(
+                        ExportChatInviteRequest(
+                            peer=created_chat_id,
+                        ),
+                    )
+                ).link
             await xx.edit(
-                f"Your [{group_name}]({result.link}) Group/Channel Has been made Boss!",
+                f"Your [{group_name}]({result}) Group/Channel Has been made Boss!",
                 link_preview=False,
             )
         except Exception as ex: