Ultroid v0.5 Updates

Co-authored-by: Amit Sharma <[email protected]>
Co-authored-by: Aditya <[email protected]>
Co-authored-by: Kaif <[email protected]>
Co-authored-by: Aditya <[email protected]>
Co-authored-by: 1Danish-00 <[email protected]>
Co-authored-by: smartman_ru <[email protected]>

.github/stalebot.yml

@@ -7,7 +7,7 @@ staleLabel: inactive
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
+  any recent activity. It will be closed if no further activity occurs. Thank you
   for your contributions.
 # Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+closeComment: false

.gitignore

@@ -2,6 +2,7 @@
 *.session-journal
 *.session
 build
+test*
 *.mp3
 *.webm
 *.webp

README.md

@@ -48,7 +48,7 @@ Get the [Necessary Variables](#Necessary-Variables) and then click the button be
 ### Local Deploy - Easy Method
 - 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 - `wget -O locals.py https://git.io/JY9UM && python locals.py`
+- Termux - `wget -O install-termux https://tiny.ultroid.tech/termux && bash install-termux`
 
 ### Local Deploy - Traditional Method
 - Get your [Necessary Variables](#Necessary-Variables)

assistant/__init__.py

@@ -7,10 +7,10 @@
 
 from pyUltroid import *
 from pyUltroid import _ult_cache
+from pyUltroid._misc import owner_and_sudos
+from pyUltroid._misc._assistant import asst_cmd, callback, in_pattern
 from pyUltroid.functions.helper import *
 from pyUltroid.functions.tools import get_stored_file
-from pyUltroid.misc import owner_and_sudos
-from pyUltroid.misc._assistant import asst_cmd, callback, in_pattern
 from telethon import Button, custom
 
 from plugins import ATRA_COL

assistant/callbackstuffs.py

@@ -15,7 +15,11 @@ from os import execl, remove
 from random import choice
 
 from bs4 import BeautifulSoup as bs
-from pyUltroid.functions.gDrive import GDriveManager
+
+try:
+    from pyUltroid.functions.gDrive import GDriveManager
+except ImportError:
+    GDriveManager = None
 from pyUltroid.functions.helper import fast_download, progress, uploader
 from pyUltroid.functions.tools import (
     Carbon,
@@ -33,7 +37,7 @@ from . import *
 
 # --------------------------------------------------------------------#
 telegraph = telegraph_client()
-GDrive = GDriveManager()
+GDrive = GDriveManager() if GDriveManager else None
 # --------------------------------------------------------------------#
 
 
@@ -1306,4 +1310,4 @@ async def fdroid_dler(event):
     if msg and hasattr(msg, "media"):
         FD_MEDIA.update({uri: msg.media})
     os.remove(thumb)
-    os.remove(file)
+    os.remove(file)

assistant/games.py

@@ -20,10 +20,17 @@ import uuid
 from html import unescape
 from random import choice, shuffle
 
-import akinator
+from . import LOGS
+
+try:
+    import akinator
+except ImportError:
+    akinator = None
+    LOGS.error("'akinator' not installed.")
+
+from pyUltroid._misc._decorators import ultroid_cmd
 from pyUltroid.functions.helper import inline_mention
 from pyUltroid.functions.tools import async_searcher
-from pyUltroid.misc._decorators import ultroid_cmd
 from telethon.errors.rpcerrorlist import (
     BotMethodInvalidError,
     ChatSendStickersForbiddenError,
@@ -41,6 +48,8 @@ aki_photo = "https://telegra.ph/file/3cc8825c029fd0cab9edc.jpg"
 
 @ultroid_cmd(pattern="akinator")
 async def akina(e):
+    if not akinator:
+        return
     sta = akinator.Akinator()
     games.update({e.chat_id: {e.id: sta}})
     try:

assistant/inlinestuff.py

@@ -6,6 +6,7 @@
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
 import base64
+import inspect
 from datetime import datetime
 from random import choice
 from re import compile as re_compile
@@ -20,6 +21,7 @@ from pyUltroid.functions.tools import (
     webuploader,
 )
 from telethon import Button
+from telethon.tl.alltlobjects import LAYER, tlobjects
 from telethon.tl.types import DocumentAttributeAudio as Audio
 from telethon.tl.types import InputWebDocument as wb
 
@@ -158,7 +160,7 @@ async def _(e):
         filename = filename.split("/")[-1]
     await e.edit(f"Uploading `{filename}` on {host}")
     link = (await webuploader(chat_id, msg_id, host)).strip().replace("\n", "")
-    await e.edit(f"Uploaded [{filename}]({link}) on {host}.")
+    await e.edit(f"Uploaded `{filename}` on {host}.", buttons=Button.url("View", link))
 
 
 @in_pattern("repo", owner=True)
@@ -688,3 +690,197 @@ async def savn_s(event):
         )
     await event.answer(res, switch_pm=swi, switch_pm_param="start")
     _savn_cache.update({query: res})
+
+
+_OMG = {}
+
+
+@in_pattern("omgu", owner=True)
+async def omgubuntu(ult):
+    try:
+        match = ult.text.split(maxsplit=1)[1].lower()
+    except IndexError:
+        return await ult.answer(
+            [], switch_pm="Enter Query to search...", switch_pm_param="start"
+        )
+    if _OMG.get(match):
+        return await ult.answer(
+            _OMG[match], switch_pm="OMG Ubuntu Search :]", switch_pm_param="start"
+        )
+    get_web = "https://www.omgubuntu.co.uk/?s=" + match.replace(" ", "+")
+    get_ = await async_searcher(get_web, re_content=True)
+    BSC = bs(get_, "html.parser", from_encoding="utf-8")
+    res = []
+    for cont in BSC.find_all("div", "sbs-layout__item"):
+        img = cont.find("div", "sbs-layout__image")
+        url = img.find("a")["href"]
+        src = img.find("img")["src"]
+        con = cont.find("div", "sbs-layout__content")
+        tit = con.find("a", "layout__title-link")
+        title = tit.text.strip()
+        desc = con.find("p", "layout__description").text.strip()
+        text = f"[{title.strip()}]({url})\n\n{desc}"
+        img = wb(src, 0, "image/jpeg", [])
+        res.append(
+            await ult.builder.article(
+                title=title,
+                type="photo",
+                description=desc,
+                url=url,
+                text=text,
+                buttons=Button.switch_inline(
+                    "Search Again", query=ult.text, same_peer=True
+                ),
+                include_media=True,
+                content=img,
+                thumb=img,
+            )
+        )
+    await ult.answer(
+        res,
+        switch_pm=f"Showing {len(res)} results!" if res else "No Results Found :[",
+        switch_pm_param="start",
+    )
+    _OMG[match] = res
+
+
+@in_pattern("tl", owner=True)
+async def inline_tl(ult):
+    try:
+        match = ult.text.split(maxsplit=1)[1]
+    except IndexError:
+        text = f"**It is Telegram TlObjects Searcher.**\n__(Don't use if you don't know what it is!)__\n\n• Example Usage\n`@{asst.me.username} tl GetUserRequest`"
+        return await ult.answer(
+            [
+                await ult.builder.article(
+                    title="How to Use?",
+                    description="Tl Searcher by Ultroid",
+                    url="https://t.me/TheUltroid",
+                    text=text,
+                )
+            ],
+            switch_pm="Tl Search 🔍",
+            switch_pm_param="start",
+        )
+    res = []
+    for key in tlobjects.values():
+        if match.lower() in key.__name__.lower():
+            tyyp = "Function" if "tl.functions." in str(key) else "Type"
+            text = f"**Name:** `{key.__name__}`\n"
+            text += f"**Category:** `{tyyp}`\n"
+            text += f"\n`from {key.__module__} import {key.__name__}`\n\n"
+            args = str(inspect.signature(key))[1:][:-1]
+            if args:
+                text += "**Parameter:**\n"
+                for para in args.split(","):
+                    text += " " * 4 + "`" + para + "`\n"
+            text += f"\n**Layer:** `{LAYER}`"
+            res.append(
+                await ult.builder.article(
+                    title=key.__name__,
+                    description=tyyp,
+                    url="https://t.me/TheUltroid",
+                    text=text[:4000],
+                )
+            )
+    if not res:
+        mo = f"No Results for {match}!"
+    else:
+        mo = f"Showing {len(res)} results!"
+    await ult.answer(res[:50], switch_pm=mo, switch_pm_param="start")
+
+
+@in_pattern("gh", owner=True)
+async def gh_feeds(ult):
+    try:
+        username = ult.text.split(maxsplit=1)[1]
+    except IndexError:
+        return await ult.answer(
+            [],
+            switch_pm="Enter Github Username to see feeds...",
+            switch_pm_param="start",
+        )
+    if not username.endswith("."):
+        return await ult.answer(
+            [], switch_pm="End your query with . to search...", switch_pm_param="start"
+        )
+    username = username[:-1]
+    data = await async_searcher(
+        f"https://api.github.com/users/{username}/events", re_json=True
+    )
+    if not isinstance(data, list):
+        msg = ""
+        for ak in list(data.keys()):
+            msg += ak + ": `" + data[ak] + "`\n"
+        return await ult.answer(
+            [
+                await ult.builder.article(
+                    title=data["message"], text=msg, link_preview=False
+                )
+            ],
+            cache_time=300,
+            switch_pm="Error!!!",
+            switch_pm_param="start",
+        )
+    res = []
+    res_ids = []
+    for cont in data[:50]:
+        text = f"<b><a href='https://github.com/{username}'>@{username}</a></b>"
+        title = f"@{username}"
+        extra = None
+        if cont["type"] == "PushEvent":
+            text += " pushed in"
+            title += " pushed in"
+            dt = cont["payload"]["commits"][-1]
+            url = "https://github.com/" + dt["url"].split("/repos/")[-1]
+            extra = f"\n-> <b>message:</b> <code>{dt['message']}</code>"
+        elif cont["type"] == "IssueCommentEvent":
+            title += " commented at"
+            text += " commented at"
+            url = cont["payload"]["comment"]["html_url"]
+        elif cont["type"] == "CreateEvent":
+            title += " created"
+            text += " created"
+            url = "https://github.com/" + cont["repo"]["name"]
+        elif cont["type"] == "PullRequestEvent":
+            if (
+                cont["payload"]["pull_request"].get("user", {}).get("login")
+                != username.lower()
+            ):
+                continue
+            url = cont["payload"]["pull_request"]["html_url"]
+            text += " created a pull request in"
+            title += " created a pull request in"
+        elif cont["type"] == "ForkEvent":
+            text += " forked"
+            title += " forked"
+            url = cont["payload"]["forkee"]["html_url"]
+        else:
+            continue
+        repo = cont["repo"]["name"]
+        repo_url = "https://github.com/" + repo
+        title += " " + repo
+        text += f" <b><a href='{repo_url}'>{repo}</a></b>"
+        if extra:
+            text += extra
+        thumb = wb(cont["actor"]["avatar_url"], 0, "image/jpeg", [])
+        article = await ult.builder.article(
+            title=title,
+            text=text,
+            url=repo_url,
+            parse_mode="html",
+            link_preview=False,
+            thumb=thumb,
+            buttons=[
+                Button.url("View", url),
+                Button.switch_inline("Search again", query=ult.text, same_peer=True),
+            ],
+        )
+        if article.id not in res_ids:
+            res_ids.append(article.id)
+            res.append(article)
+    if res:
+        msg = f"Showing {len(res)} feeds!"
+    else:
+        msg = "Nothing Found"
+    await ult.answer(res, cache_time=5000, switch_pm=msg, switch_pm_param="start")

assistant/manager/__init__.py

@@ -5,7 +5,7 @@
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
+from pyUltroid._misc._decorators import ultroid_cmd
 from pyUltroid.functions.helper import inline_mention
-from pyUltroid.misc._decorators import ultroid_cmd
 
 from .. import *

assistant/manager/stickermanager.py

@@ -7,7 +7,7 @@
 
 import random
 
-from pyUltroid.functions.misc import create_quotly
+from pyUltroid.functions.misc import Quotly
 from pyUltroid.functions.tools import TgConverter
 from telethon import errors
 from telethon.errors.rpcerrorlist import StickersetInvalidError
@@ -54,7 +54,7 @@ async def kang_cmd(ult):
         image = TgConverter.resize_photo_sticker(dl)
         image.save(name, "WEBP")
     elif reply.text:
-        dl = await create_quotly(reply)
+        dl = await Quotly().create_quotly(reply)
     else:
         return await ult.eor("`Reply to sticker or text to add it in your pack...`")
     if not emoji:

assistant/start.py

@@ -8,9 +8,9 @@
 from datetime import datetime
 
 from pytz import timezone as tz
+from pyUltroid._misc import SUDO_M, owner_and_sudos
 from pyUltroid.dB.asst_fns import *
 from pyUltroid.functions.helper import inline_mention
-from 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

docker-compose.yml

@@ -0,0 +1,12 @@
+version: "3.9"
+services:
+  worker:
+    build: .
+    environment:
+      REDIS_URI: $REDIS_URI
+      REDIS_PASSWORD: $REDIS_PASSWORD
+      SESSION: $SESSION
+      API_ID: $API_ID  # defaults to None
+      API_HASH: $API_HASH  # defaults to None
+      MONGO_URI: $MONGO_URI  # defaults to None
+      DATABASE_URL: $DATABASE_URL  # defaults to None

install-termux

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# 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/>.
+
+if [ -d "resources" ]
+then
+    echo "Current directory Identified.."
+else
+    apt install git -y
+    git clone https://github.com/TeamUltroid/Ultroid
+    cd Ultroid
+fi
+bash resources/startup/termux.sh

plugins/__init__.py

@@ -11,15 +11,16 @@ import os
 import time
 from random import choice
 
+import requests
 from pyUltroid import *
+from pyUltroid._misc._assistant import asst_cmd, callback, in_pattern
+from pyUltroid._misc._decorators import ultroid_cmd
+from pyUltroid._misc._wrappers import eod, eor
 from pyUltroid.dB import DEVLIST, ULTROID_IMAGES
 from pyUltroid.functions.helper import *
 from pyUltroid.functions.info import *
 from pyUltroid.functions.misc import *
 from pyUltroid.functions.tools import *
-from pyUltroid.misc._assistant import asst_cmd, callback, in_pattern
-from pyUltroid.misc._decorators import ultroid_cmd
-from pyUltroid.misc._wrappers import eod, eor
 from pyUltroid.version import __version__, ultroid_version
 from telethon import Button, events
 from telethon.tl import functions, types
@@ -28,6 +29,7 @@ from strings import get_string
 
 Redis = udB.get_key
 con = TgConverter
+quotly = Quotly()
 OWNER_NAME = ultroid_bot.full_name
 OWNER_ID = ultroid_bot.uid
 

plugins/_chatactions.py

@@ -36,7 +36,7 @@ async def Function(event):
 
 
 async def DummyHandler(ult):
-   # clean chat actions
+    # clean chat actions
     key = udB.get_key("CLEANCHAT") or []
     if ult.chat_id in key:
         try:

plugins/_help.py

@@ -5,8 +5,10 @@
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
-
-from fuzzywuzzy.process import extractOne
+try:
+    from fuzzywuzzy.process import extractOne
+except ImportError:
+    extractOne = None
 from pyUltroid.dB._core import HELP, LIST
 from pyUltroid.functions.tools import cmd_regex_replace
 from telethon.errors.rpcerrorlist import (
@@ -83,12 +85,11 @@ async def _help(ult):
                                 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]
-                            ),
-                        )
+                        text = f"`{plug}` is not a valid plugin!"
+                        if extractOne:
+                            best_match = extractOne(plug, compare_strings)
+                            text += "\nDid you mean `{}`?".format(best_match[0])
+                        return await ult.eor(text)
                     output = f"**Command** `{plug}` **found in plugin** - `{file}`\n"
                     if file in HELP["Official"]:
                         for i in HELP["Official"][file]:

plugins/_inline.py

@@ -11,10 +11,10 @@ from datetime import datetime
 from os import remove
 
 from git import Repo
+from pyUltroid._misc._assistant import callback, in_pattern
 from pyUltroid.dB._core import HELP, LIST
 from pyUltroid.functions.helper import gen_chlog, time_formatter, updater
 from pyUltroid.functions.misc import split_list
-from pyUltroid.misc._assistant import callback, in_pattern
 from telethon import Button
 from telethon.tl.types import InputWebDocument, Message
 from telethon.utils import resolve_bot_file_id
@@ -332,9 +332,14 @@ async def _(e):
         [
             Button.switch_inline(
                 "Fᴅʀᴏɪᴅ Sᴇᴀʀᴄʜ", query="fdroid telegram", same_peer=True
-            )
+            ),
+            Button.switch_inline("Sᴀᴀᴠɴ sᴇᴀʀᴄʜ", query="saavn", same_peer=True),
+        ],
+        [
+            Button.switch_inline("Tʟ Sᴇᴀʀᴄʜ", query="tl", same_peer=True),
+            Button.switch_inline("GɪᴛHᴜʙ ғᴇᴇᴅs", query="gh", same_peer=True),
         ],
