Ultroid v0.7 Updates

Date: 30-8-2022
Co-Authored-By: Aditya <[email protected]>
Co-Authored-By: Amit Sharma <[email protected]>
Co-Authored-By: CyrusXD <[email protected]>
Co-Authored-By: Danish <[email protected]>
Co-Authored-By: TechiError <[email protected]>
Co-Authored-By: Arnab Paryali <[email protected]>

.github/ISSUE_TEMPLATE/bug-reports.yml

@@ -30,18 +30,18 @@ body:
       label: Version
       description: What version of Ultroid are you running?
       options:
-        - 0.3
-        - 0.2
-        - 0.1
-        - 0.0.9
-        - 0.0.8 (or lesser)
+        - "0.5"
+        - "0.6"
+        - "0.7"
+        - "> 0.7"
+
     validations:
       required: true
   - type: dropdown
     id: hosted
     attributes:
       label: Hosted On
-      description: You Hosted Ultroid In Which Platform?
+      description: You are hosting Ultroid on Which Platform?
       options:
         - Vps
         - Heroku
@@ -65,4 +65,4 @@ body:
       description: By submitting this issue, you agree that you have read the [docs](https://ultroid.tech) and gone through the [deploy tutorial](https://www.youtube.com/watch?v=9wF7k9qA0Q4) at first.
       options:
         - label: I have followed all of the above steps.
-          required: true
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
   - name: Ultroid Support
-    url: https://t.me/UltroidSupport
+    url: https://t.me/UltroidSupportChat
     about: Please drop your doubts or queries there for an immediate response.
   - name: Documentation
     url: https://ultroid.tech/
-    about: Basic documentation for setting up.
+    about: Basic documentation for setting up.

.github/workflows/autotranslate.yml

@@ -0,0 +1,33 @@
+name: Strings Translation
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ dev ]
+    paths:
+    - strings/strings/en.yml
+
+env:
+    GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  analyze:
+    name: Checkout Strings
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9.x
+      - name: Update Translations
+        run: |
+           git config --global user.email "[email protected]"
+           git config --global user.name "New-Dev0"
+           git branch translation && git checkout translation
+           pip install pyyaml requests telethon
+           wget -O run.py https://gist.githubusercontent.com/New-dev0/c7d0d1eb514d311e8e3b687ae5cbe5f3/raw/350cc6d451a02a4b07d0f9bbc27b0e7c9465d3d4/updater.py
+           python3 run.py
+           rm run.py
+           git add . && git commit -m "[Auto] Translate" && git push --set-upstream origin translation
+           gh pr create --title "[Auto] Translation" -B dev --body "Update Translation"

.github/workflows/pylint.yaml

