Ultroid v0.4 updates

Co-authored-by: Amit Sharma <[email protected]>
Co-authored-by: Danish <[email protected]>
Co-authored-by: Mahesh Chauhan <[email protected]>
Co-authored-by: Aditya <[email protected]>
Co-authored-by: CyrusXD <[email protected]>

Dockerfile

@@ -14,6 +14,9 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
     && pip3 install --no-cache-dir -r root/TeamUltroid/requirements.txt \
     && pip3 install av --no-binary av
 
+# Railway's banned dependency
+RUN if [ ! $RAILWAY_STATIC_URL ]; then pip3 install --no-cache-dir yt-dlp; fi
+
 # changing workdir
 WORKDIR /root/TeamUltroid/
 

README.md

@@ -11,7 +11,7 @@
 [![Stars](https://img.shields.io/github/stars/TeamUltroid/Ultroid?style=flat-square&color=yellow)](https://github.com/TeamUltroid/Ultroid/stargazers)
 [![Forks](https://img.shields.io/github/forks/TeamUltroid/Ultroid?style=flat-square&color=orange)](https://github.com/TeamUltroid/Ultroid/fork)
 [![Size](https://img.shields.io/github/repo-size/TeamUltroid/Ultroid?style=flat-square&color=green)](https://github.com/TeamUltroid/Ultroid/)   
-[![Python](https://img.shields.io/badge/Python-v3.9.9-blue)](https://www.python.org/)
+[![Python](https://img.shields.io/badge/Python-v3.10.2-blue)](https://www.python.org/)
 [![CodeFactor](https://www.codefactor.io/repository/github/teamultroid/ultroid/badge/main)](https://www.codefactor.io/repository/github/teamultroid/ultroid/overview/main)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/TeamUltroid/Ultroid/graphs/commit-activity)
 [![Docker Pulls](https://img.shields.io/docker/pulls/theteamultroid/ultroid?style=flat-square)](https://img.shields.io/docker/pulls/theteamultroid/ultroid?style=flat-square)   
@@ -46,9 +46,9 @@ Get the [Necessary Variables](#Necessary-Variables) and then click the button be
 - [Ultroid CLI](#Ultroid-CLI)
 
 ### Local Deploy - Easy Method
-- Linux - `bash -c "$(curl -fsSL https://git.io/JY9UM)"`
+- Linux - `wget -O locals.py https://git.io/JY9UM && python3 locals.py`
 - Windows - `cd desktop ; wget https://git.io/JY9UM -o locals.py ; python locals.py`
-- Termux - `sh -c "$(curl -fsSL https://git.io/JY9UM)"`
+- Termux - `wget -O locals.py https://git.io/JY9UM && python locals.py`
 
 ### Local Deploy - Traditional Method
 - Get your [Necessary Variables](#Necessary-Variables)
@@ -66,9 +66,9 @@ Get the [Necessary Variables](#Necessary-Variables) and then click the button be
   - For Linux users:
     `bash sessiongen`
      or
-    `bash -c "$(curl -fsSL https://git.io/JY9JI)"`
+    `wget -O session.py https://git.io/JY9JI && python3 session.py`
   - For Termux users:
-    `sh -c "$(curl -fsSL https://git.io/JqgsR)"`
+    `wget -O session.py https://git.io/JY9JI && python session.py`
   - For Windows Users:
     `cd desktop ; wget https://git.io/JY9JI -o ultroid.py ; python ultroid.py`
 - Fill your details in a `.env` file, as given in [`.env.sample`](https://github.com/TeamUltroid/Ultroid/blob/main/.env.sample).
@@ -94,15 +94,22 @@ Take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli/) for mo
 ---
 ## Necessary Variables
 - `SESSION` - SessionString for your accounts login session. Get it from [here](#Session-String)
-- `REDIS_URI` - Redis endpoint URL, from [redislabs](http://redislabs.com/), tutorial [here.](./resources/extras/redistut.md)
-- `REDIS_PASSWORD` - Redis endpoint Password, from [redislabs](http://redislabs.com/), tutorial [here.](./resources/extras/redistut.md)
+
+One of the following databases:
+- For **Redis** (tutorial [here](./resources/extras/redistut.md))
+  - `REDIS_URI` - Redis endpoint URL, from [redislabs](http://redislabs.com/).
+  - `REDIS_PASSWORD` - Redis endpoint Password, from [redislabs](http://redislabs.com/).
+- For **MONGODB**
+  - `MONGO_URI` - Get it from [mongodb](https://mongodb.com/atlas).
+- For **SQLDB**
+  - `DATABASE_URL`- Get it from [elephantsql](https://elephantsql.com).
 
 ## Session String
 Different ways to get your `SESSION`:
 * [![Run on Repl.it](https://replit.com/badge/github/TeamUltroid/Ultroid)](https://replit.com/@TeamUltroid/UltroidStringSession)
-* Linux : `bash -c "$(curl -fsSL https://git.io/JY9JI)"`
+* Linux : `wget -O session.py https://git.io/JY9JI && python3 session.py`
 * PowerShell : `cd desktop ; wget https://git.io/JY9JI ; python ultroid.py`
-* Termux : `sh -c "$(curl -fsSL https://da.gd/termux-tel)"`
+* Termux : `wget -O session.py https://git.io/JY9JI && python session.py`
 * TelegramBot : [@SessionGeneratorBot](https://t.me/SessionGeneratorBot)
 
 ---

assistant/callbackstuffs.py

@@ -92,7 +92,7 @@ _buttons = {
             [Button.inline("« Bᴀᴄᴋ", data="cbs_pmcstm")],
         ],
     },
-    "alabs_vcstm": {
+    "alvcstm": {
         "text": f"Customise your {HNDLR}alive. Choose from the below options -",
         "buttons": [
             [Button.inline("Aʟɪᴠᴇ Tᴇxᴛ", data="abs_alvtx")],

assistant/games.py

@@ -65,7 +65,7 @@ async def _akokk(e):
 
 @callback(re.compile("aki_(.*)"), owner=True)
 async def doai(e):
-    adt = e.pattern_match.group(1).decode("utf-8")
+    adt = e.pattern_match.group(1).strip().decode("utf-8")
     dt = adt.split("_")
     ch = int(dt[0])
     mid = int(dt[1])
@@ -156,10 +156,11 @@ CONGO_STICKER = [
     "CAADAgADjAADECECEFZM-SrKO9GgAg",
     "CAADAgADSwIAAj-VzArAzNCDiGWAHAI",
     "CAADAgADhQADwZxgDIuMHR9IU10iAg",
+    "CAADAgADiwMAAsSraAuoe2BwYu1sdQI",
 ]
 
 
-@callback("delit")
+@callback("delit", owner=True)
 async def delete_it(event):
     await event.delete()
 

assistant/inlinestuff.py

@@ -124,17 +124,22 @@ async def _(e):
         ],
     ]
     try:
-        lnk = e.builder.article(
-            title=f"Upload {filename}",
-            text=f"**File:**\n{filename}",
-            buttons=buttons,
-        )
-    except BaseException:
-        lnk = e.builder.article(
-            title="fl2lnk",
-            text="File not found",
-        )
-    await e.answer([lnk], switch_pm="File to Link.", switch_pm_param="start")
+        lnk = [
+            await e.builder.article(
+                title=f"Upload {filename}",
+                text=f"**File:**\n{filename}",
+                buttons=buttons,
+            )
+        ]
+    except BaseException as er:
+        LOGS.exception(er)
+        lnk = [
+            await e.builder.article(
+                title="fl2lnk",
+                text="File not found",
+            )
+        ]
+    await e.answer(lnk, switch_pm="File to Link.", switch_pm_param="start")
 
 
 @callback(

assistant/manager/_help.py

@@ -130,5 +130,5 @@ async def home_aja(e):
 
 @callback(re.compile("hlp_(.*)"))
 async def do_something(event):
-    match = event.pattern_match.group(1).decode("utf-8")
+    match = event.pattern_match.group(1).strip().decode("utf-8")
     await event.edit(STRINGS[match], buttons=Button.inline("<< Back", "mnghome"))

assistant/manager/admins.py

@@ -22,7 +22,7 @@ async def dowj(e):
         return await e.eor("Reply to a message...")
     try:
         await replied.delete()
-        if e.pattern_match.group(1) == "kick":
+        if e.pattern_match.group(1).strip() == "kick":
             await e.client.kick_participant(e.chat_id, user)
             te = "Kicked"
         else:

assistant/manager/misc.py

@@ -22,9 +22,9 @@ async def dheh(e):
     await e.client.send_message(e.chat_id, text, reply_to=ri)
 
 
-@asst_cmd(pattern="echo ?(.*)")
+@asst_cmd(pattern="echo( (.*)|$)")
 async def oqha(e):
-    match = e.pattern_match.group(1)
+    match = e.pattern_match.group(1).strip()
     if match:
         text = match
         reply_to = e

assistant/manager/stickermanager.py

@@ -8,7 +8,7 @@
 import random
 
 from pyUltroid.functions.misc import create_quotly
-from pyUltroid.functions.tools import resize_photo
+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
@@ -51,7 +51,7 @@ async def kang_cmd(ult):
     elif reply.photo:
         dl = await reply.download_media()
         name = "sticker.webp"
-        image = resize_photo(dl)
+        image = TgConverter.resize_photo_sticker(dl)
         image.save(name, "WEBP")
     elif reply.text:
         dl = await create_quotly(reply)

assistant/start.py

@@ -12,6 +12,7 @@ from pyUltroid.dB.asst_fns import *
 from pyUltroid.functions.helper import inline_mention
 from pyUltroid.misc import SUDO_M, owner_and_sudos
 from telethon import Button, events
+from telethon.errors.rpcerrorlist import MessageDeleteForbiddenError
 from telethon.utils import get_display_name
 
 from strings.strings import get_string
@@ -77,12 +78,15 @@ async def own(event):
 
 @callback("closeit")
 async def closet(lol):
-    await lol.delete()
+    try:
+        await lol.delete()
+    except MessageDeleteForbiddenError:
+        await lol.answer("MESSAGE_TOO_OLD", alert=True)
 
 
-@asst_cmd(pattern="start ?(.*)", forwards=False, func=lambda x: not x.is_group)
+@asst_cmd(pattern="start( (.*)|$)", forwards=False, func=lambda x: not x.is_group)
 async def ultroid(event):
-    args = event.pattern_match.group(1)
+    args = event.pattern_match.group(1).strip()
     if not is_added(event.sender_id) and event.sender_id not in owner_and_sudos():
         add_user(event.sender_id)
         kak_uiw = udB.get_key("OFF_START_LOG")

assistant/ytdl.py

@@ -13,7 +13,13 @@ try:
     from PIL import Image
 except ImportError:
     Image = None
-from pyUltroid.functions.helper import bash, fast_download, numerize, time_formatter
+from pyUltroid.functions.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
@@ -52,7 +58,7 @@ async def _(event):
         await event.answer([fuk])
         return
     results = []
-    search = VideosSearch(string, limit=10)
+    search = VideosSearch(string, limit=50)
     nub = search.result()
     nibba = nub["result"]
     for v in nibba:
@@ -70,12 +76,12 @@ async def _(event):
             else "None"
         )
         thumb = f"https://i.ytimg.com/vi/{ids}/hqdefault.jpg"
-        text = f"<strong>Title:- <a href={link}>{title}</a></strong>\n"
-        text += f"<strong>⏳ Duration:-</strong> <code>{duration}</code>\n"
-        text += f"<strong>👀 Views:- </strong> <code>{views}</code>\n"
-        text += f"<strong>🎙️ Publisher:- </strong> <code>{publisher}</code>\n"
-        text += f"<strong>🗓️ Published on:- </strong> <code>{published_on}</code>\n"
-        text += f"<strong>📝 Description:- </strong> <code>{description}</code>"
+        text = f"**Title: [{title}]({link})**\n\n"
+        text += f"`Description: {description}\n\n"
+        text += f"「 Duration: {duration} 」\n"
+        text += f"「 Views: {views} 」\n"
+        text += f"「 Publisher: {publisher} 」\n"
+        text += f"「 Published on: {published_on} 」`"
         desc = f"{title}\n{duration}"
         file = wb(thumb, 0, "image/jpeg", [])
         buttons = [
@@ -96,9 +102,7 @@ async def _(event):
                 ),
             ],
         ]
-        BACK_BUTTON.update(
-            {ids: {"text": text, "buttons": buttons, "parse_mode": "html"}}
-        )
+        BACK_BUTTON.update({ids: {"text": text, "buttons": buttons}})
         results.append(
             await event.builder.article(
                 type="photo",
@@ -108,7 +112,6 @@ async def _(event):
                 content=file,
                 text=text,
                 include_media=True,
-                parse_mode="html",
                 buttons=buttons,
             ),
         )
@@ -122,7 +125,7 @@ async def _(event):
     owner=True,
 )
 async def _(e):
-    _e = e.pattern_match.group(1).decode("UTF-8")
+    _e = e.pattern_match.group(1).strip().decode("UTF-8")
     _lets_split = _e.split(":")
     _ytdl_data = await dler(e, _yt_base_url + _lets_split[1])
     _data = get_formats(_lets_split[0], _lets_split[1], _ytdl_data)
@@ -140,7 +143,7 @@ async def _(e):
     owner=True,
 )
 async def _(event):
-    url = event.pattern_match.group(1).decode("UTF-8")
+    url = event.pattern_match.group(1).strip().decode("UTF-8")
     lets_split = url.split(":")
     vid_id = lets_split[2]
     link = _yt_base_url + vid_id
@@ -151,6 +154,7 @@ async def _(event):
         ext = "mp3"
     if lets_split[0] == "audio":
         opts = {
+            "format": "bestaudio",
             "addmetadata": True,
             "key": "FFmpegMetadata",
             "prefer_ffmpeg": True,
@@ -184,8 +188,12 @@ async def _(event):
             else ytdl_data["description"][:100]
         )
         description = description or "None"
+        filepath = vid_id + f".{ext}"
+        if not os.path.exists(filepath):
+            filepath = filepath + f".{ext}"
+        size = os.path.getsize(filepath)
         file, _ = await event.client.fast_uploader(
-            vid_id + f".{ext}" * 2,
+            filepath,
             filename=title + "." + ext,
             show_progress=True,
             event=event,
@@ -235,6 +243,7 @@ async def _(event):
         filepath = vid_id + ".mkv"
         if not os.path.exists(filepath):
             filepath = filepath + ".webm"
+        size = os.path.getsize(filepath)
         file, _ = await event.client.fast_uploader(
             filepath,
             filename=title + ".mkv",
@@ -250,12 +259,14 @@ async def _(event):
                 supports_streaming=True,
             ),
         ]
-    text = f"**Title:** `{title}`\n\n"
-    text += f"`📝 Description:` `{description}`\n\n"
-    text += f"`⏳ Duration:` `{time_formatter(int(duration)*1000)}`\n"
-    text += f"`🎤 Artist:` `{artist}`\n"
-    text += f"`👀 Views`: `{views}`\n"
-    text += f"`👍 Likes`: `{likes}`\n"
+    description = description if description != "" else "None"
+    text = f"**Title: [{title}]({_yt_base_url}{vid_id})**\n\n"
+    text += f"`📝 Description: {description}\n\n"
+    text += f"「 Duration: {time_formatter(int(duration)*1000)} 」\n"
+    text += f"「 Artist: {artist} 」\n"
+    text += f"「 Views: {views} 」\n"
+    text += f"「 Likes: {likes} 」\n"
+    text += f"「 Size: {humanbytes(size)} 」`"
     button = Button.switch_inline("Search More", query="yt ", same_peer=True)
     try:
         await event.edit(

plugins/__init__.py

@@ -5,6 +5,7 @@
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
+
 import asyncio
 import os
 import time
@@ -26,7 +27,7 @@ from telethon.tl import functions, types
 from strings import get_string
 
 Redis = udB.get_key
-
+con = TgConverter
 OWNER_NAME = ultroid_bot.full_name
 OWNER_ID = ultroid_bot.uid
 

plugins/_chatactions.py

@@ -13,7 +13,7 @@ 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 create_tl_btn, get_chatbot_reply
+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
@@ -64,10 +64,33 @@ async def ChatActionsHandler(ult):  # sourcery no-metrics
                 )
                 await res[0].click(ult.chat_id, reply_to=ult.action_message.id)
 
-    # gban checks
     if ult.user_joined or ult.added_by:
         user = await ult.get_user()
         chat = await ult.get_chat()
+        # gbans and @UltroidBans checks
+        if udB.get_key("ULTROID_BANS"):
+            try:
+                is_banned = await async_searcher(
+                    "https://bans.ultroid.tech/api/status",
+                    json={"userId": user.id},
+                    post=True,
+                    re_json=True,
+                )
+                if is_banned["is_banned"]:
+                    await ult.client.edit_permissions(
+                        chat.id,
+                        user.id,
+                        view_messages=False,
+                    )
+                    await ult.client.send_message(
+                        chat.id,
+                        "**@UltroidBans:** Banned user detected and banned!\n`{}`.\nBan reason: {}".format(
+                            str(is_banned),
+                            is_banned["reason"],
+                        ),
+                    )
+            except BaseException:
+                pass
         reason = is_gbanned(user.id)
         if reason and chat.admin_rights:
             try:

plugins/_help.py

@@ -6,7 +6,9 @@
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
 
+from fuzzywuzzy.process import extractOne
 from pyUltroid.dB._core import HELP, LIST
+from pyUltroid.functions.tools import cmd_regex_replace
 from telethon.errors.rpcerrorlist import (
     BotInlineDisabledError,
     BotMethodInvalidError,
@@ -35,9 +37,9 @@ _main_help_menu = [
 ]
 
 
-@ultroid_cmd(pattern="help ?(.*)")
+@ultroid_cmd(pattern="help( (.*)|$)")
 async def _help(ult):
-    plug = ult.pattern_match.group(1)
+    plug = ult.pattern_match.group(1).strip()
     chat = await ult.get_chat()
     if plug:
         try:
@@ -68,7 +70,37 @@ async def _help(ult):
                     x += "\n© @TeamUltroid"
                     await ult.eor(x)
                 except BaseException:
-                    await ult.eor(get_string("help_1").format(plug), time=5)
+                    file = None
+                    compare_strings = []
+                    for file_name in LIST:
+                        compare_strings.append(file_name)
+                        value = LIST[file_name]
+                        for j in value:
+                            j = cmd_regex_replace(j)
+                            compare_strings.append(j)
+                            if j.strip() == plug:
+                                file = file_name
+                                break
+                    if not file:
+                        # the enter command/plugin name is not found
+                        best_match = extractOne(plug, compare_strings)
+                        return await ult.eor(
+                            "`{}` is not a valid plugin!\nDid you mean `{}`?".format(
+                                plug, best_match[0]
+                            ),
+                        )
+                    output = f"**Command** `{plug}` **found in plugin** - `{file}`\n"
+                    if file in HELP["Official"]:
+                        for i in HELP["Official"][file]:
+                            output += i
+                    elif HELP.get("Addons") and file in HELP["Addons"]:
+                        for i in HELP["Addons"][file]:
+                            output += i
+                    elif HELP.get("VCBot") and file in HELP["VCBot"]:
+                        for i in HELP["VCBot"][file]:
+                            output += i
+                    output += "\n© @TeamUltroid"
+                    await ult.eor(output)
         except BaseException as er:
             LOGS.exception(er)
             await ult.eor("Error 🤔 occured.")

plugins/_inline.py

@@ -70,7 +70,13 @@ async def inline_alive(o):
             content=InputWebDocument(TLINK, 0, "image/jpg", []),
         )
     ]
-    await o.answer(RES, switch_pm="👥 ULTROID PORTAL", switch_pm_param="start")
+    await o.answer(
+        RES,
+        private=True,
+        cache_time=300,
+        switch_pm="👥 ULTROID PORTAL",
+        switch_pm_param="start",
+    )
 
 
 @in_pattern("ultd", owner=True)
@@ -95,7 +101,7 @@ async def inline_handler(event):
         result = await event.builder.article(
             title="Ultroid Help Menu", text=text, buttons=_main_help_menu
         )
-    await event.answer([result], gallery=True)
+    await event.answer([result], private=True, cache_time=300, gallery=True)
 
 
 @in_pattern("pasta", owner=True)
@@ -183,7 +189,7 @@ async def uptd_plugin(event):
                 help_ += "\n"
     if not help_:
         help_ = f"{file} has no Detailed Help!"
-    help_ += "\n© Join @TeamUltroid"
+    help_ += "\n© @TeamUltroid"
     buttons = []
     if INLINE_PIC:
         data = f"sndplug_{key}_{file}"
@@ -328,6 +334,7 @@ async def _(e):
                 "Fᴅʀᴏɪᴅ Sᴇᴀʀᴄʜ", query="fdroid telegram", same_peer=True
             )
         ],
+        [Button.switch_inline("Sᴀᴀᴠɴ sᴇᴀʀᴄʜ", query="saavn", same_peer=True)],
         [
             Button.inline(
                 "« Bᴀᴄᴋ",
@@ -406,7 +413,7 @@ STUFF = {}
 
 @in_pattern("stf(.*)", owner=True)
 async def ibuild(e):
-    n = e.pattern_match.group(1)
+    n = e.pattern_match.group(1).strip()
     builder = e.builder
     if not (n and n.isdigit()):
         return

plugins/_ultroid.py

@@ -62,4 +62,5 @@ async def useUltroid(rs):
         file="https://telegra.ph/file/54a917cc9dbb94733ea5f.jpg",
         buttons=button,
     )
-    await eor(rs, f"**[Click Here]({msg.message_link})**")
+    if not (rs.chat_id == LOG_CHANNEL and rs.client._bot):
+        await eor(rs, f"**[Click Here]({msg.message_link})**")

plugins/_userlogs.py

@@ -10,6 +10,7 @@ import re
 
 from pyUltroid.dB.botchat_db import tag_add, who_tag
 from telethon.errors.rpcerrorlist import (
+    ChannelPrivateError,
     ChatWriteForbiddenError,
     MediaCaptionTooLongError,
     MediaEmptyError,
@@ -46,18 +47,18 @@ async def all_messages_catcher(e):
     try:
         sent = await asst.send_message(NEEDTOLOG, e.message, buttons=buttons)
         if TAG_EDITS.get(e.chat_id):
-            TAG_EDITS[e.chat_id].update({e.id: {"id": sent.id}})
+            TAG_EDITS[e.chat_id].update({e.id: {"id": sent.id, "msg": e}})
         else:
-            TAG_EDITS.update({e.chat_id: {e.id: {"id": sent.id}}})
+            TAG_EDITS.update({e.chat_id: {e.id: {"id": sent.id, "msg": e}}})
         tag_add(sent.id, e.chat_id, e.id)
     except MediaEmptyError:
         try:
             msg = await asst.get_messages(e.chat_id, ids=e.id)
             sent = await asst.send_message(NEEDTOLOG, msg, buttons=buttons)
             if TAG_EDITS.get(e.chat_id):
-                TAG_EDITS[e.chat_id].update({e.id: {"id": sent.id}})
+                TAG_EDITS[e.chat_id].update({e.id: {"id": sent.id, "msg": e}})
             else:
-                TAG_EDITS.update({e.chat_id: {e.id: {"id": sent.id}}})
+                TAG_EDITS.update({e.chat_id: {e.id: {"id": sent.id, "msg": e}}})
             tag_add(sent.id, e.chat_id, e.id)
         except Exception as me:
             if not isinstance(me, (PeerIdInvalidError, ValueError)):
@@ -69,9 +70,9 @@ async def all_messages_catcher(e):
                         NEEDTOLOG, e.message.text, file=media, buttons=buttons
                     )
                     if TAG_EDITS.get(e.chat_id):
-                        TAG_EDITS[e.chat_id].update({e.id: {"id": sent.id}})
+                        TAG_EDITS[e.chat_id].update({e.id: {"id": sent.id, "msg": e}})
                     else:
-                        TAG_EDITS.update({e.chat_id: {e.id: {"id": sent.id}}})
+                        TAG_EDITS.update({e.chat_id: {e.id: {"id": sent.id, "msg": e}}})
                     return os.remove(media)
                 except Exception as er:
                     LOGS.exception(er)
@@ -141,6 +142,8 @@ if udB.get_key("TAG_LOG"):
         if not d_.get(event.id):
             return
         d_ = d_[event.id]
+        if d_["msg"].text == event.text:
+            return
         msg = None
         if d_.get("count"):
             d_["count"] += 1
@@ -164,7 +167,8 @@ if udB.get_key("TAG_LOG"):
         if d_["count"] == 10:
             TEXT += "\n\n• __Only the first 10 Edits are shown.__"
         try:
-            await MSG.edit(TEXT, buttons=await parse_buttons(event))
+            msg = await MSG.edit(TEXT, buttons=await parse_buttons(event))
+            d_["msg"] = msg
         except (MessageTooLongError, MediaCaptionTooLongError):
             del TAG_EDITS[event.chat_id][event.id]
         except Exception as er:
@@ -237,8 +241,18 @@ async def leave_ch_at(event):
         client = _client[client]
     except KeyError:
         return
-    name = (await client.get_entity(int(ch_id))).title
-    await client.delete_dialog(int(ch_id))
+    try:
+        name = (await client.get_entity(int(ch_id))).title
+        await client.delete_dialog(int(ch_id))
+    except UserNotParticipantError:
+        pass
+    except ChannelPrivateError:
+        return await event.edit(
+            "`[CANT_ACCESS_CHAT]` `Maybe already left or got banned.`"
+        )
+    except Exception as er:
+        LOGS.exception(er)
+        return await event.answer(str(er))
     await event.edit(get_string("userlogs_5").format(name))
 
 

plugins/_wspr.py

@@ -32,7 +32,7 @@ buddhhu = {}
 
 
 @ultroid_cmd(
-    pattern="wspr ?(.*)",
+    pattern="wspr( (.*)|$)",
 )
 async def _(e):
     if e.reply_to_msg_id:
@@ -41,7 +41,7 @@ async def _(e):
             put = f"@{okk.sender.username}"
         put = okk.sender_id
     else:
-        put = e.pattern_match.group(1)
+        put = e.pattern_match.group(1).strip()
     if put:
         try:
             results = await e.client.inline_query(asst.me.username, f"msg {put}")
@@ -170,7 +170,7 @@ async def _(e):
     ),
 )
 async def _(e):
-    ids = int(e.pattern_match.group(1).decode("UTF-8"))
+    ids = int(e.pattern_match.group(1).strip().decode("UTF-8"))
     if buddhhu.get(ids):
         if e.sender_id in buddhhu[ids]:
             await e.answer(buddhhu[ids][-1], alert=True)
@@ -182,7 +182,7 @@ async def _(e):
 
 @callback(re.compile("del_(.*)"))
 async def _(e):
-    ids = int(e.pattern_match.group(1).decode("UTF-8"))
+    ids = int(e.pattern_match.group(1).strip().decode("UTF-8"))
     if buddhhu.get(ids):
         if e.sender_id in buddhhu[ids]:
             buddhhu.pop(ids)

plugins/admintools.py

@@ -20,6 +20,7 @@
 
 • `{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.
 
@@ -41,6 +42,8 @@
     Delete all msgs of replied user.
 """
 
+import asyncio
+
 from pyUltroid.dB import DEVLIST
 from pyUltroid.functions.admins import ban_time
 from telethon.errors import BadRequestError
@@ -64,7 +67,7 @@ from . import (
 
 
 @ultroid_cmd(
-    pattern="promote ?(.*)", admins_only=True, manager=True, require="add_admins"
+    pattern="promote( (.*)|$)", admins_only=True, manager=True, require="add_admins"
 )
 async def prmte(ult):
     xx = await ult.eor(get_string("com_1"))
@@ -92,7 +95,7 @@ async def prmte(ult):
 
 
 @ultroid_cmd(
-    pattern="demote ?(.*)", admins_only=True, manager=True, require="add_admins"
+    pattern="demote( (.*)|$)", admins_only=True, manager=True, require="add_admins"
 )
 async def dmote(ult):
     xx = await ult.eor(get_string("com_1"))
@@ -119,7 +122,7 @@ async def dmote(ult):
 
 
 @ultroid_cmd(
-    pattern="ban ?(.*)",
+    pattern="ban( (.*)|$)",
     admins_only=True,
     manager=True,
     require="ban_users",
@@ -135,10 +138,10 @@ async def bban(ult):
         return await eod(ult, get_string("ban_2"))
     try:
         await ult.client.edit_permissions(ult.chat_id, user.id, view_messages=False)
-    except BadRequestError:
-        return await eod(ult, get_string("ban_3"))
     except UserIdInvalidError:
         return await eod(ult, get_string("adm_1"))
+    except BadRequestError:
+        return await eod(ult, get_string("ban_3"))
     senderme = inline_mention(await ult.get_sender())
     userme = inline_mention(user)
     text = get_string("ban_4").format(userme, senderme, ult.chat.title)
@@ -147,7 +150,9 @@ async def bban(ult):
     await eod(ult, text)
 
 
-@ultroid_cmd(pattern="unban ?(.*)", admins_only=True, manager=True, require="ban_users")
+@ultroid_cmd(
+    pattern="unban( (.*)|$)", admins_only=True, manager=True, require="ban_users"
+)
 async def uunban(ult):
     xx = await ult.eor(get_string("com_1"))
     if ult.text[1:].startswith("unbanall"):
@@ -160,10 +165,10 @@ async def uunban(ult):
         return await xx.edit(get_string("unban_1"))
     try:
         await ult.client.edit_permissions(ult.chat_id, user.id, view_messages=True)
+    except UserIdInvalidError:
+        return await eod(ult, get_string("adm_1"))
     except BadRequestError:
         return await xx.edit(get_string("adm_2"))
-    except UserIdInvalidError:
-        await xx.edit(get_string("adm_1"))
     sender = inline_mention(await ult.get_sender())
     text = get_string("unban_3").format(inline_mention(user), sender, ult.chat.title)
     if reason:
@@ -172,7 +177,7 @@ async def uunban(ult):
 
 
 @ultroid_cmd(
-    pattern="kick ?(.*)",
+    pattern="kick( (.*)|$)",
     manager=True,
     require="ban_users",
 )
@@ -208,7 +213,9 @@ async def kck(ult):
     await xx.edit(text)
 
 
-@ultroid_cmd(pattern="tban ?(.*)", admins_only=True, manager=True, require="ban_users")
+@ultroid_cmd(
+    pattern="tban( (.*)|$)", admins_only=True, manager=True, require="ban_users"
+)
 async def tkicki(e):
     huh = e.text.split()
     inputt = None
@@ -242,7 +249,7 @@ async def tkicki(e):
         return await e.eor(str(m))
 
 
-@ultroid_cmd(pattern="pin$", admins_only=True, manager=True, require="pin_messages")
+@ultroid_cmd(pattern="pin$", manager=True, require="pin_messages")
 async def pin(msg):
     if not msg.is_reply:
         return await eor(msg, get_string("pin_1"))
@@ -268,7 +275,7 @@ async def pin(msg):
 )
 async def unp(ult):
     xx = await ult.eor(get_string("com_1"))
-    ch = (ult.pattern_match.group(1)).strip()
+    ch = (ult.pattern_match.group(1).strip()).strip()
     msg = None
     if ult.is_reply:
         msg = ult.reply_to_msg_id
@@ -283,9 +290,35 @@ async def unp(ult):
     await xx.edit("`Unpinned!`")
 
 
-@ultroid_cmd(pattern="purge ?(.*)", manager=True, require="delete_messages")
+@ultroid_cmd(
+    pattern="tpin( (.*)|$)", admins_only=True, manager=True, require="pin_messages"
+)
+async def pin_message(ult):
+    match = ult.pattern_match.group(1).strip()
+    if not ult.is_reply:
+        return await ult.eor("`Reply to message..`", time=6)
+    if not match:
+        return await ult.eor("`Please provide time..`", time=8)
+    msg = await ult.eor(get_string("com_1"))
+    time = await ban_time(msg, match)
+    if not time:
+        return
+    msg_id = ult.reply_to_msg_id
+    try:
+        await ult.client.pin_message(ult.chat_id, msg_id)
+        await msg.eor(f"`pinned for time` `{time}`", time=8)
+    except Exception as er:
+        return await msg.edit(str(er))
+    await asyncio.sleep(time)
+    try:
+        await ult.client.unpin_message(ult.chat_id, msg_id)
+    except Exception as er:
+        LOGS.exception(er)
+
+
+@ultroid_cmd(pattern="purge( (.*)|$)", manager=True, require="delete_messages")
 async def fastpurger(purg):
-    match = purg.pattern_match.group(1)
+    match = purg.pattern_match.group(1).strip()
     try:
         ABC = purg.text[6]
     except IndexError:
@@ -320,10 +353,10 @@ async def fastpurger(purg):
 
 
 @ultroid_cmd(
-    pattern="purgeme ?(.*)",
+    pattern="purgeme( (.*)|$)",
 )
 async def fastpurgerme(purg):
-    num = purg.pattern_match.group(1)
+    num = purg.pattern_match.group(1).strip()
     if num and not purg.is_reply:
         try:
             nnt = int(num)
@@ -435,11 +468,11 @@ async def get_all_pinned(event):
 
 
 @ultroid_cmd(
-    pattern="autodelete ?(.*)",
+    pattern="autodelete( (.*)|$)",
     admins_only=True,
 )
 async def autodelte(ult):
-    match = ult.pattern_match.group(1)
+    match = ult.pattern_match.group(1).strip()
     if not match or match not in ["24h", "7d", "1m", "off"]:
         return await ult.eor("`Please Use in Proper Format..`", time=5)
     if match == "24h":

plugins/afk.py

@@ -9,9 +9,9 @@
 
 • `{i}afk <optional reason>`
     AFK means away from keyboard,
-    After u active this if Someone tag or msg u then It auto Reply Him/her,
+    After this is activated, if someone tags or messages you, he/she would get an automated reply from the bot.
 
-    (Note : By Reply To any media U can set media afk too).
+    (Note : Set a media file in afk messages by replying to any media with `{i}afk <reason>`).
 
 """
 
@@ -37,12 +37,12 @@ from . import (
 old_afk_msg = []
 
 
-@ultroid_cmd(pattern="afk ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="afk( (.*)|$)", fullsudo=True)
 async def set_afk(event):
     if event.client._bot or is_afk():
         return
     text, media, media_type = None, None, None
-    if event.pattern_match.group(1):
+    if event.pattern_match.group(1).strip():
         text = event.text.split(maxsplit=1)[1]
     reply = await event.get_reply_message()
     if reply:

plugins/antiflood.py

@@ -46,7 +46,7 @@ if Redis("ANTIFLOOD"):
                 _check_flood[event.chat_id] = {event.sender_id: count}
         else:
             _check_flood[event.chat_id] = {event.sender_id: count}
-        if await admin_check(event, silent=True) or event.sender.bot:
+        if await admin_check(event, silent=True) or getattr(event.sender, "bot", None):
             return
         if event.sender_id in DEVLIST:
             return
@@ -93,7 +93,7 @@ async def unmuting(e):
     admins_only=True,
 )
 async def setflood(e):
-    input_ = e.pattern_match.group(1)
+    input_ = e.pattern_match.group(1).strip()
     if not input_:
         return await e.eor("`What?`", time=5)
     if not input_.isdigit():

plugins/asstcmd.py

@@ -26,9 +26,9 @@ from telethon import events, utils
 from . import asst, get_string, mediainfo, ultroid_cmd
 
 
-@ultroid_cmd(pattern="addcmd ?(.*)")
+@ultroid_cmd(pattern="addcmd( (.*)|$)")
 async def ac(e):
-    wrd = (e.pattern_match.group(1)).lower()
+    wrd = (e.pattern_match.group(1).strip()).lower()
     wt = await e.get_reply_message()
     if not (wt and wrd):
         return await e.eor(get_string("asstcmd_1"), time=5)
@@ -72,9 +72,9 @@ async def ac(e):
     await e.eor(get_string("asstcmd_4").format(wrd))
 
 
-@ultroid_cmd(pattern="remcmd ?(.*)")
+@ultroid_cmd(pattern="remcmd( (.*)|$)")
 async def rc(e):
-    wrd = (e.pattern_match.group(1)).lower()
+    wrd = (e.pattern_match.group(1).strip()).lower()
     if not wrd:
         return await e.eor(get_string("asstcmd_2"), time=5)
     wrd = wrd.replace("/", "")

plugins/audiotools.py

@@ -23,8 +23,7 @@ import os
 import time
 from datetime import datetime as dt
 
-from pyUltroid.functions.tools import metadata
-from telethon.tl.types import DocumentAttributeAudio
+from pyUltroid.functions.tools import set_attributes
 
 from . import (
     bash,
@@ -50,30 +49,28 @@ async def vnc(e):
     if not mediainfo(r.media).startswith(("audio", "video")):
         return await eod(e, get_string("spcltool_1"))
     xxx = await e.eor(get_string("com_1"))
-    dl = r.file.name
-    c_time = time.time()
-    file = await downloader(
-        "resources/downloads/" + dl,
-        r.media.document,
-        xxx,
-        c_time,
-        "Downloading " + dl + "...",
+    file, _ = await e.client.fast_downloader(
+        r.document,
     )
     await xxx.edit(get_string("audiotools_2"))
     await bash(
         f"ffmpeg -i '{file.name}' -map 0:a -codec:a libopus -b:a 100k -vbr on out.opus"
     )
-    await e.client.send_message(
-        e.chat_id, file="out.opus", force_document=False, reply_to=r
-    )
+    try:
+        await e.client.send_message(
+            e.chat_id, file="out.opus", force_document=False, reply_to=r
+        )
+    except Exception as er:
+        LOGS.exception(er)
+        return await xxx.edit("`Failed to convert in Voice...`")
     await xxx.delete()
     os.remove(file.name)
     os.remove("out.opus")
 
 
-@ultroid_cmd(pattern="atrim ?(.*)")
+@ultroid_cmd(pattern="atrim( (.*)|$)")
 async def trim_aud(e):
-    sec = e.pattern_match.group(1)
+    sec = e.pattern_match.group(1).strip()
     if not sec or "-" not in sec:
         return await eod(e, get_string("audiotools_3"))
     a, b = sec.split("-")
@@ -103,7 +100,7 @@ async def trim_aud(e):
         diff = time_formatter((d_time - c_time) * 1000)
         file_name = (file.name).split("/")[-1]
         out = file_name.replace(file_name.split(".")[-1], "_trimmed.aac")
-        if int(b) > int(genss(file.name)):
+        if int(b) > int(await genss(file.name)):
             os.remove(file.name)
             return await eod(xxx, get_string("audiotools_6"))
         ss, dd = stdr(int(a)), stdr(int(b))
@@ -121,16 +118,7 @@ async def trim_aud(e):
             xxx,
             "Uploading " + out + "...",
         )
-        data = await metadata(out)
-        artist = data["performer"]
-        duration = data["duration"]
-        attributes = [
-            DocumentAttributeAudio(
-                duration=duration,
-                title=out.split(".")[0],
-                performer=vido.file.performer or artist,
-            )
-        ]
+        attributes = await set_attributes(out)
 
         caption = get_string("audiotools_7").format(ss, dd)
         await e.client.send_file(
@@ -167,18 +155,7 @@ async def ex_aud(e):
     cmd = f"ffmpeg -i {file.name} -vn -acodec copy {out_file}"
     o, err = await bash(cmd)
     os.remove(file.name)
-    data = await metadata(out_file)
-    artist = data["performer"]
-    duration = data["duration"]
-    attributes = [
-        DocumentAttributeAudio(
-            duration=reply.file.duration or duration,
-            title=reply.file.name.split(".")[0]
-            if reply.file.name
-            else "Extracted Audio",
-            performer=reply.file.performer or artist,
-        )
-    ]
+    attributes = await set_attributes(out_file)
 
     f_time = time.time()
     try:

plugins/autocorrect.py

@@ -9,12 +9,12 @@
 
 • `{i}autocorrect`
     To on/off Autocorrect Feature.
-
 """
 
 import string
 
-from . import HNDLR, eor, get_string, udB, ultroid_bot, ultroid_cmd  # ignore: pylint
+from . import udB  # ignore: pylint
+from . import HNDLR, get_string, ultroid_bot, ultroid_cmd
 
 try:
     from gingerit.gingerit import GingerIt
@@ -26,7 +26,7 @@ from telethon import events
 
 @ultroid_cmd(pattern="autocorrect", fullsudo=True)
 async def acc(e):
-    if Redis("AUTOCORRECT") != "True":
+    if udB.get_key("AUTOCORRECT"):
         udB.set_key("AUTOCORRECT", "True")
         ultroid_bot.add_handler(
             gramme, events.NewMessage(outgoing=True, func=lambda x: x.text)

plugins/autopic.py

@@ -24,9 +24,9 @@ from telethon.tl.functions.photos import UploadProfilePhotoRequest
 from . import LOGS, get_string, udB, ultroid_bot, ultroid_cmd
 
 
-@ultroid_cmd(pattern="autopic ?(.*)")
+@ultroid_cmd(pattern="autopic( (.*)|$)")
 async def autopic(e):
-    search = e.pattern_match.group(1)
+    search = e.pattern_match.group(1).strip()
     if udB.get_key("AUTOPIC") and not search:
         udB.del_key("AUTOPIC")
         return await e.eor(get_string("autopic_5"))

plugins/blacklist.py

@@ -30,9 +30,9 @@ from pyUltroid.dB.blacklist_db import (
 from . import events, get_string, udB, ultroid_bot, ultroid_cmd
 
 
-@ultroid_cmd(pattern="blacklist ?(.*)", admins_only=True)
+@ultroid_cmd(pattern="blacklist( (.*)|$)", admins_only=True)
 async def af(e):
-    wrd = e.pattern_match.group(1)
+    wrd = e.pattern_match.group(1).strip()
     chat = e.chat_id
     if not (wrd):
         return await e.eor(get_string("blk_1"), time=5)
@@ -44,9 +44,9 @@ async def af(e):
     await e.eor(get_string("blk_2").format(wrd))
 
 
-@ultroid_cmd(pattern="remblacklist ?(.*)", admins_only=True)
+@ultroid_cmd(pattern="remblacklist( (.*)|$)", admins_only=True)
 async def rf(e):
-    wrd = e.pattern_match.group(1)
+    wrd = e.pattern_match.group(1).strip()
     chat = e.chat_id
     if not wrd:
         return await e.eor(get_string("blk_3"), time=5)

plugins/bot.py

@@ -104,10 +104,10 @@ async def alive(event):
 
 
 @ultroid_cmd(
-    pattern="alive ?(.*)",
+    pattern="alive( (.*)|$)",
 )
 async def lol(ult):
-    match = ult.pattern_match.group(1)
+    match = ult.pattern_match.group(1).strip()
     inline = None
     if match in ["inline", "i"]:
         try:
@@ -119,6 +119,8 @@ async def lol(ult):
             LOGS.exception(er)
         inline = True
     pic = udB.get_key("ALIVE_PIC")
+    if isinstance(pic, list):
+        pic = choice(pic)
     uptime = time_formatter((time.time() - start_time) * 1000)
     header = udB.get_key("ALIVE_TEXT") or get_string("bot_1")
     y = Repo().active_branch
@@ -161,7 +163,7 @@ async def lol(ult):
                 link_preview=False,
                 buttons=buttons if inline else None,
             )
-            await ult.try_delete()
+            return await ult.try_delete()
         except ChatSendMediaForbiddenError:
             pass
         except BaseException as er:
@@ -212,6 +214,8 @@ heroku_api = Var.HEROKU_API
 async def restartbt(ult):
     ok = await ult.eor(get_string("bot_5"))
     call_back()
+    who = "bot" if ult.client._bot else "user"
+    udB.set_key("_RESTART", f"{who}_{ult.chat_id}_{ok.id}")
     if heroku_api:
         return await restart(ok)
     await bash("git pull && pip3 install -r requirements.txt")
@@ -230,11 +234,11 @@ async def shutdownbot(ult):
 
 
 @ultroid_cmd(
-    pattern="logs ?(.*)",
+    pattern="logs( (.*)|$)",
     chats=[],
 )
 async def _(event):
-    opt = event.pattern_match.group(1)
+    opt = event.pattern_match.group(1).strip()
     file = f"ultroid{sys.argv[-1]}.log" if len(sys.argv) > 1 else "ultroid.log"
     if opt == "heroku":
         await heroku_logs(event)
@@ -258,6 +262,8 @@ async def _(event):
 @in_pattern("alive", owner=True)
 async def inline_alive(ult):
     pic = udB.get_key("ALIVE_PIC")
+    if isinstance(pic, list):
+        pic = choice(pic)
     uptime = time_formatter((time.time() - start_time) * 1000)
     header = udB.get_key("ALIVE_TEXT") or get_string("bot_1")
     y = Repo().active_branch
@@ -310,11 +316,12 @@ async def inline_alive(ult):
     await ult.answer(result)
 
 
-@ultroid_cmd(pattern="update ?(.*)")
+@ultroid_cmd(pattern="update( (.*)|$)")
 async def _(e):
     xx = await e.eor(get_string("upd_1"))
-    if e.pattern_match.group(1) and (
-        "fast" in e.pattern_match.group(1) or "soft" in e.pattern_match.group(1)
+    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()

plugins/broadcast.py

@@ -26,16 +26,17 @@ import asyncio
 import io
 
 from pyUltroid.dB.broadcast_db import *
+from telethon.utils import get_display_name
 
 from . import HNDLR, LOGS, eor, get_string, udB, ultroid_bot, ultroid_cmd
 
 
 @ultroid_cmd(
-    pattern="addch ?(.*)",
+    pattern="addch( (.*)|$)",
     allow_sudo=False,
 )
 async def broadcast_adder(event):
-    msgg = event.pattern_match.group(1)
+    msgg = event.pattern_match.group(1).strip()
     x = await event.eor(get_string("bd_1"))
     if msgg == "all":
         await x.edit(get_string("bd_2"))
@@ -56,7 +57,7 @@ async def broadcast_adder(event):
                     cid = f"-100{i.id}"
                     add_channel(int(cid))
             except Exception as Ex:
-                LOGS.info(Ex)
+                LOGS.exception(Ex)
         await x.edit(get_string("bd_3").format(get_no_channels(), new))
         return
     if event.reply_to_msg_id:
@@ -73,7 +74,7 @@ async def broadcast_adder(event):
         await event.delete()
         return
     chat_id = event.chat_id
-    if int(chat_id) == int(udB.get_key("LOG_CHANNEL")):
+    if chat_id == udB.get_key("LOG_CHANNEL"):
         return
     if not is_channel_added(chat_id):
         xx = add_channel(chat_id)
@@ -81,20 +82,18 @@ async def broadcast_adder(event):
             await x.edit(get_string("bd_5"))
         else:
             await x.edit(get_string("sf_8"))
-        await asyncio.sleep(3)
-        await event.delete()
-    elif is_channel_added(chat_id):
+    else:
         await x.edit(get_string("bd_6"))
-        await asyncio.sleep(3)
-        await event.delete()
+    await asyncio.sleep(3)
+    await x.delete()
 
 
 @ultroid_cmd(
-    pattern="remch ?(.*)",
+    pattern="remch( (.*)|$)",
     allow_sudo=False,
 )
 async def broadcast_remover(event):
-    chat_id = event.pattern_match.group(1)
+    chat_id = event.pattern_match.group(1).strip() or event.chat_id
     x = await event.eor(get_string("com_1"))
     if chat_id == "all":
         await x.edit(get_string("bd_8"))
@@ -104,17 +103,10 @@ async def broadcast_remover(event):
     if is_channel_added(chat_id):
         rem_channel(chat_id)
         await x.edit(get_string("bd_7"))
-        await asyncio.sleep(3)
-        await x.delete()
-    elif is_channel_added(event.chat_id):
-        rem_channel(event.chat_id)
-        await x.edit(get_string("bd_7"))
-        await asyncio.sleep(3)
-        await x.delete()
-    elif not is_channel_added(event.chat_id):
+    else:
         await x.edit(get_string("bd_9"))
-        await asyncio.sleep(3)
-        await x.delete()
+    await asyncio.sleep(3)
+    await x.delete()
 
 
 @ultroid_cmd(
@@ -123,18 +115,18 @@ async def broadcast_remover(event):
 async def list_all(event):
     x = await event.eor(get_string("com_1"))
     channels = get_channels()
-    num = get_no_channels()
-    if num == 0:
+    num = len(channels)
+    if not channels:
         return await eor(x, "No chats were added.", time=5)
     msg = "Channels in database:\n"
     for channel in channels:
         name = ""
         try:
-            name = (await event.client.get_entity(int(channel))).title
-        except BaseException:
+            name = get_display_name(await event.client.get_entity(channel))
+        except ValueError:
             name = ""
         msg += f"=> **{name}** [`{channel}`]\n"
-    msg += f"\nTotal {get_no_channels()} channels."
+    msg += f"\nTotal {num} channels."
     if len(msg) > 4096:
         MSG = msg.replace("*", "").replace("`", "")
         with io.BytesIO(str.encode(MSG)) as out_file:
@@ -160,7 +152,7 @@ async def forw(event):
     ultroid_bot = event.client
     channels = get_channels()
     x = await event.eor("Sending...")
-    if get_no_channels() == 0:
+    if not channels:
         return await x.edit(f"Please add channels by using `{HNDLR}add` in them.")
     error_count = 0
     sent_count = 0
@@ -169,7 +161,7 @@ async def forw(event):
     error_count = 0
     for channel in channels:
         try:
-            await ultroid_bot.forward_messages(int(channel), previous_message)
+            await ultroid_bot.forward_messages(channel, previous_message)
             sent_count += 1
             await x.edit(
                 f"Sent : {sent_count}\nError : {error_count}\nTotal : {len(channels)}",
@@ -194,7 +186,7 @@ async def forw(event):
 
 
 @ultroid_cmd(
-    pattern="broadcast ?(.*)",
+    pattern="broadcast( (.*)|$)",
     allow_sudo=False,
 )
 async def sending(event):
@@ -202,7 +194,7 @@ async def sending(event):
     if not event.is_reply:
         return await x.edit(get_string("ex_1"))
     channels = get_channels()
-    if get_no_channels() == 0:
+    if not channels:
         return await x.edit(f"Please add channels by using `{HNDLR}add` in them.")
     await x.edit("Sending....")
     if event.reply_to_msg_id:
@@ -214,7 +206,7 @@ async def sending(event):
             sent_count = 0
             for channel in channels:
                 try:
-                    await ultroid_bot.send_message(int(channel), previous_message)
+                    await ultroid_bot.send_message(channel, previous_message)
                     sent_count += 1
                     await x.edit(
                         f"Sent : {sent_count}\nError : {error_count}\nTotal : {len(channels)}",
@@ -222,7 +214,7 @@ async def sending(event):
                 except Exception as error:
 
                     await ultroid_bot.send_message(
-                        int(udB.get_key("LOG_CHANNEL")),
+                        udB.get_key("LOG_CHANNEL"),
                         f"Error in sending at {channel}.\n\n{error}",
                     )
                     error_count += 1

plugins/carbon.py

@@ -202,10 +202,10 @@ async def crbn(event):
 
 
 @ultroid_cmd(
-    pattern="ccarbon ?(.*)",
+    pattern="ccarbon( (.*)|$)",
 )
 async def crbn(event):
-    match = event.pattern_match.group(1)
+    match = event.pattern_match.group(1).strip()
     if not match:
         return await event.eor(get_string("carbon_3"))
     msg = await event.eor(get_string("com_1"))

plugins/channelhacks.py

@@ -79,7 +79,7 @@ async def autopost_func(e):
 
 @ultroid_cmd(pattern="shift (.*)")
 async def _(e):
-    x = e.pattern_match.group(1)
+    x = e.pattern_match.group(1).strip()
     z = await e.eor(get_string("com_1"))
     a, b = x.split("|")
     try:
@@ -107,7 +107,7 @@ async def _(e):
 
 @ultroid_cmd(pattern="asource (.*)")
 async def source(e):
-    x = e.pattern_match.group(1)
+    x = e.pattern_match.group(1).strip()
     if not x:
         y = e.chat_id
     else:
@@ -124,9 +124,9 @@ async def source(e):
         await e.eor(get_string("cha_3"))
 
 
-@ultroid_cmd(pattern="dsource ?(.*)")
+@ultroid_cmd(pattern="dsource( (.*)|$)")
 async def dd(event):
-    chat_id = event.pattern_match.group(1)
+    chat_id = event.pattern_match.group(1).strip()
     x = await event.eor(get_string("com_1"))
     if chat_id == "all":
         await x.edit(get_string("bd_8"))
@@ -135,7 +135,7 @@ async def dd(event):
         return
     if chat_id:
         try:
-            y = await e.client.parse_id(chat_id)
+            y = await event.client.parse_id(chat_id)
         except Exception as er:
             LOGS.exception(er)
             return
@@ -186,7 +186,7 @@ async def list_all(event):
 
 @ultroid_cmd(pattern="adest (.*)")
 async def destination(e):
-    x = e.pattern_match.group(1)
+    x = e.pattern_match.group(1).strip()
     if x:
         try:
             y = await e.client.parse_id(x)
@@ -202,9 +202,9 @@ async def destination(e):
         await e.eor("Destination channel already added")
 
 
-@ultroid_cmd(pattern="ddest ?(.*)")
+@ultroid_cmd(pattern="ddest( (.*)|$)")
 async def dd(event):
-    chat_id = event.pattern_match.group(1)
+    chat_id = event.pattern_match.group(1).strip()
     x = await event.eor(get_string("com_1"))
     if chat_id == "all":
         await x.edit(get_string("bd_8"))

plugins/chats.py

@@ -56,7 +56,7 @@ from telethon.tl.types import (
     UserStatusRecently,
 )
 
-from . import HNDLR, LOGS, asst, get_string, mediainfo, os, types, udB, ultroid_cmd
+from . import HNDLR, LOGS, asst, con, get_string, mediainfo, os, types, udB, ultroid_cmd
 
 
 @ultroid_cmd(
@@ -116,7 +116,7 @@ async def _(e):
     pattern="create (b|g|c)(?: |$)(.*)",
 )
 async def _(e):
-    type_of_group = e.pattern_match.group(1)
+    type_of_group = e.pattern_match.group(1).strip()
     group_name = e.pattern_match.group(2)
     username = None
     if " ; " in group_name:
@@ -178,12 +178,12 @@ async def _(e):
 
 
 @ultroid_cmd(
-    pattern="setgpic ?(.*)", admins_only=True, manager=True, require="change_info"
+    pattern="setgpic( (.*)|$)", admins_only=True, manager=True, require="change_info"
 )
 async def _(ult):
     if not ult.is_reply:
         return await ult.eor("`Reply to a Media..`", time=5)
-    match = ult.pattern_match.group(1)
+    match = ult.pattern_match.group(1).strip()
     if not ult.client._bot and match:
         try:
             chat = await ult.client.parse_id(match)
@@ -191,13 +191,21 @@ async def _(ult):
             return await ult.eor(str(ok))
     else:
         chat = ult.chat_id
-    reply_message = await ult.get_reply_message()
-    if reply_message.media:
-        replfile = await reply_message.download_media()
+    reply = await ult.get_reply_message()
+    if reply.photo or reply.sticker or reply.video:
+        replfile = await reply.download_media()
+    elif reply.document and reply.document.thumbs:
+        replfile = await reply.download_media(thumb=-1)
     else:
         return await ult.eor("Reply to a Photo or Video..")
+    mediain = mediainfo(reply.media)
+    if "animated" in mediain:
+        replfile = await con.convert(replfile, convert_to="mp4")
+    else:
+        replfile = await con.convert(
+            replfile, outname="chatphoto", allowed_formats=["jpg", "png", "mp4"]
+        )
     file = await ult.client.upload_file(replfile)
-    mediain = mediainfo(reply_message.media)
     try:
         if "pic" not in mediain:
             file = types.InputChatUploadedPhoto(video=file)
@@ -209,10 +217,10 @@ async def _(ult):
 
 
 @ultroid_cmd(
-    pattern="delgpic ?(.*)", admins_only=True, manager=True, require="change_info"
+    pattern="delgpic( (.*)|$)", admins_only=True, manager=True, require="change_info"
 )
 async def _(ult):
-    match = ult.pattern_match.group(1)
+    match = ult.pattern_match.group(1).strip()
     chat = ult.chat_id
     if not ult.client._bot and match:
         chat = match
@@ -245,14 +253,14 @@ async def _(event):
 
 
 @ultroid_cmd(
-    pattern="rmusers ?(.*)",
+    pattern="rmusers( (.*)|$)",
     groups_only=True,
     admins_only=True,
     fullsudo=True,
 )
 async def _(event):
     xx = await event.eor(get_string("com_1"))
-    input_str = event.pattern_match.group(1)
+    input_str = event.pattern_match.group(1).strip()
     p, a, b, c, d, m, n, y, w, o, q, r = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     async for i in event.client.iter_participants(event.chat_id):
         p += 1  # Total Count

plugins/compressor.py

@@ -41,9 +41,9 @@ from . import (
 )
 
 
-@ultroid_cmd(pattern="compress ?(.*)")
+@ultroid_cmd(pattern="compress( (.*)|$)")
 async def _(e):
-    cr = e.pattern_match.group(1)
+    cr = e.pattern_match.group(1).strip()
     crf = 27
     to_stream = False
     if cr:
@@ -88,7 +88,7 @@ async def _(e):
         with open(progress, "w") as fk:
             pass
         proce = await asyncio.create_subprocess_shell(
-            f'ffmpeg -hide_banner -loglevel quiet -progress {progress} -i """{file.name}""" -preset ultrafast -vcodec libx265 -crf {crf} """{out}""" -y',
+            f'ffmpeg -hide_banner -loglevel quiet -progress {progress} -i """{file.name}""" -preset ultrafast -vcodec libx265 -crf {crf} -c:a copy """{out}""" -y',
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
         )

plugins/converter.py

@@ -7,11 +7,8 @@
 """
 ✘ Commands Available -
 
-• `{i}mtoi <reply to media>`
-    Media to image conversion
-
-• `{i}mtos <reply to media>`
-    Convert media to sticker.
+• `{i}convert <gif/img/sticker/webm>`
+    Reply to media to convert it into gif / image / webm / normal sticker.
 
 • `{i}doc <filename.ext>`
     Reply to a text msg to save it in a file.
@@ -43,7 +40,7 @@ except ImportError:
 
 from telegraph import upload_file as uf
 
-from . import bash, downloader, get_paste, get_string, udB, ultroid_cmd, uploader
+from . import bash, con, downloader, get_paste, get_string, udB, ultroid_cmd, uploader
 
 opn = []
 
@@ -68,14 +65,14 @@ async def _(e):
 
 
 @ultroid_cmd(
-    pattern="rename ?(.*)",
+    pattern="rename( (.*)|$)",
 )
 async def imak(event):
     reply = await event.get_reply_message()
     t = time.time()
     if not reply:
         return await event.eor(get_string("cvt_1"))
-    inp = event.pattern_match.group(1)
+    inp = event.pattern_match.group(1).strip()
     if not inp:
         return await event.eor(get_string("cvt_2"))
     xx = await event.eor(get_string("com_1"))
@@ -95,7 +92,7 @@ async def imak(event):
             file = await event.client.download_media(reply.media)
     if os.path.exists(inp):
         os.remove(inp)
-    await bash(f"""ffmpeg -i "{file}" "{inp}" -y""")
+    await bash(f'mv """{file}""" """{inp}"""')
     if not os.path.exists(inp) or os.path.exists(inp) and not os.path.getsize(inp):
         os.rename(file, inp)
     k = time.time()
@@ -110,61 +107,46 @@ async def imak(event):
     await xx.delete()
 
 
-@ultroid_cmd(
-    pattern="mtoi$",
-)
-async def imak(event):
-    reply = await event.get_reply_message()
-    if not (reply and (reply.media)):
-        await event.eor(get_string("cvt_3"))
-        return
-    xx = await event.eor(get_string("com_1"))
-    image = await reply.download_media()
-    file = "ult.png"
-    if image.endswith((".webp", ".png")):
-        c = Image.open(image)
-        c.save(file)
-    elif image.endswith(".tgs"):
-        await bash(f"lottie_convert.py '{image}' {file}")
-    else:
-        img = cv2.VideoCapture(image)
-        ult, roid = img.read()
-        cv2.imwrite(file, roid)
-    await event.reply(file=file)
-    await xx.delete()
-    os.remove(file)
-    os.remove(image)
+conv_keys = {
+    "img": "png",
+    "sticker": "webp",
+    "webp": "webp",
+    "image": "png",
+    "webm": "webm",
+    "gif": "gif",
+}
 
 
 @ultroid_cmd(
-    pattern="mtos$",
+    pattern="convert( (.*)|$)",
 )
-async def smak(event):
-    reply = await event.get_reply_message()
-    if not (reply and (reply.media)):
-        await event.eor(get_string("cvt_3"))
-        return
+async def uconverter(event):
     xx = await event.eor(get_string("com_1"))
-    image = await reply.download_media()
-    file = "ult.webp"
-    if image.endswith((".webp", ".png", ".jpg")):
-        c = Image.open(image)
-        c.save(file)
-    else:
-        img = cv2.VideoCapture(image)
-        ult, roid = img.read()
-        cv2.imwrite(file, roid)
-    await event.reply(file=file)
+    a = await event.get_reply_message()
+    input_ = event.pattern_match.group(1).strip()
+    b = await a.download_media("resources/downloads/")
+    if not b and (a.document and a.document.thumbs):
+        b = await a.download_media(thumb=-1)
+    if not b:
+        return await xx.edit(get_string("cvt_3"))
+    try:
+        convert = conv_keys[input_]
+    except KeyError:
+        return await xx.edit(get_string("sts_3").format("gif/img/sticker/webm"))
+    file = await con.convert(b, outname="ultroid", convert_to=convert)
+    if file:
+        await event.client.send_file(
+            event.chat_id, file, reply_to=event.reply_to_msg_id or event.id
+        )
+        os.remove(file)
     await xx.delete()
-    os.remove(file)
-    os.remove(image)
 
 
 @ultroid_cmd(
-    pattern="doc ?(.*)",
+    pattern="doc( (.*)|$)",
 )
 async def _(event):
-    input_str = event.pattern_match.group(1)
+    input_str = event.pattern_match.group(1).strip()
     if not (input_str and event.is_reply):
         return await event.eor(get_string("cvt_1"), time=5)
     xx = await event.eor(get_string("com_1"))
@@ -180,11 +162,11 @@ async def _(event):
 
 
 @ultroid_cmd(
-    pattern="open ?(.*)",
+    pattern="open( (.*)|$)",
 )
 async def _(event):
     a = await event.get_reply_message()
-    b = event.pattern_match.group(1)
+    b = event.pattern_match.group(1).strip()
     if not ((a and a.media) or (b and os.path.exists(b))):
         return await event.eor(get_string("cvt_7"), time=5)
     xx = await event.eor(get_string("com_1"))

plugins/core.py

@@ -24,15 +24,19 @@
 • `{i}help <plugin name>`
     Shows you a help menu (like this) for every plugin.
 
+• `{i}pick addons`
+  `{i}pick vcbot`
+    Instantly load 'Addons' or 'VcBot'.
+
 • `{i}getaddons <raw link to code>`
     Load Plugins from the given raw link.
 """
 
 import os
 
-from pyUltroid.startup.loader import load_addons
+from pyUltroid.startup.loader import Loader, load_addons
 
-from . import eod, get_string, requests, safeinstall, ultroid_cmd, un_plug
+from . import async_searcher, eod, get_string, safeinstall, udB, ultroid_cmd, un_plug
 
 
 @ultroid_cmd(pattern="install", fullsudo=True)
@@ -41,10 +45,10 @@ async def install(event):
 
 
 @ultroid_cmd(
-    pattern=r"unload ?(.*)",
+    pattern=r"unload( (.*)|$)",
 )
 async def unload(event):
-    shortname = event.pattern_match.group(1)
+    shortname = event.pattern_match.group(1).strip()
     if not shortname:
         await event.eor(get_string("core_9"))
         return
@@ -64,10 +68,10 @@ async def unload(event):
 
 
 @ultroid_cmd(
-    pattern=r"uninstall ?(.*)",
+    pattern=r"uninstall( (.*)|$)",
 )
 async def uninstall(event):
-    shortname = event.pattern_match.group(1)
+    shortname = event.pattern_match.group(1).strip()
     if not shortname:
         await event.eor(get_string("core_13"))
         return
@@ -88,11 +92,11 @@ async def uninstall(event):
 
 
 @ultroid_cmd(
-    pattern=r"load ?(.*)",
+    pattern=r"load( (.*)|$)",
     fullsudo=True,
 )
 async def load(event):
-    shortname = event.pattern_match.group(1)
+    shortname = event.pattern_match.group(1).strip()
     if not shortname:
         await event.eor(get_string("core_16"))
         return
@@ -111,9 +115,30 @@ async def load(event):
         )
 
 
-@ultroid_cmd(pattern="getaddons ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="pick( (.*)|$)", fullsudo=True)
+async def pickup_call(ult):
+    match_ = ult.pattern_match.group(1).strip()
+    match = match_.lower()
+    proc = await ult.eor(get_string("com_1"))
+    if match == "addons":
+        if udB.get_key("ADDONS"):
+            return await proc.eor("`Addons are Already Enabled!`", time=8)
+        udB.set_key("ADDONS", True)
+        Loader(path="addons", key="Addons").load(func=load_addons)
+    elif match == "vcbot":
+        if udB.get_key("VCBOT"):
+            return await proc.eor("`VcBot is Already Active!`", time=8)
+        Loader(path="vcbot", key="VCBot").load()
+    else:
+        return await proc.eor(
+            "`Found Nothing to pick!\nSpecify what to pick..`", time=8
+        )
+    await proc.eor(f"`Successfully Activated {match_}`", time=8)
+
+
+@ultroid_cmd(pattern="getaddons( (.*)|$)", fullsudo=True)
 async def get_the_addons_lol(event):
-    thelink = event.pattern_match.group(1)
+    thelink = event.pattern_match.group(1).strip()
     xx = await event.eor(get_string("com_1"))
     fool = get_string("gas_1")
     if thelink is None:
@@ -121,8 +146,8 @@ async def get_the_addons_lol(event):
     split_thelink = thelink.split("/")
     if "raw" not in thelink:
         return await xx.eor(fool, time=10)
-    name_of_it = split_thelink[(len(split_thelink) - 1)]
-    plug = requests.get(thelink).text
+    name_of_it = split_thelink[-1]
+    plug = await async_searcher(thelink)
     fil = f"addons/{name_of_it}"
     await xx.edit("Packing the codes...")
     with open(fil, "w", encoding="utf-8") as uult:

plugins/database.py

@@ -27,9 +27,9 @@ import re
 from . import Redis, eor, get_string, udB, ultroid_cmd
 
 
-@ultroid_cmd(pattern="setdb ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="setdb( (.*)|$)", fullsudo=True)
 async def _(ult):
-    match = ult.pattern_match.group(1)
+    match = ult.pattern_match.group(1).strip()
     if not match:
         return await ult.eor("Provide key and value to set!")
     try:
@@ -50,9 +50,9 @@ async def _(ult):
         await ult.eor(get_string("com_7"))
 
 
-@ultroid_cmd(pattern="deldb ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="deldb( (.*)|$)", fullsudo=True)
 async def _(ult):
-    key = ult.pattern_match.group(1)
+    key = ult.pattern_match.group(1).strip()
     if not key:
         return await ult.eor("Give me a key name to delete!", time=5)
     _ = key.split(maxsplit=1)
@@ -70,9 +70,9 @@ async def _(ult):
         await ult.eor(get_string("com_7"))
 
 
-@ultroid_cmd(pattern="rendb ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="rendb( (.*)|$)", fullsudo=True)
 async def _(ult):
-    match = ult.pattern_match.group(1)
+    match = ult.pattern_match.group(1).strip()
     if not match:
         return await ult.eor("`Provide Keys name to rename..`")
     delim = " " if re.search("[|]", match) is None else " | "

plugins/devtools.py

@@ -26,6 +26,7 @@
 • `{i}sysinfo`
     Shows System Info.
 """
+from __future__ import print_function
 
 import sys
 import traceback
@@ -68,16 +69,18 @@ async def _(event):
     reply_to_id = event.reply_to_msg_id or event.id
     stdout, stderr = await bash(cmd)
     OUT = f"**☞ BASH\n\n• COMMAND:**\n`{cmd}` \n\n"
+    err, out = "", ""
     if stderr:
-        OUT += f"**• ERROR:** \n`{stderr}`\n\n"
+        err = f"**• ERROR:** \n`{stderr}`\n\n"
     if stdout:
         _o = stdout.split("\n")
         o = "\n".join(_o)
-        OUT += f"**• OUTPUT:**\n`{o}`"
+        out = f"**• OUTPUT:**\n`{o}`"
     if not stderr and not stdout:
-        OUT += "**• OUTPUT:**\n`Success`"
+        out = "**• OUTPUT:**\n`Success`"
+    OUT += err + out
     if len(OUT) > 4096:
-        ultd = OUT.replace("`", "").replace("**", "").replace("__", "")
+        ultd = err + out
         with BytesIO(str.encode(ultd)) as out_file:
             out_file.name = "bash.txt"
             await event.client.send_file(
@@ -98,12 +101,10 @@ async def _(event):
 pp = pprint  # ignore: pylint
 bot = ultroid = ultroid_bot
 
-_ignore_eval = []
-
 
-def _parse_eval(value):
-    if value is None:
-        return
+def _parse_eval(value=None):
+    if not value:
+        return value
     if hasattr(value, "stringify"):
         try:
             return value.stringify()
@@ -114,10 +115,12 @@ def _parse_eval(value):
             return json_parser(value, indent=1)
         except BaseException:
             pass
-    # is to_dict is also Good option to format?
     return str(value)
 
 
+_ignore_eval = []
+
+
 @ultroid_cmd(pattern="eval", fullsudo=True, only_devs=True)
 async def _(event):
     try:
@@ -146,7 +149,7 @@ async def _(event):
         except BaseException:
             # Consider it as Code Error, and move on to be shown ahead.
             pass
-    reply_to_id = event.reply_to_msg_id or event.id
+    reply_to_id = event.reply_to_msg_id or event
     if any(item in cmd for item in KEEP_SAFE().All) and (
         not (event.out or event.sender_id == ultroid_bot.uid)
     ):
@@ -196,8 +199,8 @@ async def _(event):
         )
     )
     if len(final_output) > 4096:
-        ultd = final_output.replace("`", "").replace("**", "").replace("__", "")
-        with BytesIO(str.encode(ultd)) as out_file:
+        final_output = evaluation
+        with BytesIO(str.encode(final_output)) as out_file:
             out_file.name = "eval.txt"
             await event.client.send_file(
                 event.chat_id,
@@ -212,20 +215,20 @@ async def _(event):
     await xx.edit(final_output)
 
 
-def _stringified(text, *args, **kwargs):
-    text = _parse_eval(text)
-    print(text, *args, **kwargs)
+def _stringify(text=None, *args, **kwargs):
+    if text:
+        text = _parse_eval(text)
+    return print(text, *args, **kwargs)
 
 
 async def aexec(code, event):
     exec(
         (
-            (
-                ("async def __aexec(e, client): " + "\n message = event = e")
-                + "\n reply = await event.get_reply_message()"
-            )
+            "async def __aexec(e, client): "
+            + "\n print = p = _stringify"
+            + "\n message = event = e"
+            + "\n reply = await event.get_reply_message()"
             + "\n chat = event.chat_id"
-            + "\n print = p = _stringified"
         )
         + "".join(f"\n {l}" for l in code.split("\n"))
     )

plugins/dnd.py

@@ -0,0 +1,59 @@
+# 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
+
+Do Not Disturb - As it says, activating this in your group will kick new users who joins the group.
+
+• `{i}dnd`
+    To activate.
+
+• `{i}deldnd`
+    To deactivate.
+"""
+
+
+from pyUltroid.dB.dnd_db import add_dnd, chat_in_dnd, del_dnd, get_dnd_chats
+from telethon import events
+
+from . import LOGS, asst, ultroid_bot, ultroid_cmd
+
+
+async def dnd_func(event):
+    if event.chat_id in get_dnd_chats():
+        for user in event.users:
+            try:
+                await (
+                    await event.client.kick_participant(event.chat_id, user)
+                ).delete()
+            except Exception as ex:
+                LOGS.error("Error in DND:")
+                LOGS.exception(ex)
+        await event.delete()
+
+
+@ultroid_cmd(pattern="dnd$", manager=True, admins_only=True, groups_only=True)
+async def _(event):
+    if chat_in_dnd(event.chat_id):
+        return await event.eor("`Chat already in do not disturb mode.`", time=3)
+    add_dnd(event.chat_id)
+    event.client.add_handler(dnd_func, events.ChatAction(func=lambda x: x.user_joined))
+    await event.eor("`Do not disturb mode activated for this chat.`", time=3)
+
+
+@ultroid_cmd(pattern="deldnd$", manager=True, admins_only=True, groups_only=True)
+async def _(event):
+    if not chat_in_dnd(event.chat_id):
+        return await event.eor("`Chat is not in do not disturb mode.`", time=3)
+    del_dnd(event.chat_id)
+    await event.eor("`Do not disturb mode deactivated for this chat.`", time=3)
+
+
+if get_dnd_chats():
+    ultroid_bot.add_handler(dnd_func, events.ChatAction(func=lambda x: x.user_joined))
+    asst.add_handler(dnd_func, events.ChatAction(func=lambda x: x.user_joined))

plugins/downloadupload.py

@@ -4,15 +4,16 @@
 # 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}ul <path/to/file>`
-    Upload file to telegram chat.
-    You Can Upload Folders too.
-
-• `{i}ul <path/to/file> (| stream)`
-    Upload files as stream.
+    Upload files on telegram.
+    Use following arguments before or after filename as per requirement:
+      `--stream` to upload as stream.
+      `--delete` to delete file after uploading.
+      `--no-thumb` to upload without thumbnail.
 
 • `{i}dl <filename(optional)>`
     Reply to file to download.
@@ -20,16 +21,16 @@
 • `{i}download <DDL> (| filename)`
     Download using DDL. Will autogenerate filename if not given.
 """
+
 import asyncio
-import glob
 import os
 import time
 from datetime import datetime as dt
 
 from aiohttp.client_exceptions import InvalidURL
-from pyUltroid.functions.tools import metadata
+from pyUltroid.functions.helper import time_formatter
+from pyUltroid.functions.tools import set_attributes
 from telethon.errors.rpcerrorlist import MessageNotModifiedError
-from telethon.tl.types import DocumentAttributeAudio, DocumentAttributeVideo
 
 from . import (
     LOGS,
@@ -37,19 +38,17 @@ from . import (
     eor,
     fast_download,
     get_string,
-    humanbytes,
     progress,
     time_formatter,
     ultroid_cmd,
-    uploader,
 )
 
 
 @ultroid_cmd(
-    pattern="download ?(.*)",
+    pattern="download( (.*)|$)",
 )
 async def down(event):
-    matched = event.pattern_match.group(1)
+    matched = event.pattern_match.group(1).strip()
     msg = await event.eor(get_string("udl_4"))
     if not matched:
         return await eor(msg, get_string("udl_5"), time=5)
@@ -80,11 +79,11 @@ async def down(event):
 
 
 @ultroid_cmd(
-    pattern="dl ?(.*)",
+    pattern="dl( (.*)|$)",
 )
 async def download(event):
     if not event.reply_to_msg_id:
-        return await event.eor(get_string("cvt_3"))
+        return await event.eor(get_string("cvt_3"), time=8)
     xx = await event.eor(get_string("com_1"))
     s = dt.now()
     k = time.time()
@@ -95,7 +94,7 @@ async def download(event):
         if hasattr(ok.media, "document"):
             file = ok.media.document
             mime_type = file.mime_type
-            filename = event.pattern_match.group(1) or ok.file.name
+            filename = event.pattern_match.group(1).strip() or ok.file.name
             if not filename:
                 if "audio" in mime_type:
                     filename = "audio_" + dt.now().isoformat("_", "seconds") + ".ogg"
@@ -133,178 +132,88 @@ async def download(event):
 
 
 @ultroid_cmd(
-    pattern="ul ?(.*)",
+    pattern="ul( (.*)|$)",
 )
-async def download(event):
-    if event.text[1:].startswith("ultroid"):
-        return
-    xx = await event.eor(get_string("com_1"))
-    hmm = event.pattern_match.group(1)
-    try:
-        kk = hmm.split(" | stream")[0]
-    except BaseException:
-        pass
-    try:
-        title = kk.split("/")[-1]
-    except BaseException:
-        title = hmm
-    s = dt.now()
-    tt = time.time()
-    ko = kk
-    if not kk:
-        return await xx.eor(get_string("udl_3"), time=5)
-    if kk == ".env" or ".session" in kk:
-        return await eod(xx, get_string("udl_7"), time=5)
-    if not os.path.exists(kk):
-        try:
-            await event.client.send_file(
-                event.chat_id, file=kk, reply_to=event.reply_to_msg_id
-            )
-            await xx.try_delete()
+async def _(event):
+    if len(event.text) >= 8:
+        if "ultroid" in event.text[:7]:
             return
+    msg = await event.eor(get_string("com_1"))
+    match = event.pattern_match.group(1)
+    if match:
+        match = match.strip()
+    stream, force_doc, delete, thumb = (
+        False,
+        True,
+        False,
+        "resources/extras/ultroid.jpg",
+    )
+    if "--stream" in match:
+        stream = True
+        force_doc = False
+    if "--delete" in match:
+        delete = True
+    if "--no-thumb" in match:
+        thumb = None
+    arguments = ["--stream", "--delete", "--no-thumb"]
+    if any(item in match for item in arguments):
+        match = (
+            match.replace("--stream", "")
+            .replace("--delete", "")
+            .replace("--no-thumb", "")
+            .strip()
+        )
+    if not os.path.exists(match):
+        try:
+            await event.reply(file=match)
+            await event.try_delete()
         except Exception as er:
             LOGS.exception(er)
-            return await xx.eor("File doesn't exists or path is incorrect!", time=5)
-    if os.path.isdir(kk):
-        if not os.listdir(kk):
-            return await xx.eor(get_string("udl_6"), time=5)
-        ok = glob.glob(f"{kk}/*")
-        kk = [*sorted(ok)]
-        for kk in kk:
-            tt = time.time()
-            try:
+        return await msg.eor("`File doesn't exist or path is incorrect!`")
+    if os.path.isdir(match):
+        c, s = 0, 0
+        for files in sorted(os.listdir(match)):
+            attributes = None
+            if stream:
                 try:
-                    res = await uploader(kk, kk, tt, xx, f"Uploading {kk}...")
-                except MessageNotModifiedError as err:
-                    return await xx.edit(str(err))
-                title = kk.split("/")[-1]
-                if " | stream" in hmm:
-                    data = await metadata(res.name)
-                    wi = data["width"]
-                    hi = data["height"]
-                    duration = data["duration"]
-                    artist = data["performer"]
-                    if res.name.endswith((".mkv", ".mp4", ".avi", "webm")):
-                        attributes = [
-                            DocumentAttributeVideo(
-                                w=wi, h=hi, duration=duration, supports_streaming=True
-                            )
-                        ]
-                    elif res.name.endswith((".mp3", ".m4a", ".opus", ".ogg", ".flac")):
-                        attributes = [
-                            DocumentAttributeAudio(
-                                duration=duration,
-                                title=".".join(title.split(".")[:-1]),
-                                performer=artist,
-                            )
-                        ]
-
-                    else:
-                        attributes = []
-                    try:
-                        await event.client.send_file(
-                            event.chat_id,
-                            res,
-                            caption=f"`{title}`",
-                            reply_to=event.reply_to_msg_id,
-                            attributes=attributes,
-                            supports_streaming=True,
-                            thumb="resources/extras/ultroid.jpg",
-                        )
-                    except BaseException as er:
-                        LOGS.exception(er)
-                        await event.client.send_file(
-                            event.chat_id,
-                            res,
-                            caption=f"`{title}`",
-                            reply_to=event.reply_to_msg_id,
-                            thumb="resources/extras/ultroid.jpg",
-                        )
-                else:
-                    await event.client.send_file(
-                        event.chat_id,
-                        res,
-                        caption=f"`{title}`",
-                        reply_to=event.reply_to_msg_id,
-                        force_document=True,
-                        thumb="resources/extras/ultroid.jpg",
-                    )
-            except Exception as ve:
-                return await xx.eor(str(ve))
-    else:
-        try:
-            try:
-                res = await uploader(kk, kk, tt, xx, f"Uploading {kk}...")
-            except MessageNotModifiedError as err:
-                return await xx.edit(str(err))
-            if title.endswith((".mp3", ".m4a", ".opus", ".ogg", ".flac")):
-                hmm = " | stream"
-            if " | stream" in hmm:
-                data = await metadata(res.name)
-                wi = data["width"]
-                hi = data["height"]
-                duration = data["duration"]
-                artist = data["performer"]
-                if res.name.endswith((".mkv", ".mp4", ".avi", "webm")):
-                    attributes = [
-                        DocumentAttributeVideo(
-                            w=wi, h=hi, duration=duration, supports_streaming=True
-                        )
-                    ]
-                elif res.name.endswith((".mp3", ".m4a", ".opus", ".ogg", ".flac")):
-                    attributes = [
-                        DocumentAttributeAudio(
-                            duration=duration,
-                            title=title.split(".")[0],
-                            performer=artist,
-                        )
-                    ]
-                else:
-                    attributes = None
-                try:
-                    await event.client.send_file(
-                        event.chat_id,
-                        res,
-                        caption=f"`{title}`",
-                        attributes=attributes,
-                        reply_to=event.reply_to_msg_id,
-                        supports_streaming=True,
-                        thumb="resources/extras/ultroid.jpg",
-                    )
-                except BaseException as er:
+                    attributes = await set_attributes(files)
+                except KeyError as er:
                     LOGS.exception(er)
-                    await event.client.send_file(
-                        event.chat_id,
-                        res,
-                        caption=f"`{title}`",
-                        reply_to=event.reply_to_msg_id,
-                        force_document=True,
-                        thumb="resources/extras/ultroid.jpg",
-                    )
-            else:
+            try:
+                file, _ = await event.client.fast_uploader(
+                    match + "/" + files, show_progress=True, event=msg, to_delete=delete
+                )
                 await event.client.send_file(
                     event.chat_id,
-                    res,
-                    caption=f"`{title}`",
-                    reply_to=event.reply_to_msg_id,
-                    force_document=True,
-                    thumb="resources/extras/ultroid.jpg",
+                    file,
+                    supports_streaming=stream,
+                    force_document=force_doc,
+                    thumb=thumb,
+                    attributes=attributes,
+                    caption=f"`Uploaded` `{match}/{files}` `in {time_formatter(_*1000)}`",
+                    reply_to=event.reply_to_msg_id or event,
                 )
-        except Exception as ve:
-            return await xx.eor(str(ve))
-    e = dt.now()
-    t = time_formatter(((e - s).seconds) * 1000)
-    if os.path.isdir(ko):
-        size = 0
-        for path, dirs, files in os.walk(ko):
-            for f in files:
-                fp = os.path.join(path, f)
-                size += os.path.getsize(fp)
-        c = len(os.listdir(ko))
-        await xx.delete()
-        await event.client.send_message(
-            event.chat_id,
-            f"Uploaded `{ko}` Folder, Total - `{c}` files of `{humanbytes(size)}` in `{t}`",
-        )
-    else:
-        await xx.eor(f"Uploaded `{ko}` in `{t}`")
+                s += 1
+            except (ValueError, IsADirectoryError):
+                c += 1
+        return await msg.eor(f"`Uploaded {s} files, failed to upload {c}.`")
+    attributes = None
+    if stream:
+        try:
+            attributes = await set_attributes(match)
+        except KeyError as er:
+            LOGS.exception(er)
+    file, _ = await event.client.fast_uploader(
+        match, show_progress=True, event=msg, to_delete=delete
+    )
+    await event.client.send_file(
+        event.chat_id,
+        file,
+        supports_streaming=stream,
+        force_document=force_doc,
+        thumb=thumb,
+        attributes=attributes,
+        caption=f"`Uploaded` `{match}` `in {time_formatter(_*1000)}`",
+        reply_to=event.reply_to_msg_id or event,
+    )
+    await msg.try_delete()

plugins/echo.py

@@ -23,7 +23,7 @@ from telethon.utils import get_display_name
 from . import LOGS, events, ultroid_bot, ultroid_cmd
 
 
-@ultroid_cmd(pattern="addecho ?(.*)")
+@ultroid_cmd(pattern="addecho( (.*)|$)")
 async def echo(e):
     r = await e.get_reply_message()
     if r:
@@ -46,7 +46,7 @@ async def echo(e):
     await e.eor(f"Activated Echo For {user}.")
 
 
-@ultroid_cmd(pattern="remecho ?(.*)")
+@ultroid_cmd(pattern="remecho( (.*)|$)")
 async def rm(e):
     r = await e.get_reply_message()
     if r:

plugins/fakeaction.py

@@ -46,10 +46,10 @@ from . import asyncio, get_string, ultroid_cmd
 
 
 @ultroid_cmd(
-    pattern="f(typing|audio|contact|document|game|location|sticker|photo|round|video) ?(.*)"
+    pattern="f(typing|audio|contact|document|game|location|sticker|photo|round|video)( (.*)|$)"
 )
 async def _(e):
-    act = e.pattern_match.group(1)
+    act = e.pattern_match.group(1).strip()
     t = e.pattern_match.group(2)
     if act in ["audio", "round", "video"]:
         act = "record-" + act

plugins/fedutils.py

@@ -33,11 +33,11 @@ bot = "@MissRose_bot"
 
 
 @ultroid_cmd(
-    pattern="superfban ?(.*)",
+    pattern="superfban( (.*)|$)",
 )
 async def _(event):
     msg = await event.eor(get_string("sf_1"))
-    inputt = event.pattern_match.group(1)
+    inputt = event.pattern_match.group(1).strip()
     if event.reply_to_msg_id:
         FBAN = (await event.get_reply_message()).sender_id
         if inputt:
@@ -148,7 +148,7 @@ async def _(event):
 
 
 @ultroid_cmd(
-    pattern="superunfban ?(.*)",
+    pattern="superunfban( (.*)|$)",
 )
 async def _(event):
     msg = await event.eor(get_string("sf_15"))
@@ -282,7 +282,7 @@ async def _(event):
 
 
 @ultroid_cmd(
-    pattern="fstat ?(.*)",
+    pattern="fstat( (.*)|$)",
 )
 async def _(event):
     ok = await event.eor("`Checking...`")
@@ -290,10 +290,10 @@ async def _(event):
         previous_message = await event.get_reply_message()
         sysarg = str(previous_message.sender_id)
         user = f"[user](tg://user?id={sysarg})"
-        if event.pattern_match.group(1):
-            sysarg += f" {event.pattern_match.group(1)}"
+        if event.pattern_match.group(1).strip():
+            sysarg += f" {event.pattern_match.group(1).strip()}"
     else:
-        sysarg = event.pattern_match.group(1)
+        sysarg = event.pattern_match.group(1).strip()
         user = sysarg
     if sysarg == "":
         await ok.edit(
@@ -330,11 +330,11 @@ async def _(event):
 
 
 @ultroid_cmd(
-    pattern="fedinfo ?(.*)",
+    pattern="fedinfo( (.*)|$)",
 )
 async def _(event):
     ok = await event.edit(get_string("sf_20"))
-    sysarg = event.pattern_match.group(1)
+    sysarg = event.pattern_match.group(1).strip()
     async with event.client.conversation(bot) as conv:
         try:
             await conv.send_message("/start")

plugins/fileshare.py

@@ -10,42 +10,65 @@
 • `{i}store <reply_to_message>`
    Store the replied message/media and generate a shareable link to that file, to be accessed via your assistant bot!
 
+• `{i}delstored <link of stored file>`
+    Delete stored file.
+
 • `{i}liststored`
    Get all stored messages.
+
+• Go Inline with your assistant bot with `filestore` to see stored files in inline.
 """
 
 import os
 
+from pyUltroid.dB.filestore_db import del_stored, get_stored_msg, list_all_stored_msgs
 from pyUltroid.functions.tools import get_file_link
 
-from . import asst, eor, get_string, udB, ultroid_cmd
+from . import asst, get_string, in_pattern, udB, ultroid_bot, ultroid_cmd
 
 
-@ultroid_cmd(pattern="store")
+@ultroid_cmd(pattern="store$")
 async def filestoreplg(event):
     msg = await event.get_reply_message()
-    if msg is None:
-        await event.eor(get_string("fsh_3"), time=10)
-        return
+    if not msg:
+        return await event.eor(get_string("fsh_3"), time=10)
     # allow storing both messages and media.
     filehash = await get_file_link(msg)
     link_to_file = "https://t.me/{}?start={}".format(asst.me.username, filehash)
-    await eor(
-        event,
+    await event.eor(
         get_string("fsh_2").format(link_to_file),
         link_preview=False,
     )
 
 
+@ultroid_cmd("delstored ?(.*)")
+async def _(event):
+    match = event.pattern_match.group(1)
+    if not match:
+        return await event.eor("`Give stored film's link to delete.`", time=5)
+    match = match.split("?start=")
+    botusername = match[0].split("/")[-1]
+    if botusername != asst.me.username:
+        return await event.eor(
+            "`Message/Media of provided link was not stored by this bot.`", time=5
+        )
+    msg_id = get_stored_msg(match[1])
+    if not msg_id:
+        return await event.eor(
+            "`Message/Media of provided link was already deleted.`", time=5
+        )
+    del_stored(match[1])
+    await ultroid_bot.delete_messages(udB.get_key("LOG_CHANNEL"), int(msg_id))
+    await event.eor("__Deleted__")
+
+
 @ultroid_cmd("liststored$")
 async def liststored(event):
-    get = udB.get_key("FILE_STORE") or {}
-    if not get:
-        await event.eor(get_string("fsh_4"), time=5)
-        return
+    files = list_all_stored_msgs()
+    if not files:
+        return await event.eor(get_string("fsh_4"), time=5)
     msg = "**Stored files:**\n"
-    for c, i in enumerate(list(get.keys())):
-        c += 1
+    for c, i in enumerate(files, start=1):
         msg += f"`{c}`. https://t.me/{asst.me.username}?start={i}\n"
     if len(msg) > 4095:
         with open("liststored.txt", "w") as f:
@@ -54,3 +77,29 @@ async def liststored(event):
         os.remove("liststored.txt")
         return
     await event.eor(msg, link_preview=False)
+
+
+@in_pattern("filestore", owner=True)
+async def file_short(event):
+    all_ = list_all_stored_msgs()
+    res = []
+    if all_:
+        LOG_CHA = udB.get_key("LOG_CHANNEL")
+        for msg in all_[:50]:
+            m_id = get_stored_msg(msg)
+            if not m_id:
+                continue
+            message = await asst.get_messages(LOG_CHA, ids=m_id)
+            if not message:
+                continue
+            if message.media:
+                res.append(await event.builder.document(title=msg, file=message.media))
+            elif message.text:
+                res.append(
+                    await event.builder.article(title=message.text, text=message.text)
+                )
+    if not res:
+        title = "You have no stored file :("
+        text = title + "\n\nRead `{HNDLR}help fileshare` to know how to store."
+        return await event.answer([await event.builder.article(title=title, text=text)])
+    await event.answer(res, switch_pm="• File Store •", switch_pm_param="start")

plugins/filter.py

@@ -30,9 +30,9 @@ from . import events, get_string, mediainfo, udB, ultroid_bot, ultroid_cmd
 from ._inline import something
 
 
-@ultroid_cmd(pattern="addfilter ?(.*)")
+@ultroid_cmd(pattern="addfilter( (.*)|$)")
 async def af(e):
-    wrd = (e.pattern_match.group(1)).lower()
+    wrd = (e.pattern_match.group(1).strip()).lower()
     wt = await e.get_reply_message()
     chat = e.chat_id
     if not (wt and wrd):
@@ -69,9 +69,9 @@ async def af(e):
     ultroid_bot.add_handler(filter_func, events.NewMessage())
 
 
-@ultroid_cmd(pattern="remfilter ?(.*)")
+@ultroid_cmd(pattern="remfilter( (.*)|$)")
 async def rf(e):
-    wrd = (e.pattern_match.group(1)).lower()
+    wrd = (e.pattern_match.group(1).strip()).lower()
     chat = e.chat_id
     if not wrd:
         return await e.eor(get_string("flr_3"))

plugins/fontgen.py

@@ -24,10 +24,10 @@ _script_royal = "𝒶𝒷𝒸𝒹𝑒𝒻𝑔𝒽𝒾𝒿𝓀𝓁𝓂𝓃𝑜
 
 
 @ultroid_cmd(
-    pattern="font ?(.*)",
+    pattern="font( (.*)|$)",
 )
 async def _(e):
-    input = e.pattern_match.group(1)
+    input = e.pattern_match.group(1).strip()
     reply = await e.get_reply_message()
     help = __doc__.format(i=HNDLR)
     if not input:

plugins/forcesubscribe.py

@@ -27,8 +27,12 @@ from telethon.errors.rpcerrorlist import ChatAdminRequiredError, UserNotParticip
 from telethon.tl.custom import Button
 from telethon.tl.functions.channels import GetParticipantRequest
 from telethon.tl.functions.messages import ExportChatInviteRequest
-from telethon.tl.types import Channel, User
-from telethon.utils import get_peer_id
+from telethon.tl.types import (
+    Channel,
+    ChannelParticipantBanned,
+    ChannelParticipantLeft,
+    User,
+)
 
 from . import (
     LOGS,
@@ -46,20 +50,13 @@ from . import (
 CACHE = {}
 
 
-@ultroid_cmd(pattern="fsub ?(.*)", admins_only=True, groups_only=True)
+@ultroid_cmd(pattern="fsub( (.*)|$)", admins_only=True, groups_only=True)
 async def addfor(e):
-    match = e.pattern_match.group(1)
+    match = e.pattern_match.group(1).strip()
     if not match:
         return await e.eor(get_string("fsub_1"), time=5)
-    if match.startswith("@"):
-        ch = match
-    else:
-        try:
-            ch = int(match)
-        except BaseException:
-            return await e.eor(get_string("fsub_2"), time=5)
     try:
-        match = get_peer_id(await e.client.get_entity(ch))
+        match = await e.client.parse_id(match)
     except BaseException:
         return await e.eor(get_string("fsub_2"), time=5)
     add_forcesub(e.chat_id, match)
@@ -84,9 +81,9 @@ async def getfsr(e):
     await e.eor(f"**ForceSub Status** : `Active`\n- **{cha.title}** `({res})`")
 
 
-@in_pattern("fsub ?(.*)", owner=True)
+@in_pattern("fsub( (.*)|$)", owner=True)
 async def fcall(e):
-    match = e.pattern_match.group(1)
+    match = e.pattern_match.group(1).strip()
     spli = match.split("_")
     user = await ultroid_bot.get_entity(int(spli[0]))
     cl = await ultroid_bot.get_entity(int(spli[1]))
@@ -116,7 +113,11 @@ async def diesoon(e):
     if e.sender_id != int(spli[0]):
         return await e.answer(get_string("fsub_7"), alert=True)
     try:
-        await ultroid_bot(GetParticipantRequest(int(spli[1]), int(spli[0])))
+        values = await ultroid_bot(GetParticipantRequest(int(spli[1]), int(spli[0])))
+        if isinstance(values.participant, ChannelParticipantLeft) or (
+            isinstance(values.participant, ChannelParticipantBanned) and values.left
+        ):
+            raise UserNotParticipantError("")
     except UserNotParticipantError:
         return await e.answer(
             "Please Join That Channel !\nThen Click This Button !", alert=True

plugins/gdrive.py

@@ -34,15 +34,14 @@ from telethon.tl.types import Message
 
 from . import asst, eod, eor, get_string, ultroid_cmd
 
-GDrive = GDriveManager()
-
 
 @ultroid_cmd(
-    pattern="gdown ?(.*)",
+    pattern="gdown( (.*)|$)",
     fullsudo=True,
 )
 async def gdown(event):
-    match = event.pattern_match.group(1)
+    GDrive = GDriveManager()
+    match = event.pattern_match.group(1).strip()
     if not match:
         return await eod(event, "`Give file id or Gdrive link to download from!`")
     filename = match.split(" | ")[1].strip() if " | " in match else None
@@ -61,6 +60,7 @@ async def gdown(event):
     fullsudo=True,
 )
 async def files(event):
+    GDrive = GDriveManager()
     if not os.path.exists(GDrive.token_file):
         return await event.eor(get_string("gdrive_6").format(asst.me.username))
     eve = await event.eor(get_string("com_1"))
@@ -95,39 +95,39 @@ async def files(event):
 
 
 @ultroid_cmd(
-    pattern="gdul ?(.*)",
+    pattern="gdul( (.*)|$)",
     fullsudo=True,
 )
 async def _(event):
+    GDrive = GDriveManager()
     if not os.path.exists(GDrive.token_file):
         return await eod(event, get_string("gdrive_6").format(asst.me.username))
-    input_file = event.pattern_match.group(1) or await event.get_reply_message()
+    input_file = event.pattern_match.group(1).strip() or await event.get_reply_message()
     if not input_file:
         return await eod(event, "`Reply to file or give its location.`")
     mone = await event.eor(get_string("com_1"))
     if isinstance(input_file, Message):
         location = "resources/downloads"
-        filename = input_file.file.name
-        if not filename:
-            filename = str(round(time.time()))
-        filename = location + "/" + filename
-        try:
-            filename, downloaded_in = await event.client.fast_downloader(
-                file=input_file.media.document,
-                filename=filename,
-                show_progress=True,
-                event=mone,
-                message=get_string("com_5"),
-            )
-            filename = filename.name
-        except AttributeError:
-            start_time = time.time()
-            filename = await event.client.download_media(location, input_file.media)
-            downloaded_in = time.time() - start_time
-        except Exception as e:
-            return await eor(mone, str(e), time=10)
+        if input_file.photo:
+            filename = await input_file.download_media(location)
+        else:
+            filename = input_file.file.name
+            if not filename:
+                filename = str(round(time.time()))
+            filename = location + "/" + filename
+            try:
+                filename, downloaded_in = await event.client.fast_downloader(
+                    file=input_file.media.document,
+                    filename=filename,
+                    show_progress=True,
+                    event=mone,
+                    message=get_string("com_5"),
+                )
+                filename = filename.name
+            except Exception as e:
+                return await eor(mone, str(e), time=10)
         await mone.edit(
-            f"`Downloaded to ``{filename}`` in {time_formatter(downloaded_in*1000)}.`",
+            f"`Downloaded to ``{filename}`.`",
         )
     else:
         filename = input_file.strip()
@@ -172,13 +172,14 @@ async def _(event):
 
 
 @ultroid_cmd(
-    pattern="gdsearch ?(.*)",
+    pattern="gdsearch( (.*)|$)",
     fullsudo=True,
 )
 async def _(event):
+    GDrive = GDriveManager()
     if not os.path.exists(GDrive.token_file):
         return await event.eor(get_string("gdrive_6").format(asst.me.username))
-    input_str = event.pattern_match.group(1)
+    input_str = event.pattern_match.group(1).strip()
     if not input_str:
         return await event.eor("`Give filename to search on GDrive...`")
     eve = await event.eor(f"`Searching for {input_str} in G-Drive...`")
@@ -214,31 +215,6 @@ async def _(event):
         os.remove(f"{input_str}.txt")
 
 
-"""
-@ultroid_cmd(
-    pattern="udir ?(.*)",
-    fullsudo=True,
-)
-async def _(event):
-    if not os.path.exists(TOKEN_FILE):
-        return await event.eor(get_string("gdrive_6").format(asst.me.username), time=5)
-    input_str = event.pattern_match.group(1)
-    if not os.path.isdir(input_str):
-        return await event.eor(f"Directory {input_str} does not seem to exist", time=5)
-
-    http = authorize(TOKEN_FILE, None)
-    a = await event.eor(f"Uploading `{input_str}` to G-Drive...")
-    dir_id = await create_directory(
-        http,
-        os.path.basename(os.path.abspath(input_str)),
-        Redis("GDRIVE_FOLDER_ID"),
-    )
-    await DoTeskWithDir(http, input_str, event, dir_id)
-    dir_link = f"https://drive.google.com/folderview?id={dir_id}"
-    await eor(a, get_string("gdrive_7").format(input_str, dir_link), time=5)
-"""
-
-
 @ultroid_cmd(
     pattern="gdfolder$",
     fullsudo=True,
@@ -250,8 +226,7 @@ async def _(event):
     if GDrive.folder_id:
         await event.eor(
             "`Your G-Drive Folder link : `\n"
-            + "https://drive.google.com/folderview?id="
-            + GDrive.folder_id,
+            + GDrive._create_folder_link(GDrive.folder_id)
         )
     else:
         await eod(event, "Set FOLDERID from your Assistant bot's Settings ")

plugins/giftools.py

@@ -33,7 +33,7 @@ from . import HNDLR, LOGS, bash, downloader, get_string, mediainfo, ultroid_cmd
 
 @ultroid_cmd(pattern="(bw|invert)gif$")
 async def igif(e):
-    match = e.pattern_match.group(1)
+    match = e.pattern_match.group(1).strip()
     a = await e.get_reply_message()
     if not (a and a.media):
         return await e.eor("`Reply To gif only`", time=5)
@@ -70,9 +70,9 @@ async def reverse_gif(event):
     os.remove("reversed.mp4")
 
 
-@ultroid_cmd(pattern="gif ?(.*)")
+@ultroid_cmd(pattern="gif( (.*)|$)")
 async def gifs(ult):
-    get = ult.pattern_match.group(1)
+    get = ult.pattern_match.group(1).strip()
     xx = random.randint(0, 5)
     n = 0
     if ";" in get:

plugins/globaltools.py

@@ -16,7 +16,7 @@
 
 • `{i}listgban` : List all GBanned users.
 
-• `{i}gmute` | `{i}ungmute` <reply user/ username>`
+• `{i}gmute` | `{i}ungmute` <reply user/ username>
     Mute/UnMute Globally.
 
 • `{i}gkick <reply/username>` `Globally Kick User`
@@ -29,12 +29,12 @@
    Add chat to blacklist and ignores global broadcast.
 • `{i}ungblacklist` `Remove the chat from blacklist.`
 
-•`{i}gpromote <reply to user> <channel/group/all> <rank>`
+• `{i}gpromote <reply to user> <channel/group/all> <rank>`
     globally promote user where you are admin
     - Set whether To promote only in groups/channels/all.
-    `Eg-``gpromote group boss` ~ promotes user in all grps.
+    Eg- `gpromote group boss` ~ promotes user in all grps.
         `gpromote @username all sar` ~ promote the user in all group & channel
-•`{i}gdemote` - `demote user globally`
+• `{i}gdemote` - `demote user globally`
 """
 import asyncio
 import os
@@ -93,9 +93,9 @@ _gdemote_rights = ChatAdminRights(
 )
 
 
-@ultroid_cmd(pattern="gpromote ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="gpromote( (.*)|$)", fullsudo=True)
 async def _(e):
-    x = e.pattern_match.group(1)
+    x = e.pattern_match.group(1).strip()
     ultroid_bot = e.client
     if not x:
         return await e.eor(get_string("schdl_2"), time=5)
@@ -201,9 +201,9 @@ async def _(e):
         await eor(ev, f"Promoted {name.first_name} in Total : {c} {key} chats.")
 
 
-@ultroid_cmd(pattern="gdemote ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="gdemote( (.*)|$)", fullsudo=True)
 async def _(e):
-    x = e.pattern_match.group(1)
+    x = e.pattern_match.group(1).strip()
     ultroid_bot = e.client
     if not x:
         return await e.eor(get_string("schdl_2"), time=5)
@@ -286,10 +286,10 @@ async def _(e):
         await eor(ev, f"Demoted {name.first_name} in Total : {c} {key} chats.")
 
 
-@ultroid_cmd(pattern="ungban ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="ungban( (.*)|$)", fullsudo=True)
 async def _(e):
     xx = await e.eor("`UnGbanning...`")
-    match = e.pattern_match.group(1)
+    match = e.pattern_match.group(1).strip()
     peer = None
     if match:
         try:
@@ -338,7 +338,7 @@ async def _(e):
                     chats += 1
                 except BaseException as er:
                     LOGS.exception(er)
-            except ChatAdminRequiredError:
+            except (ChatAdminRequiredError, ValueError):
                 pass
             except BaseException as er:
                 LOGS.exception(er)
@@ -350,18 +350,18 @@ async def _(e):
     )
 
 
-@ultroid_cmd(pattern="gban ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="gban( (.*)|$)", fullsudo=True)
 async def _(e):
     xx = await e.eor("`Gbanning...`")
     reason = ""
-    if e.pattern_match.group(1):
-        usr = e.text.split(" ", maxsplit=2)[1]
+    if e.pattern_match.group(1).strip():
+        usr = e.text.split(maxsplit=2)[1]
         try:
             userid = await e.client.parse_id(usr)
         except ValueError:
             userid = usr
         try:
-            reason = e.text.split(" ", maxsplit=2)[2]
+            reason = e.text.split(maxsplit=2)[2]
         except IndexError:
             pass
     elif e.reply_to_msg_id:
@@ -377,7 +377,7 @@ async def _(e):
         except IndexError:
             pass
     else:
-        return await xx.eor("`Reply to some msg or add their id.`", tome=5, time=5)
+        return await xx.eor("`Reply to some msg or add their id.`", time=5)
     user = None
     try:
         user = await e.client.get_entity(userid)
@@ -418,7 +418,7 @@ async def _(e):
                     chats += 1
                 except BaseException as er:
                     LOGS.exception(er)
-            except ChatAdminRequiredError:
+            except (ChatAdminRequiredError, ValueError):
                 pass
             except BaseException as er:
                 LOGS.exception(er)
@@ -431,7 +431,7 @@ async def _(e):
     await xx.edit(gb_msg)
 
 
-@ultroid_cmd(pattern="g(admin|)cast ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="g(admin|)cast( (.*)|$)", fullsudo=True)
 async def gcast(event):
     text, btn, reply = "", None, None
     xx = event.pattern_match.group(2)
@@ -516,10 +516,10 @@ async def gcast(event):
     await kk.edit(text)
 
 
-@ultroid_cmd(pattern="gucast ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="gucast( (.*)|$)", fullsudo=True)
 async def gucast(event):
     msg, btn, reply = "", None, None
-    xx = event.pattern_match.group(1)
+    xx = event.pattern_match.group(1).strip()
     if xx:
         msg, btn = get_msg_button(event.text.split(maxsplit=1)[1])
     elif event.is_reply:
@@ -566,13 +566,13 @@ async def gucast(event):
     await kk.edit(f"Done in {done} chats, error in {er} chat(s)")
 
 
-@ultroid_cmd(pattern="gkick ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="gkick( (.*)|$)", fullsudo=True)
 async def gkick(e):
     xx = await e.eor("`Gkicking...`")
     if e.reply_to_msg_id:
         userid = (await e.get_reply_message()).sender_id
-    elif e.pattern_match.group(1):
-        userid = await e.client.parse_id(e.pattern_match.group(1))
+    elif e.pattern_match.group(1).strip():
+        userid = await e.client.parse_id(e.pattern_match.group(1).strip())
     elif e.is_private:
         userid = e.chat_id
     else:
@@ -598,13 +598,13 @@ async def gkick(e):
     await xx.edit(f"`Gkicked` [{name}](tg://user?id={userid}) `in {chats} chats.`")
 
 
-@ultroid_cmd(pattern="gmute ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="gmute( (.*)|$)", fullsudo=True)
 async def _(e):
     xx = await e.eor("`Gmuting...`")
     if e.reply_to_msg_id:
         userid = (await e.get_reply_message()).sender_id
-    elif e.pattern_match.group(1):
-        userid = await e.client.parse_id(e.pattern_match.group(1))
+    elif e.pattern_match.group(1).strip():
+        userid = await e.client.parse_id(e.pattern_match.group(1).strip())
     elif e.is_private:
         userid = e.chat_id
     else:
@@ -633,13 +633,13 @@ async def _(e):
     await xx.edit(f"`Gmuted` {inline_mention(name)} `in {chats} chats.`")
 
 
-@ultroid_cmd(pattern="ungmute ?(.*)", fullsudo=True)
+@ultroid_cmd(pattern="ungmute( (.*)|$)", fullsudo=True)
 async def _(e):
     xx = await e.eor("`UnGmuting...`")
     if e.reply_to_msg_id:
         userid = (await e.get_reply_message()).sender_id
-    elif e.pattern_match.group(1):
-        userid = await e.client.parse_id(e.pattern_match.group(1))
+    elif e.pattern_match.group(1).strip():
+        userid = await e.client.parse_id(e.pattern_match.group(1).strip())
     elif e.is_private:
         userid = e.chat_id
     else:
@@ -701,7 +701,7 @@ async def list_gengbanned(event):
 
 
 @ultroid_cmd(
-    pattern="gstat ?(.*)",
+    pattern="gstat( (.*)|$)",
 )
 async def gstat_(e):
     xx = await e.eor(get_string("com_1"))
@@ -709,9 +709,9 @@ async def gstat_(e):
         userid = (await e.get_chat()).id
     elif e.reply_to_msg_id:
         userid = (await e.get_reply_message()).sender_id
-    elif e.pattern_match.group(1):
+    elif e.pattern_match.group(1).strip():
         try:
-            userid = await e.client.parse_id(e.pattern_match.group(1))
+            userid = await e.client.parse_id(e.pattern_match.group(1).strip())
         except Exception as err:
             return await xx.eor(f"{err}", time=10)
     else:

plugins/greetings.py

@@ -186,7 +186,7 @@ async def listgd(event):
 
 @ultroid_cmd(pattern="thankmembers (on|off)", groups_only=True)
 async def thank_set(event):
-    type_ = event.pattern_match.group(1)
+    type_ = event.pattern_match.group(1).strip()
     if not type_ or type_ == "":
         await eor(
             event,

plugins/imagetools.py

@@ -522,7 +522,7 @@ async def ultd(event):
 
 @ultroid_cmd(pattern="csample (.*)")
 async def sampl(ult):
-    color = ult.pattern_match.group(1)
+    color = ult.pattern_match.group(1).strip()
     if color:
         img = Image.new("RGB", (200, 100), f"{color}")
         img.save("csample.png")
@@ -592,12 +592,12 @@ async def ultd(event):
     os.remove(ultt)
 
 
-@ultroid_cmd(pattern="border ?(.*)")
+@ultroid_cmd(pattern="border( (.*)|$)")
 async def ok(event):
     hm = await event.get_reply_message()
     if not (hm and (hm.photo or hm.sticker)):
         return await event.eor("`Reply to Sticker or Photo..`")
-    col = event.pattern_match.group(1)
+    col = event.pattern_match.group(1).strip()
     wh = 20
     if not col:
         col = [255, 255, 255]
@@ -620,14 +620,14 @@ async def ok(event):
     await event.delete()
 
 
-@ultroid_cmd(pattern="pixelator ?(.*)")
+@ultroid_cmd(pattern="pixelator( (.*)|$)")
 async def pixelator(event):
     reply_message = await event.get_reply_message()
     if not (reply_message and reply_message.photo):
         return await event.eor("`Reply to a photo`")
     hw = 50
     try:
-        hw = int(event.pattern_match.group(1))
+        hw = int(event.pattern_match.group(1).strip())
     except (ValueError, TypeError):
         pass
     msg = await event.eor(get_string("com_1"))