-        [Button.switch_inline("Sᴀᴀᴠɴ sᴇᴀʀᴄʜ", query="saavn", same_peer=True)],
+        [Button.switch_inline("OᴍɢUʙᴜɴᴛᴜ", query="omgu cutefish", same_peer=True)],
         [
             Button.inline(
                 "« Bᴀᴄᴋ",

plugins/_userlogs.py

@@ -21,7 +21,18 @@ from telethon.errors.rpcerrorlist import (
 from telethon.tl.types import MessageEntityMention, MessageEntityMentionName, User
 from telethon.utils import get_display_name
 
-from . import ultroid_bot, asst, udB, inline_mention, Button, LOGS, get_string, LOG_CHANNEL,  callback, events
+from . import (
+    LOG_CHANNEL,
+    LOGS,
+    Button,
+    asst,
+    callback,
+    events,
+    get_string,
+    inline_mention,
+    udB,
+    ultroid_bot,
+)
 
 CACHE_SPAM = {}
 TAG_EDITS = {}

plugins/_wspr.py

@@ -90,7 +90,7 @@ async def _(e):
     ]
     us = logi.username or logi.first_name
     sur = e.builder.article(
-        title=f"{logi.first_name}",
+        title=logi.first_name,
         description=desc,
         text=get_string("wspr_1").format(us),
         buttons=button,
@@ -141,9 +141,11 @@ async def _(e):
                 same_peer=True,
             ),
         ]
-        sur = e.builder.article(
+        sur = e.builder.document(
             title=user.first_name,
             description=desc,
+            file=logi.full_user.profile_photo,
+            include_media=False,
             text=text,
             buttons=button,
         )

plugins/admintools.py

@@ -68,7 +68,11 @@ from . import (
 
 
 @ultroid_cmd(
-    pattern="promote( (.*)|$)", admins_only=True, manager=True, require="add_admins"
+    pattern="promote( (.*)|$)",
+    admins_only=True,
+    manager=True,
+    require="add_admins",
+    fullsudo=True,
 )
 async def prmte(ult):
     xx = await ult.eor(get_string("com_1"))
@@ -96,7 +100,11 @@ 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",
+    fullsudo=True,
 )
 async def dmote(ult):
     xx = await ult.eor(get_string("com_1"))
@@ -127,6 +135,7 @@ async def dmote(ult):
     admins_only=True,
     manager=True,
     require="ban_users",
+    fullsudo=True,
 )
 async def bban(ult):
     something = await get_uinfo(ult)
@@ -152,7 +161,11 @@ async def bban(ult):
 
 
 @ultroid_cmd(
-    pattern="unban( (.*)|$)", admins_only=True, manager=True, require="ban_users"
+    pattern="unban( (.*)|$)",
+    admins_only=True,
+    manager=True,
+    require="ban_users",
+    fullsudo=True,
 )
 async def uunban(ult):
     xx = await ult.eor(get_string("com_1"))
@@ -181,6 +194,7 @@ async def uunban(ult):
     pattern="kick( (.*)|$)",
     manager=True,
     require="ban_users",
+    fullsudo=True,
 )
 async def kck(ult):
     if "kickme" in ult.text:
@@ -215,7 +229,11 @@ async def kck(ult):
 
 
 @ultroid_cmd(
-    pattern="tban( (.*)|$)", admins_only=True, manager=True, require="ban_users"
+    pattern="tban( (.*)|$)",
+    admins_only=True,
+    manager=True,
+    require="ban_users",
+    fullsudo=True,
 )
 async def tkicki(e):
     huh = e.text.split()
@@ -235,9 +253,9 @@ async def tkicki(e):
     try:
         user = await e.client.get_entity(userid)
     except Exception as ex:
-        return await eor(d, f"`{ex}`")
+        return await eor(e, f"`{ex}`")
     try:
-        bun = await ban_time(e, tme)
+        bun = ban_time(e, tme)
         await e.client.edit_permissions(
             e.chat_id, user.id, until_date=bun, view_messages=False
         )
@@ -250,7 +268,13 @@ async def tkicki(e):
         return await e.eor(str(m))
 
 
-@ultroid_cmd(pattern="pin$", manager=True, require="pin_messages")
+@ultroid_cmd(
+    pattern="pin$",
+    admins_only=True,
+    manager=True,
+    require="pin_messages",
+    fullsudo=True,
+)
 async def pin(msg):
     if not msg.is_reply:
         return await eor(msg, get_string("pin_1"))
@@ -273,6 +297,7 @@ async def pin(msg):
     admins_only=True,
     manager=True,
     require="pin_messages",
+    fullsudo=True,
 )
 async def unp(ult):
     xx = await ult.eor(get_string("com_1"))
@@ -292,7 +317,11 @@ async def unp(ult):
 
 
 @ultroid_cmd(
-    pattern="tpin( (.*)|$)", admins_only=True, manager=True, require="pin_messages"
+    pattern="tpin( (.*)|$)",
+    admins_only=True,
+    manager=True,
+    require="pin_messages",
+    fullsudo=True,
 )
 async def pin_message(ult):
     match = ult.pattern_match.group(1).strip()
@@ -301,7 +330,7 @@ async def pin_message(ult):
     if not match:
         return await ult.eor("`Please provide time..`", time=8)
     msg = await ult.eor(get_string("com_1"))
-    time = await ban_time(msg, match)
+    time = ban_time(msg, match)
     if not time:
         return
     msg_id = ult.reply_to_msg_id

plugins/afk.py

@@ -37,7 +37,7 @@ from . import (
 old_afk_msg = []
 
 
-@ultroid_cmd(pattern="afk( (.*)|$)", fullsudo=True)
+@ultroid_cmd(pattern="afk( (.*)|$)", owner_only=True)
 async def set_afk(event):
     if event.client._bot or is_afk():
         return

plugins/asstcmd.py

@@ -18,12 +18,16 @@
 """
 import os
 
-from pyUltroid.dB.asstcmd_db import *
+from pyUltroid.dB.asstcmd_db import add_cmd, cmd_reply, list_cmds, rem_cmd
 from pyUltroid.functions.tools import create_tl_btn, format_btn, get_msg_button
-from telegraph import upload_file as uf
+
+try:
+    from telegraph import upload_file as uf
+except ImportError:
+    uf = None
 from telethon import events, utils
 
-from . import asst, get_string, mediainfo, ultroid_cmd
+from . import asst, get_string, mediainfo, udB, ultroid_cmd
 
 
 @ultroid_cmd(pattern="addcmd( (.*)|$)")

plugins/audiotools.py

@@ -26,6 +26,7 @@ from datetime import datetime as dt
 from pyUltroid.functions.tools import set_attributes
 
 from . import (
+    LOGS,
     bash,
     downloader,
     eod,

plugins/autoban.py

@@ -0,0 +1,158 @@
+# Ultroid - UserBot
+# Copyright (C) 2021-2022 TeamUltroid
+#
+# This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
+# PLease read the GNU Affero General Public License in
+# <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
+
+"""
+✘ Commands Available
+
+• `{i}autokick <on/off>`
+    on - To enable.
+    off - To disable.
+    Automatically kick new joined users from the group.
+
+• `{i}cban`
+    Enable/Disable autobanning send as channel in used chat.
+
+• `{i}addwl <Username>`
+   Add Channel to channelban whitelist.
+
+• `{i}remwl <Username>`
+   Remove Channel from channelban whitelist.
+
+• `{i}listwl` : List all whitelist channels.
+"""
+
+
+from pyUltroid.dB import autoban_db, dnd_db
+from pyUltroid.functions.admins import get_update_linked_chat
+from telethon import events
+from telethon.tl.types import Channel
+
+from . import LOGS, asst, get_string, inline_mention, ultroid_bot, ultroid_cmd
+
+
+async def dnd_func(event):
+    if event.chat_id in dnd_db.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()
+
+
+async def channel_del(event):
+    if not autoban_db.is_autoban_enabled(event.chat_id):
+        return
+    if autoban_db.is_whitelisted(event.chat_id, event.sender_id):
+        return
+    linked = await get_update_linked_chat(event)
+    if linked == event.sender.id:
+        return
+    if event.chat.creator or event.chat.admin_rights.ban_users:
+        try:
+            await event.client.edit_permissions(
+                event.chat_id, event.sender_id, view_messages=False
+            )
+        except Exception as er:
+            LOGS.exception(er)
+    await event.try_delete()
+
+
+@ultroid_cmd(
+    pattern="autokick (on|off)$",
+    admins_only=True,
+    manager=True,
+    require="ban_users",
+    fullsudo=True,
+)
+async def _(event):
+    match = event.pattern_match.group(1)
+    if match == "on":
+        if dnd_db.chat_in_dnd(event.chat_id):
+            return await event.eor("`Chat already in do not disturb mode.`", time=3)
+        dnd_db.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)
+    elif match == "off":
+        if not dnd_db.chat_in_dnd(event.chat_id):
+            return await event.eor("`Chat is not in do not disturb mode.`", time=3)
+        dnd_db.del_dnd(event.chat_id)
+        await event.eor("`Do not disturb mode deactivated for this chat.`", time=3)
+
+
+@ultroid_cmd(pattern="cban$", admins_only=True)
+async def ban_cha(ult):
+    if autoban_db.is_autoban_enabled(ult.chat_id):
+        autoban_db.del_channel(ult.chat_id)
+        return await ult.eor("`Disabled Auto ChannelBan...`")
+    if not (
+        ult.chat.creator
+        or (ult.chat.admin_rights.delete_messages or ult.chat.admin_rights.ban_users)
+    ):
+        return await ult.eor(
+            "You are missing required admin rights!\nYou can't use ChannelBan without Ban/del privilege..`"
+        )
+    autoban_db.add_channel(ult.chat_id)
+    await ult.eor("`Enabled Auto ChannelBan Successfully!`")
+    ult.client.add_handler(
+        channel_del,
+        events.NewMessage(
+            func=lambda x: not x.is_private and isinstance(x.sender, Channel)
+        ),
+    )
+
+
+@ultroid_cmd(pattern="(list|add|rem)wl( (.*)|$)")
+async def do_magic(event):
+    match = event.pattern_match.group(1)
+    msg = await event.eor(get_string("com_1"))
+    if match == "list":
+        cha = autoban_db.get_whitelisted_channels(event.chat_id)
+        if not cha:
+            return await msg.edit("`No Whitelisted channels for current chat.`")
+        Msg = "**Whitelist Channels in Current Chat**\n\n"
+        for ch in cha:
+            Msg += f"(`{ch}`) "
+            try:
+                Msg += inline_mention(await event.client.get_entity(ch))
+            except Exception:
+                Msg += "\n"
+        return await msg.edit(Msg)
+    usea = event.pattern_match.group(2).strip()
+    if not usea:
+        return await Msg.edit(
+            "`Please provide a channel username/id to add/remove to/from whitelist..`"
+        )
+    try:
+        u_id = await event.client.parse_id(usea)
+        cha = await event.client.get_entity(u_id)
+    except Exception as er:
+        LOGS.exception(er)
+        return await msg.edit(f"Error Broke Out!\n`{er}`")
+    if match == "add":
+        autoban_db.add_to_whitelist(event.chat_id, u_id)
+        return await msg.edit(f"`Added` {inline_mention(cha)} `to WhiteList..`")
+    autoban_db.del_from_whitelist(event.chat_id, u_id)
+    await msg.edit(f"`Removed` {inline_mention(cha)} `from WhiteList.`")
+
+
+if dnd_db.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))
+
+if autoban_db.get_all_channels():
+    ultroid_bot.add_handler(
+        channel_del,
+        events.NewMessage(
+            func=lambda x: not x.is_private and isinstance(x.sender, Channel)
+        ),
+    )

plugins/autocorrect.py

@@ -13,13 +13,14 @@
 
 import string
 
-from . import udB  # ignore: pylint
-from . import HNDLR, get_string, ultroid_bot, ultroid_cmd
+from . import HNDLR, LOGS, get_string, udB, ultroid_bot, ultroid_cmd  # ignore: pylint
 
 try:
     from gingerit.gingerit import GingerIt
 except ImportError:
     LOGS.info("GingerIt not found")
+    GingerIt = None
+
 from google_trans_new import google_translator
 from telethon import events
 
@@ -54,7 +55,7 @@ async def gramme(event):
         pass
 
 
-if udB.get_key("AUTOCORRECT"):
+if GingerIt and udB.get_key("AUTOCORRECT"):
     ultroid_bot.add_handler(
         gramme, events.NewMessage(outgoing=True, func=lambda x: x.text)
     )

plugins/autopic.py

@@ -92,8 +92,11 @@ if search := udB.get_key("AUTOPIC"):
         await ultroid_bot(UploadProfilePhotoRequest(file))
         shuffle(ok)
 
-    from apscheduler.schedulers.asyncio import AsyncIOScheduler
+    try:
+        from apscheduler.schedulers.asyncio import AsyncIOScheduler
 
-    schedule = AsyncIOScheduler()
-    schedule.add_job(autopic_func, "interval", seconds=sleep)
-    schedule.start()
+        schedule = AsyncIOScheduler()
+        schedule.add_job(autopic_func, "interval", seconds=sleep)
+        schedule.start()
+    except ModuleNotFoundError as er:
+        LOGS.error(f"autopic: '{er.name}' not installed.")

plugins/bot.py

@@ -38,13 +38,21 @@ import time
 from platform import python_version as pyver
 from random import choice
 
-from git import Repo
 from pyUltroid.version import __version__ as UltVer
 from telethon import __version__
 from telethon.errors.rpcerrorlist import (
     BotMethodInvalidError,
     ChatSendMediaForbiddenError,
 )
+
+from . import HOSTED_ON, LOGS
+
+try:
+    from git import Repo
+except ImportError:
+    LOGS.error("bot: 'gitpython' module not found!")
+    Repo = None
+
 from telethon.utils import resolve_bot_file_id
 
 from . import (
@@ -132,7 +140,7 @@ async def lol(ult):
         parse = "html"
         als = in_alive.format(
             header,
-            ultroid_version,
+            ultroid_version + f" [{HOSTED_ON}]",
             UltVer,
             pyver(),
             uptime,
@@ -145,7 +153,7 @@ async def lol(ult):
         als = (get_string("alive_1")).format(
             header,
             OWNER_NAME,
-            ultroid_version,
+            ultroid_version + f" [{HOSTED_ON}]",
             UltVer,
             uptime,
             pyver(),
@@ -272,7 +280,7 @@ async def inline_alive(ult):
     kk = f"<a href={rep}>{y}</a>"
     als = in_alive.format(
         header,
-        ultroid_version,
+        ultroid_version + f" [{HOSTED_ON}]",
         UltVer,
         pyver(),
         uptime,
@@ -319,9 +327,12 @@ async def inline_alive(ult):
 @ultroid_cmd(pattern="update( (.*)|$)")
 async def _(e):
     xx = await e.eor(get_string("upd_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()
+    if HOSTED_ON == "heroku" or (
+        e.pattern_match.group(1).strip()
+        and (
+            "fast" in e.pattern_match.group(1).strip()
+            or "soft" in e.pattern_match.group(1).strip()
+        )
     ):
         await bash("git pull -f && pip3 install -r requirements.txt")
         call_back()

plugins/button.py

@@ -15,11 +15,12 @@ Format:- `{i}button Hey There! @UseUltroid 😎.
 [TeamUltroid | t.me/TeamUltroid]`
 """
 import os
+
 from pyUltroid.functions.tools import create_tl_btn, get_msg_button
 from telegraph import upload_file as uf
 from telethon.utils import pack_bot_file_id
 
-from . import HNDLR, ultroid_cmd, mediainfo, get_string
+from . import HNDLR, get_string, mediainfo, ultroid_cmd
 from ._inline import something
 
 

plugins/chats.py

@@ -11,6 +11,9 @@
     Delete the group this cmd is used in.
 
 • `{i}getlink`
+• `{i}getlink r` - `create link with admin approval`
+• `{i}getlink r title_here` - `admin approval with link title`
+• `{i}getlink 10` - `usage limit in new link`
     Get link of group this cmd is used in.
 
 • `{i}create (g|b|c) <group_name> ; <optional-username>`
@@ -80,8 +83,9 @@ async def _(e):
         int(udB.get_key("LOG_CHANNEL")), get_string("chats_6").format(e.chat_id)
     )
 