@@ -0,0 +1,44 @@
+name: PyLint
+on:
+  push:
+    branches: [ dev ]
+    paths:
+    - "**.py"
+jobs:
+  PEP8:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+      - name: Install Python lint libraries
+        run: pip install autopep8 autoflake isort black
+      - name: Check for showstoppers
+        run: |
+          autopep8 --verbose --in-place --recursive --aggressive --aggressive assistant/*.py
+          autopep8 --verbose --in-place --recursive --aggressive --aggressive assistant/manager/*.py
+          autopep8 --verbose --in-place --recursive --aggressive --aggressive plugins/*.py
+      - name: Remove unused imports and variables
+        run: |
+          autoflake --in-place --recursive --remove-all-unused-imports --remove-unused-variables --ignore-init-module-imports assistant/*.py
+          autoflake --in-place --recursive --remove-all-unused-imports --remove-unused-variables --ignore-init-module-imports assistant/manager/*.py
+          autoflake --in-place --recursive --remove-all-unused-imports --remove-unused-variables --ignore-init-module-imports plugins/*.py
+      - name: lint with isort and black
+        run: |
+          isort assistant/*.py
+          isort assistant/manager/*.py
+          black --fast assistant/*.py
+          black assistant/manager/*.py
+          isort plugins/*.py
+          black --fast plugins/*.py
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 'pylint: auto fixes'
+          commit_options: '--no-verify'
+          repository: .
+          commit_user_name: buddhhu
+          commit_user_email: [email protected]
+          commit_author: Amit Sharma <[email protected]>
+          

.github/workflows/stringanalysis.yml

@@ -0,0 +1,33 @@
+name: Strings Analysis
+
+on:
+  pull_request:
+  push:
+    branches: dev
+    paths: strings/strings/*
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    name: Checkout Strings
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9.x
+      - name: Install Stuff
+        run: pip install pyyaml
+      - name: dl stuff
+        run: wget -O stringizer.py https://gist.githubusercontent.com/New-dev0/6dfc8a177418565a776167764b2fe0e4/raw/f515e9892a331110c1565eb109eb712eb64423bd/stringzer.py
+      - name: do stuff
+        run: python stringizer.py && rm stringizer.py
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 'Strings: Auto Count'
+          commit_options: '--no-verify'
+          repository: .
+          commit_user_name: TeamUltroid
+          commit_user_email: [email protected]
+          commit_author: Amit Sharma <[email protected]>

.gitignore

@@ -14,10 +14,11 @@ test*
 *.log
 target/npmlist.json
 package-lock.json
+resources/extras/thumbnail.jpg
 
 # Directories
 addons/
-pyUltroid/
+vcbot/
 __pycache__/
 venv/
 node_modules/
@@ -38,5 +39,6 @@ bin-release/
 
 # temporary files
 *.raw
-tplugins
-tassistant
+
+# fly.io configs
+fly.toml

README.md

@@ -7,7 +7,7 @@
 
 <b>A stable pluggable Telegram userbot + Voice & Video Call music bot, based on Telethon.</b>
 
-[![](https://img.shields.io/badge/Ultroid-v0.6-darkblue)](#)
+[![](https://img.shields.io/badge/Ultroid-v0.7-darkgreen)](#)
 [![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/)   
@@ -84,8 +84,9 @@ Get the [Necessary Variables](#Necessary-Variables) and then click the button be
    `bash startup`
   - Windows Users:
     `python(3) -m pyUltroid`
+<details>
+<summary><h3>[OUTDATED] Ultroid CLI</h3></summary>
 
-### Ultroid CLI
 [Ultroid CLI](https://github.com/BLUE-DEVIL1134/UltroidCli) is a command-line interface for deploying Ultroid.   
 
 - **Installing** -    
@@ -96,6 +97,7 @@ Go to [UltroidCli](https://github.com/BLUE-DEVIL1134/UltroidCli) and install the
 
 - **Documentation** -
 Take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli/) for more detailed information.
+</details>
 
 ---
 ## Necessary Variables

app.json

@@ -1,7 +1,7 @@
 {
     "name": "Ultroid UserBot",
     "description": "Pluggable telegram userbot, made in python using Telethon.",
-    "logo": "https://telegra.ph/file/031957757a4f6a5191040.jpg",
+    "logo": "https://graph.org/file/031957757a4f6a5191040.jpg",
     "keywords": [
         "Telethon",
         "telegram",
@@ -11,7 +11,7 @@
     ],
     "repository": "https://github.com/TeamUltroid/Ultroid",
     "website": "https://ultroid.tech",
-    "success_url": "https://t.me/TheUltroid",
+    "success_url": "https://t.me/TeamUltroid",
     "stack": "container",
     "env": {
         "API_ID": {

assistant/__init__.py

@@ -5,16 +5,16 @@
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
+from telethon import Button, custom
+
+from plugins import ATRA_COL, InlinePlugin
 from pyUltroid import *
 from pyUltroid import _ult_cache
 from pyUltroid._misc import owner_and_sudos
 from pyUltroid._misc._assistant import asst_cmd, callback, in_pattern
-from pyUltroid.functions.helper import *
-from pyUltroid.functions.tools import get_stored_file
-from telethon import Button, custom
-
-from plugins import ATRA_COL
-from strings import get_languages, get_string, language
+from pyUltroid.fns.helper import *
+from pyUltroid.fns.tools import get_stored_file
+from strings import get_languages, get_string
 
 OWNER_NAME = ultroid_bot.full_name
 OWNER_ID = ultroid_bot.uid

assistant/callbackstuffs.py

@@ -17,22 +17,18 @@ from random import choice
 from bs4 import BeautifulSoup as bs
 
 try:
-    from pyUltroid.functions.gDrive import GDriveManager
+    from pyUltroid.fns.gDrive import GDriveManager
 except ImportError:
     GDriveManager = None
-from pyUltroid.functions.helper import fast_download, progress
-from pyUltroid.functions.tools import (
-    Carbon,
-    async_searcher,
-    get_paste,
-    telegraph_client,
-)
-from pyUltroid.startup.loader import Loader
 from telegraph import upload_file as upl
 from telethon import Button, events
 from telethon.tl.types import MessageMediaWebPage
 from telethon.utils import get_peer_id
 
+from pyUltroid.fns.helper import fast_download, progress
+from pyUltroid.fns.tools import Carbon, async_searcher, get_paste, telegraph_client
+from pyUltroid.startup.loader import Loader
+
 from . import *
 
 # --------------------------------------------------------------------#
@@ -54,7 +50,7 @@ def text_to_url(event):
 
 _buttons = {
     "otvars": {
-        "text": "Other Variables to set for @TheUltroid:",
+        "text": "Other Variables to set for @TeamUltroid:",
         "buttons": [
             [
                 Button.inline("Tᴀɢ Lᴏɢɢᴇʀ", data="taglog"),
@@ -306,8 +302,9 @@ 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:" + heroku_api + "@"
+            "https://", f"https://api:{heroku_api}@"
         )
+
         if "heroku" in repo.remotes:
             remote = repo.remote("heroku")
             remote.set_url(heroku_git_url)
@@ -340,7 +337,7 @@ async def changes(okk):
     if not match:
         try:
             if len(tl_chnglog) > 700:
-                tl_chnglog = tl_chnglog[:700] + "..."
+                tl_chnglog = f"{tl_chnglog[:700]}..."
                 button.append([Button.inline("View Complete", "changesall")])
             await okk.edit("• Writing Changelogs 📝 •")
             img = await Carbon(
@@ -387,7 +384,7 @@ async def _(e):
         ok, index = ok.split("|")
     with open(ok, "r") as hmm:
         _, key = await get_paste(hmm.read())
-    link = "https://spaceb.in/" + key
+    link = f"https://spaceb.in/{key}"
     raw = f"https://spaceb.in/api/v1/documents/{key}/raw"
     if not _:
         return await e.answer(key[:30], alert=True)
@@ -512,7 +509,7 @@ async def rhwhe(e):
     else:
         udB.set_key("DUAL_MODE", "True")
         key = "On"
-    Msg = "Dual Mode : " + key
+    Msg = f"Dual Mode : {key}"
     await e.edit(Msg, buttons=get_back_button("cbs_otvars"))
 
 
@@ -603,10 +600,7 @@ async def pluginch(event):
         else:
             await setit(event, var, themssg)
             await conv.send_message(
-                "{} changed to {}\n After Setting All Things Do Restart".format(
-                    name,
-                    themssg,
-                ),
+                f"{name} changed to {themssg}\n After Setting All Things Do Restart",
                 buttons=get_back_button("cbs_otvars"),
             )
 
@@ -705,10 +699,12 @@ async def _(e):
 
 @callback("eaddon", owner=True)
 async def pmset(event):
-    if not udB.get_key("ADDONS"):
-        BT = [Button.inline("Aᴅᴅᴏɴs  Oɴ", data="edon")]
-    else:
-        BT = [Button.inline("Aᴅᴅᴏɴs  Oғғ", data="edof")]
+    BT = (
+        [Button.inline("Aᴅᴅᴏɴs  Oғғ", data="edof")]
+        if udB.get_key("ADDONS")
+        else [Button.inline("Aᴅᴅᴏɴs  Oɴ", data="edon")]
+    )
+
     await event.edit(
         "ADDONS~ Extra Plugins:",
         buttons=[
@@ -739,10 +735,12 @@ async def eddof(event):
 
 @callback("sudo", owner=True)
 async def pmset(event):
-    if not udB.get_key("SUDO"):
-        BT = [Button.inline("Sᴜᴅᴏ Mᴏᴅᴇ  Oɴ", data="onsudo")]
-    else:
-        BT = [Button.inline("Sᴜᴅᴏ Mᴏᴅᴇ  Oғғ", data="ofsudo")]
+    BT = (
+        [Button.inline("Sᴜᴅᴏ Mᴏᴅᴇ  Oғғ", data="ofsudo")]
+        if udB.get_key("SUDO")
+        else [Button.inline("Sᴜᴅᴏ Mᴏᴅᴇ  Oɴ", data="onsudo")]
+    )
+
     await event.edit(
         f"SUDO MODE ~ Some peoples can use ur Bot which u selected. To know More use `{HNDLR}help sudo`",
         buttons=[
@@ -829,7 +827,7 @@ async def media(event):
             media = await event.client.download_media(response, "alvpc")
             try:
                 x = upl(media)
-                url = f"https://telegra.ph/{x[0]}"
+                url = f"https://graph.org/{x[0]}"
                 remove(media)
             except BaseException:
                 return await conv.send_message(
@@ -902,10 +900,7 @@ async def name(event):
             )
         await setit(event, var, themssg)
         await conv.send_message(
-            "{} changed to {}\n\nAfter Setting All Things Do restart".format(
-                name,
-                themssg,
-            ),
+            f"{name} changed to {themssg}\n\nAfter Setting All Things Do restart",
             buttons=get_back_button("cbs_pmcstm"),
         )
 
@@ -925,8 +920,7 @@ async def name(event):
 @callback(re.compile(b"wrns_(.*)"), owner=True)
 async def set_wrns(event):
     value = int(event.data_match.group(1).decode("UTF-8"))
-    dn = udB.set_key("PMWARNS", value)
-    if dn:
+    if dn := udB.set_key("PMWARNS", value):
         await event.edit(
             f"PM Warns Set to {value}.\nNew users will have {value} chances in PMs before getting banned.",
             buttons=get_back_button("cbs_pmcstm"),
@@ -970,7 +964,7 @@ async def media(event):
         else:
             try:
                 x = upl(media)
-                url = f"https://telegra.ph/{x[0]}"
+                url = f"https://graph.org/{x[0]}"
                 remove(media)
             except BaseException:
                 return await conv.send_message(
@@ -1025,10 +1019,12 @@ async def apof(event):
 
 @callback("pml", owner=True)
 async def l_vcs(event):
-    if not udB.get_key("PMLOG"):
-        BT = [Button.inline("PMLOGGER ON", data="pmlog")]
-    else:
-        BT = [Button.inline("PMLOGGER OFF", data="pmlogof")]
+    BT = (
+        [Button.inline("PMLOGGER OFF", data="pmlogof")]
+        if udB.get_key("PMLOG")
+        else [Button.inline("PMLOGGER ON", data="pmlog")]
+    )
+
     await event.edit(
         "PMLOGGER This Will Forward Ur Pm to Ur Private Group -",
         buttons=[
@@ -1170,10 +1166,7 @@ async def name(event):
             )
         await setit(event, var, themssg)
         await conv.send_message(
-            "{} changed to {}".format(
-                name,
-                themssg,
-            ),
+            f"{name} changed to {themssg}",
             buttons=get_back_button("cbs_chatbot"),
         )
 
@@ -1237,7 +1230,7 @@ async def media(event):
         else:
             try:
                 x = upl(media)
-                url = f"https://telegra.ph/{x[0]}"
+                url = f"https://graph.org/{x[0]}"
                 remove(media)
             except BaseException:
                 return await conv.send_message(
@@ -1268,12 +1261,12 @@ async def fdroid_dler(event):
     title = BSC.find("h3", "package-name").text.strip()
     thumb = BSC.find("img", "package-icon")["src"]
     if thumb.startswith("/"):
-        thumb = "https://f-droid.org" + thumb
-    thumb, _ = await fast_download(thumb, filename=uri + ".png")
+        thumb = f"https://f-droid.org{thumb}"
+    thumb, _ = await fast_download(thumb, filename=f"{uri}.png")
     s_time = time.time()
     file, _ = await fast_download(
         dl_,
-        filename=title + ".apk",
+        filename=f"{title}.apk",
         progress_callback=lambda d, t: asyncio.get_event_loop().create_task(
             progress(
                 d,
@@ -1284,6 +1277,7 @@ async def fdroid_dler(event):
             )
         ),
     )
+
     time.time()
     n_file = await event.client.fast_uploader(
         file, show_progress=True, event=event, message="Uploading...", to_delete=True

assistant/games.py

@@ -28,9 +28,6 @@ except ImportError:
     akinator = None
     LOGS.error("'akinator' not installed.")
 
-from pyUltroid._misc._decorators import ultroid_cmd
-from pyUltroid.functions.helper import inline_mention
-from pyUltroid.functions.tools import async_searcher
 from telethon.errors.rpcerrorlist import (
     BotMethodInvalidError,
     ChatSendStickersForbiddenError,
@@ -38,12 +35,16 @@ from telethon.errors.rpcerrorlist import (
 from telethon.events import Raw
 from telethon.tl.types import InputMediaPoll, Poll, PollAnswer, UpdateMessagePollVote
 
+from pyUltroid._misc._decorators import ultroid_cmd
+from pyUltroid.fns.helper import inline_mention
+from pyUltroid.fns.tools import async_searcher
+
 from . import *
 
 # -------------------------- Akinator ----------------------- #
 
 games = {}
-aki_photo = "https://telegra.ph/file/3cc8825c029fd0cab9edc.jpg"
+aki_photo = "https://graph.org/file/3cc8825c029fd0cab9edc.jpg"
 
 
 @ultroid_cmd(pattern="akinator")
@@ -89,7 +90,7 @@ async def doai(e):
 
     bts = [bts, cts]
     # ignored Back Button since it makes the Pagination looks Bad
-    await e.edit("Q. " + qu, buttons=bts)
+    await e.edit(f"Q. {qu}", buttons=bts)
 
 
 @callback(re.compile("aka_(.*)"), owner=True)
@@ -138,6 +139,11 @@ async def eiagx(e):
 
 # ----------------------- Main Command ------------------- #
 
+GIMAGES = [
+    "https://graph.org/file/1c51015bae5205a65fd69.jpg",
+    "https://imgwhale.xyz/3xyr322l64j9590",
+]
+
 
 @asst_cmd(pattern="startgame", owner=True)
 async def magic(event):
@@ -147,7 +153,7 @@ async def magic(event):
     ]
     await event.reply(
         get_string("games_1"),
-        file="https://telegra.ph/file/1c51015bae5205a65fd69.jpg",
+        file=choice(GIMAGES),
         buttons=buttons,
     )
 
@@ -261,7 +267,7 @@ async def choose_cata(event):
                     close_period=int(in_),
                 ),
                 correct_answers=[ansi],
-                solution="Join @TheUltroid",
+                solution="Join @TeamUltroid",
                 solution_entities=[],
             )
             m_ = await event.client.send_message(chat, file=poll)

assistant/initial.py

@@ -32,7 +32,7 @@ STRINGS = {
 -> [Also Check](https://t.me/UltroidUpdates/14)
 
 **• To Know About Updates**
-  - Join @TheUltroid.""",
+  - Join @TeamUltroid.""",
     4: f"""• `To Know All Available Commands`
 
   - `{HNDLR}help`
@@ -50,14 +50,15 @@ async def init_depl(e):
     if CURRENT == 5:
         return await e.edit(
             STRINGS[5],
-            buttons=Button.inline("<< Back", "initbk_" + str(4)),
+            buttons=Button.inline("<< Back", "initbk_4"),
             link_preview=False,
         )
+
     await e.edit(
         STRINGS[CURRENT],
         buttons=[
-            Button.inline("<<", "initbk_" + str(CURRENT - 1)),
-            Button.inline(">>", "initft_" + str(CURRENT + 1)),
+            Button.inline("<<", f"initbk_{str(CURRENT - 1)}"),
+            Button.inline(">>", f"initft_{str(CURRENT + 1)}"),
         ],
         link_preview=False,
     )
@@ -69,14 +70,15 @@ async def ineiq(e):
     if CURRENT == 1:
         return await e.edit(
             STRINGS[1],
-            buttons=Button.inline("Start Back >>", "initft_" + str(2)),
+            buttons=Button.inline("Start Back >>", "initft_2"),
             link_preview=False,
         )
+
     await e.edit(
         STRINGS[CURRENT],
         buttons=[
-            Button.inline("<<", "initbk_" + str(CURRENT - 1)),
-            Button.inline(">>", "initft_" + str(CURRENT + 1)),
+            Button.inline("<<", f"initbk_{str(CURRENT - 1)}"),
+            Button.inline(">>", f"initft_{str(CURRENT + 1)}"),
         ],
         link_preview=False,
     )

assistant/inlinestuff.py

@@ -8,22 +8,24 @@
 import base64
 import inspect
 from datetime import datetime
+from html import unescape
 from random import choice
 from re import compile as re_compile
 
 from bs4 import BeautifulSoup as bs
-from pyUltroid.functions.misc import google_search
-from pyUltroid.functions.tools import (
+from telethon import Button
+from telethon.tl.alltlobjects import LAYER, tlobjects
+from telethon.tl.types import DocumentAttributeAudio as Audio
+from telethon.tl.types import InputWebDocument as wb
+
+from pyUltroid.fns.misc import google_search
+from pyUltroid.fns.tools import (
     _webupload_cache,
     async_searcher,
     get_ofox,
     saavn_search,
     webuploader,
 )
-from telethon import Button
-from telethon.tl.alltlobjects import LAYER, tlobjects
-from telethon.tl.types import DocumentAttributeAudio as Audio
-from telethon.tl.types import InputWebDocument as wb
 
 from . import *
 from . import _ult_cache
@@ -31,13 +33,13 @@ from . import _ult_cache
 SUP_BUTTONS = [
     [
         Button.url("• Repo •", url="https://github.com/TeamUltroid/Ultroid"),
-        Button.url("• Support •", url="t.me/ultroidsupportchat"),
+        Button.url("• Support •", url="t.me/UltroidSupportChat"),
     ],
 ]
 
-ofox = "https://telegra.ph/file/231f0049fcd722824f13b.jpg"
-gugirl = "https://telegra.ph/file/0df54ae4541abca96aa11.jpg"
-ultpic = "https://telegra.ph/file/4136aa1650bc9d4109cc5.jpg"
+ofox = "https://graph.org/file/231f0049fcd722824f13b.jpg"
+gugirl = "https://graph.org/file/0df54ae4541abca96aa11.jpg"
+ultpic = "https://graph.org/file/4136aa1650bc9d4109cc5.jpg"
 
 apis = [
     "QUl6YVN5QXlEQnNZM1dSdEI1WVBDNmFCX3c4SkF5NlpkWE5jNkZV",
@@ -229,12 +231,11 @@ async def _(e):
         return await e.answer(
             [], switch_pm="Mod Apps Search. Enter app name!", switch_pm_param="start"
         )
-    page = 1
-    start = (page - 1) * 3 + 1
+    start = 0 * 3 + 1
     da = base64.b64decode(choice(apis)).decode("ascii")
     url = f"https://www.googleapis.com/customsearch/v1?key={da}&cx=25b3b50edb928435b&q={quer}&start={start}"
     data = await async_searcher(url, re_json=True)
-    search_items = data.get("items")
+    search_items = data.get("items", [])
     modss = []
     for a in search_items:
         title = a.get("title")
@@ -268,55 +269,22 @@ async def _(e):
     await e.answer(modss, switch_pm="Search Mod Applications.", switch_pm_param="start")
 
 
-# Inspired by @FindXDaBot
-
-
-@in_pattern("xda", owner=True)
-async def xda_dev(event):
-    QUERY = event.text.split(maxsplit=1)
-    try:
-        query = QUERY[1]
-    except IndexError:
-        return await event.answer(
-            [], switch_pm=get_string("instu_3"), switch_pm_param="start"
-        )
-    le = "https://www.xda-developers.com/search/" + query.replace(" ", "+")
-    ct = await async_searcher(le, re_content=True)
-    ml = bs(ct, "html.parser", from_encoding="utf-8")
-    ml = ml.find_all("div", re_compile("layout_post_"), id=re_compile("post-"))
-    out = []
-    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 event.builder.article(
-                title=title, description=desc, url=hre, thumb=thumb, text=text
-            )
-        )
-    uppar = "No Results Found :(" if not out else "|| XDA Search Results ||"
-    await event.answer(out, switch_pm=uppar, switch_pm_param="start")
-
-
 APP_CACHE = {}
 RECENTS = {}
+PLAY_API = "https://googleplay.onrender.com/api/apps?q="
 
 
 @in_pattern("app", owner=True)
 async def _(e):
     try:
-        f = e.text.split(" ", maxsplit=1)[1].lower()
+        f = e.text.split(maxsplit=1)[1].lower()
     except IndexError:
         get_string("instu_1")
         res = []
         if APP_CACHE and RECENTS.get(e.sender_id):
-            for a in RECENTS[e.sender_id]:
-                if APP_CACHE.get(a):
-                    res.append(APP_CACHE[a][0])
+            res.extend(
+                APP_CACHE[a][0] for a in RECENTS[e.sender_id] if APP_CACHE.get(a)
+            )
         return await e.answer(
             res, switch_pm=get_string("instu_2"), switch_pm_param="start"
         )
@@ -327,33 +295,21 @@ async def _(e):
     except KeyError:
         pass
     foles = []
-    base_uri = "https://play.google.com"
-    url = f"{base_uri}/store/search?q={f.replace(' ', '%20')}&c=apps"
-    aap = await async_searcher(url, re_content=True)
-    b_ = bs(aap, "html.parser", from_encoding="utf-8")
-    aap = b_.find_all("div", "Vpfmgd")
-    for z in aap[:10]:
-        url = base_uri + z.find("a")["href"]
-        scra = await async_searcher(url, re_content=True)
-        bp = bs(scra, "html.parser", from_encoding="utf-8")
-        name = z.find("div", "WsMG1c nnK0zc")["title"]
-        desc = (
-            str(bp.find("div", jsname="sngebd"))
-            .replace('<div jsname="sngebd">', "")
-            .replace("<br/>", "\n")
-            .replace("</div>", "")[:300]
-            + "..."
-        )
-        dev = z.find("div", "KoLSrc").text
-        icon = z.find("img", "T75of QNCnCf")["data-src"]
-        text = f"**••Aᴘᴘ Nᴀᴍᴇ••** [{name}]({icon})\n"
+    url = PLAY_API + f.replace(" ", "+")
+    aap = await async_searcher(url, re_json=True)
+    for z in aap["results"][:50]:
+        url = "https://play.google.com/store/apps/details?id=" + z["appId"]
+        name = z["title"]
+        desc = unescape(z["summary"])[:300].replace("<br>", "\n") + "..."
+        dev = z["developer"]["devId"]
+        text = f"**••Aᴘᴘ Nᴀᴍᴇ••** [{name}]({url})\n"
         text += f"**••Dᴇᴠᴇʟᴏᴘᴇʀ••** `{dev}`\n"
         text += f"**••Dᴇsᴄʀɪᴘᴛɪᴏɴ••**\n`{desc}`"
         foles.append(
             await e.builder.article(
                 title=name,
                 description=dev,
-                thumb=wb(icon, 0, "image/jpeg", []),
+                thumb=wb(z["icon"], 0, "image/jpeg", []),
                 text=text,
                 link_preview=True,
                 buttons=[
@@ -395,13 +351,13 @@ async def piston_run(event):
             title="Bad Query",
             description="Usage: [Language] [code]",
             thumb=wb(
-                "https://telegra.ph/file/e33c57fc5f1044547e4d8.jpg", 0, "image/jpeg", []
+                "https://graph.org/file/e33c57fc5f1044547e4d8.jpg", 0, "image/jpeg", []
             ),
-            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)',
+            text=f'**Inline Usage**\n\n`@{asst.me.username} run python print("hello world")`\n\n[Language List](https://graph.org/Ultroid-09-01-6)',
         )
         return await event.answer([result])
     if not PISTON_LANGS:
-        se = await async_searcher(PISTON_URI + "runtimes", re_json=True)
+        se = await async_searcher(f"{PISTON_URI}runtimes", re_json=True)
         PISTON_LANGS.update({lang.pop("language"): lang for lang in se})
     if lang in PISTON_LANGS.keys():
         version = PISTON_LANGS[lang]["version"]
@@ -410,26 +366,31 @@ async def piston_run(event):
             title="Unsupported Language",
             description="Usage: [Language] [code]",
             thumb=wb(
-                "https://telegra.ph/file/e33c57fc5f1044547e4d8.jpg", 0, "image/jpeg", []
+                "https://graph.org/file/e33c57fc5f1044547e4d8.jpg", 0, "image/jpeg", []
             ),
-            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)',
+            text=f'**Inline Usage**\n\n`@{asst.me.username} run python print("hello world")`\n\n[Language List](https://graph.org/Ultroid-09-01-6)',
         )
         return await event.answer([result])
     output = await async_searcher(
-        PISTON_URI + "execute",
+        f"{PISTON_URI}execute",
         post=True,
-        json={"language": lang, "version": version, "files": [{"content": code}]},
+        json={
+            "language": lang,
+            "version": version,
+            "files": [{"content": code}],
+        },
         re_json=True,
     )
+
     output = output["run"]["output"] or get_string("instu_4")
     if len(output) > 3000:
-        output = output[:3000] + "..."
+        output = f"{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}`",
         thumb=wb(
-            "https://telegra.ph/file/871ee4a481f58117dccc4.jpg", 0, "image/jpeg", []
+            "https://graph.org/file/871ee4a481f58117dccc4.jpg", 0, "image/jpeg", []
         ),
         buttons=Button.switch_inline("Fork", query=event.text, same_peer=True),
     )
@@ -458,7 +419,7 @@ async def do_magic(event):
     for dat in BSC.find_all("a", "package-header")[:10]:
         image = dat.find("img", "package-icon")["src"]
         if image.endswith("/"):
-            image = "https://telegra.ph/file/a8dd4a92c5a53a89d0eff.jpg"
+            image = "https://graph.org/file/a8dd4a92c5a53a89d0eff.jpg"
         title = dat.find("h4", "package-name").text.strip()
         desc = dat.find("span", "package-summary").text.strip()
         text = f"• **Name :** `{title}`\n\n"
@@ -487,96 +448,6 @@ async def do_magic(event):
     await event.answer(ress, switch_pm=msg, switch_pm_param="start")
 
 
-_koo_ = {}
-
-
-@in_pattern("koo", owner=True)
-async def koo_search(ult):
-    """Search Users on koo with API"""
-    try:
-        match = ult.text.split(maxsplit=1)[1].lower()
-        match_ = match
-    except IndexError:
-        return await ult.answer(
-            [], switch_pm="Enter Query to Search..", switch_pm_param="start"
-        )
-    if _koo_.get(match):
-        return await ult.answer(
-            _koo_[match], switch_pm="• Koo Search •", switch_pm_param="start"
-        )
-    res = []
-    se_ = None
-    key_count = None
-    if " | " in match:
-        match = match.split(" | ", maxsplit=1)
-        try:
-            key_count = int(match[1])
-        except ValueError:
-            pass
-        match = match[0]
-    match = match.replace(" ", "+")
-    req = await async_searcher(
-        f"https://www.kooapp.com/apiV1/search?query={match}&searchType=EXPLORE",
-        re_json=True,
-    )
-    if key_count:
-        try:
-            se_ = [req["feed"][key_count - 1]]
-        except KeyError:
-            pass
-    if not se_:
-        se_ = req["feed"]
-    for count, feed in enumerate(se_[:10]):
-        if feed["uiItemType"] == "search_profile":
-            count += 1
-            item = feed["items"][0]
-            profileImage = (
-                item["profileImageBaseUrl"]
-                if item.get("profileImageBaseUrl")
-                else "https://telegra.ph/file/dc28e69bd7ea2c0f25329.jpg"
-            )
-            extra = await async_searcher(
-                "https://www.kooapp.com/apiV1/users/handle/" + item["userHandle"],
-                re_json=True,
-            )
-            img = wb(profileImage, 0, "image/jpeg", [])
-            text = f"‣ **Name :** `{item['name']}`"
-            if extra.get("title"):
-                text += f"\n‣ **Title :** `{extra['title']}`"
-            text += f"\n‣ **Username :** `@{item['userHandle']}`"
-            if extra.get("description"):
-                text += f"\n‣ **Description :** `{extra['description']}`"
-            text += f"\n‣ **Followers :** `{extra['followerCount']}`    ‣ **Following :** {extra['followingCount']}"
-            if extra.get("socialProfile") and extra["socialProfile"].get("website"):
-                text += f"\n‣ **Website :** {extra['socialProfile']['website']}"
-            res.append(
-                await ult.builder.article(
-                    title=item["name"],
-                    description=item.get("title") or f"@{item['userHandle']}",
-                    type="photo",
-                    content=img,
-                    thumb=img,
-                    include_media=True,
-                    text=text,
-                    buttons=[
-                        Button.url(
-                            "View", "https://kooapp.com/profile/" + item["userHandle"]
-                        ),
-                        Button.switch_inline(
-                            "• Share •",
-                            query=ult.text if key_count else ult.text + f" | {count}",
-                        ),
-                    ],
-                )
-            )
-    if not res:
-        switch = "No Results Found :("
-    else:
-        _koo_.update({match_: res})
-        switch = f"Showing {len(res)} Results!"
-    await ult.answer(res, switch_pm=switch, switch_pm_param="start")
-
-
 # Thanks to OpenSource
 _bearer_collected = [
     "AAAAAAAAAAAAAAAAAAAAALIKKgEAAAAA1DRuS%2BI7ZRKiagD6KHYmreaXomo%3DP5Vaje4UTtEkODg0fX7nCh5laSrchhtLxeyEqxXpv0w9ZKspLD",
@@ -601,7 +472,7 @@ async def twitter_search(event):
         )
     except KeyError:
         pass
-    headers = {"Authorization": "bearer " + choice(_bearer_collected)}
+    headers = {"Authorization": f"bearer {choice(_bearer_collected)}"}
     res = await async_searcher(
         f"https://api.twitter.com/1.1/users/search.json?q={match}",
         headers=headers,
@@ -629,7 +500,7 @@ async def twitter_search(event):
                 thumb=thumb,
             )
         )
-    swi_ = "No User Found :(" if not reso else f"🐦 Showing {len(reso)} Results!"
+    swi_ = f"🐦 Showing {len(reso)} Results!" if reso else "No User Found :("
     await event.answer(reso, switch_pm=swi_, switch_pm_param="start")
     if _ult_cache.get("twitter"):
         _ult_cache["twitter"].update({match: reso})
@@ -655,18 +526,19 @@ async def savn_s(event):
             switch_pm_param="start",
         )
     results = await saavn_search(query)
-    swi = "No Results Found!" if not results else "🎵 Saavn Search"
+    swi = "🎵 Saavn Search" if results else "No Results Found!"
     res = []
     for song in results:
         thumb = wb(song["image"], 0, "image/jpeg", [])
-        text = f"• **Title :** {song['song']}"
+        text = f"• **Title :** {song['title']}"
         text += f"\n• **Year :** {song['year']}"
         text += f"\n• **Lang :** {song['language']}"
-        text += f"\n• **Artist :** {song['primary_artists']}"
+        text += f"\n• **Artist :** {song['artists']}"
         text += f"\n• **Release Date :** {song['release_date']}"
         res.append(
             await event.builder.article(
-                title=song["song"],
+                title=song["title"],
+                description=song["artists"],
                 type="audio",
                 text=text,
                 include_media=True,
@@ -675,14 +547,14 @@ async def savn_s(event):
                 ),
                 thumb=thumb,
                 content=wb(
-                    song["media_url"],
+                    song["url"],
                     0,
                     "audio/mp4",
                     [
                         Audio(
-                            title=song["song"],
+                            title=song["title"],
                             duration=int(song["duration"]),
-                            performer=song["primary_artists"],
+                            performer=song["artists"],
                         )
                     ],
                 ),
@@ -692,58 +564,6 @@ async def savn_s(event):
     _savn_cache.update({query: res})
 
 
-_OMG = {}
-
-
-@in_pattern("omgu", owner=True)
-async def omgubuntu(ult):
-    try:
-        match = ult.text.split(maxsplit=1)[1].lower()
-    except IndexError:
-        return await ult.answer(
-            [], switch_pm="Enter Query to search...", switch_pm_param="start"
-        )
-    if _OMG.get(match):
-        return await ult.answer(
-            _OMG[match], switch_pm="OMG Ubuntu Search :]", switch_pm_param="start"
-        )
-    get_web = "https://www.omgubuntu.co.uk/?s=" + match.replace(" ", "+")
-    get_ = await async_searcher(get_web, re_content=True)
-    BSC = bs(get_, "html.parser", from_encoding="utf-8")
-    res = []
-    for cont in BSC.find_all("div", "sbs-layout__item"):
-        img = cont.find("div", "sbs-layout__image")
-        url = img.find("a")["href"]
-        src = img.find("img")["src"]
-        con = cont.find("div", "sbs-layout__content")
-        tit = con.find("a", "layout__title-link")
-        title = tit.text.strip()
-        desc = con.find("p", "layout__description").text.strip()
-        text = f"[{title.strip()}]({url})\n\n{desc}"
-        img = wb(src, 0, "image/jpeg", [])
-        res.append(
-            await ult.builder.article(
-                title=title,
-                type="photo",
-                description=desc,
-                url=url,
-                text=text,
-                buttons=Button.switch_inline(
-                    "Search Again", query=ult.text, same_peer=True
-                ),
-                include_media=True,
-                content=img,
-                thumb=img,
-            )
-        )
-    await ult.answer(
-        res,
-        switch_pm=f"Showing {len(res)} results!" if res else "No Results Found :[",
-        switch_pm_param="start",
-    )
-    _OMG[match] = res
-
-
 @in_pattern("tl", owner=True)
 async def inline_tl(ult):
     try:
@@ -755,7 +575,7 @@ async def inline_tl(ult):
                 await ult.builder.article(
                     title="How to Use?",
                     description="Tl Searcher by Ultroid",
-                    url="https://t.me/TheUltroid",
+                    url="https://t.me/TeamUltroid",
                     text=text,
                 )
             ],
@@ -769,8 +589,7 @@ async def inline_tl(ult):
             text = f"**Name:** `{key.__name__}`\n"
             text += f"**Category:** `{tyyp}`\n"
             text += f"\n`from {key.__module__} import {key.__name__}`\n\n"
-            args = str(inspect.signature(key))[1:][:-1]
-            if args:
+            if args := str(inspect.signature(key))[1:][:-1]:
                 text += "**Parameter:**\n"
                 for para in args.split(","):
                     text += " " * 4 + "`" + para + "`\n"
@@ -779,108 +598,26 @@ async def inline_tl(ult):
                 await ult.builder.article(
                     title=key.__name__,
                     description=tyyp,
-                    url="https://t.me/TheUltroid",
+                    url="https://t.me/TeamUltroid",
                     text=text[:4000],
                 )
             )
-    if not res:
-        mo = f"No Results for {match}!"
-    else:
-        mo = f"Showing {len(res)} results!"
+    mo = f"Showing {len(res)} results!" if res else f"No Results for {match}!"
     await ult.answer(res[:50], switch_pm=mo, switch_pm_param="start")
 
 
-@in_pattern("gh", owner=True)
-async def gh_feeds(ult):
-    try:
-        username = ult.text.split(maxsplit=1)[1]
-    except IndexError:
-        return await ult.answer(
-            [],
-            switch_pm="Enter Github Username to see feeds...",
-            switch_pm_param="start",
-        )
-    if not username.endswith("."):
-        return await ult.answer(
-            [], switch_pm="End your query with . to search...", switch_pm_param="start"
-        )
-    username = username[:-1]
-    data = await async_searcher(
-        f"https://api.github.com/users/{username}/events", re_json=True
-    )
-    if not isinstance(data, list):
-        msg = ""
-        for ak in list(data.keys()):
-            msg += ak + ": `" + data[ak] + "`\n"
-        return await ult.answer(
-            [
-                await ult.builder.article(
-                    title=data["message"], text=msg, link_preview=False
-                )
-            ],
-            cache_time=300,
-            switch_pm="Error!!!",
-            switch_pm_param="start",
-        )
-    res = []
-    res_ids = []
-    for cont in data[:50]:
-        text = f"<b><a href='https://github.com/{username}'>@{username}</a></b>"
-        title = f"@{username}"
-        extra = None
-        if cont["type"] == "PushEvent":
-            text += " pushed in"
-            title += " pushed in"
-            dt = cont["payload"]["commits"][-1]
-            url = "https://github.com/" + dt["url"].split("/repos/")[-1]
-            extra = f"\n-> <b>message:</b> <code>{dt['message']}</code>"
-        elif cont["type"] == "IssueCommentEvent":
-            title += " commented at"
-            text += " commented at"
-            url = cont["payload"]["comment"]["html_url"]
-        elif cont["type"] == "CreateEvent":
-            title += " created"
-            text += " created"
-            url = "https://github.com/" + cont["repo"]["name"]
-        elif cont["type"] == "PullRequestEvent":
-            if (
-                cont["payload"]["pull_request"].get("user", {}).get("login")
-                != username.lower()
-            ):
-                continue
-            url = cont["payload"]["pull_request"]["html_url"]
-            text += " created a pull request in"
-            title += " created a pull request in"
-        elif cont["type"] == "ForkEvent":
-            text += " forked"
-            title += " forked"
-            url = cont["payload"]["forkee"]["html_url"]
-        else:
-            continue
-        repo = cont["repo"]["name"]
-        repo_url = "https://github.com/" + repo
-        title += " " + repo
-        text += f" <b><a href='{repo_url}'>{repo}</a></b>"
-        if extra:
-            text += extra
-        thumb = wb(cont["actor"]["avatar_url"], 0, "image/jpeg", [])
-        article = await ult.builder.article(
-            title=title,
-            text=text,
-            url=repo_url,
-            parse_mode="html",
-            link_preview=False,
-            thumb=thumb,
-            buttons=[
-                Button.url("View", url),
-                Button.switch_inline("Search again", query=ult.text, same_peer=True),
-            ],
-        )
-        if article.id not in res_ids:
-            res_ids.append(article.id)
-            res.append(article)
-    if res:
-        msg = f"Showing {len(res)} feeds!"
-    else:
-        msg = "Nothing Found"
-    await ult.answer(res, cache_time=5000, switch_pm=msg, switch_pm_param="start")
+InlinePlugin.update(
+    {
+        "Pʟᴀʏ Sᴛᴏʀᴇ Aᴘᴘs": "app telegram",
+        "Mᴏᴅᴅᴇᴅ Aᴘᴘs": "mods minecraft",
+        "Sᴇᴀʀᴄʜ Oɴ Gᴏᴏɢʟᴇ": "go TeamUltroid",
+        "WʜɪSᴘᴇʀ": "wspr @username Hello🎉",
+        "YᴏᴜTᴜʙᴇ Dᴏᴡɴʟᴏᴀᴅᴇʀ": "yt Ed Sheeran Perfect",
+        "Piston Eval": "run javascript console.log('Hello Ultroid')",
+        "OʀᴀɴɢᴇFᴏx🦊": "ofox beryllium",
+        "Tᴡɪᴛᴛᴇʀ Usᴇʀ": "twitter theultroid",
+        "Fᴅʀᴏɪᴅ Sᴇᴀʀᴄʜ": "fdroid telegram",
+        "Sᴀᴀᴠɴ sᴇᴀʀᴄʜ": "saavn",
+        "Tʟ Sᴇᴀʀᴄʜ": "tl",
+    }
+)

assistant/localization.py

@@ -7,7 +7,15 @@
 
 import re
 
-from . import Button, callback, get_back_button, get_languages, language, udB
+from . import (
+    Button,
+    ULTConfig,
+    callback,
+    get_back_button,
+    get_languages,
+    get_string,
+    udB,
+)
 
 
 @callback("lang", owner=True)
@@ -24,14 +32,14 @@ async def setlang(event):
     if len(tultd) % 2 == 1:
         buttons.append((tultd[-1],))
     buttons.append([Button.inline("« Back", data="mainmenu")])
-    await event.edit("List Of Available Languages.", buttons=buttons)
+    await event.edit(get_string("ast_4"), buttons=buttons)
 
 
 @callback(re.compile(b"set_(.*)"), owner=True)
 async def settt(event):
     lang = event.data_match.group(1).decode("UTF-8")
     languages = get_languages()
-    language[0] = lang
+    ULTConfig.lang = lang
     udB.del_key("language") if lang == "en" else udB.set_key("language", lang)
     await event.edit(
         f"Your language has been set to {languages[lang]['natively']} [{lang}].",

assistant/manager/__init__.py

@@ -6,6 +6,6 @@
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
 from pyUltroid._misc._decorators import ultroid_cmd
-from pyUltroid.functions.helper import inline_mention
+from pyUltroid.fns.helper import inline_mention
 
 from .. import *

assistant/manager/_help.py

@@ -14,7 +14,7 @@ START = """
 ✘  /help : Get This Message.
 ✘  /repo : Get Bot's Repo..
 
-🧑‍💻 Join **@TheUltroid**
+🧑‍💻 Join **@TeamUltroid**
 """
 
 ADMINTOOLS = """✘ **AdminTools** ✘
@@ -93,11 +93,11 @@ def get_buttons():
     while keys:
         BT = []
         for i in list(keys)[:2]:
-            text = MNGE + " " + i + " " + MNGE
-            BT.append(Button.inline(text, "hlp_" + i))
+            text = f"{MNGE} {i} {MNGE}"
+            BT.append(Button.inline(text, f"hlp_{i}"))
             del keys[i]
         BTTS.append(BT)
-    url = "https://t.me/" + asst.me.username + "?startgroup=true"
+    url = f"https://t.me/{asst.me.username}?startgroup=true"
     BTTS.append([Button.url("Add me to Group", url)])
     return BTTS
 

assistant/manager/admins.py

@@ -7,9 +7,10 @@
 
 import re
 
-from pyUltroid import _ult_cache
 from telethon.errors.rpcerrorlist import UserNotParticipantError
 
+from pyUltroid import _ult_cache
+
 from . import *
 
 

assistant/manager/afk.py

@@ -7,7 +7,6 @@
 
 from datetime import datetime as dt
 
-from pyUltroid.functions.helper import inline_mention, time_formatter
 from telethon.events import NewMessage
 from telethon.tl.types import (
     Message,
@@ -17,6 +16,8 @@ from telethon.tl.types import (
 )
 from telethon.utils import get_display_name
 
+from pyUltroid.fns.helper import inline_mention, time_formatter
+
 from . import asst, asst_cmd
 
 AFK = {}

assistant/manager/misc.py

@@ -9,8 +9,9 @@
 import random
 
 import aiohttp
+
 from pyUltroid.dB import DEVLIST
-from pyUltroid.functions.admins import admin_check
+from pyUltroid.fns.admins import admin_check
 
 from . import *
 
@@ -27,8 +28,7 @@ async def dheh(e):
 async def oqha(e):
     if not await admin_check(e):
         return
-    match = e.pattern_match.group(1).strip()
-    if match:
+    if match := e.pattern_match.group(1).strip():
         text = match
         reply_to = e
     elif e.is_reply:

assistant/manager/stickermanager.py

@@ -7,8 +7,6 @@
 
 import random
 
-from pyUltroid.functions.misc import Quotly
-from pyUltroid.functions.tools import TgConverter
 from telethon import errors
 from telethon.errors.rpcerrorlist import StickersetInvalidError
 from telethon.tl.functions.messages import GetStickerSetRequest as GetSticker
@@ -20,6 +18,9 @@ from telethon.tl.types import InputStickerSetItem as SetItem
 from telethon.tl.types import InputStickerSetShortName, User
 from telethon.utils import get_display_name, get_input_document
 
+from pyUltroid.fns.misc import Quotly
+from pyUltroid.fns.tools import TgConverter
+
 from . import LOGS, asst, asst_cmd, udB
 
 
@@ -37,7 +38,7 @@ async def kang_cmd(ult):
         pre = sender.username[:4]
     else:
         pre = random.random_string(length=3)
-    animated, dl = None, None
+    animated, dl, video = None, None, None
     try:
         emoji = ult.text.split(maxsplit=1)[1]
     except IndexError:
@@ -45,9 +46,13 @@ async def kang_cmd(ult):
     if reply.sticker:
         file = get_input_document(reply.sticker)
         emoji = emoji or reply.file.emoji
-        if reply.file.name.endswith(".tgs"):
+        name = reply.file.name
+        if name.endswith(".tgs"):
             animated = True
             dl = await reply.download_media()
+        elif name.endswith(".webm"):
+            video = True
+            dl = await reply.download_media()
     elif reply.photo:
         dl = await reply.download_media()
         name = "sticker.webp"
@@ -65,7 +70,7 @@ async def kang_cmd(ult):
             await ult.client(UploadMediaRequest(InputPeerSelf(), upl))
         )
     get_ = udB.get_key("STICKERS") or {}
-    type_ = "static" if not animated else "anim"
+    type_ = "anim" if animated else "static"
     if not get_.get(ult.sender_id) or not get_.get(ult.sender_id, {}).get(type_):
         sn = f"{pre}_{ult.sender_id}"
         title = f"{get_display_name(sender)}'s Kang Pack"
@@ -73,6 +78,10 @@ async def kang_cmd(ult):
             type_ = "anim"
             sn += "_anim"
             title += " (Animated)"
+        elif video:
+            type_ = "vid"
+            sn += "_vid"
+            title += " (Video)"
         sn += f"_by_{asst.me.username}"
         try:
             await asst(GetSticker(InputStickerSetShortName(sn), hash=0))
@@ -86,7 +95,9 @@ async def kang_cmd(ult):
                     title=title,
                     short_name=sn,
                     stickers=[SetItem(file, emoji=emoji)],
+                    videos=video,
                     animated=animated,
+                    software="@TeamUltroid",
                 )
             )
         except Exception as er:
@@ -115,6 +126,9 @@ async def kang_cmd(ult):
         if animated:
             sn += "_anim"
             title += " (Animated)"
+        elif video:
+            sn += "_vid"
+            title += "(Video)"
         sn += f"_by_{asst.me.username}"
         try:
             pack = await ult.client(
@@ -148,10 +162,8 @@ async def do_magic(ult):
         return await ult.reply("No Sticker Pack Found!")
     al_ = []
     ul = ko[ult.sender_id]
-    if ul.get("static"):
-        al_.extend(ul["static"])
-    if ul.get("anim"):
-        al_.extend(ul["anim"])
+    for _ in ul.keys():
+        al_.extend(ul[_])
     msg = "• **Stickers Owned by You!**\n\n"
     for _ in al_:
         try:
@@ -160,7 +172,9 @@ async def do_magic(ult):
         except StickerSetInvalidError:
             if ul.get("anim") and _ in ul["anim"]:
                 ul["anim"].remove(_)
+            elif ul.get("vid") and _ in ul["vid"]:
+                ul["vid"].remove(_)
             else:
                 ul["static"].remove(_)
-    udB.set_key("STICKERS", ko)
+            udB.set_key("STICKERS", ko)
     await ult.reply(msg)

assistant/pmbot.py

@@ -11,9 +11,6 @@
 
 import os
 
-from pyUltroid.dB.asst_fns import *
-from pyUltroid.dB.botchat_db import *
-from pyUltroid.functions.helper import inline_mention
 from telethon.errors.rpcerrorlist import UserNotParticipantError
 from telethon.tl.custom import Button
 from telethon.tl.functions.channels import GetFullChannelRequest
@@ -21,6 +18,10 @@ from telethon.tl.functions.messages import GetFullChatRequest
 from telethon.tl.types import Channel, Chat
 from telethon.utils import get_display_name
 
+from pyUltroid.dB.asst_fns import *
+from pyUltroid.dB.botchat_db import *
+from pyUltroid.fns.helper import inline_mention
+
 from . import *
 
 FSUB = udB.get_key("PMBOT_FSUB")
@@ -50,7 +51,7 @@ async def on_new_mssg(event):
                 try:
                     TAHC_ = await event.client.get_entity(chat)
                     if hasattr(TAHC_, "username") and TAHC_.username:
-                        uri = "t.me/" + TAHC_.username
+                        uri = f"t.me/{TAHC_.username}"
                     elif CACHE.get(chat):
                         uri = CACHE[chat]
                     else:
@@ -98,7 +99,7 @@ async def on_out_mssg(event):
                 os.remove(photu)
             return
         except BaseException as er:
-            return await event.reply("**ERROR : **" + str(er))
+            return await event.reply(f"**ERROR : **{str(er)}")
     elif event.text.startswith("/"):
         return
     if to_user:

assistant/start.py

@@ -8,14 +8,14 @@
 from datetime import datetime
 
 from pytz import timezone as tz
-from pyUltroid._misc import SUDO_M, owner_and_sudos
-from pyUltroid.dB.asst_fns import *
-from pyUltroid.functions.helper import inline_mention
 from telethon import Button, events
 from telethon.errors.rpcerrorlist import MessageDeleteForbiddenError
 from telethon.utils import get_display_name
 
-from strings.strings import get_string
+from pyUltroid._misc import SUDO_M, owner_and_sudos
+from pyUltroid.dB.asst_fns import *
+from pyUltroid.fns.helper import inline_mention
+from strings import get_string
 
 from . import *
 
@@ -68,7 +68,7 @@ async def own(event):
         mention=event.sender.mention, me=inline_mention(ultroid_bot.me)
     )
     if custom_info:
-        msg += "\n\n• Powered by **@TheUltroid**"
+        msg += "\n\n• Powered by **@TeamUltroid**"
     await event.edit(
         msg,
         buttons=[Button.inline("Close", data="closeit")],

assistant/ytdl.py

@@ -13,18 +13,19 @@ try:
     from PIL import Image
 except ImportError:
     Image = None
-from pyUltroid.functions.helper import (
+from telethon import Button
+from telethon.errors.rpcerrorlist import FilePartLengthInvalidError, MediaEmptyError
+from telethon.tl.types import DocumentAttributeAudio, DocumentAttributeVideo
+from telethon.tl.types import InputWebDocument as wb
+
+from pyUltroid.fns.helper import (
     bash,
     fast_download,
     humanbytes,
     numerize,
     time_formatter,
 )
-from pyUltroid.functions.ytdl import dler, get_buttons, get_formats
-from telethon import Button
-from telethon.errors.rpcerrorlist import FilePartLengthInvalidError, MediaEmptyError
-from telethon.tl.types import DocumentAttributeAudio, DocumentAttributeVideo
-from telethon.tl.types import InputWebDocument as wb
+from pyUltroid.fns.ytdl import dler, get_buttons, get_formats
 
 from . import LOGS, asst, callback, in_pattern, udB
 
@@ -35,7 +36,7 @@ except ImportError:
     VideosSearch = None
 
 
-ytt = "https://telegra.ph/file/afd04510c13914a06dd03.jpg"
+ytt = "https://graph.org/file/afd04510c13914a06dd03.jpg"
 _yt_base_url = "https://www.youtube.com/watch?v="
 BACK_BUTTON = {}
 
@@ -130,9 +131,12 @@ async def _(e):
     _ytdl_data = await dler(e, _yt_base_url + _lets_split[1])
     _data = get_formats(_lets_split[0], _lets_split[1], _ytdl_data)
     _buttons = get_buttons(_data)
-    _text = "`Select Your Format.`"
-    if not _buttons:
-        _text = "`Error downloading from YouTube.\nTry Restarting your bot.`"
+    _text = (
+        "`Select Your Format.`"
+        if _buttons
+        else "`Error downloading from YouTube.\nTry Restarting your bot.`"
+    )
+
     await e.edit(_text, buttons=_buttons)
 
 
@@ -159,7 +163,7 @@ async def _(event):
             "key": "FFmpegMetadata",
             "prefer_ffmpeg": True,
             "geo_bypass": True,
-            "outtmpl": "%(id)s." + ext,
+            "outtmpl": f"%(id)s.{ext}",
             "logtostderr": False,
             "postprocessors": [
                 {
@@ -170,6 +174,7 @@ async def _(event):
                 {"key": "FFmpegMetadata"},
             ],
         }
+
         ytdl_data = await dler(event, link, opts, True)
         title = ytdl_data["title"]
         if ytdl_data.get("artist"):
@@ -179,7 +184,8 @@ async def _(event):
         elif ytdl_data.get("channel"):
             artist = ytdl_data["channel"]
         views = numerize(ytdl_data.get("view_count")) or 0
-        thumb, _ = await fast_download(ytdl_data["thumbnail"], filename=vid_id + ".jpg")
+        thumb, _ = await fast_download(ytdl_data["thumbnail"], filename=f"{vid_id}.jpg")
+
         likes = numerize(ytdl_data.get("like_count")) or 0
         duration = ytdl_data.get("duration") or 0
         description = (
@@ -188,17 +194,18 @@ async def _(event):
             else ytdl_data["description"][:100]
         )
         description = description or "None"
-        filepath = vid_id + f".{ext}"
+        filepath = f"{vid_id}.{ext}"
         if not os.path.exists(filepath):
-            filepath = filepath + f".{ext}"
+            filepath = f"{filepath}.{ext}"
         size = os.path.getsize(filepath)
         file, _ = await event.client.fast_uploader(
             filepath,
-            filename=title + "." + ext,
+            filename=f"{title}.{ext}",
             show_progress=True,
             event=event,
             to_delete=True,
         )
+
         attributes = [
             DocumentAttributeAudio(
                 duration=int(duration),
@@ -213,10 +220,11 @@ async def _(event):
             "key": "FFmpegMetadata",
             "prefer_ffmpeg": True,
             "geo_bypass": True,
-            "outtmpl": "%(id)s." + ext,
+            "outtmpl": f"%(id)s.{ext}",
             "logtostderr": False,
             "postprocessors": [{"key": "FFmpegMetadata"}],
         }
+
         ytdl_data = await dler(event, link, opts, True)
         title = ytdl_data["title"]
         if ytdl_data.get("artist"):
@@ -226,7 +234,8 @@ async def _(event):
         elif ytdl_data.get("channel"):
             artist = ytdl_data["channel"]
         views = numerize(ytdl_data.get("view_count")) or 0
-        thumb, _ = await fast_download(ytdl_data["thumbnail"], filename=vid_id + ".jpg")
+        thumb, _ = await fast_download(ytdl_data["thumbnail"], filename=f"{vid_id}.jpg")
+
         try:
             Image.open(thumb).save(thumb, "JPEG")
         except Exception as er:
@@ -240,17 +249,18 @@ async def _(event):
         likes = numerize(ytdl_data.get("like_count")) or 0
         hi, wi = ytdl_data.get("height") or 720, ytdl_data.get("width") or 1280
         duration = ytdl_data.get("duration") or 0
-        filepath = vid_id + ".mkv"
+        filepath = f"{vid_id}.mkv"
         if not os.path.exists(filepath):
-            filepath = filepath + ".webm"
+            filepath = f"{filepath}.webm"
         size = os.path.getsize(filepath)
         file, _ = await event.client.fast_uploader(
             filepath,
-            filename=title + ".mkv",
+            filename=f"{title}.mkv",
             show_progress=True,
             event=event,
             to_delete=True,
         )
+
         attributes = [
             DocumentAttributeVideo(
                 duration=int(duration),

installer.sh

@@ -19,29 +19,71 @@ clone_repo(){
     if [ ! $BRANCH ]
         then export BRANCH="main"
     fi
-    echo -e "\n\nCloning Ultroid ${BRANCH}... "
+    if [ -d $DIR ]
+        then
+            echo -e $DIR "Already exists.."
+            cd $DIR
+            git pull
+            currentbranch="$(git rev-parse --abbrev-ref HEAD)"
+            if [ currentbranch != $BRANCH ]
+                then
+                    git checkout $BRANCH
+            fi
+            if [ -d "addons" ]
+                then
+                    cd addons
+                    git pull
+            fi
+            return
+    fi
+    echo -e "Cloning Ultroid ${BRANCH}... "
     git clone -b $BRANCH $REPO $DIR
 }
 
 install_requirements(){
     echo -e "\n\nInstalling requirements... "
-    pip3 install -q --no-cache-dir -r $DIR/requirements.txt && pip3 install av -q --no-binary av
+    pip3 install -q --no-cache-dir -r $DIR/requirements.txt
     pip3 install -q -r $DIR/resources/startup/optional-requirements.txt
 }
 
 railways_dep(){
     if [ $RAILWAY_STATIC_URL ]
         then
-            echo -e "\n\nInstalling YouTube dependency... "
-            pip3 install -q --no-cache-dir yt-dlp
+            echo -e "Installing YouTube dependency... "
+            pip3 install -q yt-dlp
     fi
 }
 
-install_okteto_cli(){
+misc_install(){
     if [ $OKTETO_TOKEN ]
         then
-            echo -e "\n\nInstalling Okteto-CLI... "
+            echo -e "Installing Okteto-CLI... "
             curl https://get.okteto.com -sSfL | sh
+    elif [ $VCBOT ]
+        then
+            if [ -d $DIR/vcbot ]
+                then
+                    cd $DIR/vcbot
+                    git pull
+            else
+                echo -e "Cloning VCBOT.."
+                git clone https://github.com/TeamUltroid/VcBot $DIR/vcbot
+            fi
+            pip3 install pytgcalls>=3.0.0.dev21 && pip3 install av -q --no-binary av
+    fi
+}
+
+dep_install(){
+    echo -e "\n\nInstalling DB Requirement..."
+    if [ $MONGO_URI ]
+        then
+            pip3 install -q pymongo[srv]
+    elif [ $DATABASE_URL ]
+        then
+            pip3 install -q psycopg2-binary
+    elif [ $REDIS_URI ]
+        then
+            pip3 install -q redis hiredis
     fi
 }
 
@@ -49,7 +91,8 @@ main(){
     (clone_repo)
     (install_requirements)
     (railways_dep)
-    (install_okteto_cli)
+    (dep_install)
+    (misc_install)
 }
 
 main

plugins/__init__.py

@@ -11,20 +11,20 @@ import time
 from random import choice
 
 import requests
+from telethon import Button, events
+from telethon.tl import functions, types  # pylint:ignore
+
 from pyUltroid import *
 from pyUltroid._misc._assistant import asst_cmd, callback, in_pattern
 from pyUltroid._misc._decorators import ultroid_cmd
 from pyUltroid._misc._wrappers import eod, eor
 from pyUltroid.dB import DEVLIST, ULTROID_IMAGES
-from pyUltroid.functions.helper import *
-from pyUltroid.functions.info import *
-from pyUltroid.functions.misc import *
-from pyUltroid.functions.tools import *
+from pyUltroid.fns.helper import *
+from pyUltroid.fns.info import *
+from pyUltroid.fns.misc import *
+from pyUltroid.fns.tools import *
 from pyUltroid.version import __version__, ultroid_version
-from telethon import Button, events
-from telethon.tl import functions, types
-
-from strings import get_string
+from strings import get_help, get_string
 
 Redis = udB.get_key
 con = TgConverter
@@ -34,19 +34,23 @@ OWNER_ID = ultroid_bot.uid
 
 LOG_CHANNEL = udB.get_key("LOG_CHANNEL")
 
-INLINE_PIC = udB.get_key("INLINE_PIC")
 
-if INLINE_PIC is None:
-    INLINE_PIC = choice(ULTROID_IMAGES)
-elif INLINE_PIC == False:
-    INLINE_PIC = None
+def inline_pic():
+    INLINE_PIC = udB.get_key("INLINE_PIC")
+    if INLINE_PIC is None:
+        INLINE_PIC = choice(ULTROID_IMAGES)
+    elif INLINE_PIC == False:
+        INLINE_PIC = None
+    return INLINE_PIC
+
 
 Telegraph = telegraph_client()
 
 List = []
 Dict = {}
+InlinePlugin = {}
 N = 0
-
+cmd = ultroid_cmd
 STUFF = {}
 
 # Chats, which needs to be ignore for some cases

plugins/_chatactions.py

@@ -7,17 +7,18 @@
 
 import asyncio
 
+from telethon import events
+from telethon.errors.rpcerrorlist import UserNotParticipantError
+from telethon.tl.functions.channels import GetParticipantRequest
+from telethon.utils import get_display_name
+
 from pyUltroid.dB import stickers
 from pyUltroid.dB.forcesub_db import get_forcesetting
 from pyUltroid.dB.gban_mute_db import is_gbanned
 from pyUltroid.dB.greetings_db import get_goodbye, get_welcome, must_thank
 from pyUltroid.dB.nsfw_db import is_profan
-from pyUltroid.functions.helper import inline_mention
-from pyUltroid.functions.tools import async_searcher, create_tl_btn, get_chatbot_reply
-from telethon import events
-from telethon.errors.rpcerrorlist import UserNotParticipantError
-from telethon.tl.functions.channels import GetParticipantRequest
-from telethon.utils import get_display_name
+from pyUltroid.fns.helper import inline_mention
+from pyUltroid.fns.tools import async_searcher, create_tl_btn, get_chatbot_reply
 
 try:
     from ProfanityDetector import detector
@@ -91,11 +92,9 @@ async def DummyHandler(ult):
                     )
                     await ult.client.send_message(
                         chat.id,
-                        "**@UltroidBans:** Banned user detected and banned!\n`{}`.\nBan reason: {}".format(
-                            str(is_banned),
-                            is_banned["reason"],
-                        ),
+                        f'**@UltroidBans:** Banned user detected and banned!\n`{str(is_banned)}`.\nBan reason: {is_banned["reason"]}',
                     )
+
             except BaseException:
                 pass
         reason = is_gbanned(user.id)

plugins/_help.py

@@ -5,12 +5,6 @@
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
-try:
-    from fuzzywuzzy.process import extractOne
-except ImportError:
-    extractOne = None
-from pyUltroid.dB._core import HELP, LIST
-from pyUltroid.functions.tools import cmd_regex_replace
 from telethon.errors.rpcerrorlist import (
     BotInlineDisabledError,
     BotMethodInvalidError,
@@ -18,7 +12,10 @@ from telethon.errors.rpcerrorlist import (
 )
 from telethon.tl.custom import Button
 
-from . import HNDLR, INLINE_PIC, LOGS, OWNER_NAME, asst, get_string, udB, ultroid_cmd
+from pyUltroid.dB._core import HELP, LIST
+from pyUltroid.fns.tools import cmd_regex_replace
+
+from . import HNDLR, LOGS, OWNER_NAME, asst, get_string, inline_pic, udB, ultroid_cmd
 
 _main_help_menu = [
     [
@@ -86,9 +83,13 @@ async def _help(ult):
                     if not file:
                         # the enter command/plugin name is not found
                         text = f"`{plug}` is not a valid plugin!"
-                        if extractOne:
-                            best_match = extractOne(plug, compare_strings)
-                            text += "\nDid you mean `{}`?".format(best_match[0])
+                        best_match = None
+                        for _ in compare_strings:
+                            if plug in _ and not _.startswith("_"):
+                                best_match = _
+                                break
+                        if best_match:
+                            text += f"\nDid you mean `{best_match}`?"
                         return await ult.eor(text)
                     output = f"**Command** `{plug}` **found in plugin** - `{file}`\n"
                     if file in HELP["Official"]:
@@ -122,7 +123,7 @@ async def _help(ult):
                     len(HELP["Addons"] if "Addons" in HELP else []),
                     cmd,
                 ),
-                file=INLINE_PIC,
+                file=inline_pic(),
                 buttons=_main_help_menu,
             )
         except BotResponseTimeoutError:

plugins/_inline.py

@@ -11,21 +11,23 @@ from datetime import datetime
 from os import remove
 
 from git import Repo
-from pyUltroid._misc._assistant import callback, in_pattern
-from pyUltroid.dB._core import HELP, LIST
-from pyUltroid.functions.helper import gen_chlog, time_formatter, updater
-from pyUltroid.functions.misc import split_list
 from telethon import Button
 from telethon.tl.types import InputWebDocument, Message
 from telethon.utils import resolve_bot_file_id
 
+from pyUltroid._misc._assistant import callback, in_pattern
+from pyUltroid.dB._core import HELP, LIST
+from pyUltroid.fns.helper import gen_chlog, time_formatter, updater
+from pyUltroid.fns.misc import split_list
+
 from . import (
     HNDLR,
-    INLINE_PIC,
     LOGS,
     OWNER_NAME,
+    InlinePlugin,
     asst,
     get_string,
+    inline_pic,
     split_list,
     start_time,
     udB,
@@ -34,16 +36,11 @@ from ._help import _main_help_menu
 
 # ================================================#
 
-TLINK = INLINE_PIC or "https://telegra.ph/file/74d6259983e0642923fdb.jpg"
 helps = get_string("inline_1")
 
 add_ons = udB.get_key("ADDONS")
 
-if add_ons is not False:
-    zhelps = get_string("inline_2")
-else:
-    zhelps = get_string("inline_3")
-
+zhelps = get_string("inline_3") if add_ons is False else get_string("inline_2")
 PLUGINS = HELP.get("Official", [])
 ADDONS = HELP.get("Addons", [])
 upage = 0
@@ -54,7 +51,7 @@ upage = 0
 SUP_BUTTONS = [
     [
         Button.url("• Repo •", url="https://github.com/TeamUltroid/Ultroid"),
-        Button.url("• Support •", url="t.me/ultroidsupportchat"),
+        Button.url("• Support •", url="t.me/UltroidSupportChat"),
     ],
 ]
 
@@ -63,9 +60,10 @@ SUP_BUTTONS = [
 
 @in_pattern(owner=True, func=lambda x: not x.text)
 async def inline_alive(o):
+    TLINK = inline_pic() or "https://graph.org/file/74d6259983e0642923fdb.jpg"
     MSG = "• **Ultroid Userbot •**"
     WEB0 = InputWebDocument(
-        "https://telegra.ph/file/acd4f5d61369f74c5e7a7.jpg", 0, "image/jpg", []
+        "https://graph.org/file/acd4f5d61369f74c5e7a7.jpg", 0, "image/jpg", []
     )
     RES = [
         await o.builder.article(
@@ -100,9 +98,9 @@ async def inline_handler(event):
         len(HELP.get("Addons", [])),
         len(z),
     )
-    if INLINE_PIC:
+    if inline_pic():
         result = await event.builder.photo(
-            file=INLINE_PIC,
+            file=inline_pic(),
             link_preview=False,
             text=text,
             buttons=_main_help_menu,
@@ -117,7 +115,7 @@ async def inline_handler(event):
 @in_pattern("pasta", owner=True)
 async def _(event):
     ok = event.text.split("-")[1]
-    link = "https://spaceb.in/" + ok
+    link = f"https://spaceb.in/{ok}"
     raw = f"https://spaceb.in/api/v1/documents/{ok}/raw"
     result = await event.builder.article(
         title="Paste",
@@ -144,7 +142,7 @@ async def setting(event):
             len(HELP.get("Addons", [])),
             len(z),
         ),
-        file=INLINE_PIC,
+        file=inline_pic(),
         link_preview=False,
         buttons=[
             [
@@ -172,11 +170,9 @@ async def help_func(ult):
         return await ult.answer(get_string("help_13").format(HNDLR), alert=True)
     if "|" in count:
         _, count = count.split("|")
-    count = 0 if not count else int(count)
+    count = int(count) if count else 0
     text = _strings.get(key, "").format(OWNER_NAME, len(HELP.get(key)))
-    await ult.edit(
-        text, file=INLINE_PIC, buttons=page_num(count, key), link_preview=False
-    )
+    await ult.edit(text, buttons=page_num(count, key), link_preview=False)
 
 
 @callback(re.compile("uplugin_(.*)"), owner=True)
@@ -201,7 +197,7 @@ async def uptd_plugin(event):
         help_ = f"{file} has no Detailed Help!"
     help_ += "\n© @TeamUltroid"
     buttons = []
-    if INLINE_PIC:
+    if inline_pic():
         data = f"sndplug_{key}_{file}"
         if index is not None:
             data += f"|{index}"
@@ -233,7 +229,7 @@ async def uptd_plugin(event):
 async def _(event):
     if not await updater():
         return await event.answer(get_string("inline_9"), cache_time=0, alert=True)
-    if not INLINE_PIC:
+    if not inline_pic():
         return await event.answer(f"Do '{HNDLR}update' to update..")
     repo = Repo.init()
     changelog, tl_chnglog = await gen_chlog(
@@ -280,36 +276,18 @@ async def _(event):
     await event.answer(pin, cache_time=0, alert=True)
 
 
-InPlugin = {
-    "Pʟᴀʏ Sᴛᴏʀᴇ Aᴘᴘs": "app telegram",
-    "Mᴏᴅᴅᴇᴅ Aᴘᴘs": "mods minecraft",
-    "Sᴇᴀʀᴄʜ Oɴ Gᴏᴏɢʟᴇ": "go TeamUltroid",
-    "Search on XDA": "xda telegram",
-    "WʜɪSᴘᴇʀ": "wspr @username Hello🎉",
-    "YᴏᴜTᴜʙᴇ Dᴏᴡɴʟᴏᴀᴅᴇʀ": "yt Ed Sheeran Perfect",
-    "Piston Eval": "run javascript console.log('Hello Ultroid')",
-    "OʀᴀɴɢᴇFᴏx🦊": "ofox beryllium",
-    "Tᴡɪᴛᴛᴇʀ Usᴇʀ": "twitter theultroid",
-    "Kᴏᴏ Sᴇᴀʀᴄʜ": "koo @__kumar__amit",
-    "Fᴅʀᴏɪᴅ Sᴇᴀʀᴄʜ": "fdroid telegram",
-    "Sᴀᴀᴠɴ sᴇᴀʀᴄʜ": "saavn",
-    "Tʟ Sᴇᴀʀᴄʜ": "tl",
-    "GɪᴛHᴜʙ ғᴇᴇᴅs": "gh",
-    "OᴍɢUʙᴜɴᴛᴜ": "omgu cutefish",
-}
-_InButtons = [Button.switch_inline(_, query=InPlugin[_]) for _ in list(InPlugin.keys())]
-InButtons = split_list(_InButtons, 2)
-
-
 @callback(data="inlone", owner=True)
 async def _(e):
+    _InButtons = [
+        Button.switch_inline(_, query=InlinePlugin[_], same_peer=True)
+        for _ in list(InlinePlugin.keys())
+    ]
+    InButtons = split_list(_InButtons, 2)
+
     button = InButtons.copy()
     button.append(
         [
-            Button.inline(
-                "« Bᴀᴄᴋ",
-                data="open",
-            ),
+            Button.inline("« Bᴀᴄᴋ", data="open"),
         ],
     )
     await e.edit(buttons=button, link_preview=False)
@@ -422,7 +400,7 @@ async def ibuild(e):
                             _pic,
                             title="Ultroid Op",
                             text=txt,
-                            description="@TheUltroid",
+                            description="@TeamUltroid",
                             buttons=btn,
                             link_preview=False,
                         )

plugins/_ultroid.py

@@ -25,7 +25,7 @@ RP_BUTTONS = [
         Button.url(get_string("bot_3"), "https://github.com/TeamUltroid/Ultroid"),
         Button.url("Addons", "https://github.com/TeamUltroid/UltroidAddons"),
     ],
-    [Button.url("Support Group", "t.me/ultroidsupportchat")],
+    [Button.url("Support Group", "t.me/UltroidSupportChat")],
 ]
 
 ULTSTRING = """🎇 **Thanks for Deploying Ultroid Userbot!**
@@ -49,7 +49,7 @@ async def repify(e):
     ):
         pass
     except Exception as er:
-        LOGS.info("Error while repo command : " + str(er))
+        LOGS.info(f"Error while repo command : {str(er)}")
     await e.eor(REPOMSG)
 
 
@@ -59,7 +59,7 @@ async def useUltroid(rs):
     msg = await asst.send_message(
         LOG_CHANNEL,
         ULTSTRING,
-        file="https://telegra.ph/file/54a917cc9dbb94733ea5f.jpg",
+        file="https://graph.org/file/54a917cc9dbb94733ea5f.jpg",
         buttons=button,
     )
     if not (rs.chat_id == LOG_CHANNEL and rs.client._bot):

plugins/_userlogs.py

@@ -8,7 +8,6 @@
 import os
 import re
 
-from pyUltroid.dB.botchat_db import tag_add, who_tag
 from telethon.errors.rpcerrorlist import (
     ChannelPrivateError,
     ChatWriteForbiddenError,
@@ -21,6 +20,8 @@ from telethon.errors.rpcerrorlist import (
 from telethon.tl.types import MessageEntityMention, MessageEntityMentionName, User
 from telethon.utils import get_display_name
 
+from pyUltroid.dB.botchat_db import tag_add, who_tag
+
 from . import (
     LOG_CHANNEL,
     LOGS,
@@ -123,8 +124,7 @@ if udB.get_key("TAG_LOG"):
                 return
             if event.is_private:
                 return
-            entities = event.get_entities_text()
-            if entities:
+            if entities := event.get_entities_text():
                 is_self = False
                 username = event.client.me.username
                 if username:
@@ -235,7 +235,6 @@ ultroid_bot.add_event_handler(
     when_added_or_joined,
     events.ChatAction(func=lambda x: x.user_added or x.user_joined),
 )
-
 _client = {"bot": asst, "user": ultroid_bot}
 
 

plugins/_wspr.py

@@ -37,10 +37,7 @@ buddhhu = {}
 async def _(e):
     if e.reply_to_msg_id:
         okk = await e.get_reply_message()
-        if okk.sender.username:
-            put = f"@{okk.sender.username}"
-        else:
-            put = okk.sender_id
+        put = f"@{okk.sender.username}" if okk.sender.username else okk.sender_id
     else:
         put = e.pattern_match.group(1).strip()
     if put:
@@ -66,6 +63,8 @@ async def _(e):
         if query.isdigit():
             query = int(query)
         logi = await ultroid_bot.get_entity(query)
+        if not isinstance(logi, types.User):
+            raise ValueError("Invalid Username.")
     except IndexError:
         sur = e.builder.article(
             title="Give Username",

plugins/admintools.py

@@ -4,48 +4,13 @@
 # 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}promote <reply to user/userid/username>`
-• `{i}demote`
-    Promote/Demote the user in the chat.
+from . import get_help
 
-• `{i}ban <reply to user/userid/username> <reason>`
-• `{i}unban`
-    Ban/Unban the user from the chat.
-
-• `{i}kick <reply to user/userid/username> <reason>`
-    Kick the user from the chat.
-
-• `{i}pin <reply to message>`
-    Pin the message in the chat
-• `{i}tpin <time> <temp pin message>`
-• `{i}unpin (all) <reply to message>`
-    Unpin the messages in the chat.
-
-• `{i}pinned`
-   Get pinned message in the current chat.
-• `{i}listpinned`
-   Get all pinned messages in current chat
-
-• `{i}autodelete <24h/7d/1m/off>`
-   Enable Auto Delete Messages in Chat.
-
-• `{i}purge <reply to message>`
-    Purge all messages from the replied message.
-
-• `{i}purgeme <reply to message>`
-    Purge Only your messages from the replied message.
-
-• `{i}purgeall`
-    Delete all msgs of replied user.
-"""
+__doc__ = get_help("help_admintools")
 
 import asyncio
 
-from pyUltroid.dB import DEVLIST
-from pyUltroid.functions.admins import ban_time
 from telethon.errors import BadRequestError
 from telethon.errors.rpcerrorlist import ChatNotModifiedError, UserIdInvalidError
 from telethon.tl.functions.channels import EditAdminRequest, GetFullChannelRequest
@@ -53,6 +18,9 @@ from telethon.tl.functions.messages import GetFullChatRequest, SetHistoryTTLRequ
 from telethon.tl.types import InputMessagesFilterPinned
 from telethon.utils import get_display_name
 
+from pyUltroid.dB import DEVLIST
+from pyUltroid.fns.admins import ban_time
+
 from . import (
     HNDLR,
     LOGS,
@@ -267,7 +235,7 @@ async def tkicki(e):
     except Exception as ex:
         return await eor(e, f"`{ex}`")
     try:
-        bun = ban_time(e, tme)
+        bun = ban_time(tme)
         await e.client.edit_permissions(
             e.chat_id, user.id, until_date=bun, view_messages=False
         )
@@ -335,11 +303,9 @@ async def pin_message(ult):
     if not match:
         return await ult.eor("`Please provide time..`", time=8)
     msg = await ult.eor(get_string("com_1"))
-    time = ban_time(msg, match)
-    if not time:
-        return
     msg_id = ult.reply_to_msg_id
     try:
+        time = ban_time(match)
         await ult.client.pin_message(ult.chat_id, msg_id)
         await msg.eor(f"`pinned for time` `{time}`", time=8)
     except Exception as er:
@@ -377,22 +343,19 @@ async def fastpurger(purg):
         return await eor(purg, get_string("purge_1"), time=10)
     try:
         await purg.client.delete_messages(
-            purg.chat_id, list(range(purg.reply_to_msg_id, purg.id + 1))
+            purg.chat_id, list(range(purg.reply_to_msg_id, purg.id))
         )
 
     except Exception as er:
         LOGS.info(er)
-    await purg.respond(
-        "__Fast purge complete!__",
-    )
+    await purg.eor("__Fast purge complete!__", time=5)
 
 
 @ultroid_cmd(
     pattern="purgeme( (.*)|$)",
 )
 async def fastpurgerme(purg):
-    num = purg.pattern_match.group(1).strip()
-    if num:
+    if num := purg.pattern_match.group(1).strip():
         try:
             nnt = int(num)
         except BaseException:
@@ -406,9 +369,7 @@ async def fastpurgerme(purg):
             mp += 1
         await eor(purg, f"Purged {mp} Messages!", time=5)
         return
-    elif purg.reply_to_msg_id:
-        pass
-    else:
+    elif not purg.reply_to_msg_id:
         return await eod(
             purg,
             "`Reply to a message to purge from or use it like ``purgeme <num>`",
@@ -424,9 +385,9 @@ async def fastpurgerme(purg):
         msgs.append(msg)
     if msgs:
         await purg.client.delete_messages(chat, msgs)
-    await eod(
-        purg,
+    await purg.eor(
         "__Fast purge complete!__\n**Purged** `" + str(len(msgs)) + "` **messages.**",
+        time=5,
     )
 
 
@@ -480,7 +441,7 @@ async def get_all_pinned(event):
     ):
         if i.message:
             t = " ".join(i.message.split()[:4])
-            txt = "{}....".format(t)
+            txt = f"{t}...."
         else:
             txt = "Go to message."
         a += f"{c}. <a href=https://t.me/c/{chat_id}/{i.id}>{txt}</a>\n"
@@ -491,7 +452,7 @@ async def get_all_pinned(event):
     else:
         m = f"<b>List of pinned message(s) in {chat_name}:</b>\n\n"
 
-    if a == "":
+    if not a:
         return await eor(x, get_string("listpin_1"), time=5)
 
     await x.edit(m + a, parse_mode="html")

plugins/afk.py

@@ -4,24 +4,20 @@
 # 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}afk <optional reason>`
-    AFK means away from keyboard,
-    After this is activated, if someone tags or messages you, he/she would get an automated reply from the bot.
+from . import get_help
 
-    (Note : Set a media file in afk messages by replying to any media with `{i}afk <reason>`).
+__doc__ = get_help("help_afk")
 
-"""
 
 import asyncio
 
-from pyUltroid.dB.afk_db import add_afk, del_afk, is_afk
-from pyUltroid.dB.pmpermit_db import is_approved
 from telegraph import upload_file as uf
 from telethon import events
 
+from pyUltroid.dB.afk_db import add_afk, del_afk, is_afk
+from pyUltroid.dB.pmpermit_db import is_approved
+
 from . import (
     LOG_CHANNEL,
     NOSPAM_CHAT,
@@ -53,7 +49,7 @@ async def set_afk(event):
             if media_type.startswith(("pic", "gif")):
                 file = await event.client.download_media(reply.media)
                 iurl = uf(file)
-                media = f"https://telegra.ph{iurl[0]}"
+                media = f"https://graph.org{iurl[0]}"
             else:
                 media = reply.file.id
     await event.eor("`Done`", time=2)

plugins/antiflood.py

@@ -4,25 +4,19 @@
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
-"""
-✘ Commands Available -
 
-• `{i}setflood <integer>`
-    Set flood limit in a chat.
+from . import get_help
 
-• `{i}remflood`
-    Remove flood limit from a chat.
+__doc__ = get_help("help_antiflood")
 
-• `{i}getflood`
-    Get flood limit of a chat.
-"""
 
 import re
 
+from telethon.events import NewMessage as NewMsg
+
 from pyUltroid.dB import DEVLIST
 from pyUltroid.dB.antiflood_db import get_flood, get_flood_limit, rem_flood, set_flood
-from pyUltroid.functions.admins import admin_check
-from telethon.events import NewMessage as NewMsg
+from pyUltroid.fns.admins import admin_check
 
 from . import Button, Redis, asst, callback, eod, get_string, ultroid_bot, ultroid_cmd
 
@@ -98,8 +92,7 @@ async def setflood(e):
         return await e.eor("`What?`", time=5)
     if not input_.isdigit():
         return await e.eor(get_string("com_3"), time=5)
-    m = set_flood(e.chat_id, input_)
-    if m:
+    if m := set_flood(e.chat_id, input_):
         return await eod(e, get_string("antiflood_4").format(input_))
 
 
@@ -123,7 +116,6 @@ async def remove_flood(e):
     admins_only=True,
 )
 async def getflood(e):
-    ok = get_flood_limit(e.chat_id)
-    if ok:
+    if ok := get_flood_limit(e.chat_id):
         return await e.eor(get_string("antiflood_5").format(ok), time=5)
     await e.eor(get_string("antiflood_2"), time=5)

plugins/asstcmd.py

@@ -4,22 +4,15 @@
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
-"""
-✘ Commands Available -
 
-•`{i}addcmd <new cmd> <reply>`
-   It will set new cmd for your assistant bot with that reply message.
+from . import get_help
 
-•`{i}remcmd <cmd name>`
-   It will remove your cmd.
+__doc__ = get_help("help_asstcmd")
 
-•`{i}listcmd`
-   To Get list of all your custom cmd.
-"""
 import os
 
 from pyUltroid.dB.asstcmd_db import add_cmd, cmd_reply, list_cmds, rem_cmd
-from pyUltroid.functions.tools import create_tl_btn, format_btn, get_msg_button
+from pyUltroid.fns.tools import create_tl_btn, format_btn, get_msg_button
 
 try:
     from telegraph import upload_file as uf
@@ -45,14 +38,14 @@ async def ac(e):
             dl = await e.client.download_media(wt.media)
             variable = uf(dl)
             os.remove(dl)
-            m = "https://telegra.ph" + variable[0]
+            m = f"https://graph.org{variable[0]}"
         elif wut == "video":
             if wt.media.document.size > 8 * 1000 * 1000:
                 return await e.eor(get_string("com_4"), time=5)
             dl = await e.client.download_media(wt.media)
             variable = uf(dl)
             os.remove(dl)
-            m = "https://telegra.ph" + variable[0]
+            m = f"https://graph.org{variable[0]}"
         else:
             m = utils.pack_bot_file_id(wt.media)
         if wt.text:
@@ -91,7 +84,7 @@ async def lscmd(e):
     if list_cmds():
         ok = get_string("asstcmd_6")
         for x in list_cmds():
-            ok += "/" + x + "\n"
+            ok += f"/{x}" + "\n"
         return await e.eor(ok)
     return await e.eor(get_string("asstcmd_5"))
 

plugins/audiotools.py

@@ -4,34 +4,23 @@
 # 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 pyUltroid.functions.tools import set_attributes
+from pyUltroid.fns.tools import set_attributes
 
 from . import (
     LOGS,
+    ULTConfig,
     bash,
     downloader,
     eod,
     eor,
     genss,
+    get_help,
     get_string,
     humanbytes,
     mediainfo,
@@ -41,6 +30,8 @@ from . import (
     uploader,
 )
 
+__doc__ = get_help("help_audiotools")
+
 
 @ultroid_cmd(pattern="makevoice$")
 async def vnc(e):
@@ -90,12 +81,13 @@ async def trim_aud(e):
         xxx = await e.eor(get_string("audiotools_5"))
         c_time = time.time()
         file = await downloader(
-            "resources/downloads/" + name,
+            f"resources/downloads/{name}",
             vfile,
             xxx,
             c_time,
-            "Downloading " + name + "...",
+            f"Downloading {name}...",
         )
+
         o_size = os.path.getsize(file.name)
         d_time = time.time()
         diff = time_formatter((d_time - c_time) * 1000)
@@ -112,20 +104,14 @@ async def trim_aud(e):
         await bash(cmd)
         os.remove(file.name)
         f_time = time.time()
-        mmmm = await uploader(
-            out,
-            out,
-            f_time,
-            xxx,
-            "Uploading " + out + "...",
-        )
+        mmmm = await uploader(out, out, f_time, xxx, f"Uploading {out}...")
         attributes = await set_attributes(out)
 
         caption = get_string("audiotools_7").format(ss, dd)
         await e.client.send_file(
             e.chat_id,
             mmmm,
-            thumb="resources/extras/ultroid.jpg",
+            thumb=ULTConfig.thumb,
             caption=caption,
             attributes=attributes,
             force_document=False,
@@ -146,13 +132,14 @@ async def ex_aud(e):
     msg = await e.eor(get_string("com_1"))
     c_time = time.time()
     file = await downloader(
-        "resources/downloads/" + name,
+        f"resources/downloads/{name}",
         vfile,
         msg,
         c_time,
-        "Downloading " + name + "...",
+        f"Downloading {name}...",
     )
-    out_file = file.name + ".aac"
+
+    out_file = f"{file.name}.aac"
     cmd = f"ffmpeg -i {file.name} -vn -acodec copy {out_file}"
     o, err = await bash(cmd)
     os.remove(file.name)
@@ -160,20 +147,15 @@ async def ex_aud(e):
 
     f_time = time.time()
     try:
-        fo = await uploader(
-            out_file,
-            out_file,
-            f_time,
-            msg,
-            "Uploading " + out_file + "...",
-        )
+        fo = await uploader(out_file, out_file, f_time, msg, f"Uploading {out_file}...")
+
     except FileNotFoundError:
         return await eor(msg, get_string("audiotools_9"))
     await e.client.send_file(
         e.chat_id,
         fo,
         caption=get_string("audiotools_10"),
-        thumb="resources/extras/ultroid.jpg",
+        thumb=ULTConfig.thumb,
         attributes=attributes,
         reply_to=e.reply_to_msg_id,
     )

plugins/autoban.py

@@ -5,32 +5,16 @@
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
-"""
-✘ Commands Available
+from . import get_help
 
-• `{i}autokick <on/off>`
-    on - To enable.
-    off - To disable.
-    Automatically kick new joined users from the group.
+__doc__ = get_help("help_autoban")
 
-• `{i}cban`
-    Enable/Disable autobanning send as channel in used chat.
-
-• `{i}addwl <Username>`
-   Add Channel to channelban whitelist.
-
-• `{i}remwl <Username>`
-   Remove Channel from channelban whitelist.
-
-• `{i}listwl` : List all whitelist channels.
-"""
-
-
-from pyUltroid.dB import autoban_db, dnd_db
-from pyUltroid.functions.admins import get_update_linked_chat
 from telethon import events
 from telethon.tl.types import Channel
 
+from pyUltroid.dB import autoban_db, dnd_db
+from pyUltroid.fns.admins import get_update_linked_chat
+
 from . import LOGS, asst, get_string, inline_mention, ultroid_bot, ultroid_cmd
 
 

plugins/autocorrect.py

@@ -1,61 +0,0 @@
-# Ultroid - UserBot
-# Copyright (C) 2021-2022 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}autocorrect`
-    To on/off Autocorrect Feature.
-"""
-
-import string
-
-from . import HNDLR, LOGS, get_string, udB, ultroid_bot, ultroid_cmd  # ignore: pylint
-
-try:
-    from gingerit.gingerit import GingerIt
-except ImportError:
-    LOGS.info("GingerIt not found")
-    GingerIt = None
-
-from google_trans_new import google_translator
-from telethon import events
-
-
-@ultroid_cmd(pattern="autocorrect", fullsudo=True)
-async def acc(e):
-    if not udB.get_key("AUTOCORRECT"):
-        udB.set_key("AUTOCORRECT", "True")
-        ultroid_bot.add_handler(
-            gramme, events.NewMessage(outgoing=True, func=lambda x: x.text)
-        )
-        return await e.eor(get_string("act_1"), time=5)
-    udB.del_key("AUTOCORRECT")
-    await e.eor(get_string("act_2"), time=5)
-
-
-async def gramme(event):
-    if not udB.get_key("AUTOCORRECT"):
-        return
-    t = event.text
-    if t[0] == HNDLR or t[0].lower() not in string.ascii_lowercase or t.endswith(".."):
-        return
-    tt = google_translator().detect(t)
-    if tt[0] != "en":
-        return
-    xx = GingerIt()
-    x = xx.parse(t)
-    res = x["result"]
-    try:
-        await event.edit(res)
-    except BaseException:
-        pass
-
-
-if GingerIt and udB.get_key("AUTOCORRECT"):
-    ultroid_bot.add_handler(
-        gramme, events.NewMessage(outgoing=True, func=lambda x: x.text)
-    )

plugins/autopic.py

@@ -4,24 +4,21 @@
 # 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}autopic <search query>`
-    Will change your profile pic at defined intervals with pics related to the given topic.
 
-• `{i}autopic` : stop autopic if active.
-"""
 import asyncio
 import os
 import random
 from glob import glob
 from random import shuffle
 
-from pyUltroid.functions.google_image import googleimagesdownload
 from telethon.tl.functions.photos import UploadProfilePhotoRequest
 
-from . import LOGS, get_string, udB, ultroid_bot, ultroid_cmd
+from pyUltroid.fns.google_image import googleimagesdownload
+
+from . import LOGS, get_help, get_string, udB, ultroid_bot, ultroid_cmd
+
+__doc__ = get_help("help_autopic")
 
 
 @ultroid_cmd(pattern="autopic( (.*)|$)")

plugins/beautify.py

@@ -4,21 +4,11 @@
 # 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}carbon <text/reply to msg/reply to document>`
-    Carbonise the text with default settings.
+from . import get_help
 
-• `{i}rcarbon <text/reply to msg/reply to document>`
-    Carbonise the text, with random bg colours.
+__doc__ = get_help("help_beautify")
 
-• `{i}ccarbon <color ><text/reply to msg/reply to document>`
-    Carbonise the text, with custom bg colours.
-
-• `{i}rayso <opt-theme> <text>/<reply to message>`
-  `{i}rayso list` - `Get list of themes.`
-"""
 
 import random
 
@@ -115,13 +105,15 @@ async def pass_on(ult):
     if len(spli) > 2:
         if spli[1] in RaySoTheme:
             theme = spli[1]
-        dark = bool(spli[2].lower().strip() in ["true", "t"])
+        dark = spli[2].lower().strip() in ["true", "t"]
     elif len(spli) > 1:
         if spli[1] in RaySoTheme:
             theme = spli[1]
         elif spli[1] == "list":
-            text = "**List of Rayso Themes:**\n"
-            text += "\n".join([f"- `{th_}`" for th_ in RaySoTheme])
+            text = "**List of Rayso Themes:**\n" + "\n".join(
+                [f"- `{th_}`" for th_ in RaySoTheme]
+            )
+
             await ult.eor(text)
             return
         else:

plugins/blacklist.py

@@ -4,21 +4,11 @@
 # 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}blacklist <word/all words with a space>`
-    blacklist the choosen word in that chat.
+from . import get_help
 
-• `{i}remblacklist <word>`
-    Remove the word from blacklist..
+__doc__ = get_help("help_blacklist")
 
-• `{i}listblacklist`
-    list all blacklisted words.
-
-  'if a person uses blacklist Word his/her msg will be deleted'
-  'And u Must be Admin in that Chat'
-"""
 
 from pyUltroid.dB.blacklist_db import (
     add_blacklist,
@@ -59,16 +49,14 @@ async def rf(e):
 
 @ultroid_cmd(pattern="listblacklist$", admins_only=True)
 async def lsnote(e):
-    x = list_blacklist(e.chat_id)
-    if x:
+    if x := list_blacklist(e.chat_id):
         sd = get_string("blk_5")
         return await e.eor(sd + x)
     await e.eor(get_string("blk_6"))
 
 
 async def blacklist(e):
-    x = get_blacklist(e.chat_id)
-    if x:
+    if x := get_blacklist(e.chat_id):
         for z in e.text.lower().split():
             for zz in x:
                 if z == zz:

plugins/bot.py

@@ -4,47 +4,25 @@
 # 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}alive` | `{i}alive inline`
-    Check if your bot is working.
-
-• `{i}ping`
-    Check Ultroid's response time.
-
-• `{i}update`
-    See changelogs if any update is available.
 
-• `{i}cmds`
-    View all plugin names.
+from . import get_help
 
-• `{i}restart`
-    To restart your bot.
+__doc__ = get_help("help_bot")
 
-• `{i}logs (sys)`
-    Get the full terminal logs.
-• `{i}logs carbon`
-    Get the carbonized sys logs.
-• `{i}logs heroku`
-   Get the latest 100 lines of heroku logs.
-
-• `{i}shutdown`
-    Turn off your bot.
-"""
 import os
 import sys
 import time
 from platform import python_version as pyver
 from random import choice
 
-from pyUltroid.version import __version__ as UltVer
 from telethon import __version__
 from telethon.errors.rpcerrorlist import (
     BotMethodInvalidError,
     ChatSendMediaForbiddenError,
 )
 
+from pyUltroid.version import __version__ as UltVer
+
 from . import HOSTED_ON, LOGS
 
 try:
@@ -57,7 +35,6 @@ from telethon.utils import resolve_bot_file_id
 
 from . import (
     ATRA_COL,
-    INLINE_PIC,
     LOGS,
     OWNER_NAME,
     ULTROID_IMAGES,
@@ -75,6 +52,7 @@ from . import (
     get_string,
     heroku_logs,
     in_pattern,
+    inline_pic,
     restart,
     shutdown,
     start_time,
@@ -85,11 +63,15 @@ from . import (
     updater,
 )
 
-ULTPIC = INLINE_PIC or choice(ULTROID_IMAGES)
+
+def ULTPIC():
+    return inline_pic() or choice(ULTROID_IMAGES)
+
+
 buttons = [
     [
         Button.url(get_string("bot_3"), "https://github.com/TeamUltroid/Ultroid"),
-        Button.url(get_string("bot_4"), "t.me/ultroidsupportchat"),
+        Button.url(get_string("bot_4"), "t.me/UltroidSupportChat"),
     ]
 ]
 
@@ -102,7 +84,7 @@ The Ultroid Userbot
   ◍ Telethon - {}
 """
 
-in_alive = "{}\n\n🌀 <b>Ultroid Version -><b> <code>{}</code>\n🌀 <b>PyUltroid -></b> <code>{}</code>\n🌀 <b>Python -></b> <code>{}</code>\n🌀 <b>Uptime -></b> <code>{}</code>\n🌀 <b>Branch -></b> [ {} ]\n\n• <b>Join @TheUltroid</b>"
+in_alive = "{}\n\n🌀 <b>Ultroid Version -><b> <code>{}</code>\n🌀 <b>PyUltroid -></b> <code>{}</code>\n🌀 <b>Python -></b> <code>{}</code>\n🌀 <b>Uptime -></b> <code>{}</code>\n🌀 <b>Branch -></b> [ {} ]\n\n• <b>Join @TeamUltroid</b>"
 
 
 @callback("alive")
@@ -140,12 +122,13 @@ async def lol(ult):
         parse = "html"
         als = in_alive.format(
             header,
-            ultroid_version + f" [{HOSTED_ON}]",
+            f"{ultroid_version} [{HOSTED_ON}]",
             UltVer,
             pyver(),
             uptime,
             kk,
         )
+
         if _e := udB.get_key("ALIVE_EMOJI"):
             als = als.replace("🌀", _e)
     else:
@@ -153,13 +136,14 @@ async def lol(ult):
         als = (get_string("alive_1")).format(
             header,
             OWNER_NAME,
-            ultroid_version + f" [{HOSTED_ON}]",
+            f"{ultroid_version} [{HOSTED_ON}]",
             UltVer,
             uptime,
             pyver(),
             __version__,
             kk,
         )
+
         if a := udB.get_key("ALIVE_EMOJI"):
             als = als.replace("✵", a)
     if pic:
@@ -252,7 +236,8 @@ async def _(event):
         await heroku_logs(event)
     elif opt == "carbon" and Carbon:
         event = await event.eor(get_string("com_1"))
-        code = open(file, "r").read()[-2500:]
+        with open(file, "r") as f:
+            code = f.read()[-2500:]
         file = await Carbon(
             file_name="ultroid-logs",
             code=code,
@@ -260,7 +245,8 @@ async def _(event):
         )
         await event.reply("**Ultroid Logs.**", file=file)
     elif opt == "open":
-        file = open("ultroid.log", "r").read()[-4000:]
+        with open("ultroid.log", "r") as f:
+            file = f.read()[-4000:]
         return await event.eor(f"`{file}`")
     else:
         await def_logs(event, file)
@@ -279,13 +265,9 @@ async def inline_alive(ult):
     rep = xx.replace(".git", f"/tree/{y}")
     kk = f"<a href={rep}>{y}</a>"
     als = in_alive.format(
-        header,
-        ultroid_version + f" [{HOSTED_ON}]",
-        UltVer,
-        pyver(),
-        uptime,
-        kk,
+        header, f"{ultroid_version} [{HOSTED_ON}]", UltVer, pyver(), uptime, kk
     )
+
     if _e := udB.get_key("ALIVE_EMOJI"):
         als = als.replace("🌀", _e)
     builder = ult.builder
@@ -298,8 +280,7 @@ async def inline_alive(ult):
                     )
                 ]
             else:
-                _pic = resolve_bot_file_id(pic)
-                if _pic:
+                if _pic := resolve_bot_file_id(pic):
                     pic = _pic
                     buttons.insert(
                         0, [Button.inline(get_string("bot_2"), data="alive")]
@@ -308,7 +289,7 @@ async def inline_alive(ult):
                     await builder.document(
                         pic,
                         title="Inline Alive",
-                        description="@TheUltroid",
+                        description="@TeamUltroid",
                         parse_mode="html",
                         buttons=buttons,
                     )
@@ -327,24 +308,21 @@ async def inline_alive(ult):
 @ultroid_cmd(pattern="update( (.*)|$)")
 async def _(e):
     xx = await e.eor(get_string("upd_1"))
-    if HOSTED_ON == "heroku" or (
-        e.pattern_match.group(1).strip()
-        and (
-            "fast" in e.pattern_match.group(1).strip()
-            or "soft" in e.pattern_match.group(1).strip()
-        )
+    if e.pattern_match.group(1).strip() and (
+        "fast" in e.pattern_match.group(1).strip()
+        or "soft" in e.pattern_match.group(1).strip()
     ):
         await bash("git pull -f && pip3 install -r requirements.txt")
         call_back()
         await xx.edit(get_string("upd_7"))
         os.execl(sys.executable, "python3", "-m", "pyUltroid")
-        return
+        # return
     m = await updater()
     branch = (Repo.init()).active_branch
     if m:
         x = await asst.send_file(
             udB.get_key("LOG_CHANNEL"),
-            ULTPIC,
+            ULTPIC(),
             caption="• **Update Available** •",
             force_document=False,
             buttons=Button.inline("Changelogs", data="changes"),
@@ -368,7 +346,7 @@ async def updava(event):
     await event.delete()
     await asst.send_file(
         udB.get_key("LOG_CHANNEL"),
-        ULTPIC,
+        ULTPIC(),
         caption="• **Update Available** •",
         force_document=False,
         buttons=Button.inline("Changelogs", data="changes"),

plugins/broadcast.py

@@ -4,30 +4,19 @@
 # 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}addch <id/reply to list/none>`
-    Add chat to database. Adds current chat if no id specified.
 
-• `{i}remch <all/id/none>`
-    Removes the specified chat (current chat if none specified), or all chats.
+from . import get_help
 
-• `{i}broadcast <reply to msg>`
-    Send the replied message to all chats in database.
+__doc__ = get_help("help_broadcast")
 
-• `{i}forward <reply to msg>`
-     Forward the message to all chats in database.
-
-• `{i}listchannels`
-    To get list of all added chats.
-"""
 import asyncio
 import io
 
-from pyUltroid.dB.broadcast_db import *
 from telethon.utils import get_display_name
 
+from pyUltroid.dB.broadcast_db import *
+
 from . import HNDLR, LOGS, eor, get_string, udB, ultroid_bot, ultroid_cmd
 
 
@@ -76,14 +65,12 @@ async def broadcast_adder(event):
     chat_id = event.chat_id
     if chat_id == udB.get_key("LOG_CHANNEL"):
         return
-    if not is_channel_added(chat_id):
-        xx = add_channel(chat_id)
-        if xx:
-            await x.edit(get_string("bd_5"))
-        else:
-            await x.edit(get_string("sf_8"))
-    else:
+    if is_channel_added(chat_id):
         await x.edit(get_string("bd_6"))
+    elif xx := add_channel(chat_id):
+        await x.edit(get_string("bd_5"))
+    else:
+        await x.edit(get_string("sf_8"))
     await asyncio.sleep(3)
     await x.delete()
 

plugins/button.py

@@ -4,22 +4,18 @@
 # 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}button <text with button format`
-   create button u can reply to pic also
+from . import get_help
+
+__doc__ = get_help("help_button")
 
-Format:- `{i}button Hey There! @UseUltroid 😎.
-[Ultroid | t.me/theUltroid][Support | t.me/ultroidsupportchat | same]
-[TeamUltroid | t.me/TeamUltroid]`
-"""
 import os
 
-from pyUltroid.functions.tools import create_tl_btn, get_msg_button
 from telegraph import upload_file as uf
 from telethon.utils import pack_bot_file_id
 
+from pyUltroid.fns.tools import create_tl_btn, get_msg_button
+
 from . import HNDLR, get_string, mediainfo, ultroid_cmd
 from ._inline import something
 
@@ -36,14 +32,14 @@ async def butt(event):
         if wut and wut.startswith(("pic", "gif")):
             dl = await wt.download_media()
             variable = uf(dl)
-            media = "https://telegra.ph" + variable[0]
+            media = f"https://graph.org{variable[0]}"
         elif wut == "video":
             if wt.media.document.size > 8 * 1000 * 1000:
                 return await event.eor(get_string("com_4"), time=5)
             dl = await wt.download_media()
             variable = uf(dl)
             os.remove(dl)
-            media = "https://telegra.ph" + variable[0]
+            media = f"https://graph.org{variable[0]}"
         else:
             media = pack_bot_file_id(wt.media)
     try:

plugins/calculator.py

@@ -4,12 +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/>.
-"""
-✘ Commands Available -
 
-•`{i}calc` - Inline Calculator
 
-"""
+from . import get_help
+
+__doc__ = get_help("help_calculator")
+
 import re
 
 from . import Button, asst, callback, get_string, in_pattern, udB, ultroid_cmd
@@ -85,20 +85,20 @@ async def _(e):
         if CALC.get(user):
             get = CALC[user]
         if get:
-            CALC.update({user: get + "/100"})
-            await e.answer(str(get + "/100"))
+            CALC.update({user: f"{get}/100"})
+            await e.answer(str(f"{get}/100"))
     elif x == "÷":
         if CALC.get(user):
             get = CALC[user]
         if get:
-            CALC.update({user: get + "/"})
-            await e.answer(str(get + "/"))
+            CALC.update({user: f"{get}/"})
+            await e.answer(str(f"{get}/"))
     elif x == "x":
         if CALC.get(user):
             get = CALC[user]
         if get:
-            CALC.update({user: get + "*"})
-            await e.answer(str(get + "*"))
+            CALC.update({user: f"{get}*"})
+            await e.answer(str(f"{get}*"))
     elif x == "=":
         if CALC.get(user):
             get = CALC[user]

plugins/channelhacks.py

@@ -4,39 +4,17 @@
 # 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
+from . import get_help
 
-🔹 `{i}shift <from channel> | <to channel>`
-     This will transfer all old post from channel A to channel B.
-      (u can use username or id of channel too)
-      example : `{i}shift @abc | @xyz`
-      [note - this (" | ") sign is nessesary]
+__doc__ = get_help("help_channelhacks")
 
-🔹 For auto-posting/forwarding all new message from any source channel to any destination channel.
-
-   `{i}asource <channel username or id>`
-      This add source channel to database
-   `{i}dsource <channel username or id>`
-      This remove source channels from database
-   `{i}listsource <channel username or id>`
-      Show list of source channels
-
-
-   `{i}adest <channel username or id>`
-      This add Ur channels to database
-   `{i}ddest <channel username or id>`
-      This Remove Ur channels from database
-   `{i}listdest <channel username or id>`
-      Show List of Ur channels
-
-   'you can set many channels in database'
-   'For activating auto-post use `{i}setdb AUTOPOST True` '
-"""
 
 import asyncio
 import io
 
+from telethon.errors.rpcerrorlist import FloodWaitError
+from telethon.utils import get_display_name, get_peer_id
+
 from pyUltroid.dB.ch_db import (
     add_destination,
     add_source_channel,
@@ -49,8 +27,6 @@ from pyUltroid.dB.ch_db import (
     rem_destination,
     rem_source_channel,
 )
-from telethon.errors.rpcerrorlist import FloodWaitError
-from telethon.utils import get_display_name, get_peer_id
 
 from . import LOGS, asst, eor, events, get_string, udB, ultroid_bot, ultroid_cmd
 
@@ -107,15 +83,14 @@ async def _(e):
 
 @ultroid_cmd(pattern="asource (.*)")
 async def source(e):
-    x = e.pattern_match.group(1).strip()
-    if not x:
-        y = e.chat_id
-    else:
+    if x := e.pattern_match.group(1).strip():
         try:
             y = await e.client.parse_id(x)
         except Exception as er:
             LOGS.exception(er)
             return
+    else:
+        y = e.chat_id
     if not is_source_channel_added(y):
         add_source_channel(y)
         await e.eor(get_string("cha_2"))
@@ -186,8 +161,7 @@ async def list_all(event):
 
 @ultroid_cmd(pattern="adest (.*)")
 async def destination(e):
-    x = e.pattern_match.group(1).strip()
-    if x:
+    if x := e.pattern_match.group(1).strip():
         try:
             y = await e.client.parse_id(x)
         except Exception as er:

plugins/chatbot.py

@@ -4,23 +4,13 @@
 # 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}addai <reply to user/give username/userid>`
-   Add a AI ChatBot to reply to that user.
+from . import get_help
 
-• `{i}remai <reply to user/give username/userid>`
-   Remove the AI ChatBot.
+__doc__ = get_help("help_chatbot")
 
-• `{i}repai <reply to user/give a message>`
-   Reply to the user with a message by an AI.
 
-• `{i}listai`
-   List the currently AI added users.
-"""
-
-from pyUltroid.functions.tools import get_chatbot_reply
+from pyUltroid.fns.tools import get_chatbot_reply
 
 from . import eod, get_string, inline_mention, udB, ultroid_cmd
 
@@ -61,7 +51,7 @@ async def lister(event):
             user = inline_mention(user)
         except BaseException:
             user = f"`{i}`"
-        msg += "• {}\n".format(user)
+        msg += f"• {user}\n"
     await event.eor(msg, link_preview=False)
 
 
@@ -71,11 +61,11 @@ async def chat_bot_fn(event, type_):
     else:
         temp = event.text.split(maxsplit=1)
         try:
-            user_ = await event.client.get_entity(temp[1])
+            user_ = await event.client.get_entity(await event.client.parse_id(temp[1]))
         except BaseException:
             if event.is_private:
                 user_ = event.chat
-            else:
+            if not user_:
                 return await eod(
                     event,
                     get_string("chab_1"),

plugins/chats.py

@@ -4,36 +4,10 @@
 # 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 -
+from . import get_help
 
-• `{i}delchat <optional- username/id>`
-    Delete the group this cmd is used in.
+__doc__ = get_help("help_chats")
 
-• `{i}getlink`
-• `{i}getlink r` - `create link with admin approval`
-• `{i}getlink r title_here` - `admin approval with link title`
-• `{i}getlink 10` - `usage limit in new link`
-    Get link of group this cmd is used in.
-
-• `{i}create (g|b|c) <group_name> ; <optional-username>`
-    Create group woth a specific name.
-    g - megagroup/supergroup
-    b - small group
-    c - channel
-
-• `{i}setgpic <reply to Photo><chat username>`
-    Set Profile photo of Group.
-
-• `{i}delgpic <chat username -optional>`
-    Delete Profile photo of Group.
-
-• `{i}unbanall`
-    Unban all Members of a group.
-
-• `{i}rmusers`
-    Remove users specifically.
-"""
 
 from telethon.errors import ChatAdminRequiredError as no_admin
 from telethon.tl.functions.channels import (
@@ -101,7 +75,7 @@ async def _(e):
     request, usage, title, link = None, None, None, None
     if match:
         split = match.split(maxsplit=1)
-        request = bool(split[0] in ["r", "request"])
+        request = split[0] in ["r", "request"]
         title = "Created by Ultroid"
         if len(split) > 1:
             match = split[1]
@@ -190,7 +164,7 @@ async def _(e):
             created_chat_id = r.chats[0].id
             if username:
                 await e.client(UpdateUsernameRequest(created_chat_id, username))
-                result = "https://t.me/" + username
+                result = f"https://t.me/{username}"
             else:
                 result = (
                     await e.client(
@@ -245,7 +219,7 @@ async def _(ult):
         await ult.client(EditPhotoRequest(chat, file))
         await ult.eor("`Group Photo has Successfully Changed !`", time=5)
     except Exception as ex:
-        await ult.eor("Error occured.\n`{}`".format(str(ex)), time=5)
+        await ult.eor(f"Error occured.\n`{str(ex)}`", time=5)
     os.remove(replfile)
 
 

plugins/cleanaction.py

@@ -4,19 +4,11 @@
 # 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}addclean`
-    Clean all Upcoming action msg in added chat like someone joined/left/pin etc.
+from . import get_help
 
-•`{i}remclean`
-    Remove chat from database.
+__doc__ = get_help("help_cleanaction")
 
-•`{i}listclean`
-   To get list of all chats where its activated.
-
-"""
 
 from telethon.utils import get_display_name
 
@@ -44,8 +36,7 @@ async def _(e):
 
 @ultroid_cmd(pattern="listclean$")
 async def _(e):
-    k = udB.get_key("CLEANCHAT")
-    if k:
+    if k := udB.get_key("CLEANCHAT"):
         o = ""
         for x in k:
             try:

plugins/compressor.py

@@ -4,19 +4,11 @@
 # 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}compress <reply to video>`
-    optional `crf` and `stream`
-    Example : `{i}compress 27 stream` or `{i}compress 28`
-    Encode the replied video according to CRF value.
-    Less CRF == High Quality, More Size
-    More CRF == Low Quality, Less Size
-    CRF Range = 20-51
-    Default = 27
+from . import get_help
+
+__doc__ = get_help("help_compressor")
 
-"""
 
 import asyncio
 import os
@@ -24,11 +16,13 @@ import re
 import time
 from datetime import datetime as dt
 
-from pyUltroid.functions.tools import metadata
 from telethon.errors.rpcerrorlist import MessageNotModifiedError
 from telethon.tl.types import DocumentAttributeVideo
 
+from pyUltroid.fns.tools import metadata
+
 from . import (
+    ULTConfig,
     bash,
     downloader,
     get_string,
@@ -66,12 +60,13 @@ async def _(e):
         xxx = await e.eor(get_string("audiotools_5"))
         c_time = time.time()
         file = await downloader(
-            "resources/downloads/" + name,
+            f"resources/downloads/{name}",
             vfile,
             xxx,
             c_time,
-            "Downloading " + name + "...",
+            f"Downloading {name}...",
         )
+
         o_size = os.path.getsize(file.name)
         d_time = time.time()
         diff = time_formatter((d_time - c_time) * 1000)
@@ -83,9 +78,11 @@ async def _(e):
         x, y = await bash(
             f'mediainfo --fullscan """{file.name}""" | grep "Frame count"'
         )
+        if y and y.endswith("NOT_FOUND"):
+            return await xxx.edit(f"ERROR: `{y}`")
         total_frames = x.split(":")[1].split("\n")[0]
         progress = f"progress-{c_time}.txt"
-        with open(progress, "w") as fk:
+        with open(progress, "w"):
             pass
         proce = await asyncio.create_subprocess_shell(
             f'ffmpeg -hide_banner -loglevel quiet -progress {progress} -i """{file.name}""" -preset ultrafast -vcodec libx265 -crf {crf} -c:a copy """{out}""" -y',
@@ -110,13 +107,13 @@ async def _(e):
                     some_eta = ((int(total_frames) - elapse) / speed) * 1000
                     text = f"`Compressing {file_name} at {crf} CRF.\n`"
                     progress_str = "`[{0}{1}] {2}%\n\n`".format(
-                        "".join("●" for i in range(math.floor(per / 5))),
-                        "".join("" for i in range(20 - math.floor(per / 5))),
+                        "".join("●" for _ in range(math.floor(per / 5))),
+                        "".join("" for _ in range(20 - math.floor(per / 5))),
                         round(per, 2),
                     )
 
-                    e_size = humanbytes(size) + " of ~" + humanbytes((size / per) * 100)
-                    eta = "~" + time_formatter(some_eta)
+                    e_size = f"{humanbytes(size)} of ~{humanbytes((size / per) * 100)}"
+                    eta = f"~{time_formatter(some_eta)}"
                     try:
                         await xxx.edit(
                             text
@@ -142,13 +139,7 @@ async def _(e):
         caption += f"**Compressed Size: **`{humanbytes(c_size)}`\n"
         caption += f"**Compression Ratio: **`{differ:.2f}%`\n"
         caption += f"\n**Time Taken To Compress: **`{difff}`"
-        mmmm = await uploader(
-            out,
-            out,
-            f_time,
-            xxx,
-            "Uploading " + out + "...",
-        )
+        mmmm = await uploader(out, out, f_time, xxx, f"Uploading {out}...")
         if to_stream:
             data = await metadata(out)
             width = data["width"]
@@ -162,7 +153,7 @@ async def _(e):
             await e.client.send_file(
                 e.chat_id,
                 mmmm,
-                thumb="resources/extras/ultroid.jpg",
+                thumb=ULTConfig.thumb,
                 caption=caption,
                 attributes=attributes,
                 force_document=False,
@@ -172,7 +163,7 @@ async def _(e):
             await e.client.send_file(
                 e.chat_id,
                 mmmm,
-                thumb="resources/extras/ultroid.jpg",
+                thumb=ULTConfig.thumb,
                 caption=caption,
                 force_document=True,
                 reply_to=e.reply_to_msg_id,