+
 @ultroid_cmd(
-    pattern="getlink",
+    pattern="getlink( (.*)|$)",
     groups_only=True,
     manager=True,
 )
@@ -94,16 +98,34 @@ async def _(e):
         chat = await e.get_chat()
     if hasattr(chat, "username") and chat.username:
         return await e.eor(f"Username: @{chat.username}")
-    request, usage = None, None
+    request, usage, title = None, None, None
     if match:
-        split = match.split()
+        split = match.split(maxsplit=1)
         request = bool(split[0] in ["r", "request"])
-        if len(split) > 1 and split[1].isdigit():
-            usage = int(split[1])
-    if request:
+        title = "Created by Ultroid"
+        if len(split) > 1:
+            match = split[1]
+            spli = match.split(maxsplit=1)
+            if spli[0].isdigit():
+                usage = int(spli[0])
+            if len(spli) > 1:
+                title = spli[1]
+        elif not request:
+            if match.isdigit():
+                usage = int(match)
+            else:
+                title = match
+        if request and usage:
+            usage = 0
+    if request or title:
         try:
             r = await e.client(
-                ExportChatInviteRequest(e.chat_id, request_needed=request, usage_limit=usage, title="Create via Ultroid"),
+                ExportChatInviteRequest(
+                    e.chat_id,
+                    request_needed=request,
+                    usage_limit=usage,
+                    title=title,
+                ),
             )
         except no_admin:
             return await e.eor(get_string("chats_2"), time=10)

plugins/database.py

@@ -14,6 +14,7 @@
     e.g :
     `{i}setdb hi there`
     `{i}setdb hi there | ultroid here`
+    `{i}setdb --extend variable value` or `{i}setdb -e variable value` to add the value to the exiting values in db.
 
 • `{i}deldb key`
     Delete Key from DB.

plugins/devtools.py

@@ -9,6 +9,7 @@
 ✘ Commands Available -
 
 • `{i}bash <cmds>`
+• `{i}bash -c <cmds>` Carbon image as command output.
     Run linux commands on telegram.
 
 • `{i}eval <code>`
@@ -26,7 +27,6 @@
 • `{i}sysinfo`
     Shows System Info.
 """
-from __future__ import print_function
 
 import sys
 import traceback
@@ -41,9 +41,16 @@ try:
     import black
 except ImportError:
     black = None
+from random import choice
 
+try:
+    from telegraph import upload_file as uf
+except ImportError:
+    uf = None
 from . import *
 
+_ignore_eval = []
+
 
 @ultroid_cmd(
     pattern="sysinfo$",
@@ -53,7 +60,7 @@ async def _(e):
     x, y = await bash("neofetch|sed 's/\x1B\\[[0-9;\\?]*[a-zA-Z]//g' >> neo.txt")
     with open("neo.txt", "r") as neo:
         p = (neo.read()).replace("\n\n", "")
-    haa = await Carbon(code=p, file_name="neofetch")
+    haa = await Carbon(code=p, file_name="neofetch", backgroundColor=choice(ATRA_COL))
     await e.reply(file=haa)
     await xx.delete()
     remove("neo.txt")
@@ -61,11 +68,19 @@ async def _(e):
 
 @ultroid_cmd(pattern="bash", fullsudo=True, only_devs=True)
 async def _(event):
+    carb = None
     try:
         cmd = event.text.split(" ", maxsplit=1)[1]
+        if cmd.split()[0] in ["-c", "--carbon"]:
+            cmd = cmd.split(maxsplit=1)[1]
+            carb = True
     except IndexError:
         return await event.eor(get_string("devs_1"), time=10)
     xx = await event.eor(get_string("com_1"))
+    if event.sender_id in _ignore_eval:
+        return await xx.edit(
+            "`You cannot use this command now. Contact owner of this bot!`"
+        )
     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"
@@ -73,9 +88,23 @@ async def _(event):
     if stderr:
         err = f"**• ERROR:** \n`{stderr}`\n\n"
     if stdout:
-        _o = stdout.split("\n")
-        o = "\n".join(_o)
-        out = f"**• OUTPUT:**\n`{o}`"
+        if (carb or udB.get_key("CARBON_ON_BASH")) and (
+            event.chat.admin_rights
+            or event.chat.creator
+            or event.chat.default_banned_rights.embed_links
+        ):
+            li = await Carbon(
+                code=stdout,
+                file_name="bash",
+                download=True,
+                backgroundColor=choice(ATRA_COL),
+            )
+            url = "https://telegra.ph" + uf(li)[-1]
+            OUT = f"[\xad]({url})" + OUT
+            out = "**• OUTPUT:**"
+            remove(li)
+        else:
+            out = f"**• OUTPUT:**\n`{stdout}`"
     if not stderr and not stdout:
         out = "**• OUTPUT:**\n`Success`"
     OUT += err + out
@@ -95,7 +124,7 @@ async def _(event):
 
             await xx.delete()
     else:
-        await xx.edit(OUT)
+        await xx.edit(OUT, link_preview=True)
 
 
 pp = pprint  # ignore: pylint
@@ -118,9 +147,6 @@ def _parse_eval(value=None):
     return str(value)
 
 
-_ignore_eval = []
-
-
 @ultroid_cmd(pattern="eval", fullsudo=True, only_devs=True)
 async def _(event):
     try:
@@ -150,13 +176,13 @@ async def _(event):
             # Consider it as Code Error, and move on to be shown ahead.
             pass
     reply_to_id = event.reply_to_msg_id or event
+    if event.sender_id in _ignore_eval:
+        return await xx.edit(
+            "`You cannot use this command now. Contact owner of this bot!`"
+        )
     if any(item in cmd for item in KEEP_SAFE().All) and (
         not (event.out or event.sender_id == ultroid_bot.uid)
     ):
-        if event.sender_id in _ignore_eval:
-            return await xx.edit(
-                "`You cannot use this command now. Contact owner of this bot!`"
-            )
         warning = await event.forward_to(udB.get_key("LOG_CHANNEL"))
         await warning.reply(
             f"Malicious Activities suspected by {inline_mention(await event.get_sender())}"
@@ -259,7 +285,7 @@ async def doie(e):
     open("cpp-ultroid.cpp", "w").write(match)
     m = await bash("g++ -o CppUltroid cpp-ultroid.cpp")
     o_cpp = f"• **Eval-Cpp**\n`{match}`"
-    if m[1] != "":
+    if m[1]:
         o_cpp += f"\n\n**• Error :**\n`{m[1]}`"
         if len(o_cpp) > 3000:
             os.remove("cpp-ultroid.cpp")
@@ -272,7 +298,7 @@ async def doie(e):
     m = await bash("./CppUltroid")
     if m[0] != "":
         o_cpp += f"\n\n**• Output :**\n`{m[0]}`"
-    if m[1] != "":
+    if m[1]:
         o_cpp += f"\n\n**• Error :**\n`{m[1]}`"
     if len(o_cpp) > 3000:
         with BytesIO(str.encode(o_cpp)) as out_file:

plugins/dnd.py

@@ -1,59 +0,0 @@
-# Ultroid - UserBot
-# Copyright (C) 2021-2022 TeamUltroid
-#
-# This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
-# PLease read the GNU Affero General Public License in
-# <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
-
-"""
-✘ Commands Available
-
-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

@@ -23,6 +23,7 @@
 """
 
 import asyncio
+import glob
 import os
 import time
 from datetime import datetime as dt
@@ -135,13 +136,12 @@ async def download(event):
     pattern="ul( (.*)|$)",
 )
 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()
+    if not event.out and match == ".env":
+        return await event.reply("`You can't do this...`")
     stream, force_doc, delete, thumb = (
         False,
         True,
@@ -163,57 +163,63 @@ async def _(event):
             .replace("--no-thumb", "")
             .strip()
         )
-    if not os.path.exists(match):
+    if match.endswith("/"):
+        match += "*"
+    results = glob.glob(match)
+    if not results and os.path.exists(match):
+        results = [match]
+    if not results:
         try:
             await event.reply(file=match)
-            await event.try_delete()
+            return await event.try_delete()
         except Exception as er:
             LOGS.exception(er)
         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:
+    for result in results:
+        if os.path.isdir(result):
+            c, s = 0, 0
+            for files in sorted(glob.glob(result + "/*")):
+                attributes = None
+                if stream:
+                    try:
+                        attributes = await set_attributes(files)
+                    except KeyError as er:
+                        LOGS.exception(er)
                 try:
-                    attributes = await set_attributes(files)
-                except KeyError as er:
-                    LOGS.exception(er)
+                    file, _ = await event.client.fast_uploader(
+                        files, 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` `{files}` `in {time_formatter(_*1000)}`",
+                        reply_to=event.reply_to_msg_id or event,
+                    )
+                    s += 1
+                except (ValueError, IsADirectoryError):
+                    c += 1
+            break
+        attributes = None
+        if stream:
             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,
-                    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,
-                )
-                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,
-    )
+                attributes = await set_attributes(result)
+            except KeyError as er:
+                LOGS.exception(er)
+        file, _ = await event.client.fast_uploader(
+            result, 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` `{result}` `in {time_formatter(_*1000)}`",
+            reply_to=event.reply_to_msg_id or event,
+        )
     await msg.try_delete()

plugins/fakeaction.py

@@ -56,7 +56,7 @@ async def _(e):
     if t.isdigit():
         t = int(t)
     elif t.endswith(("s", "h", "d", "m")):
-        t = math.ceil((await ban_time(e, t)) - time.time())
+        t = math.ceil((ban_time(e, t)) - time.time())
     else:
         t = 60
     await e.eor(get_string("fka_1").format(str(t)), time=5)

plugins/fileshare.py

@@ -24,7 +24,7 @@ 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, get_string, in_pattern, udB, ultroid_bot, ultroid_cmd, HNDLR
+from . import HNDLR, asst, get_string, in_pattern, udB, ultroid_bot, ultroid_cmd
 
 
 @ultroid_cmd(pattern="store$")

plugins/forcesubscribe.py

@@ -87,7 +87,7 @@ async def fcall(e):
     spli = match.split("_")
     user = await ultroid_bot.get_entity(int(spli[0]))
     cl = await ultroid_bot.get_entity(int(spli[1]))
-    text = f"Hi [{inline_mention(user)}), You Need to Join"
+    text = f"Hi {inline_mention(user)}, You Need to Join"
     text += f" {cl.title} in order to Chat in this Group."
     if not cl.username:
         el = (await ultroid_bot(ExportChatInviteRequest(cl))).link
@@ -131,7 +131,6 @@ async def diesoon(e):
 async def force_sub(ult):
     if not udB.get_key("FORCESUB"):
         return
-
     user = await ult.get_sender()
     joinchat = get_forcesetting(ult.chat_id)
     if (not joinchat) or (isinstance(user, User) and user.bot):
@@ -145,7 +144,7 @@ async def force_sub(ult):
         CACHE.update({ult.chat_id: {user.id: 1}})
     count = CACHE[ult.chat_id][user.id]
     if count == 11:
-        CACHE[ult.chat_id][user.id].update(1)
+        CACHE[ult.chat_id][user.id] = 1
         return
     if count in range(2, 11):
         return
@@ -167,6 +166,7 @@ async def force_sub(ult):
     except ChatAdminRequiredError:
         return
     except Exception as e:
+        await ult.delete()
         LOGS.info(e)
     res = await ultroid_bot.inline_query(asst.me.username, f"fsub {user.id}_{joinchat}")
     await res[0].click(ult.chat_id, reply_to=ult.id)

plugins/globaltools.py

@@ -291,7 +291,9 @@ async def _(e):
     xx = await e.eor("`UnGbanning...`")
     match = e.pattern_match.group(1).strip()
     peer = None
-    if match:
+    if e.reply_to_msg_id:
+        userid = (await e.get_reply_message()).sender_id
+    elif match:
         try:
             userid = int(match)
         except ValueError:
@@ -300,8 +302,6 @@ async def _(e):
             userid = (await e.client.get_entity(userid)).id
         except (ValueError, Exception) as er:
             return await xx.edit(f"Failed to get User...\nError: {er}")
-    elif e.reply_to_msg_id:
-        userid = (await e.get_reply_message()).sender_id
     elif e.is_private:
         userid = e.chat_id
     else:
@@ -354,7 +354,13 @@ async def _(e):
 async def _(e):
     xx = await e.eor("`Gbanning...`")
     reason = ""
-    if e.pattern_match.group(1).strip():
+    if e.reply_to_msg_id:
+        userid = (await e.get_reply_message()).sender_id
+        try:
+            reason = e.text.split(" ", maxsplit=1)[1]
+        except IndexError:
+            pass
+    elif e.pattern_match.group(1).strip():
         usr = e.text.split(maxsplit=2)[1]
         try:
             userid = await e.client.parse_id(usr)
@@ -364,12 +370,6 @@ async def _(e):
             reason = e.text.split(maxsplit=2)[2]
         except IndexError:
             pass
-    elif e.reply_to_msg_id:
-        userid = (await e.get_reply_message()).sender_id
-        try:
-            reason = e.text.split(" ", maxsplit=1)[1]
-        except IndexError:
-            pass
     elif e.is_private:
         userid = e.chat_id
         try:
@@ -503,8 +503,8 @@ async def gcast(event):
                                 chat, msg, file=reply.media if reply else None
                             )
                         done += 1
-                    except Exception as er:
-                        err += f"• {er}\n"
+                    except Exception as rr:
+                        err += f"• {rr}\n"
                         er += 1
                 except BaseException as h:
                     err += "• " + str(h) + "\n"

plugins/imagetools.py

@@ -52,13 +52,16 @@
 • `{i}pixelator <reply image>`
     Create a Pixelated Image..
 """
-import asyncio
 import os
 
-import cv2
-import numpy as np
+from . import LOGS, con
 
-from . import LOGS
+try:
+    import cv2
+except ImportError:
+    LOGS.error(f"{__file__}: OpenCv not Installed.")
+
+import numpy as np
 
 try:
     from PIL import Image
@@ -94,22 +97,7 @@ async def sketch(e):
     ultt = await ureply.download_media()
     if ultt.endswith(".tgs"):
         await xx.edit(get_string("sts_9"))
-        cmd = ["lottie_convert.py", ultt, "ult.png"]
-        file = "ult.png"
-        process = await asyncio.create_subprocess_exec(
-            *cmd,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await process.communicate()
-        stderr.decode().strip()
-        stdout.decode().strip()
-    else:
-        await xx.edit(get_string("com_1"))
-        img = cv2.VideoCapture(ultt)
-        heh, lol = img.read()
-        cv2.imwrite("ult.png", lol)
-        file = "ult.png"
+    file = await con.convert(ultt, convert_to="png", outname="ult")
     img = cv2.imread(file)
     gray_image = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
     inverted_gray_image = 255 - gray_image
@@ -164,22 +152,7 @@ async def ultd(event):
     ultt = await ureply.download_media()
     if ultt.endswith(".tgs"):
         xx = await event.eor(get_string("sts_9"))
-        cmd = ["lottie_convert.py", ultt, "ult.png"]
-        file = "ult.png"
-        process = await asyncio.create_subprocess_exec(
-            *cmd,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await process.communicate()
-        stderr.decode().strip()
-        stdout.decode().strip()
-    else:
-        xx = await event.eor(get_string("com_1"))
-        img = cv2.VideoCapture(ultt)
-        heh, lol = img.read()
-        cv2.imwrite("ult.png", lol)
-        file = "ult.png"
+    file = await con.convert(ultt, convert_to="png", outname="ult")
     ult = cv2.imread(file)
     ultroid = cv2.cvtColor(ult, cv2.COLOR_BGR2GRAY)
     cv2.imwrite("ult.jpg", ultroid)
@@ -206,22 +179,7 @@ async def ultd(event):
     ultt = await ureply.download_media()
     if ultt.endswith(".tgs"):
         xx = await event.eor(get_string("sts_9"))
-        cmd = ["lottie_convert.py", ultt, "ult.png"]
-        file = "ult.png"
-        process = await asyncio.create_subprocess_exec(
-            *cmd,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await process.communicate()
-        stderr.decode().strip()
-        stdout.decode().strip()
-    else:
-        xx = await event.eor(get_string("com_1"))
-        img = cv2.VideoCapture(ultt)
-        heh, lol = img.read()
-        cv2.imwrite("ult.png", lol)
-        file = "ult.png"
+    file = await con.convert(ultt, convert_to="png", outname="ult")
     ult = cv2.imread(file)
     ultroid = cv2.GaussianBlur(ult, (35, 35), 0)
     cv2.imwrite("ult.jpg", ultroid)
@@ -249,22 +207,7 @@ async def ultd(event):
     ultt = await ureply.download_media()
     if ultt.endswith(".tgs"):
         await xx.edit(get_string("sts_9"))
-        cmd = ["lottie_convert.py", ultt, "ult.png"]
-        file = "ult.png"
-        process = await asyncio.create_subprocess_exec(
-            *cmd,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await process.communicate()
-        stderr.decode().strip()
-        stdout.decode().strip()
-    else:
-        await xx.edit(get_string("com_1"))
-        img = cv2.VideoCapture(ultt)
-        heh, lol = img.read()
-        cv2.imwrite("ult.png", lol)
-        file = "ult.png"
+    file = await con.convert(ultt, convert_to="png", outname="ult")
     ult = cv2.imread(file)
     ultroid = cv2.bitwise_not(ult)
     cv2.imwrite("ult.jpg", ultroid)
@@ -290,24 +233,7 @@ async def ultd(event):
         await xx.edit(get_string("cvt_3"))
         return
     ultt = await ureply.download_media()
-    if ultt.endswith(".tgs"):
-        await xx.edit(get_string("sts_9"))
-        cmd = ["lottie_convert.py", ultt, "ult.png"]
-        file = "ult.png"
-        process = await asyncio.create_subprocess_exec(
-            *cmd,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await process.communicate()
-        stderr.decode().strip()
-        stdout.decode().strip()
-    else:
-        await xx.edit(get_string("com_1"))
-        img = cv2.VideoCapture(ultt)
-        heh, lol = img.read()
-        cv2.imwrite("ult.png", lol)
-        file = "ult.png"
+    file = await con.convert(ultt, convert_to="png", outname="ult")
     ult = cv2.imread(file)
     ish = cv2.flip(ult, 1)
     ultroid = cv2.hconcat([ult, ish])
@@ -336,22 +262,7 @@ async def ultd(event):
     ultt = await ureply.download_media()
     if ultt.endswith(".tgs"):
         await xx.edit(get_string("sts_9"))
-        cmd = ["lottie_convert.py", ultt, "ult.png"]
-        file = "ult.png"
-        process = await asyncio.create_subprocess_exec(
-            *cmd,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await process.communicate()
-        stderr.decode().strip()
-        stdout.decode().strip()
-    else:
-        await xx.edit(get_string("com_1"))
-        img = cv2.VideoCapture(ultt)
-        heh, lol = img.read()
-        cv2.imwrite("ult.png", lol)
-        file = "ult.png"
+    file = await con.convert(ultt, convert_to="png", outname="ult")
     ult = cv2.imread(file)
     trn = cv2.flip(ult, 1)
     ish = cv2.rotate(trn, cv2.ROTATE_180)
@@ -381,22 +292,7 @@ async def ultd(event):
     ultt = await ureply.download_media()
     if ultt.endswith(".tgs"):
         await xx.edit(get_string("sts_9"))
-        cmd = ["lottie_convert.py", ultt, "ult.png"]
-        file = "ult.png"
-        process = await asyncio.create_subprocess_exec(
-            *cmd,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await process.communicate()
-        stderr.decode().strip()
-        stdout.decode().strip()
-    else:
-        await xx.edit(get_string("com_1"))
-        img = cv2.VideoCapture(ultt)
-        heh, lol = img.read()
-        cv2.imwrite("ult.png", lol)
-        file = "ult.png"
+    file = await con.convert(ultt, convert_to="png", outname="ult")
     ult = cv2.imread(file)
     roid = cv2.flip(ult, 1)
     mici = cv2.hconcat([ult, roid])
@@ -428,22 +324,7 @@ async def ultd(event):
     ultt = await ureply.download_media()
     if ultt.endswith(".tgs"):
         await xx.edit(get_string("sts_9"))
-        cmd = ["lottie_convert.py", ultt, "ult.png"]
-        file = "ult.png"
-        process = await asyncio.create_subprocess_exec(
-            *cmd,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await process.communicate()
-        stderr.decode().strip()
-        stdout.decode().strip()
-    else:
-        await xx.edit(get_string("com_1"))
-        img = cv2.VideoCapture(ultt)
-        heh, lol = img.read()
-        cv2.imwrite("ult.png", lol)
-        file = "ult.png"
+    file = await con.convert(ultt, convert_to="png", outname="ult")
     ult = cv2.imread(file)
     height, width, channels = ult.shape
     samples = np.zeros([height * width, 3], dtype=np.float32)
@@ -488,22 +369,7 @@ async def ultd(event):
     ultt = await ureply.download_media()
     if ultt.endswith(".tgs"):
         await xx.edit(get_string("sts_9"))
-        cmd = ["lottie_convert.py", ultt, "ult.png"]
-        file = "ult.png"
-        process = await asyncio.create_subprocess_exec(
-            *cmd,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await process.communicate()
-        stderr.decode().strip()
-        stdout.decode().strip()
-    else:
-        await xx.edit(get_string("com_1"))
-        img = cv2.VideoCapture(ultt)
-        heh, lol = img.read()
-        cv2.imwrite("ult.png", lol)
-        file = "ult.png"
+    file = await con.convert(ultt, convert_to="png", outname="ult")
     ult = cv2.imread(file)
     dan = cv2.cvtColor(ult, cv2.COLOR_BGR2RGB)
     ultroid = cv2.cvtColor(dan, cv2.COLOR_HSV2BGR)
@@ -553,22 +419,7 @@ async def ultd(event):
     ultt = await ureply.download_media()
     if ultt.endswith(".tgs"):
         await xx.edit(get_string("sts_9"))
-        cmd = ["lottie_convert.py", ultt, "ult.png"]
-        file = "ult.png"
-        process = await asyncio.create_subprocess_exec(
-            *cmd,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await process.communicate()
-        stderr.decode().strip()
-        stdout.decode().strip()
-    else:
-        await xx.edit(get_string("com_1"))
-        img = cv2.VideoCapture(ultt)
-        heh, lol = img.read()
-        cv2.imwrite("ult.png", lol)
-        file = "ult.png"
+    file = await con.convert(ultt, convert_to="png", outname="ult")
     got = upf(file)
     lnk = f"https://telegra.ph{got[0]}"
     r = await async_searcher(

plugins/instagram.py

@@ -103,17 +103,13 @@ async def insta_dl(e):
         e.media.webpage, WebPage
     ):
         photo = e.media.webpage.photo or e.media.webpage.document
-        if not photo:
-            return await eor(
-                tt,
-                "Please Fill `INSTA_USERNAME` and `INSTA_PASSWORD` to Use This Comamand!",
+        if photo:
+            await tt.delete()
+            return await e.reply(
+                f"**Link** :{text}\n\nIf This Wasnt Excepted Result, Please Fill `INSTA_USERNAME` and `INSTA_PASSWORD`...",
+                file=photo,
             )
-        await tt.delete()
-        return await e.reply(
-            f"**Link** :{text}\n\nIf This Wasnt Excepted Result, Please Fill `INSTA_USERNAME` and `INSTA_PASSWORD`...",
-            file=photo,
-        )
-    await eor(tt, "Please Fill Instagram Credential to Use this Command...")
+    # await eor(tt, "Please Fill Instagram Credential to Use this Command...")
 
 
 @ultroid_cmd(pattern="instadata( (.*)|$)")
@@ -156,7 +152,7 @@ async def soon_(e):
 async def insta_karbon(event):
     cl = await create_instagram_client(event)
     if not cl:
-        return await event.eor("`Please Fill Instagram Credentials to Use This...`")
+        return
     msg = await event.eor(get_string("com_1"))
     replied = await event.get_reply_message()
     type_ = event.pattern_match.group(1).strip()

plugins/misc.py

@@ -22,13 +22,19 @@
     Convert replied image into html.
 """
 
-import calendar
 import os
 from datetime import datetime as dt
 
 from bs4 import BeautifulSoup as bs
-from htmlwebshot import WebShot
-from img2html.converter import Img2HTMLConverter
+
+try:
+    from htmlwebshot import WebShot
+except ImportError:
+    WebShot = None
+try:
+    from img2html.converter import Img2HTMLConverter
+except ImportError:
+    Img2HTMLConverter = None
 
 from . import async_searcher, get_random_user_data, get_string, re, ultroid_cmd
 
@@ -120,6 +126,8 @@ async def _gen_data(event):
     pattern="ascii( (.*)|$)",
 )
 async def _(e):
+    if not Img2HTMLConverter:
+        return await e.eor("'img2html-converter' not installed!")
     if not e.reply_to_msg_id:
         return await e.eor(get_string("ascii_1"))
     m = await e.eor(get_string("ascii_2"))

plugins/mute.py

@@ -31,7 +31,7 @@ from pyUltroid.functions.admins import ban_time
 from telethon import events
 from telethon.utils import get_display_name
 
-from . import eod, get_string, inline_mention, ultroid_bot, ultroid_cmd
+from . import asst, eod, get_string, inline_mention, ultroid_bot, ultroid_cmd
 
 
 @ultroid_bot.on(events.NewMessage(incoming=True))
@@ -54,14 +54,17 @@ async def startmute(event):
         except Exception as x:
             return await xx.edit(str(x))
     elif event.reply_to_msg_id:
-        userid = (await event.get_reply_message()).sender_id
+        reply = await event.get_reply_message()
+        userid = reply.sender_id
+        if reply.out or userid in [ultroid_bot.me.id, asst.me.id]:
+            return await xx.eor("`You cannot mute yourself or your assistant bot.`")
     elif event.is_private:
         userid = event.chat_id
     else:
         return await xx.eor("`Reply to a user or add their userid.`", time=5)
     chat = await event.get_chat()
     if "admin_rights" in vars(chat) and vars(chat)["admin_rights"] is not None:
-        if chat.admin_rights.delete_messages is not True:
+        if not chat.admin_rights.delete_messages:
             return await xx.eor("`No proper admin rights...`", time=5)
     elif "creator" not in vars(chat) and not event.is_private:
         return await xx.eor("`No proper admin rights...`", time=5)
@@ -88,10 +91,9 @@ async def endmute(event):
         userid = event.chat_id
     else:
         return await xx.eor("`Reply to a user or add their userid.`", time=5)
-    chat_id = event.chat_id
-    if not is_muted(chat_id, userid):
+    if not is_muted(event.chat_id, userid):
         return await xx.eor("`This user is not muted in this chat.`", time=3)
-    unmute(chat_id, userid)
+    unmute(event.chat_id, userid)
     await xx.eor("`Successfully unmuted...`", time=3)
 
 
@@ -124,7 +126,7 @@ async def _(e):
     if userid == ultroid_bot.uid:
         return await xx.eor("`I can't mute myself.`", time=3)
     try:
-        bun = await ban_time(xx, tme)
+        bun = ban_time(xx, tme)
         await e.client.edit_permissions(
             chat.id,
             userid,

plugins/nightmode.py

@@ -29,12 +29,19 @@ And Turn On auto at morning
    Ex- `nmtime 01 00 06 30`
 """
 
-from apscheduler.schedulers.asyncio import AsyncIOScheduler
+from . import LOGS
+
+try:
+    from apscheduler.schedulers.asyncio import AsyncIOScheduler
+except ImportError:
+    LOGS.error("nightmode: 'apscheduler' not Installed!")
+    AsyncIOScheduler = None
+
 from pyUltroid.dB.night_db import *
 from telethon.tl.functions.messages import EditChatDefaultBannedRightsRequest
 from telethon.tl.types import ChatBannedRights
 
-from . import LOGS, get_string, ultroid_bot, ultroid_cmd, udB
+from . import get_string, udB, ultroid_bot, ultroid_cmd
 
 
 @ultroid_cmd(pattern="nmtime( (.*)|$)")
@@ -138,7 +145,7 @@ async def close_grp():
             LOGS.info(er)
 
 
-if night_grps():
+if AsyncIOScheduler and night_grps():
     try:
         h1, m1, h2, m2 = 0, 0, 7, 0
         if udB.get_key("NIGHT_TIME"):

plugins/nsfwfilter.py

@@ -16,10 +16,16 @@
 
 import os
 
-from ProfanityDetector import detector
+from . import LOGS
+
+try:
+    from ProfanityDetector import detector
+except ImportError:
+    detector = None
+    LOGS.error("nsfwfilter: 'Profanitydetector' not installed!")
 from pyUltroid.dB.nsfw_db import is_nsfw, nsfw_chat, rem_nsfw
 
-from . import HNDLR, LOGS, async_searcher, eor, events, udB, ultroid_bot, ultroid_cmd
+from . import HNDLR, async_searcher, eor, events, udB, ultroid_bot, ultroid_cmd
 
 
 @ultroid_cmd(pattern="addnsfw( (.*)|$)", admins_only=True)
@@ -56,7 +62,7 @@ async def nsfw_check(e):
             pass
         if e.file:
             name = e.file.name
-        if name:
+        if detector and name:
             x, y = detector(name)
             if y:
                 nsfw += 1

plugins/pmpermit.py

@@ -8,28 +8,28 @@
 ✘ Commands Available -
 
 • `{i}a` or `{i}approve`
-    To Approve Someone In PM.
+    Approve someone to PM.
 
 • `{i}da` or `{i}disapprove`
-    To Disapprove Someone In PM.
+    Disapprove someone to PM.
 
 • `{i}block`
-    To Block Someone in PM.
+    Block someone.
 
 • `{i}unblock` | `{i}unblock all`
-    To Unblock Someone in PM.
+    Unblock someone.
 
 • `{i}nologpm`
-    To stop logging from that user.
+    Stop logging messages from the user.
 
 • `{i}logpm`
-    Start logging again from that user.
+    Start logging messages from the user.
 
 • `{i}startarchive`
-    Will start adding new PMs to archive.
+    Archive new PMs.
 
 • `{i}stoparchive`
-    Will stop adding new PMs to archive.
+    Don't archive new PMs.
 
 • `{i}cleararchive`
     Unarchive all chats.
@@ -45,7 +45,11 @@ from os import remove
 from pyUltroid.dB import DEVLIST
 from pyUltroid.dB.logusers_db import *
 from pyUltroid.dB.pmpermit_db import *
-from tabulate import tabulate
+
+try:
+    from tabulate import tabulate
+except ImportError:
+    tabulate = None
 from telethon import events
 from telethon.errors import MessageNotModifiedError
 from telethon.tl.functions.contacts import (
@@ -155,7 +159,7 @@ if udB.get_key("PMLOG"):
 
 
 if udB.get_key("PMSETTING"):
-    if udB.get_key("AUTOAPPROVE") in [True, None]:
+    if udB.get_key("AUTOAPPROVE"):
 
         @ultroid_bot.on(
             events.NewMessage(
@@ -353,7 +357,7 @@ if udB.get_key("PMSETTING"):
                 COUNT_PM[user.id] = COUNT_PM[user.id] + 1
             if COUNT_PM[user.id] >= WARNS:
                 await delete_pm_warn_msgs(user.id)
-                await event.respond(UNS)
+                _to_delete[user.id] = await event.respond(UNS)
                 try:
                     del COUNT_PM[user.id]
                     del LASTMSG[user.id]
@@ -516,7 +520,7 @@ async def blockpm(block):
         )
     await block.client(BlockRequest(user))
     aname = await block.client.get_entity(user)
-    await block.eor(f"`{aname.first_name} has been blocked!`")
+    await block.eor(f"{inline_mention(aname)} `has been blocked!`")
     try:
         disapprove_user(user)
     except AttributeError:
@@ -525,7 +529,7 @@ async def blockpm(block):
         await asst.edit_message(
             int(udB.get_key("LOG_CHANNEL")),
             _not_approved[user],
-            f"#BLOCKED\n\n[{aname.first_name}](tg://user?id={user}) [`{user}`] has been **blocked**.",
+            f"#BLOCKED\n\n{inline_mention(aname)} [`{user}`] has been **blocked**.",
             buttons=[
                 Button.inline("UnBlock", data=f"unblock_{user}"),
             ],
@@ -533,7 +537,7 @@ async def blockpm(block):
     except KeyError:
         _not_approved[user] = await asst.send_message(
             int(udB.get_key("LOG_CHANNEL")),
-            f"#BLOCKED\n\n[{aname.first_name}](tg://user?id={user}) [`{user}`] has been **blocked**.",
+            f"#BLOCKED\n\n{inline_mention(aname)} [`{user}`] has been **blocked**.",
             buttons=[
                 Button.inline("UnBlock", data=f"unblock_{user}"),
             ],
@@ -544,31 +548,38 @@ async def blockpm(block):
 
 @ultroid_cmd(pattern="unblock( (.*)|$)")
 async def unblockpm(event):
-    match = (
-        event.pattern_match.group(1).strip()
-        or (await event.get_reply_message()).sender_id
-    )
-    if not match:
-        return await event.eor(NO_REPLY + "`Or give it's username/id`", time=5)
-    if match == "all":
-        msg = await event.eor(get_string("com_1"))
-        u_s = await event.client(GetBlockedRequest(0, 0))
-        count = len(u_s.users)
-        if not count:
-            return await eor(msg, "__You have not blocked Anyone...__")
-        for user in u_s.users:
-            await asyncio.sleep(1)
-            await event.client(UnblockRequest(user.id))
-        # GetBlockedRequest return 20 users at most.
-        if count < 20:
-            return await eor(msg, f"__Unblocked {count} Users!__")
-        while u_s.users:
+    match = event.pattern_match.group(1).strip()
+    if event.reply_to_msg_id:
+        user = (await event.get_reply_message()).sender_id
+    elif match:
+        if match == "all":
+            msg = await event.eor(get_string("com_1"))
             u_s = await event.client(GetBlockedRequest(0, 0))
+            count = len(u_s.users)
+            if not count:
+                return await eor(msg, "__You have not blocked Anyone...__")
             for user in u_s.users:
-                await asyncio.sleep(3)
+                await asyncio.sleep(1)
                 await event.client(UnblockRequest(user.id))
-            count += len(u_s.users)
-        return await eor(msg, f"__Unblocked {count} users.__")
+            # GetBlockedRequest return 20 users at most.
+            if count < 20:
+                return await eor(msg, f"__Unblocked {count} Users!__")
+            while u_s.users:
+                u_s = await event.client(GetBlockedRequest(0, 0))
+                for user in u_s.users:
+                    await asyncio.sleep(3)
+                    await event.client(UnblockRequest(user.id))
+                count += len(u_s.users)
+            return await eor(msg, f"__Unblocked {count} users.__")
+
+        try:
+            user = await event.client.parse_id(match)
+        except Exception as er:
+            return await event.eor(str(er))
+    elif block.is_private:
+        user = (await event.get_chat()).id
+    else:
+        return await event.eor(NO_REPLY, time=10)
     try:
         user = await event.client.parse_id(match)
     except Exception as er:
@@ -576,7 +587,7 @@ async def unblockpm(event):
     try:
         await event.client(UnblockRequest(user))
         aname = await event.client.get_entity(user)
-        await event.eor(f"{inline_mention(aname)} [`user`] `has been UnBlocked!`")
+        await event.eor(f"{inline_mention(aname)} [`{user}`] `has been UnBlocked!`")
     except Exception as et:
         return await event.eor(f"ERROR - {et}")
     try:
@@ -614,9 +625,15 @@ async def list_approved(event):
             name = ""
         users.append([name.strip(), str(i)])
     with open("approved_pms.txt", "w") as list_appr:
-        list_appr.write(
-            tabulate(users, headers=["UserName", "UserID"], showindex="always")
-        )
+        if tabulate:
+            list_appr.write(
+                tabulate(users, headers=["UserName", "UserID"], showindex="always")
+            )
+        else:
+            text = ""
+            for user in users:
+                text += f"[{user[-1]}] - {user[0]}"
+            list_appr.write(text)
     await event.reply(
         "List of users approved by [{}](tg://user?id={})".format(OWNER_NAME, OWNER_ID),
         file="approved_pms.txt",

plugins/qrcode.py

@@ -18,7 +18,11 @@
 """
 import os
 
-import cv2
+try:
+    import cv2
+except ImportError:
+    cv2 = None
+
 import qrcode
 from PIL import Image
 from telethon.tl.types import MessageMediaDocument as doc

plugins/schedulemsg.py

@@ -33,7 +33,7 @@ async def _(e):
             await e.eor(get_string("schdl_1"), time=5)
         else:
             try:
-                z = await ban_time(e, y)
+                z = ban_time(e, y)
                 await e.client.send_message(e.chat_id, k, schedule=z)
                 await e.eor(get_string("schdl_1"), time=5)
             except BaseException:
@@ -46,7 +46,7 @@ async def _(e):
             await e.eor(get_string("schdl_1"), time=5)
         else:
             try:
-                z = await ban_time(e, x)
+                z = ban_time(e, x)
                 await e.client.send_message(e.chat_id, xx, schedule=z)
                 await e.eor(get_string("schdl_1"), time=5)
             except BaseException:

plugins/search.py

@@ -42,7 +42,7 @@ from pyUltroid.functions.misc import google_search
 from pyUltroid.functions.tools import saavn_search
 from telethon.tl.types import DocumentAttributeAudio
 
-from . import async_searcher, eod, fast_download, get_string, ultroid_cmd
+from . import async_searcher, con, eod, fast_download, get_string, ultroid_cmd
 
 
 @ultroid_cmd(
@@ -145,18 +145,13 @@ async def reverse(event):
         return await event.eor("`Reply to an Image`")
     ult = await event.eor(get_string("com_1"))
     dl = await reply.download_media()
-    if reply.video:
-        img = cv2.VideoCapture(dl)
-        ult, roid = img.read()
-        os.remove(dl)
-        dl = "file.png"
-        cv2.imwrite(dl, roid)
-    img = Image.open(dl)
+    file = await con.convert(dl, convert_to="png")
+    img = Image.open(file)
     x, y = img.size
-    file = {"encoded_image": (dl, open(dl, "rb"))}
+    files = {"encoded_image": (file, open(file, "rb"))}
     grs = requests.post(
         "https://www.google.com/searchbyimage/upload",
-        files=file,
+        files=files,
         allow_redirects=False,
     )
     loc = grs.headers.get("Location")
@@ -188,7 +183,7 @@ async def reverse(event):
         caption="Similar Images Realted to Search",
     )
     rmtree(f"./resources/downloads/{text}/")
-    os.remove(dl)
+    os.remove(file)
 
 
 @ultroid_cmd(
@@ -214,9 +209,9 @@ async def siesace(e):
     song, _ = await fast_download(url, filename=title + ".m4a")
     thumb, _ = await fast_download(img, filename=title + ".jpg")
     song, _ = await e.client.fast_uploader(song, to_delete=True)
-    await e.reply(
+    await eve.eor(
         file=song,
-        message=f"`{title}`\n`From Saavn`",
+        text=f"`{title}`\n`From Saavn`",
         attributes=[
             DocumentAttributeAudio(
                 duration=int(duration),

plugins/snips.py

@@ -21,9 +21,9 @@
 """
 import os
 
+from pyUltroid._misc import sudoers
 from pyUltroid.dB.snips_db import add_snip, get_snips, list_snip, rem_snip
 from pyUltroid.functions.tools import create_tl_btn, format_btn, get_msg_button
-from pyUltroid.misc import sudoers
 from telegraph import upload_file as uf
 from telethon.utils import pack_bot_file_id
 

plugins/specialtools.py

@@ -40,17 +40,18 @@ from shutil import rmtree
 import pytz
 from bs4 import BeautifulSoup as bs
 from pyUltroid.functions.google_image import googleimagesdownload
-from pyUltroid.functions.misc import create_quotly
 from pyUltroid.functions.tools import metadata
 from telethon.tl.types import DocumentAttributeVideo
 
 from . import (
+    HNDLR,
     async_searcher,
     bash,
     downloader,
     eod,
     get_string,
     mediainfo,
+    quotly,
     ultroid_bot,
     ultroid_cmd,
     uploader,
@@ -161,9 +162,8 @@ async def hbd(event):
     s = kk[2]
     day = int(p)
     month = r
-    paida = q
     try:
-        jn = dt.strptime(paida, "%d/%m/%Y")
+        jn = dt.strptime(match, "%d/%m/%Y")
     except BaseException:
         return await event.eor(get_string("spcltool_6"))
     jnm = zn.localize(jn)
@@ -234,7 +234,7 @@ async def hbd(event):
         f"""
     Name -: {name}
 
-D.O.B -:  {paida}
+D.O.B -:  {match}
 
 Lived -:  {saal}yr, {mahina}m, {din}d, {ghanta}hr, {mi}min, {slive}sec
 
@@ -351,7 +351,9 @@ async def quott_(event):
     if match == "random":
         match = choice(all_col)
     try:
-        file = await create_quotly(reply_, bg=match, reply=replied_to, sender=user)
+        file = await quotly.create_quotly(
+            reply_, bg=match, reply=replied_to, sender=user
+        )
     except Exception as er:
         return await msg.edit(str(er))
     message = await reply.reply("Quotly by Ultroid", file=file)

plugins/stickertools.py

@@ -27,12 +27,19 @@ import os
 import random
 from os import remove
 
-import cv2
-import numpy as np
-import requests
-from PIL import Image, ImageDraw
-from pyUltroid.functions.misc import create_quotly
-from pyUltroid.functions.tools import TgConverter
+try:
+    import cv2
+except ImportError:
+    cv2 = None
+try:
+    import numpy as np
+except ImportError:
+    np = None
+try:
+    from PIL import Image, ImageDraw
+except ImportError:
+    pass
+
 from telethon.errors import PeerIdInvalidError, YouBlockedUserError
 from telethon.tl.types import DocumentAttributeFilename, DocumentAttributeSticker
 from telethon.utils import get_input_document
@@ -41,12 +48,14 @@ from . import (
     KANGING_STR,
     LOGS,
     asst,
+    async_searcher,
     bash,
     con,
     functions,
     get_string,
     inline_mention,
     mediainfo,
+    quotly,
     types,
     udB,
     ultroid_cmd,
@@ -134,7 +143,7 @@ async def hehe(args):
         xy = await message.download_media()
         if (message.file.duration or 0) <= 10:
             is_vid = True
-            photo = await TgConverter.create_webm(xy)
+            photo = await con.create_webm(xy)
         else:
             y = cv2.VideoCapture(xy)
             heh, lol = y.read()
@@ -152,7 +161,7 @@ async def hehe(args):
         is_anim = True
         photo = 1
     elif message.message:
-        photo = await create_quotly(message)
+        photo = await quotly.create_quotly(message)
     else:
         return await xx.edit(get_string("com_4"))
     if not udB.get_key("language") or udB.get_key("language") == "en":
@@ -192,8 +201,8 @@ async def hehe(args):
             file.name = "sticker.png"
             image.save(file, "PNG")
 
-        response = requests.get(f"http://t.me/addstickers/{packname}")
-        htmlstr = response.text.split("\n")
+        response = await async_searcher(f"http://t.me/addstickers/{packname}")
+        htmlstr = response.split("\n")
 
         if (
             "  A <strong>Telegram</strong> user has created the <strong>Sticker&nbsp;Set</strong>."
@@ -477,4 +486,4 @@ async def ultiny(event):
         )
         os.remove(file)
     await xx.delete()
-    os.remove(ik)
+    os.remove(ik)

plugins/sudo.py

@@ -17,7 +17,7 @@
     List all sudo users.
 """
 
-from pyUltroid.misc import sudoers
+from pyUltroid._misc import sudoers
 from telethon.tl.types import User
 
 from . import get_string, inline_mention, udB, ultroid_bot, ultroid_cmd