Update Ultroid v0.8

---------

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

.github/workflows/autotranslate.yml

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

.github/workflows/pylint.yaml

@@ -13,6 +13,7 @@ jobs:
         uses: actions/setup-python@v1
         with:
           python-version: 3.8
+          cache: "pip"
       - name: Install Python lint libraries
         run: pip install autopep8 autoflake isort black
       - name: Check for showstoppers

.gitignore

@@ -8,12 +8,14 @@ test*
 *.webp
 *.mp4
 *.tgs
+*.txt
 /*.jpg
 /*.png
 /*.mp4
 *.log
 target/npmlist.json
 package-lock.json
+ultroid.json
 resources/extras/thumbnail.jpg
 
 # Directories

README.md

@@ -7,7 +7,7 @@
 
 <b>A stable pluggable Telegram userbot + Voice & Video Call music bot, based on Telethon.</b>
 
-[![](https://img.shields.io/badge/Ultroid-v0.7-darkgreen)](#)
+[![](https://img.shields.io/badge/Ultroid-v0.8-crimson)](#)
 [![Stars](https://img.shields.io/github/stars/TeamUltroid/Ultroid?style=flat-square&color=yellow)](https://github.com/TeamUltroid/Ultroid/stargazers)
 [![Forks](https://img.shields.io/github/forks/TeamUltroid/Ultroid?style=flat-square&color=orange)](https://github.com/TeamUltroid/Ultroid/fork)
 [![Size](https://img.shields.io/github/repo-size/TeamUltroid/Ultroid?style=flat-square&color=green)](https://github.com/TeamUltroid/Ultroid/)   
@@ -84,20 +84,6 @@ Get the [Necessary Variables](#Necessary-Variables) and then click the button be
    `bash startup`
   - Windows Users:
     `python(3) -m pyUltroid`
-<details>
-<summary><h3>[OUTDATED] Ultroid CLI</h3></summary>
-
-[Ultroid CLI](https://github.com/BLUE-DEVIL1134/UltroidCli) is a command-line interface for deploying Ultroid.   
-
-- **Installing** -    
-Run the following code on a terminal, with curl installed.   
-`ver=$(curl https://raw.githubusercontent.com/BLUE-DEVIL1134/UltroidCli/main/version.txt) && curl -L -o ultroid https://github.com/BLUE-DEVIL1134/UltroidCli/releases/download/$ver/ultroid.exe`
-OR
-Go to [UltroidCli](https://github.com/BLUE-DEVIL1134/UltroidCli) and install the version release from the Github Releases. Add the executable to your system path as specified in the [Readme](https://github.com/BLUE-DEVIL1134/UltroidCli#how-to-use-ultroidcli-).   
-
-- **Documentation** -
-Take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli/) for more detailed information.
-</details>
 
 ---
 ## Necessary Variables

app.json

@@ -50,7 +50,7 @@
     "formation": {
         "ultroid": {
             "quantity": 1,
-            "size": "free"
+            "size": "eco"
         }
     }
 }

assistant/__init__.py

@@ -25,7 +25,8 @@ AST_PLUGINS = {}
 async def setit(event, name, value):
     try:
         udB.set_key(name, value)
-    except BaseException:
+    except BaseException as er:
+        LOGS.exception(er)
         return await event.edit("`Something Went Wrong`")
 
 

assistant/callbackstuffs.py

@@ -5,7 +5,7 @@
 # PLease read the GNU Affero General Public License in
 # <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
-
+import ast
 import asyncio
 import re
 import sys
@@ -426,9 +426,12 @@ async def convo_handler(event: events.CallbackQuery):
     back = get_["back"]
     async with event.client.conversation(event.sender_id) as conv:
         await conv.send_message(get_["text"])
-        response = conv.wait_event(events.NewMessage(chats=event.sender_id))
-        response = await response
-        themssg = response.message.message
+        response = await conv.get_response()
+        themssg = response.message
+        try:
+            themssg = ast.literal_eval(themssg)
+        except Exception:
+            pass
         if themssg == "/cancel":
             return await conv.send_message(
                 "Cancelled!!",
@@ -1182,7 +1185,7 @@ async def name(event):
 async def chon(event):
     var = "PMBOT"
     await setit(event, var, "True")
-    Loader(path="assistant/pmbot.py", key="PM Bot").load_single()
+    Loader(path="assistant/pmbot.py", key="PM Bot").load()
     if AST_PLUGINS.get("pmbot"):
         for i, e in AST_PLUGINS["pmbot"]:
             event.client.remove_event_handler(i)

assistant/pmbot.py

@@ -18,12 +18,13 @@ from telethon.tl.functions.messages import GetFullChatRequest
 from telethon.tl.types import Channel, Chat
 from telethon.utils import get_display_name
 
-from pyUltroid.dB.asst_fns import *
+from pyUltroid.dB.base import KeyManager
 from pyUltroid.dB.botchat_db import *
 from pyUltroid.fns.helper import inline_mention
 
 from . import *
 
+botb = KeyManager("BOTBLS", cast=list)
 FSUB = udB.get_key("PMBOT_FSUB")
 CACHE = {}
 # --------------------------------------- Incoming -------------------------------------------- #
@@ -32,7 +33,7 @@ CACHE = {}
 @asst_cmd(
     load=AST_PLUGINS,
     incoming=True,
-    func=lambda e: e.is_private and not is_blacklisted(e.sender_id),
+    func=lambda e: e.is_private and not botb.contains(e.sender_id),
 )
 async def on_new_mssg(event):
     who = event.sender_id
@@ -49,6 +50,7 @@ async def on_new_mssg(event):
                 if not MSG:
                     MSG += get_string("pmbot_1")
                 try:
+                    uri = ""
                     TAHC_ = await event.client.get_entity(chat)
                     if hasattr(TAHC_, "username") and TAHC_.username:
                         uri = f"t.me/{TAHC_.username}"
@@ -119,10 +121,10 @@ async def banhammer(event):
     if not event.is_reply:
         return await event.reply(get_string("pmbot_2"))
     target = get_who(event.reply_to_msg_id)
-    if is_blacklisted(target):
+    if botb.contains(target):
         return await event.reply(get_string("pmbot_3"))
 
-    blacklist_user(target)
+    botb.add(target)
     await event.reply(f"#BAN\nUser : {target}")
     await asst.send_message(target, get_string("pmbot_4"))
 
@@ -137,10 +139,10 @@ async def unbanhammer(event):
     if not event.is_reply:
         return await event.reply(get_string("pmbot_5"))
     target = get_who(event.reply_to_msg_id)
-    if not is_blacklisted(target):
+    if not botb.contains(target):
         return await event.reply(get_string("pmbot_6"))
 
-    rem_blacklist(target)
+    botb.remove(target)
     await event.reply(f"#UNBAN\nUser : {target}")
     await asst.send_message(target, get_string("pmbot_7"))
 

assistant/start.py

@@ -13,7 +13,7 @@ from telethon.errors.rpcerrorlist import MessageDeleteForbiddenError
 from telethon.utils import get_display_name
 
 from pyUltroid._misc import SUDO_M, owner_and_sudos
-from pyUltroid.dB.asst_fns import *
+from pyUltroid.dB.base import KeyManager
 from pyUltroid.fns.helper import inline_mention
 from strings import get_string
 
@@ -87,8 +87,9 @@ async def closet(lol):
 @asst_cmd(pattern="start( (.*)|$)", forwards=False, func=lambda x: not x.is_group)
 async def ultroid(event):
     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)
+    keym = KeyManager("BOT_USERS", cast=list)
+    if not keym.contains(event.sender_id) and event.sender_id not in owner_and_sudos():
+        keym.add(event.sender_id)
         kak_uiw = udB.get_key("OFF_START_LOG")
         if not kak_uiw or kak_uiw != True:
             msg = f"{inline_mention(event.sender)} `[{event.sender_id}]` started your [Assistant bot](@{asst.me.username})."
@@ -158,7 +159,7 @@ async def ultroid(event):
 
 @callback("stat", owner=True)
 async def botstat(event):
-    ok = len(get_all_users("BOT_USERS"))
+    ok = len(udB.get_key("BOT_USERS") or [])
     msg = """Ultroid Assistant - Stats
 Total Users - {}""".format(
         ok,
@@ -168,8 +169,9 @@ Total Users - {}""".format(
 
 @callback("bcast", owner=True)
 async def bdcast(event):
-    ok = get_all_users("BOT_USERS")
-    await event.edit(f"• Broadcast to {len(ok)} users.")
+    keym = KeyManager("BOT_USERS", cast=list)
+    total = keym.count()
+    await event.edit(f"• Broadcast to {total} users.")
     async with event.client.conversation(OWNER_ID) as conv:
         await conv.send_message(
             "Enter your broadcast message.\nUse /cancel to stop the broadcast.",
@@ -179,9 +181,9 @@ async def bdcast(event):
             return await conv.send_message("Cancelled!!")
         success = 0
         fail = 0
-        await conv.send_message(f"Starting a broadcast to {len(ok)} users...")
+        await conv.send_message(f"Starting a broadcast to {total} users...")
         start = datetime.now()
-        for i in ok:
+        for i in keym.get():
             try:
                 await asst.send_message(int(i), response)
                 success += 1
@@ -192,7 +194,7 @@ async def bdcast(event):
         await conv.send_message(
             f"""
 **Broadcast completed in {time_taken} seconds.**
-Total Users in Bot - {len(ok)}
+Total Users in Bot - {total}
 **Sent to** : `{success} users.`
 **Failed for** : `{fail} user(s).`""",
         )

installer.sh

@@ -1,99 +1,241 @@
 #!/usr/bin/env bash
 
 REPO="https://github.com/TeamUltroid/Ultroid.git"
+CURRENT_DIR="$(pwd)"
+ENV_FILE_PATH=".env"
 DIR="/root/TeamUltroid"
 
-spinner(){
-    local pid=$!
-    while [ "$(ps a | awk '{print $1}' | grep $pid)" ];
-    do
-        for i in "Ooooo" "oOooo" "ooOoo" "oooOo" "ooooO" "oooOo" "ooOoo" "oOooo" "Ooooo"
-        do
-          echo -ne "\r• $i"
-          sleep 0.2
-        done
-    done
+while [ $# -gt 0 ]; do
+    case "$1" in
+    --dir=*)
+        DIR="${1#*=}" || DIR="/root/TeamUltroid"
+        ;;
+    --branch=*)
+        BRANCH="${1#*=}" || BRANCH="main"
+        ;;
+    --env-file=*)
+        ENV_FILE_PATH="${1#*=}" || ENV_FILE_PATH=".env"
+        ;;
+    --no-root)
+        NO_ROOT=true
+        ;;
+    *)
+        echo "Unknown parameter passed: $1"
+        exit 1
+        ;;
+    esac
+    shift
+done
+
+check_dependencies() {
+    # check if debian
+    echo "Checking dependencies..."
+    # read file with root access
+    if ! [[ $(ls -l "/etc/sudoers" | cut -d " " -f1) =~ "r" ]]; then
+        # check dependencies if installed
+        echo -e "Root access not found. Checking if dependencies are installed." >&2
+        if ! [ -x "$(command -v python3)" ] || ! [ -x "$(command -v python)" ]; then
+            echo -e "Python3 isn't installed. Please install python3.8 or higher to run this bot." >&2
+            exit 1
+        fi
+        if [ $(python3 -c "import sys; print(sys.version_info[1])") -lt 8 ] || [ $(python -c "import sys; print(sys.version_info[1])") -lt 8 ]; then
+            echo -e "Python 3.8 or higher is required to run this bot." >&2
+            exit 1
+        fi
+        # check if any of ffmpeg, mediainfo, neofetch, git is not installed
+        if ! command -v ffmpeg &>/dev/null || ! command -v mediainfo &>/dev/null || ! command -v neofetch &>/dev/null || ! command -v git &>/dev/null; then
+            echo -e "Some dependencies aren't installed. Please install ffmpeg, mediainfo, neofetch and git to run this bot." >&2
+            exit 1
+        fi
+    fi
+    if [ -x "$(command -v apt-get)" ]; then
+        echo -e "Installing dependencies..."
+        # check if any of ffmpeg, mediainfo, neofetch, git is not installed via dpkg
+        if dpkg -l | grep -q ffmpeg || dpkg -l | grep -q mediainfo || dpkg -l | grep -q neofetch || dpkg -l | grep -q git; then
+            sudo apt-get -qq -o=Dpkg::Use-Pty=0 update
+            sudo apt-get install -qq -o=Dpkg::Use-Pty=0 python3 python3-pip ffmpeg mediainfo neofetch git -y
+        fi
+    elif [ -x "$(command -v pacman)" ]; then
+        echo -e "Installing dependencies..."
+        if pacman -Q | grep -q ffmpeg || pacman -Q | grep -q mediainfo || pacman -Q | grep -q neofetch || pacman -Q | grep -q git; then
+            sudo pacman -Sy python python-pip git ffmpeg mediainfo neofetch --noconfirm
+        fi
+    else
+        echo -e "Unknown OS. Checking if dependecies are installed" >&2
+        if ! [ -x "$(command -v python3)" ] || ! [ -x "$(command -v python)" ]; then
+            echo -e "Python3 isn't installed. Please install python3.8 or higher to run this bot." >&2
+            exit 1
+        fi
+        if [ $(python3 -c "import sys; print(sys.version_info[1])") -lt 8 ] || [ $(python -c "import sys; print(sys.version_info[1])") -lt 8 ]; then
+            echo -e "Python 3.8 or higher is required to run this bot." >&2
+            exit 1
+        fi
+        if ! command -v ffmpeg &>/dev/null || ! command -v mediainfo &>/dev/null || ! command -v neofetch &>/dev/null || ! command -v git &>/dev/null; then
+            echo -e "Some dependencies aren't installed. Please install ffmpeg, mediainfo, neofetch and git to run this bot." >&2
+            exit 1
+        fi
+    fi
 }
 
-clone_repo(){
-    if [ ! $BRANCH ]
-        then export BRANCH="main"
+check_python() {
+    # check if python is installed
+    if ! command -v python3 &>/dev/null; then
+        echo -e "Python3 isn't installed. Please install python3.8 or higher to run this bot."
+        exit 1
+    elif ! command -v python &>/dev/null; then
+        echo -e "Python3 isn't installed. Please install python3.8 or higher to run this bot."
+        exit 1
+    fi
+    if [ $(python3 -c "import sys; print(sys.version_info[1])") -lt 8 ]; then
+        echo -e "Python 3.8 or higher is required to run this bot."
+        exit 1
+    elif [ $(python -c "import sys; print(sys.version_info[1])") -lt 3 ]; then
+        if [ $(python -c "import sys; print(sys.version_info[1])") -lt 8 ]; then
+            echo -e "Python 3.8 or higher is required to run this bot."
+            exit 1
+        fi
     fi
-    if [ -d $DIR ]
-        then
-            echo -e $DIR "Already exists.."
+}
+
+clone_repo() {
+    # check if pyultroid, startup, plugins folders exist
+    cd $DIR
+    if [ -d $DIR ]; then
+        if [ -d $DIR/.git ]; then
+            echo -e "Updating Ultroid ${BRANCH}... "
             cd $DIR
             git pull
             currentbranch="$(git rev-parse --abbrev-ref HEAD)"
-            if [ currentbranch != $BRANCH ]
-                then
-                    git checkout $BRANCH
+            if [ ! $BRANCH ]; then
+                export BRANCH=$currentbranch
             fi
-            if [ -d "addons" ]
-                then
-                    cd addons
-                    git pull
-            fi
-            return
+            case $currentbranch in
+            $BRANCH)
+                # do nothing
+                ;;
+            *)
+                echo -e "Switching to branch ${BRANCH}... "
+                echo -e $currentbranch
+                git checkout $BRANCH
+                ;;
+            esac
+        else
+            rm -rf $DIR
+            exit 1
+        fi
+        if [ -d "addons" ]; then
+            cd addons
+            git pull
+        fi
+        return
+    else
+        if [ ! $BRANCH ]; then
+            export BRANCH="main"
+        fi
+        mkdir -p $DIR
+        echo -e "Cloning Ultroid ${BRANCH}... "
+        git clone -b $BRANCH $REPO $DIR
     fi
-    echo -e "Cloning Ultroid ${BRANCH}... "
-    git clone -b $BRANCH $REPO $DIR
 }
 
-install_requirements(){
-    pip install --upgrade pip
+install_requirements() {
+    pip3 install -q --upgrade pip
     echo -e "\n\nInstalling requirements... "
     pip3 install -q --no-cache-dir -r $DIR/requirements.txt
     pip3 install -q -r $DIR/resources/startup/optional-requirements.txt
 }
 
-railways_dep(){
-    if [ $RAILWAY_STATIC_URL ]
-        then
-            echo -e "Installing YouTube dependency... "
-            pip3 install -q yt-dlp
+railways_dep() {
+    if [ $RAILWAY_STATIC_URL ]; then
+        echo -e "Installing YouTube dependency... "
+        pip3 install -q yt-dlp
     fi
 }
 
-misc_install(){
-    if [ $OKTETO_TOKEN ]
-        then
-            echo -e "Installing Okteto-CLI... "
-            curl https://get.okteto.com -sSfL | sh
-    elif [ $VCBOT ]
-        then
-            if [ -d $DIR/vcbot ]
-                then
-                    cd $DIR/vcbot
-                    git pull
-            else
-                echo -e "Cloning VCBOT.."
-                git clone https://github.com/TeamUltroid/VcBot $DIR/vcbot
-            fi
-            pip3 install pytgcalls>=3.0.0.dev21 && pip3 install av -q --no-binary av
+misc_install() {
+    if [ $SETUP_PLAYWRIGHT ]
+    then
+        echo -e "Installing playwright."
+        pip3 install playwright
+        playwright install
+    fi
+    if [ $OKTETO_TOKEN ]; then
+        echo -e "Installing Okteto-CLI... "
+        curl https://get.okteto.com -sSfL | sh
+    elif [ $VCBOT ]; then
+        if [ -d $DIR/vcbot ]; then
+            cd $DIR/vcbot
+            git pull
+        else
+            echo -e "Cloning VCBOT.."
+            git clone https://github.com/TeamUltroid/VcBot $DIR/vcbot
+        fi
+        pip3 install pytgcalls==3.0.0.dev23 && pip3 install av -q --no-binary av
     fi
 }
 
-dep_install(){
+dep_install() {
     echo -e "\n\nInstalling DB Requirement..."
-    if [ $MONGO_URI ]
-        then
-            pip3 install -q pymongo[srv]
-    elif [ $DATABASE_URL ]
-        then
-            pip3 install -q psycopg2-binary
-    elif [ $REDIS_URI ]
-        then
-            pip3 install -q redis hiredis
+    if [ $MONGO_URI ]; then
+        echo -e "   Installing MongoDB Requirements..."
+        pip3 install -q pymongo[srv]
+    elif [ $DATABASE_URL ]; then
+        echo -e "   Installing PostgreSQL Requirements..."
+        pip3 install -q psycopg2-binary
+    elif [ $REDIS_URI ]; then
+        echo -e "   Installing Redis Requirements..."
+        pip3 install -q redis hiredis
     fi
 }
 
-main(){
+main() {
+    echo -e "Starting Ultroid Setup..."
+    if [ -d "pyUltroid" ] && [ -d "resources" ] && [ -d "plugins" ]; then
+        DIR=$CURRENT_DIR
+    fi
+    if [ -f $ENV_FILE_PATH ]
+    then
+        set -a
+        source <(cat $ENV_FILE_PATH | sed -e '/^#/d;/^\s*$/d' -e "s/'/'\\\''/g" -e "s/=\(.*\)/='\1'/g")
+        set +a
+        cp $ENV_FILE_PATH .env
+    fi
+    (check_dependencies)
+    (check_python)
     (clone_repo)
     (install_requirements)
     (railways_dep)
     (dep_install)
     (misc_install)
+    echo -e "\n\nSetup Completed."
 }
 
-main
+if [ $NO_ROOT ]; then
+    echo -e "Running with non root"
+    main
+    return 0
+elif [ -t 0 ]; then
+    unameOut="$(uname -s)"
+    case "${unameOut}" in
+        Linux*)     machine=Linux;;
+        Darwin*)    machine=Mac;;
+        CYGWIN*)    machine=Cygwin;;
+        MINGW*)     machine=MinGw;;
+        *)          machine="UNKNOWN:${unameOut}"
+    esac
+    if machine != "Linux"; then
+        echo -e "This script is only for Linux. Please use the Windows installer."
+        exit 1
+    fi
+    # check if sudo is installed
+    if ! command -v sudo &>/dev/null; then
+        echo -e "Sudo isn't installed. Please install sudo to run this bot."
+        exit 1
+    fi
+    sudo echo "Sudo permission granted."
+    main
+else
+    echo "Not an interactive terminal, skipping sudo."
+    # run main function
+    main
+fi

plugins/__init__.py

@@ -20,18 +20,23 @@ from pyUltroid._misc._decorators import ultroid_cmd
 from pyUltroid._misc._wrappers import eod, eor
 from pyUltroid.dB import DEVLIST, ULTROID_IMAGES
 from pyUltroid.fns.helper import *
-from pyUltroid.fns.info import *
 from pyUltroid.fns.misc import *
 from pyUltroid.fns.tools import *
+from pyUltroid.startup._database import _BaseDatabase as Database
 from pyUltroid.version import __version__, ultroid_version
 from strings import get_help, get_string
 
+udB: Database
+
 Redis = udB.get_key
 con = TgConverter
 quotly = Quotly()
 OWNER_NAME = ultroid_bot.full_name
 OWNER_ID = ultroid_bot.uid
 
+ultroid_bot: UltroidClient
+asst: UltroidClient
+
 LOG_CHANNEL = udB.get_key("LOG_CHANNEL")
 
 

plugins/_chatactions.py

@@ -13,6 +13,7 @@ from telethon.tl.functions.channels import GetParticipantRequest
 from telethon.utils import get_display_name
 
 from pyUltroid.dB import stickers
+from pyUltroid.dB.echo_db import check_echo
 from pyUltroid.dB.forcesub_db import get_forcesetting
 from pyUltroid.dB.gban_mute_db import is_gbanned
 from pyUltroid.dB.greetings_db import get_goodbye, get_welcome, must_thank
@@ -90,8 +91,7 @@ async def DummyHandler(ult):
                         user.id,
                         view_messages=False,
                     )
-                    await ult.client.send_message(
-                        chat.id,
+                    await ult.respond(
                         f'**@UltroidBans:** Banned user detected and banned!\n`{str(is_banned)}`.\nBan reason: {is_banned["reason"]}',
                     )
 
@@ -196,8 +196,13 @@ async def DummyHandler(ult):
 @ultroid_bot.on(events.NewMessage(incoming=True))
 async def chatBot_replies(e):
     sender = await e.get_sender()
-    if not isinstance(sender, types.User):
+    if not isinstance(sender, types.User) or sender.bot:
         return
+    if check_echo(e.chat_id, e.sender_id):
+        try:
+            await e.respond(e)
+        except Exception as er:
+            LOGS.exception(er)
     key = udB.get_key("CHATBOT_USERS") or {}
     if e.text and key.get(e.chat_id) and sender.id in key[e.chat_id]:
         msg = await get_chatbot_reply(e.message.message)
@@ -206,12 +211,10 @@ async def chatBot_replies(e):
             await asyncio.sleep(sleep)
             await e.reply(msg)
     chat = await e.get_chat()
-    if e.is_group and not sender.bot:
-        if sender.username:
-            await uname_stuff(e.sender_id, sender.username, sender.first_name)
-    elif e.is_private and not sender.bot:
-        if chat.username:
-            await uname_stuff(e.sender_id, chat.username, chat.first_name)
+    if e.is_group and sender.username:
+        await uname_stuff(e.sender_id, sender.username, sender.first_name)
+    elif e.is_private and chat.username:
+        await uname_stuff(e.sender_id, chat.username, chat.first_name)
     if detector and is_profan(e.chat_id) and e.text:
         x, y = detector(e.text)
         if y:
@@ -220,7 +223,7 @@ async def chatBot_replies(e):
 
 @ultroid_bot.on(events.Raw(types.UpdateUserName))
 async def uname_change(e):
-    await uname_stuff(e.user_id, e.username, e.first_name)
+    await uname_stuff(e.user_id, e.usernames[0] if e.usernames else None, e.first_name)
 
 
 async def uname_stuff(id, uname, name):

plugins/_userlogs.py

@@ -51,10 +51,7 @@ async def all_messages_catcher(e):
         return
     if not udB.get_key("TAG_LOG"):
         return
-    try:
-        NEEDTOLOG = int(udB.get_key("TAG_LOG"))
-    except Exception:
-        return LOGS.info(get_string("userlogs_1"))
+    NEEDTOLOG = udB.get_key("TAG_LOG")
     buttons = await parse_buttons(e)
     try:
         sent = await asst.send_message(NEEDTOLOG, e.message, buttons=buttons)
@@ -63,7 +60,8 @@ async def all_messages_catcher(e):
         else:
             TAG_EDITS.update({e.chat_id: {e.id: {"id": sent.id, "msg": e}}})
         tag_add(sent.id, e.chat_id, e.id)
-    except MediaEmptyError:
+    except MediaEmptyError as er:
+        LOGS.debug(f"handling {er}.")
         try:
             msg = await asst.get_messages(e.chat_id, ids=e.id)
             sent = await asst.send_message(NEEDTOLOG, msg, buttons=buttons)
@@ -89,7 +87,8 @@ async def all_messages_catcher(e):
                 except Exception as er:
                     LOGS.exception(er)
             await asst.send_message(NEEDTOLOG, get_string("com_4"), buttons=buttons)
-    except (PeerIdInvalidError, ValueError):
+    except (PeerIdInvalidError, ValueError) as er:
+        LOGS.exception(er)
         try:
             CACHE_SPAM[NEEDTOLOG]
         except KeyError:
@@ -225,7 +224,7 @@ async def when_added_or_joined(event):
         text = f"#APPROVAL_LOG\n\n{inline_mention(user)} just got Chat Join Approval to {chat}."
     else:
         text = f"#JOIN_LOG\n\n{inline_mention(user)} just joined {chat}."
-    await asst.send_message(int(udB.get_key("LOG_CHANNEL")), text, buttons=buttons)
+    await asst.send_message(udB.get_key("LOG_CHANNEL"), text, buttons=buttons)
 
 
 asst.add_event_handler(

plugins/_wspr.py

@@ -66,7 +66,7 @@ async def _(e):
         if not isinstance(logi, types.User):
             raise ValueError("Invalid Username.")
     except IndexError:
-        sur = e.builder.article(
+        sur = await e.builder.article(
             title="Give Username",
             description="You Didn't Type Username or id.",
             text="You Didn't Type Username or id.",
@@ -74,7 +74,7 @@ async def _(e):
         return await e.answer([sur])
     except ValueError as er:
         LOGS.exception(er)
-        sur = e.builder.article(
+        sur = await e.builder.article(
             title="User Not Found",
             description="Make sure username or id is correct.",
             text="Make sure username or id is correct.",
@@ -83,14 +83,23 @@ async def _(e):
     try:
         desc = zzz[2]
     except IndexError:
-        sur = e.builder.article(title="Type ur msg", text="You Didn't Type Your Msg")
+        sur = await e.builder.article(
+            title="Type ur msg", text="You Didn't Type Your Msg"
+        )
         return await e.answer([sur])
     button = [
-        Button.inline("Secret Msg", data=f"dd_{e.id}"),
-        Button.inline("Delete Msg", data=f"del_{e.id}"),
+        [
+            Button.inline("Secret Msg", data=f"dd_{e.id}"),
+            Button.inline("Delete Msg", data=f"del_{e.id}"),
+        ],
+        [
+            Button.switch_inline(
+                "New", query=f"wspr {logi.username or logi.id}", same_peer=True
+            )
+        ],
     ]
     us = logi.username or logi.first_name
-    sur = e.builder.article(
+    sur = await e.builder.article(
         title=logi.first_name,
         description=desc,
         text=get_string("wspr_1").format(us),

plugins/admintools.py

@@ -20,18 +20,9 @@ from telethon.utils import get_display_name
 
 from pyUltroid.dB import DEVLIST
 from pyUltroid.fns.admins import ban_time
+from pyUltroid.fns.info import get_uinfo
 
-from . import (
-    HNDLR,
-    LOGS,
-    eod,
-    eor,
-    get_string,
-    get_uinfo,
-    inline_mention,
-    types,
-    ultroid_cmd,
-)
+from . import HNDLR, LOGS, eod, eor, get_string, inline_mention, types, ultroid_cmd
 
 
 @ultroid_cmd(

plugins/afk.py

@@ -16,7 +16,7 @@ from telegraph import upload_file as uf
 from telethon import events
 
 from pyUltroid.dB.afk_db import add_afk, del_afk, is_afk
-from pyUltroid.dB.pmpermit_db import is_approved
+from pyUltroid.dB.base import KeyManager
 
 from . import (
     LOG_CHANNEL,
@@ -32,6 +32,8 @@ from . import (
 
 old_afk_msg = []
 
+is_approved = KeyManager("PMPERMIT", cast=list).contains
+
 
 @ultroid_cmd(pattern="afk( (.*)|$)", owner_only=True)
 async def set_afk(event):

plugins/audiotools.py

@@ -151,12 +151,10 @@ async def ex_aud(e):
 
     except FileNotFoundError:
         return await eor(msg, get_string("audiotools_9"))
-    await e.client.send_file(
-        e.chat_id,
-        fo,
-        caption=get_string("audiotools_10"),
+    await e.reply(
+        get_string("audiotools_10"),
+        file=fo,
         thumb=ULTConfig.thumb,
         attributes=attributes,
-        reply_to=e.reply_to_msg_id,
     )
     await msg.delete()

plugins/autoban.py

@@ -10,43 +10,26 @@ from . import get_help
 __doc__ = get_help("help_autoban")
 
 from telethon import events
-from telethon.tl.types import Channel
 
-from pyUltroid.dB import autoban_db, dnd_db
-from pyUltroid.fns.admins import get_update_linked_chat
+from pyUltroid.dB.base import KeyManager
 
-from . import LOGS, asst, get_string, inline_mention, ultroid_bot, ultroid_cmd
+from . import LOGS, asst, ultroid_bot, ultroid_cmd
 
+Keym = KeyManager("DND_CHATS", cast=list)
 
-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()
+
+def join_func(e):
+    return e.user_joined and Keym.contains(e.chat_id)
 
 
-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:
+async def dnd_func(event):
+    for user in event.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()
+            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(
@@ -59,84 +42,18 @@ async def channel_del(event):
 async def _(event):
     match = event.pattern_match.group(1)
     if match == "on":
-        if dnd_db.chat_in_dnd(event.chat_id):
+        if Keym.contains(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)
-        )
+        Keym.add(event.chat_id)
+        event.client.add_handler(dnd_func, events.ChatAction(func=join_func))
         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):
+        if not Keym.contains(event.chat_id):
             return await event.eor("`Chat is not in do not disturb mode.`", time=3)
-        dnd_db.del_dnd(event.chat_id)
+        Keym.remove(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)
-        ),
-    )
+if Keym.get():
+    ultroid_bot.add_handler(dnd_func, events.ChatAction(func=join_func))
+    asst.add_handler(dnd_func, events.ChatAction(func=join_func))

plugins/autopic.py

@@ -9,12 +9,12 @@
 import asyncio
 import os
 import random
-from glob import glob
 from random import shuffle
 
 from telethon.tl.functions.photos import UploadProfilePhotoRequest
 
-from pyUltroid.fns.google_image import googleimagesdownload
+from pyUltroid.fns.helper import download_file
+from pyUltroid.fns.tools import get_google_images
 
 from . import LOGS, get_help, get_string, udB, ultroid_bot, ultroid_cmd
 
@@ -59,35 +59,20 @@ async def autopic(e):
 
 
 if search := udB.get_key("AUTOPIC"):
-    gi = googleimagesdownload()
-    args = {
-        "keywords": search,
-        "limit": 50,
-        "format": "jpg",
-        "output_directory": "./resources/downloads/",
-    }
-    images = []
-    if os.path.exists(f"./resources/downloads/{search}"):
-        images = glob(f"resources/downloads/{search}/*")
+    images = {}
     sleep = udB.get_key("SLEEP_TIME") or 1221
 
     async def autopic_func():
-        if udB.get_key("AUTOPIC") != search:
+        search = udB.get_key("AUTOPIC")
+        if images.get(search) is None:
+            images[search] = await get_google_images(search)
+        if not images.get(search):
             return
-        if not images:
-            try:
-                pth = await gi.download(args)
-                ok = pth[0][search]
-                images.extend(ok)
-            except Exception as er:
-                LOGS.exception(er)
-                return
-        else:
-            ok = images
-        img = random.choice(ok)
-        file = await ultroid_bot.upload_file(img)
+        img = random.choice(images[search])
+        filee = await download_file(img["original"], "resources/downloads/autopic.jpg")
+        file = await ultroid_bot.upload_file(filee)
         await ultroid_bot(UploadProfilePhotoRequest(file))
-        shuffle(ok)
+        os.remove(filee)
 
     try:
         from apscheduler.schedulers.asyncio import AsyncIOScheduler

plugins/beautify.py

@@ -10,11 +10,12 @@ from . import get_help
 __doc__ = get_help("help_beautify")
 
 
+import os
 import random
 
 from telethon.utils import get_display_name
 
-from . import Carbon, eor, get_string, inline_mention, os, ultroid_cmd
+from . import Carbon, ultroid_cmd, get_string, inline_mention
 
 _colorspath = "resources/colorlist.txt"
 
@@ -28,7 +29,7 @@ else:
 @ultroid_cmd(
     pattern="(rc|c)arbon",
 )
-async def crbn(event):
+async def cr_bn(event):
     xxxx = await event.eor(get_string("com_1"))
     te = event.pattern_match.group(1)
     col = random.choice(all_col) if te[0] == "r" else "White"
@@ -45,8 +46,11 @@ async def crbn(event):
         try:
             code = event.text.split(" ", maxsplit=1)[1]
         except IndexError:
-            return await eor(xxxx, get_string("carbon_2"))
+            return await xxxx.eor(get_string("carbon_2"))
     xx = await Carbon(code=code, file_name="ultroid_carbon", backgroundColor=col)
+    if isinstance(xx, dict):
+        await xxxx.edit(f"`{xx}`")
+        return
     await xxxx.delete()
     await event.reply(
         f"Carbonised by {inline_mention(event.sender)}",
@@ -77,7 +81,7 @@ async def crbn(event):
             code = match[1]
             match = match[0]
         except IndexError:
-            return await eor(msg, get_string("carbon_2"))
+            return await msg.eor(get_string("carbon_2"))
     xx = await Carbon(code=code, backgroundColor=match)
     await msg.delete()
     await event.reply(
@@ -125,7 +129,7 @@ async def pass_on(ult):
         theme = random.choice(RaySoTheme)
     if ult.is_reply:
         msg = await ult.get_reply_message()
-        text = msg.text
+        text = msg.message
         title = get_display_name(msg.sender)
     await ult.reply(
         file=await Carbon(text, rayso=True, title=title, theme=theme, darkMode=dark)

plugins/blacklist.py

@@ -57,14 +57,12 @@ async def lsnote(e):
 
 async def blacklist(e):
     if x := get_blacklist(e.chat_id):
-        for z in e.text.lower().split():
-            for zz in x:
-                if z == zz:
-                    try:
-                        await e.delete()
-                        break
-                    except BaseException:
-                        break
+        text = e.text.lower().split()
+        if any((z in text) for z in x):
+            try:
+                await e.delete()
+            except BaseException:
+                pass
 
 
 if udB.get_key("BLACKLIST_DB"):

plugins/bot.py

@@ -84,7 +84,7 @@ The Ultroid Userbot
   ◍ Telethon - {}
 """
 
-in_alive = "{}\n\n🌀 <b>Ultroid Version -><b> <code>{}</code>\n🌀 <b>PyUltroid -></b> <code>{}</code>\n🌀 <b>Python -></b> <code>{}</code>\n🌀 <b>Uptime -></b> <code>{}</code>\n🌀 <b>Branch -></b> [ {} ]\n\n• <b>Join @TeamUltroid</b>"
+in_alive = "{}\n\n🌀 <b>Ultroid Version -><b> <code>{}</code>\n🌀 <b>PyUltroid -></b> <code>{}</code>\n🌀 <b>Python -></b> <code>{}</code>\n🌀 <b>Uptime -></b> <code>{}</code>\n🌀 <b>Branch -></b>[ {} ]\n\n• <b>Join @TeamUltroid</b>"
 
 
 @callback("alive")
@@ -243,6 +243,9 @@ async def _(event):
             code=code,
             backgroundColor=choice(ATRA_COL),
         )
+        if isinstance(file, dict):
+            await event.eor(f"`{file}`")
+            return
         await event.reply("**Ultroid Logs.**", file=file)
     elif opt == "open":
         with open("ultroid.log", "r") as f:
@@ -296,7 +299,7 @@ async def inline_alive(ult):
                 ]
             return await ult.answer(results)
         except BaseException as er:
-            LOGS.info(er)
+            LOGS.exception(er)
     result = [
         await builder.article(
             "Alive", text=als, parse_mode="html", link_preview=False, buttons=buttons

plugins/broadcast.py

@@ -15,10 +15,12 @@ import io
 
 from telethon.utils import get_display_name
 
-from pyUltroid.dB.broadcast_db import *
+from pyUltroid.dB.base import KeyManager
 
 from . import HNDLR, LOGS, eor, get_string, udB, ultroid_bot, ultroid_cmd
 
+KeyM = KeyManager("BROADCAST", cast=list)
+
 
 @ultroid_cmd(
     pattern="addch( (.*)|$)",
@@ -40,14 +42,14 @@ async def broadcast_adder(event):
                 if (
                     i.broadcast
                     and (i.creator or i.admin_rights)
-                    and not is_channel_added(i.id)
+                    and not KeyM.contains(i.id)
                 ):
                     new += 1
                     cid = f"-100{i.id}"
-                    add_channel(int(cid))
+                    KeyM.add(int(cid))
             except Exception as Ex:
                 LOGS.exception(Ex)
-        await x.edit(get_string("bd_3").format(get_no_channels(), new))
+        await x.edit(get_string("bd_3").format(KeyM.count(), new))
         return
     if event.reply_to_msg_id:
         previous_message = await event.get_reply_message()
@@ -56,8 +58,8 @@ async def broadcast_adder(event):
         length = len(lines)
         for line_number in range(1, length - 2):
             channel_id = lines[line_number][4:-1]
-            if not is_channel_added(channel_id):
-                add_channel(channel_id)
+            if not KeyM.contains(channel_id):
+                KeyM.add(channel_id)
         await x.edit(get_string("bd_4"))
         await asyncio.sleep(3)
         await event.delete()
@@ -65,9 +67,9 @@ async def broadcast_adder(event):
     chat_id = event.chat_id
     if chat_id == udB.get_key("LOG_CHANNEL"):
         return
-    if is_channel_added(chat_id):
+    if KeyM.contains(chat_id):
         await x.edit(get_string("bd_6"))
-    elif xx := add_channel(chat_id):
+    elif xx := KeyM.add(chat_id):
         await x.edit(get_string("bd_5"))
     else:
         await x.edit(get_string("sf_8"))
@@ -87,8 +89,8 @@ async def broadcast_remover(event):
         udB.del_key("BROADCAST")
         await x.edit("Database cleared.")
         return
-    if is_channel_added(chat_id):
-        rem_channel(chat_id)
+    if KeyM.contains(chat_id):
+        KeyM.remove(chat_id)
         await x.edit(get_string("bd_7"))
     else:
         await x.edit(get_string("bd_9"))
@@ -101,8 +103,8 @@ async def broadcast_remover(event):
 )
 async def list_all(event):
     x = await event.eor(get_string("com_1"))
-    channels = get_channels()
-    num = len(channels)
+    channels = KeyM.get()
+    num = KeyM.count()
     if not channels:
         return await eor(x, "No chats were added.", time=5)
     msg = "Channels in database:\n"
@@ -137,14 +139,13 @@ async def forw(event):
     if not event.is_reply:
         return await event.eor(get_string("ex_1"))
     ultroid_bot = event.client
-    channels = get_channels()
+    channels = KeyM.get()
     x = await event.eor("Sending...")
     if not channels:
         return await x.edit(f"Please add channels by using `{HNDLR}add` in them.")
     error_count = 0
     sent_count = 0
-    if event.reply_to_msg_id:
-        previous_message = await event.get_reply_message()
+    previous_message = await event.get_reply_message()
     error_count = 0
     for channel in channels:
         try:
@@ -156,7 +157,7 @@ async def forw(event):
         except Exception:
             try:
                 await ultroid_bot.send_message(
-                    int(udB.get_key("LOG_CHANNEL")),
+                    udB.get_key("LOG_CHANNEL"),
                     f"Error in sending at {channel}.",
                 )
             except Exception as Em:
@@ -168,7 +169,7 @@ async def forw(event):
     await x.edit(f"{sent_count} messages sent with {error_count} errors.")
     if error_count > 0:
         await ultroid_bot.send_message(
-            int(udB.get_key("LOG_CHANNEL")), f"{error_count} Errors"
+            udB.get_key("LOG_CHANNEL"), f"{error_count} Errors"
         )
 
 
@@ -180,7 +181,7 @@ async def sending(event):
     x = await event.eor(get_string("com_1"))
     if not event.is_reply:
         return await x.edit(get_string("ex_1"))
-    channels = get_channels()
+    channels = KeyM.get()
     if not channels:
         return await x.edit(f"Please add channels by using `{HNDLR}add` in them.")
     await x.edit("Sending....")
@@ -199,7 +200,6 @@ async def sending(event):
                         f"Sent : {sent_count}\nError : {error_count}\nTotal : {len(channels)}",
                     )
                 except Exception as error:
-
                     await ultroid_bot.send_message(
                         udB.get_key("LOG_CHANNEL"),
                         f"Error in sending at {channel}.\n\n{error}",
@@ -211,6 +211,6 @@ async def sending(event):
             await x.edit(f"{sent_count} messages sent with {error_count} errors.")
             if error_count > 0:
                 await ultroid_bot.send_message(
-                    int(udB.get_key("LOG_CHANNEL")),
+                    udB.get_key("LOG_CHANNEL"),
                     f"{error_count} Errors",
                 )

plugins/channelhacks.py

@@ -15,32 +15,23 @@ import io
 from telethon.errors.rpcerrorlist import FloodWaitError
 from telethon.utils import get_display_name, get_peer_id
 
-from pyUltroid.dB.ch_db import (
-    add_destination,
-    add_source_channel,
-    get_destinations,
-    get_no_destinations,
-    get_no_source_channels,
-    get_source_channels,
-    is_destination_added,
-    is_source_channel_added,
-    rem_destination,
-    rem_source_channel,
-)
+from pyUltroid.dB.base import KeyManager
 
 from . import LOGS, asst, eor, events, get_string, udB, ultroid_bot, ultroid_cmd
 
 ERROR = {}
+SourceM = KeyManager("CH_SOURCE", cast=list)
+DestiM = KeyManager("CH_DESTINATIONS", cast=list)
 
 
 async def autopost_func(e):
     if not udB.get_key("AUTOPOST"):
         return
-    x = get_source_channels()
+    x = SourceM.get()
     th = await e.get_chat()
     if get_peer_id(th) not in x:
         return
-    y = get_destinations()
+    y = DestiM.get()
     for ys in y:
         try:
             await e.client.send_message(int(ys), e.message)
@@ -91,11 +82,11 @@ async def source(e):
             return
     else:
         y = e.chat_id
-    if not is_source_channel_added(y):
-        add_source_channel(y)
+    if not SourceM.contains(y):
+        SourceM.add(y)
         await e.eor(get_string("cha_2"))
         ultroid_bot.add_handler(autopost_func, events.NewMessage())
-    elif is_source_channel_added(y):
+    else:
         await e.eor(get_string("cha_3"))
 
 
@@ -116,24 +107,21 @@ async def dd(event):
             return
     else:
         y = event.chat_id
-    if is_source_channel_added(y):
-        rem_source_channel(y)
-        await eor(x, get_string("cha_5"), time=3)
-    elif is_source_channel_added(y):
-        rem_source_channel(y)
+    if SourceM.contains(y):
+        SourceM.remove(y)
         await eor(x, get_string("cha_5"), time=5)
-    elif not is_source_channel_added(y):
+    else:
         await eor(x, "Source channel is already removed from database. ", time=3)
 
 
 @ultroid_cmd(pattern="listsource")
 async def list_all(event):
     x = await event.eor(get_string("com_1"))
-    num = get_no_source_channels()
+    num = SourceM.count()
     if not num:
         return await eor(x, "No chats were added.", time=5)
     msg = get_string("cha_8")
-    channels = get_source_channels()
+    channels = SourceM.get()
     for channel in channels:
         name = ""
         try:
@@ -141,18 +129,16 @@ async def list_all(event):
         except BaseException:
             name = ""
         msg += f"\n=> **{name}** [`{channel}`]"
-    msg += f"\nTotal {get_no_source_channels()} channels."
+    msg += f"\nTotal {num} channels."
     if len(msg) > 4096:
         MSG = msg.replace("*", "").replace("`", "")
         with io.BytesIO(str.encode(MSG)) as out_file:
             out_file.name = "channels.txt"
-            await event.client.send_file(
-                event.chat_id,
-                out_file,
+            await event.reply(
+                "Channels in database",
+                file=out_file,
                 force_document=True,
                 allow_cache=False,
-                caption="Channels in database",
-                reply_to=event,
             )
             await x.delete()
     else:
@@ -169,10 +155,10 @@ async def destination(e):
             return
     else:
         y = e.chat_id
-    if not is_destination_added(y):
-        add_destination(y)
+    if not DestiM.contains(y):
+        DestiM.add(y)
         await e.eor("Destination added succesfully")
-    elif is_destination_added(y):
+    else:
         await e.eor("Destination channel already added")
 
 
@@ -193,13 +179,10 @@ async def dd(event):
             return
     else:
         y = event.chat_id
-    if is_destination_added(y):
-        rem_destination(y)
+    if DestiM.contains(y):
+        DestiM.remove(y)
         await eor(x, "Destination removed from database")
-    elif is_destination_added(y):
-        rem_destination(y)
-        await eor(x, "Destination removed from database", time=5)
-    elif not is_destination_added(y):
+    else:
         await eor(x, "Destination channel is already removed from database. ", time=5)
 
 
@@ -207,8 +190,8 @@ async def dd(event):
 async def list_all(event):
     ultroid_bot = event.client
     x = await event.eor(get_string("com_1"))
-    channels = get_destinations()
-    num = get_no_destinations()
+    channels = DestiM.get()
+    num = len(channels)
     if not num:
         return await eor(x, "No chats were added.", time=5)
     msg = get_string("cha_7")
@@ -219,7 +202,7 @@ async def list_all(event):
         except BaseException:
             name = ""
         msg += f"\n=> **{name}** [`{channel}`]"
-    msg += f"\nTotal {get_no_destinations()} channels."
+    msg += f"\nTotal {num} channels."
     if len(msg) > 4096:
         MSG = msg.replace("*", "").replace("`", "")
         with io.BytesIO(str.encode(MSG)) as out_file:

plugins/chatbot.py

@@ -12,7 +12,7 @@ __doc__ = get_help("help_chatbot")
 
 from pyUltroid.fns.tools import get_chatbot_reply
 
-from . import eod, get_string, inline_mention, udB, ultroid_cmd, LOGS
+from . import LOGS, eod, get_string, inline_mention, udB, ultroid_cmd
 
 
 @ultroid_cmd(pattern="repai")
@@ -67,8 +67,8 @@ async def chat_bot_fn(event, type_):
             user_ = event.chat if event.is_private else None
     if not user_:
         return await eod(
-                event,
-                get_string("chab_1"),
+            event,
+            get_string("chab_1"),
         )
     key = udB.get_key("CHATBOT_USERS") or {}
     chat = event.chat_id

plugins/cleanaction.py

@@ -44,6 +44,5 @@ async def _(e):
             except BaseException:
                 title = get_string("clan_3")
             o += f"{x} {title}\n"
-        await e.eor(o)
-    else:
-        await e.eor(get_string("clan_4"), time=5)
+        return await e.eor(o)
+    await e.eor(get_string("clan_4"), time=5)

plugins/devtools.py

@@ -50,22 +50,28 @@ async def _(e):
     x, y = await bash("neofetch|sed 's/\x1B\\[[0-9;\\?]*[a-zA-Z]//g' >> neo.txt")
     if y and y.endswith("NOT_FOUND"):
         return await xx.edit(f"Error: `{y}`")
-    with open("neo.txt", "r") as neo:
+    with open("neo.txt", "r", encoding="utf-8") as neo:
         p = (neo.read()).replace("\n\n", "")
     haa = await Carbon(code=p, file_name="neofetch", backgroundColor=choice(ATRA_COL))
-    await e.reply(file=haa)
-    await xx.delete()
+    if isinstance(haa, dict):
+        await xx.edit(f"`{haa}`")
+    else:
+        await e.reply(file=haa)
+        await xx.delete()
     remove("neo.txt")
 
 
 @ultroid_cmd(pattern="bash", fullsudo=True, only_devs=True)
 async def _(event):
-    carb, yamlf = None, False
+    carb, rayso, yamlf = None, None, False
     try:
         cmd = event.text.split(" ", maxsplit=1)[1]
         if cmd.split()[0] in ["-c", "--carbon"]:
             cmd = cmd.split(maxsplit=1)[1]
             carb = True
+        if cmd.split()[0] in ["-r", "--rayso"]:
+            cmd = cmd.split(maxsplit=1)[1]
+            rayso = True
     except IndexError:
         return await event.eor(get_string("devs_1"), time=10)
     xx = await event.eor(get_string("com_1"))
@@ -88,6 +94,33 @@ async def _(event):
                 download=True,
                 backgroundColor=choice(ATRA_COL),
             )
+            if isinstance(li, dict):
+                await xx.edit(
+                    f"Unknown Response from Carbon: `{li}`\n\nstdout`:{stdout}`\nstderr: `{stderr}`"
+                )
+                return
+            url = f"https://graph.org{uf(li)[-1]}"
+            OUT = f"[\xad]({url}){OUT}"
+            out = "**• OUTPUT:**"
+            remove(li)
+        elif (rayso or udB.get_key("RAYSO_ON_BASH")) and (
+            event.is_private
+            or 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),
+                rayso=True,
+            )
+            if isinstance(li, dict):
+                await xx.edit(
+                    f"Unknown Response from Carbon: `{li}`\n\nstdout`:{stdout}`\nstderr: `{stderr}`"
+                )
+                return
             url = f"https://graph.org{uf(li)[-1]}"
             OUT = f"[\xad]({url}){OUT}"
             out = "**• OUTPUT:**"
@@ -136,7 +169,7 @@ bot = ultroid = ultroid_bot
 
 
 class u:
-    ...
+    _ = ""
 
 
 def _parse_eval(value=None):
@@ -152,6 +185,14 @@ def _parse_eval(value=None):
             return json_parser(value, indent=1)
         except BaseException:
             pass
+    elif isinstance(value, list):
+        newlist = "["
+        for index, child in enumerate(value):
+            newlist += "\n  " + str(_parse_eval(child))
+            if index < len(value) - 1:
+                newlist += ","
+        newlist += "\n]"
+        return newlist
     return str(value)
 
 
@@ -161,7 +202,8 @@ async def _(event):
         cmd = event.text.split(maxsplit=1)[1]
     except IndexError:
         return await event.eor(get_string("devs_2"), time=5)
-    silent, gsource, xx = False, False, None
+    xx = None
+    mode = ""
     spli = cmd.split()
 
     async def get_():
@@ -174,17 +216,19 @@ async def _(event):
 
     if spli[0] in ["-s", "--silent"]:
         await event.delete()
-        silent = True
-        cmd = await get_()
+        mode = "silent"
     elif spli[0] in ["-n", "-noedit"]:
-        cmd = await get_()
+        mode = "no-edit"
         xx = await event.reply(get_string("com_1"))
     elif spli[0] in ["-gs", "--source"]:
-        gsource = True
+        mode = "gsource"
+    elif spli[0] in ["-ga", "--args"]:
+        mode = "g-args"
+    if mode:
         cmd = await get_()
     if not cmd:
         return
-    if not silent and not xx:
+    if not mode == "silent" and not xx:
         xx = await event.eor(get_string("com_1"))
     if black:
         try:
@@ -220,13 +264,20 @@ async def _(event):
     stderr = redirected_error.getvalue()
     sys.stdout = old_stdout
     sys.stderr = old_stderr
-    if value and gsource:
+    if value:
         try:
-            exc = inspect.getsource(value)
+            if mode == "gsource":
+                exc = inspect.getsource(value)
+            elif mode == "g-args":
+                args = inspect.signature(value).parameters.values()
+                name = ""
+                if hasattr(value, "__name__"):
+                    name = value.__name__
+                exc = f"**{name}**\n\n" + "\n ".join([str(arg) for arg in args])
         except Exception:
             exc = traceback.format_exc()
     evaluation = exc or stderr or stdout or _parse_eval(value) or get_string("instu_4")
-    if silent:
+    if mode == "silent":
         if exc:
             msg = f"• <b>EVAL ERROR\n\n• CHAT:</b> <code>{get_display_name(event.chat)}</code> [<code>{event.chat_id}</code>]"
             msg += f"\n\n∆ <b>CODE:</b>\n<code>{cmd}</code>\n\n∆ <b>ERROR:</b>\n<code>{exc}</code>"

plugins/echo.py

@@ -14,7 +14,7 @@ from telethon.utils import get_display_name
 
 from pyUltroid.dB.echo_db import add_echo, check_echo, list_echo, rem_echo
 
-from . import LOGS, events, ultroid_bot, ultroid_cmd
+from . import inline_mention, ultroid_cmd
 
 
 @ultroid_cmd(pattern="addecho( (.*)|$)")
@@ -36,7 +36,7 @@ async def echo(e):
         return await e.eor("Echo already activated for this user.", time=5)
     add_echo(e.chat_id, user)
     ok = await e.client.get_entity(user)
-    user = f"[{get_display_name(ok)}](tg://user?id={ok.id})"
+    user = inline_mention(ok)
     await e.eor(f"Activated Echo For {user}.")
 
 
@@ -63,16 +63,6 @@ async def rm(e):
     await e.eor("Echo not activated for this user")
 
 
-@ultroid_bot.on(events.NewMessage(incoming=True))
-async def okk(e):
-    if check_echo(e.chat_id, e.sender_id):
-        try:
-            ok = await e.client.get_messages(e.chat_id, ids=e.id)
-            return await e.client.send_message(e.chat_id, ok)
-        except Exception as er:
-            LOGS.info(er)
-
-
 @ultroid_cmd(pattern="listecho$")
 async def lstecho(e):
     if k := list_echo(e.chat_id):

plugins/fontgen.py

@@ -11,7 +11,7 @@ __doc__ = get_help("help_fontgen")
 
 import string
 
-from . import HNDLR, eod, ultroid_cmd
+from . import eod, ultroid_cmd
 
 _default = string.ascii_letters
 Fonts = {

plugins/giftools.py

@@ -60,7 +60,7 @@ async def igif(e):
 async def reverse_gif(event):
     a = await event.get_reply_message()
     if not (a and a.media) and "video" not in mediainfo(a.media):
-        return await e.eor("`Reply To Video only`", time=5)
+        return await event.eor("`Reply To Video only`", time=5)
     msg = await event.eor(get_string("com_1"))
     file = await a.download_media()
     await bash(f'ffmpeg -i "{file}" -vf reverse -af areverse reversed.mp4 -y')

plugins/glitch.py

@@ -35,7 +35,7 @@ async def _(e):
     else:
         return await xx.eor(get_string("com_4"))
     cmd = f"glitch_me gif --line_count 200 -f 10 -d 50 '{ok}' ult.gif"
-    stdout, stderr = await bash(cmd)
+    await bash(cmd)
     await e.reply(file="ult.gif", force_document=False)
     await xx.delete()
     os.remove(ok)

plugins/globaltools.py

@@ -45,6 +45,7 @@ from telethon.tl.functions.contacts import BlockRequest, UnblockRequest
 from telethon.tl.types import ChatAdminRights, User
 
 from pyUltroid.dB import DEVLIST
+from pyUltroid.dB.base import KeyManager
 from pyUltroid.dB.gban_mute_db import (
     gban,
     gmute,
@@ -54,11 +55,6 @@ from pyUltroid.dB.gban_mute_db import (
     ungban,
     ungmute,
 )
-from pyUltroid.dB.gcast_blacklist_db import (
-    add_gblacklist,
-    is_gblacklisted,
-    rem_gblacklist,
-)
 from pyUltroid.fns.tools import create_tl_btn, format_btn, get_msg_button
 
 from . import (
@@ -93,6 +89,8 @@ _gdemote_rights = ChatAdminRights(
     pin_messages=False,
 )
 
+keym = KeyManager("GBLACKLISTS", cast=list)
+
 
 @ultroid_cmd(pattern="gpromote( (.*)|$)", fullsudo=True)
 async def _(e):
@@ -462,7 +460,7 @@ async def gcast(event):
         if x.is_group:
             chat = x.entity.id
             if (
-                not is_gblacklisted(chat)
+                not keym.contains(chat)
                 and int(f"-100{str(chat)}") not in NOSPAM_CHAT
                 and (
                     (
@@ -545,7 +543,7 @@ async def gucast(event):
     for x in dialog:
         if x.is_user and not x.entity.bot:
             chat = x.id
-            if not is_gblacklisted(chat):
+            if not keym.contains(chat):
                 try:
                     if btn:
                         bt = create_tl_btn(btn)
@@ -749,7 +747,7 @@ async def gblacker(event, type_):
     except IndexError:
         chat_id = event.chat_id
     if type_ == "add":
-        add_gblacklist(chat_id)
+        keym.add(chat_id)
     elif type_ == "remove":
-        rem_gblacklist(chat_id)
+        keym.remove(chat_id)
     await event.eor(f"Global Broadcasts: \n{type_}ed {chat_id}")

plugins/imagetools.py

@@ -177,11 +177,9 @@ async def ult_tools(event):
         ish = centers[labels.flatten()]
         ultroid = ish.reshape(ult.shape)
     cv2.imwrite("ult.jpg", ultroid)
-    await event.client.send_file(
-        event.chat_id,
-        "ult.jpg",
+    await ureply.reply(
+        file="ult.jpg",
         force_document=False,
-        reply_to=event.reply_to_msg_id,
     )
     await xx.delete()
     os.remove("ult.jpg")
@@ -196,9 +194,7 @@ async def sampl(ult):
         try:
             try:
                 await ult.delete()
-                await ult.client.send_message(
-                    ult.chat_id, f"Colour Sample for `{color}` !", file="csample.png"
-                )
+                await ult.respond(f"Colour Sample for `{color}` !", file="csample.png")
             except MessageDeleteForbiddenError:
                 await ult.reply(f"Colour Sample for `{color}` !", file="csample.png")
         except ChatSendMediaForbiddenError:
@@ -275,7 +271,7 @@ async def ok(event):
 @ultroid_cmd(pattern="pixelator( (.*)|$)")
 async def pixelator(event):
     reply_message = await event.get_reply_message()
-    if not (reply_message and reply_message.photo):
+    if not (reply_message and (reply_message.photo or reply_message.sticker)):
         return await event.eor("`Reply to a photo`")
     hw = 50
     try:

plugins/instagram.py

@@ -1,267 +0,0 @@
-# Ultroid - UserBot
-# Copyright (C) 2021-2022 TeamUltroid
-#
-# This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
-# PLease read the GNU Affero General Public License in
-# <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
-"""
-✘ Commands Available -
-
-• `{i}instadl <Instagram Url>`
-  `Download Instagram Media...`
-
-• `{i}instadata <username>`
-  `Get Instagram Data of someone or self`
-
-• `{i}instaul <reply video/photo> <caption>`
-  `Upload Media to Instagram...`
-
-• `{i}igtv <reply video> <caption>`
-  `Upload Media to Igtv...`
-
-• `{i}reels <reply video> <caption>`
-  `Upload Media to Instagram reels...`
-
-• Go Inline with Your Assistant with query `instatm`
-   To get home page's posts...
-
-• Fill `INSTA_USERNAME` and `INSTA_PASSWORD`
-  before using it..
-"""
-
-import os
-from re import compile
-
-from telethon.errors.rpcerrorlist import ChatSendInlineForbiddenError
-from telethon.tl.types import (
-    DocumentAttributeFilename,
-    InputWebDocument,
-    MessageMediaWebPage,
-    WebPage,
-)
-
-from pyUltroid.fns.helper import numerize
-from pyUltroid.fns.misc import create_instagram_client
-
-from . import (
-    LOGS,
-    Button,
-    asst,
-    callback,
-    eor,
-    get_string,
-    in_pattern,
-    udB,
-    ultroid_cmd,
-)
-
-
-@ultroid_cmd(pattern="instadl( (.*)|$)")
-async def insta_dl(e):
-    match = e.pattern_match.group(1).strip()
-    replied = await e.get_reply_message()
-    tt = await e.eor(get_string("com_1"))
-    if match:
-        text = match
-    elif e.is_reply and "insta" in replied.message:
-        text = replied.message
-    else:
-        return await eor(tt, "Provide a Link to Download...")
-    CL = await create_instagram_client(e)
-    if CL:
-        try:
-            mpk = CL.media_pk_from_url(text)
-            media = CL.media_info(mpk)
-            if media.media_type == 1:  # photo
-                media = CL.photo_download(mpk)
-            elif media.media_type == 2 and media.product_type == "feed":  # video:
-                media = CL.video_download(mpk)
-            elif media.media_type == 2 and media.product_type == "igtv":  # igtv:
-                media = CL.igtv_download(mpk)
-            elif (
-                media.media_type == 2 and media.product_type == "clips"
-            ):  # clips/reels:
-                media = CL.clip_download(mpk)
-            elif media.media_type == 8:  # Album:
-                media = CL.album_download(mpk)
-            else:
-                LOGS.info(f"UnPredictable Media Type : {mpk}")
-                return
-            await e.reply(
-                f"**• Uploaded Successfully\n• Link :** {text}\n",
-                file=media,
-            )
-            await tt.delete()
-            if not isinstance(media, list):
-                os.remove(media)
-            else:
-                [os.remove(media) for media in media]
-            return
-        except Exception as B:
-            LOGS.exception(B)
-            return await eor(tt, str(B))
-    if isinstance(e.media, MessageMediaWebPage) and isinstance(
-        e.media.webpage, WebPage
-    ):
-        if photo := e.media.webpage.photo or e.media.webpage.document:
-            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...")
-
-
-@ultroid_cmd(pattern="instadata( (.*)|$)")
-async def soon_(e):
-    cl = await create_instagram_client(e)
-    if not cl:
-        return
-    match = e.pattern_match.group(1).strip()
-    ew = await e.eor(get_string("com_1"))
-    if match:
-        try:
-            iid = cl.user_id_from_username(match)
-            data = cl.user_info(iid)
-        except Exception as g:
-            return await eor(ew, f"**ERROR** : `{g}`")
-    else:
-        data = cl.account_info()
-        data = cl.user_info(data.pk)
-    photo = data.profile_pic_url
-    unam = f"https://instagram.com/{data.username}"
-    msg = f"• **Full Name** : __{data.full_name}__"
-    if hasattr(data, "biography") and data.biography:
-        msg += f"\n• **Bio** : `{data.biography}`"
-    msg += f"\n• **UserName** : [@{data.username}]({unam})"
-    msg += f"\n• **Verified** : {data.is_verified}"
-    msg += f"\n• **Posts Count** : {numerize(data.media_count)}"
-    msg += f"\n• **Followers** : {numerize(data.follower_count)}"
-    msg += f"\n• **Following** : {numerize(data.following_count)}"
-    msg += f"\n• **Category** : {data.category_name}"
-    await e.reply(
-        msg,
-        file=photo,
-        force_document=True,
-        attributes=[DocumentAttributeFilename("InstaUltroid.jpg")],
-    )
-    await ew.delete()
-
-
-@ultroid_cmd(pattern="(instaul|reels|igtv)( (.*)|$)")
-async def insta_karbon(event):
-    cl = await create_instagram_client(event)
-    if not cl:
-        return
-    msg = await event.eor(get_string("com_1"))
-    replied = await event.get_reply_message()
-    type_ = event.pattern_match.group(1).strip()
-    if not (replied and (replied.photo or replied.video)):
-        return await event.eor("`Reply to Photo Or Video...`")
-    caption = (
-        event.pattern_match.group(2) + "\n\n• By #Ultroid"
-        or replied.message + "\n\n• By #Ultroid"
-        or "Telegram To Instagram Upload\nBy #Ultroid.."
-    )
-    dle = await replied.download_media()
-    title = None
-    if replied.photo:
-        method = cl.photo_upload
-    elif type_ == "instaul":
-        method = cl.video_upload
-    elif type_ == "igtv":
-        method = cl.igtv_upload
-        title = caption
-    elif type_ == "reels":
-        method = cl.clip_upload
-    else:
-        return await eor(msg, "`Use In Proper Format...`")
-    try:
-        if title:
-            uri = method(dle, caption=caption, title=title)
-        else:
-            uri = method(dle, caption=caption)
-        os.remove(dle)
-    except Exception as er:
-        LOGS.exception(er)
-        return await msg.edit(str(er))
-    if not event.client._bot:
-        try:
-            que = await event.client.inline_query(
-                asst.me.username, f"instp-{uri.code}_{uri.pk}"
-            )
-            await que[0].click(event.chat_id, reply_to=replied.id)
-            await msg.delete()
-        except ChatSendInlineForbiddenError:
-            pass
-        except Exception as er:
-            return await msg.edit(str(er))
-    await msg.edit(
-        f"__Uploaded To Instagram!__\n~ https://instagram.com/p/{uri.code}",
-        buttons=Button.inline("•Delete•", f"instd{uri.pk}"),
-        link_preview=False,
-    )
-
-
-@in_pattern("instp-(.*)", owner=True)
-async def instapl(event):
-    match = event.pattern_match.group(1).strip().split("_")
-    uri = f"https://instagram.com/p/{match[0]}"
-    await event.answer(
-        [
-            await event.builder.article(
-                title="Instagram Post",
-                text="**Uploaded on Instagram**",
-                buttons=[
-                    Button.url("•View•", uri),
-                    Button.inline("•Delete•", f"instd{match[1]}"),
-                ],
-            )
-        ]
-    )
-
-
-@callback(compile("instd(.*)"), owner=True)
-async def dele_post(event):
-    CL = await create_instagram_client(event)
-    if not CL:
-        return await event.answer("Fill Instagram Credentials", alert=True)
-    await event.answer("• Deleting...")
-    try:
-        CL.media_delete(event.data_match.group(1).decode("utf-8"))
-    except Exception as er:
-        return await event.edit(f"ERROR: {str(er)}")
-    await event.edit("**• Deleted!**")
-
-
-@in_pattern(pattern="instatm", owner=True)
-async def bhoot_ayaa(event):
-    if not udB.get_key("INSTA_SET"):
-        return await event.answer(
-            [], switch_pm="Fill Instagram Credentials First.", switch_pm_param="start"
-        )
-    insta = await create_instagram_client(event)
-    posts = insta.get_timeline_feed()
-    res = []
-    switch_pm = f"Showing {posts['num_results']} Feeds.."
-    for rp in posts["feed_items"]:
-        try:
-            me = rp["media_or_ad"]
-            url = me["image_versions2"]["candidates"][1]["url"] + ".jpg"
-            text = (
-                f"| Instagram Inline Search |\n~ https://instagram.com/p/{me['code']}"
-            )
-            file = InputWebDocument(url, 0, "image/jpeg", [])
-            res.append(
-                await event.builder.article(
-                    title="Instagram",
-                    type="photo",
-                    content=file,
-                    thumb=file,
-                    text=text,
-                    include_media=True,
-                )
-            )
-        except Exception as er:
-            LOGS.exception(er)
-    await event.answer(res, gallery=True, switch_pm=switch_pm, switch_pm_param="start")

plugins/logo.py

@@ -19,6 +19,10 @@ import random
 
 from telethon.tl.types import InputMessagesFilterPhotos
 
+try:
+    from PIL import Image
+except ImportError:
+    Image = None
 from pyUltroid.fns.misc import unsplashsearch
 from pyUltroid.fns.tools import LogoHelper
 
@@ -45,9 +49,22 @@ async def logo_gen(event):
                 bg_ = await temp.download_media()
     if not bg_:
         if event.client._bot:
-            SRCH = ["blur background", "background", "neon lights", "wallpaper"]
+            SRCH = [
+                "blur background",
+                "background",
+                "neon lights",
+                "nature",
+                "abstract",
+                "space",
+                "3d render",
+            ]
             res = await unsplashsearch(random.choice(SRCH), limit=1)
-            bg_ = await download_file(res[0], "resources/downloads/logo.png")
+            bg_, _ = await download_file(res[0], "resources/downloads/logo.png")
+            newimg = "resources/downloads/unsplash-temp.jpg"
+            img_ = Image.open(bg_)
+            img_.resize((5000, 5000)).save(newimg)
+            os.remove(bg_)
+            bg_ = newimg
         else:
             pics = []
             async for i in event.client.iter_messages(

plugins/mediatools.py

@@ -73,7 +73,8 @@ async def mi(e):
         else:
             naam = await r.download_media()
     elif match and (
-        os.path.isfile(match) or (match.startswith("https://") and is_url_ok(match))
+        os.path.isfile(match)
+        or (match.startswith("https://") and (await is_url_ok(match)))
     ):
         naam, xx = match, "file"
     else:
@@ -123,18 +124,18 @@ async def rotate_(ult):
     reply = await ult.get_reply_message()
     msg = await ult.eor(get_string("com_1"))
     photo = reply.game.photo if reply.game else None
-    if photo or reply.photo or reply.sticker:
-        media = await ult.client.download_media(photo or reply)
-        img = cv2.imread(media)
-        new_ = rotate_image(img, match)
-        file = "ult.png"
-        cv2.imwrite(file, new_)
-    elif reply.video:
+    if reply.video:
         media = await reply.download_media()
         file = f"{media}.mp4"
         await bash(
             f'ffmpeg -i "{media}" -c copy -metadata:s:v:0 rotate={match} "{file}" -y'
         )
+    elif photo or reply.photo or reply.sticker:
+        media = await ult.client.download_media(photo or reply)
+        img = cv2.imread(media)
+        new_ = rotate_image(img, match)
+        file = "ult.png"
+        cv2.imwrite(file, new_)
     else:
         return await msg.edit("`Unsupported Media..\nReply to Photo/Video`")
     if os.path.exists(file):

plugins/mute.py

@@ -109,16 +109,16 @@ async def _(e):
     except IndexError:
         return await xx.eor("`Time till mute?`", time=5)
     try:
-        input = huh[2]
+        input_ = huh[2]
     except IndexError:
-        pass
+        input_ = ""
     chat = await e.get_chat()
     if e.reply_to_msg_id:
         reply = await e.get_reply_message()
         userid = reply.sender_id
         name = (await reply.get_sender()).first_name
-    elif input:
-        userid = await e.client.parse_id(input)
+    elif input_:
+        userid = await e.client.parse_id(input_)
         name = (await e.client.get_entity(userid)).first_name
     else:
         return await xx.eor(get_string("tban_1"), time=3)

plugins/nightmode.py

@@ -40,10 +40,12 @@ except ImportError:
 from telethon.tl.functions.messages import EditChatDefaultBannedRightsRequest
 from telethon.tl.types import ChatBannedRights
 
-from pyUltroid.dB.night_db import *
+from pyUltroid.dB.base import KeyManager
 
 from . import get_string, udB, ultroid_bot, ultroid_cmd
 
+keym = KeyManager("NIGHT_CHATS", cast=list)
+
 
 @ultroid_cmd(pattern="nmtime( (.*)|$)")
 async def set_time(e):
@@ -64,29 +66,29 @@ async def set_time(e):
 async def add_grp(e):
     if pat := e.pattern_match.group(1).strip():
         try:
-            add_night((await ultroid_bot.get_entity(pat)).id)
+            keym.add((await ultroid_bot.get_entity(pat)).id)
             return await e.eor(f"Done, Added {pat} To Night Mode.")
         except BaseException:
             return await e.eor(get_string("nightm_5"), time=5)
-    add_night(e.chat_id)
+    keym.add(e.chat_id)
     await e.eor(get_string("nightm_3"))
 
 
 @ultroid_cmd(pattern="remnm( (.*)|$)")
-async def rem_grp(e):
+async def r_em_grp(e):
     if pat := e.pattern_match.group(1).strip():
         try:
-            rem_night((await ultroid_bot.get_entity(pat)).id)
+            keym.remove((await ultroid_bot.get_entity(pat)).id)
             return await e.eor(f"Done, Removed {pat} To Night Mode.")
         except BaseException:
             return await e.eor(get_string("nightm_5"), time=5)
-    rem_night(e.chat_id)
+    keym.remove(e.chat_id)
     await e.eor(get_string("nightm_4"))
 
 
 @ultroid_cmd(pattern="listnm$")
 async def rem_grp(e):
-    chats = night_grps()
+    chats = keym.get()
     name = "NightMode Groups Are-:\n\n"
     for x in chats:
         try:
@@ -98,8 +100,7 @@ async def rem_grp(e):
 
 
 async def open_grp():
-    chats = night_grps()
-    for chat in chats:
+    for chat in keym.get():
         try:
             await ultroid_bot(
                 EditChatDefaultBannedRightsRequest(
@@ -122,11 +123,10 @@ async def open_grp():
 
 
 async def close_grp():
-    chats = night_grps()
-    h1, m1, h2, m2 = 0, 0, 7, 0
+    __, _, h2, m2 = 0, 0, 7, 0
     if udB.get_key("NIGHT_TIME"):
-        h1, m1, h2, m2 = eval(udB.get_key("NIGHT_TIME"))
-    for chat in chats:
+        _, __, h2, m2 = eval(udB.get_key("NIGHT_TIME"))
+    for chat in keym.get():
         try:
             await ultroid_bot(
                 EditChatDefaultBannedRightsRequest(
@@ -144,7 +144,7 @@ async def close_grp():
             LOGS.info(er)
 
 
-if AsyncIOScheduler and night_grps():
+if AsyncIOScheduler and keym.get():
     try:
         h1, m1, h2, m2 = 0, 0, 7, 0
         if udB.get_key("NIGHT_TIME"):

plugins/pdftools.py

@@ -8,21 +8,22 @@
 ✘ Commands Available -
 
 • `{i}pdf <page num> <reply to pdf file>`
-    Extract nd Send page as a Image.(note-: For Extraction all pages just use .pdf)
-    You Can use multi pages too like `{i}pdf 1-7`
+    Extract & send page as an Image.(note-: For extracting all pages, just use .pdf)
+    to upload selected range `{i}pdf 1-7`
 
 • `{i}pdtext <page num> <reply to pdf file>`
     Extract Text From the Pdf.(note-: For Extraction all text just use .pdtext)
-    You Can use multi pages too like `{i}pdf 1-7`
+    to extract selected pages `{i}pdf 1-7`
 
 • `{i}pdscan <reply to image>`
-    It scan, crop nd send img as pdf.
+    It scan, crop & send image(s) as pdf.
 
 • `{i}pdsave <reply to image/pdf>`
-    It scan, crop nd save file to merge u can merge many pages as a single pdf.
+    It scan, crop & save file to merge.
+    you can merge many pages in a single pdf.
 
 • `{i}pdsend `
-    Merge nd send the Pdf to collected from .pdsave.
+    Merge & send the pdf, collected from .pdsave.
 """
 import glob
 import os

plugins/pmpermit.py

@@ -43,8 +43,6 @@ import re
 from os import remove
 
 from pyUltroid.dB import DEVLIST
-from pyUltroid.dB.logusers_db import *
-from pyUltroid.dB.pmpermit_db import *
 
 try:
     from tabulate import tabulate
@@ -60,6 +58,8 @@ from telethon.tl.functions.contacts import (
 from telethon.tl.functions.messages import ReportSpamRequest
 from telethon.utils import get_display_name, resolve_bot_file_id
 
+from pyUltroid.dB.base import KeyManager
+
 from . import *
 
 # ========================= CONSTANTS =============================
@@ -68,6 +68,11 @@ COUNT_PM = {}
 LASTMSG = {}
 WARN_MSGS = {}
 U_WARNS = {}
+if isinstance(udB.get_key("PMPERMIT"), (int, str)):
+    value = [udB.get_key("PMPERMIT")]
+    udB.set_key("PMPERMIT", value)
+keym = KeyManager("PMPERMIT", cast=list)
+Logm = KeyManager("LOGUSERS", cast=list)
 PMPIC = udB.get_key("PMPIC")
 LOG_CHANNEL = udB.get_key("LOG_CHANNEL")
 UND = get_string("pmperm_1")
@@ -127,10 +132,10 @@ if udB.get_key("PMLOG"):
     async def _(e):
         if not e.is_private:
             return await e.eor("`Use me in Private.`", time=3)
-        if not is_logger(e.chat_id):
+        if not Logm.contains(e.chat_id):
             return await e.eor("`Wasn't logging msgs from here.`", time=3)
 
-        nolog_user(e.chat_id)
+        Logm.remove(e.chat_id)
         return await e.eor("`Now I Will log msgs from here.`", time=3)
 
     @ultroid_cmd(
@@ -139,10 +144,10 @@ if udB.get_key("PMLOG"):
     async def _(e):
         if not e.is_private:
             return await e.eor("`Use me in Private.`", time=3)
-        if is_logger(e.chat_id):
+        if Logm.contains(e.chat_id):
             return await e.eor("`Wasn't logging msgs from here.`", time=3)
 
-        log_user(e.chat_id)
+        Logm.add(e.chat_id)
         return await e.eor("`Now I Won't log msgs from here.`", time=3)
 
     @ultroid_bot.on(
@@ -153,7 +158,7 @@ if udB.get_key("PMLOG"):
     )
     async def permitpm(event):
         user = await event.get_sender()
-        if user.bot or user.is_self or user.verified or is_logger(user.id):
+        if user.bot or user.is_self or user.verified or Logm.contains(user.id):
             return
         await event.forward_to(udB.get_key("PMLOGGROUP") or LOG_CHANNEL)
 
@@ -171,9 +176,9 @@ if udB.get_key("PMSETTING"):
             miss = await e.get_chat()
             if miss.bot or miss.is_self or miss.verified or miss.id in DEVLIST:
                 return
-            if is_approved(miss.id):
+            if keym.contains(miss.id):
                 return
-            approve_user(miss.id)
+            keym.add(miss.id)
             await delete_pm_warn_msgs(miss.id)
             try:
                 await ultroid_bot.edit_folder(miss.id, folder=0)
@@ -209,7 +214,7 @@ if udB.get_key("PMSETTING"):
     async def permitpm(event):
         inline_pm = Redis("INLINE_PM") or False
         user = event.sender
-        if not is_approved(user.id) and event.text != UND:
+        if not keym.contains(user.id) and event.text != UND:
             if Redis("MOVE_ARCHIVE"):
                 try:
                     await ultroid_bot.edit_folder(user.id, folder=1)
@@ -221,11 +226,11 @@ if udB.get_key("PMSETTING"):
             fullname = get_display_name(user)
             username = f"@{user.username}"
             mention = inline_mention(user)
-            count = len(get_approved())
+            count = keym.count()
             try:
                 wrn = COUNT_PM[user.id] + 1
                 await asst.edit_message(
-                    int(udB.get_key("LOG_CHANNEL")),
+                    udB.get_key("LOG_CHANNEL"),
                     _not_approved[user.id],
                     f"Incoming PM from **{mention}** [`{user.id}`] with **{wrn}/{WARNS}** warning!",
                     buttons=[
@@ -235,7 +240,7 @@ if udB.get_key("PMSETTING"):
                 )
             except KeyError:
                 _not_approved[user.id] = await asst.send_message(
-                    int(udB.get_key("LOG_CHANNEL")),
+                    udB.get_key("LOG_CHANNEL"),
                     f"Incoming PM from **{mention}** [`{user.id}`] with **1/{WARNS}** warning!",
                     buttons=[
                         Button.inline("Approve PM", data=f"approve_{user.id}"),
@@ -366,14 +371,14 @@ if udB.get_key("PMSETTING"):
                     del LASTMSG[user.id]
                 except KeyError:
                     await asst.send_message(
-                        int(udB.get_key("LOG_CHANNEL")),
+                        udB.get_key("LOG_CHANNEL"),
                         "PMPermit is messed! Pls restart the bot!!",
                     )
                     return LOGS.info("COUNT_PM is messed.")
                 await ultroid_bot(BlockRequest(user.id))
                 await ultroid_bot(ReportSpamRequest(peer=user.id))
                 await asst.edit_message(
-                    int(udB.get_key("LOG_CHANNEL")),
+                    udB.get_key("LOG_CHANNEL"),
                     _not_approved[user.id],
                     f"**{mention}** [`{user.id}`] was Blocked for spamming.",
                 )
@@ -407,8 +412,8 @@ if udB.get_key("PMSETTING"):
                 apprvpm,
                 "Lol, He is my Developer\nHe is auto Approved",
             )
-        if not is_approved(user.id):
-            approve_user(user.id)
+        if not keym.contains(user.id):
+            keym.add(user.id)
             try:
                 await delete_pm_warn_msgs(user.id)
                 await apprvpm.client.edit_folder(user.id, folder=0)
@@ -421,7 +426,7 @@ if udB.get_key("PMSETTING"):
             )
             try:
                 await asst.edit_message(
-                    int(udB.get_key("LOG_CHANNEL")),
+                    udB.get_key("LOG_CHANNEL"),
                     _not_approved[user.id],
                     f"#APPROVED\n\n<b>{inline_mention(user, html=True)}</b> [<code>{user.id}</code>] <code>was approved to PM you!</code>",
                     buttons=[
@@ -432,7 +437,7 @@ if udB.get_key("PMSETTING"):
                 )
             except KeyError:
                 _not_approved[user.id] = await asst.send_message(
-                    int(udB.get_key("LOG_CHANNEL")),
+                    udB.get_key("LOG_CHANNEL"),
                     f"#APPROVED\n\n<b>{inline_mention(user, html=True)}</b> [<code>{user.id}</code>] <code>was approved to PM you!</code>",
                     buttons=[
                         Button.inline("Disapprove PM", data=f"disapprove_{user.id}"),
@@ -458,8 +463,8 @@ if udB.get_key("PMSETTING"):
                 e,
                 "`Lol, He is my Developer\nHe Can't Be DisApproved.`",
             )
-        if is_approved(user.id):
-            disapprove_user(user.id)
+        if keym.contains(user.id):
+            keym.remove(user.id)
             await eod(
                 e,
                 f"<b>{inline_mention(user, html=True)}</b> <code>Disapproved to PM!</code>",
@@ -467,7 +472,7 @@ if udB.get_key("PMSETTING"):
             )
             try:
                 await asst.edit_message(
-                    int(udB.get_key("LOG_CHANNEL")),
+                    udB.get_key("LOG_CHANNEL"),
                     _not_approved[user.id],
                     f"#DISAPPROVED\n\n<b>{inline_mention(user, html=True)}</b> [<code>{user.id}</code>] <code>was disapproved to PM you.</code>",
                     buttons=[
@@ -478,7 +483,7 @@ if udB.get_key("PMSETTING"):
                 )
             except KeyError:
                 _not_approved[user.id] = await asst.send_message(
-                    int(udB.get_key("LOG_CHANNEL")),
+                    udB.get_key("LOG_CHANNEL"),
                     f"#DISAPPROVED\n\n<b>{inline_mention(user, html=True)}</b> [<code>{user.id}</code>] <code>was disapproved to PM you.</code>",
                     buttons=[
                         Button.inline("Approve PM", data=f"approve_{user.id}"),
@@ -515,12 +520,12 @@ async def blockpm(block):
     aname = await block.client.get_entity(user)
     await block.eor(f"{inline_mention(aname)} [`{user}`] `has been blocked!`")
     try:
-        disapprove_user(user)
+        keym.remove(user)
     except AttributeError:
         pass
     try:
         await asst.edit_message(
-            int(udB.get_key("LOG_CHANNEL")),
+            udB.get_key("LOG_CHANNEL"),
             _not_approved[user],
             f"#BLOCKED\n\n{inline_mention(aname)} [`{user}`] has been **blocked**.",
             buttons=[
@@ -529,7 +534,7 @@ async def blockpm(block):
         )
     except KeyError:
         _not_approved[user] = await asst.send_message(
-            int(udB.get_key("LOG_CHANNEL")),
+            udB.get_key("LOG_CHANNEL"),
             f"#BLOCKED\n\n{inline_mention(aname)} [`{user}`] has been **blocked**.",
             buttons=[
                 Button.inline("UnBlock", data=f"unblock_{user}"),
@@ -604,7 +609,7 @@ async def unblockpm(event):
 @ultroid_cmd(pattern="listapproved$", owner=True)
 async def list_approved(event):
     xx = await event.eor(get_string("com_1"))
-    all = get_approved()
+    all = keym.get()
     if not all:
         return await xx.eor("`You haven't approved anyone yet!`", time=5)
     users = []
@@ -641,8 +646,8 @@ async def apr_in(event):
     uid = int(event.data_match.group(1).decode("UTF-8"))
     if uid in DEVLIST:
         await event.edit("It's a dev! Approved!")
-    if not is_approved(uid):
-        approve_user(uid)
+    if not keym.contains(uid):
+        keym.add(uid)
         try:
             await ultroid_bot.edit_folder(uid, folder=0)
         except BaseException:
@@ -683,8 +688,8 @@ async def apr_in(event):
 )
 async def disapr_in(event):
     uid = int(event.data_match.group(1).decode("UTF-8"))
-    if is_approved(uid):
-        disapprove_user(uid)
+    if keym.contains(uid):
+        keym.remove(uid)
         try:
             user = await ultroid_bot.get_entity(uid)
         except BaseException:

plugins/polls.py

@@ -58,9 +58,8 @@ async def uri_poll(e):
         return await e.eor("`Options Should be More than 1..`", time=5)
     m = await e.eor(get_string("com_1"))
     OUT = [PollAnswer(option[on], str(on).encode()) for on in range(len(option))]
-    await e.client.send_file(
-        e.chat_id,
-        InputMediaPoll(
+    await e.respond(
+        file=InputMediaPoll(
             Poll(20, ques, OUT, multiple_choice=mpp, public_voters=publ, quiz=quizo),
             correct_answers=karzo,
         ),

plugins/profanityfilter.py

@@ -20,13 +20,13 @@ from pyUltroid.dB.nsfw_db import profan_chat, rem_profan
 from . import get_string, ultroid_cmd
 
 
-@ultroid_cmd(pattern="addprofanity$", admins_only=True)
+@ultroid_cmd(pattern="(add|rem)profanity$", admins_only=True)
 async def addp(e):
-    profan_chat(e.chat_id, "mute")
-    await e.eor(get_string("prof_1"), time=10)
-
-
-@ultroid_cmd(pattern="remprofanity", admins_only=True)
-async def remp(e):
+    cas = e.pattern_match.group(1)
+    add = cas == "add"
+    if add:
+        profan_chat(e.chat_id, "mute")
+        await e.eor(get_string("prof_1"), time=10)
+        return
     rem_profan(e.chat_id)
     await e.eor(get_string("prof_2"), time=10)

plugins/profile.py

@@ -19,7 +19,10 @@
 • `{i}delpfp <n>(optional)`
     Delete one profile pic, if no value given, else delete n number of pics.
 
-• `{i}poto <username>`
+• `{i}poto <username>/reply`
+  `{i}poto <reply/upload-limit>/all`
+
+  Ex: `{i}poto 10` - uploads starting 10 pfps of user.
     Upload the photo of Chat/User if Available.
 """
 import os
@@ -51,8 +54,7 @@ async def _(ult):
 @ultroid_cmd(pattern="setname ?((.|//)*)", fullsudo=True)
 async def _(ult):
     ok = await ult.eor("...")
-    names = ult.pattern_match.group(1).strip()
-    first_name = names
+    names = first_name = ult.pattern_match.group(1).strip()
     last_name = ""
     if "//" in names:
         first_name, last_name = names.split("//", 1)
@@ -111,21 +113,56 @@ async def remove_profilepic(delpfp):
 @ultroid_cmd(pattern="poto( (.*)|$)")
 async def gpoto(e):
     ult = e.pattern_match.group(1).strip()
+
+    if e.is_reply:
+        gs = await e.get_reply_message()
+        user_id = gs.sender_id
+    elif ult:
+        split = ult.split()
+        user_id = split[0]
+        if len(ult) > 1:
+            ult = ult[-1]
+        else:
+            ult = None
+    else:
+        user_id = e.chat_id
+
     a = await e.eor(get_string("com_1"))
+    limit = None
+
     just_dl = ult in ["-dl", "--dl"]
     if just_dl:
         ult = None
-    if not ult:
-        if e.is_reply:
-            gs = await e.get_reply_message()
-            ult = gs.sender_id
-        else:
-            ult = e.chat_id
-    okla = await e.client.download_profile_photo(ult)
+
+    if ult and ult != "all":
+        try:
+            limit = int(ult)
+        except ValueError:
+            pass
+
+    if not limit or e.client._bot:
+        okla = await e.client.download_profile_photo(user_id)
+    else:
+        okla = []
+        if limit == "all":
+            limit = None
+        async for photo in e.client.iter_profile_photos(user_id, limit=limit):
+            photo_path = await e.client.download_media(photo)
+            if photo.video_sizes:
+                await e.respond(file=photo_path)
+                os.remove(photo_path)
+            else:
+                okla.append(photo_path)
     if not okla:
         return await eor(a, "`Pfp Not Found...`")
     if not just_dl:
         await a.delete()
         await e.reply(file=okla)
-        return os.remove(okla)
+        if not isinstance(okla, list):
+            okla = [okla]
+        for file in okla:
+            os.remove(file)
+        return
+    if isinstance(okla, list):
+        okla = "\n".join(okla)
     await a.edit(f"Downloaded pfp to [ `{okla}` ].")

plugins/qrcode.py

@@ -28,7 +28,6 @@ except ImportError:
 import qrcode
 from PIL import Image
 from telethon.tl.types import MessageMediaDocument as doc
-from telethon.tl.types import MessageMediaPhoto as photu
 
 from . import check_filename, get_string, ultroid_bot, ultroid_cmd
 
@@ -70,11 +69,10 @@ async def cd(e):
 async def qrwater(e):
     msg = e.pattern_match.group(1).strip()
     r = await e.get_reply_message()
-    if isinstance(r.media, photu):
-        dl = await e.client.download_media(r.media)
-    elif isinstance(r.media, doc):
-        dl = await e.client.download_media(r, thumb=-1)
-    else:
+    dl = await e.client.download_media(
+        r, thumb=-1 if isinstance(r.media, doc) else None
+    )
+    if not dl:
         return await e.eor("`Reply Any Media and Give Text`", time=5)
     kk = await e.eor(get_string("com_1"))
     img_bg = Image.open(dl)
@@ -96,11 +94,10 @@ async def decod(e):
     if not (r and r.media):
         return await e.eor("`Reply to Qrcode Media`", time=5)
     kk = await e.eor(get_string("com_1"))
-    if isinstance(r.media, photu):
-        dl = await r.download_media()
-    elif isinstance(r.media, doc):
-        dl = await r.download_media(thumb=-1)
-    else:
+    dl = await e.client.download_media(
+        r, thumb=-1 if isinstance(r.media, doc) else None
+    )
+    if not dl:
         return
     im = cv2.imread(dl)
     try:

plugins/resize.py

@@ -36,7 +36,7 @@ async def size(e):
 
 
 @ultroid_cmd(pattern="resize( (.*)|$)")
-async def size(e):
+async def resize(e):
     r = await e.get_reply_message()
     if not (r and r.media):
         return await e.eor(get_string("ascii_1"))

plugins/schedulemsg.py

@@ -34,20 +34,18 @@ async def _(e):
         else:
             try:
                 z = ban_time(y)
-                await e.client.send_message(e.chat_id, k, schedule=z)
+                await e.respond(k, schedule=z)
                 await e.eor(get_string("schdl_1"), time=5)
             except BaseException:
                 await e.eor(get_string("schdl_2"), time=5)
     elif xx and x:
         if x.isdigit():
-            await e.client.send_message(
-                e.chat_id, xx, schedule=timedelta(seconds=int(x))
-            )
+            await e.respond(xx, schedule=timedelta(seconds=int(x)))
             await e.eor(get_string("schdl_1"), time=5)
         else:
             try:
                 z = ban_time(x)
-                await e.client.send_message(e.chat_id, xx, schedule=z)
+                await e.respond(xx, schedule=z)
                 await e.eor(get_string("schdl_1"), time=5)
             except BaseException:
                 await e.eor(get_string("schdl_2"), time=5)

plugins/search.py

@@ -24,7 +24,6 @@
     Reply an Image or sticker to find its sauce.
 """
 import os
-from shutil import rmtree
 
 import requests
 from bs4 import BeautifulSoup as bs
@@ -39,11 +38,10 @@ except ImportError:
     cv2 = None
 from telethon.tl.types import DocumentAttributeAudio
 
-from pyUltroid.fns.google_image import googleimagesdownload
 from pyUltroid.fns.misc import google_search
-from pyUltroid.fns.tools import saavn_search
+from pyUltroid.fns.tools import get_google_images, saavn_search
 
-from . import async_searcher, con, eod, fast_download, get_string, ultroid_cmd
+from . import LOGS, async_searcher, con, eod, fast_download, get_string, ultroid_cmd
 
 
 @ultroid_cmd(
@@ -122,20 +120,12 @@ async def goimg(event):
             query = query.split(";")[0]
         except BaseException:
             pass
-    try:
-        gi = googleimagesdownload()
-        args = {
-            "keywords": query,
-            "limit": lmt,
-            "format": "jpg",
-            "output_directory": "./resources/downloads/",
-        }
-        pth = await gi.download(args)
-        ok = pth[0][query]
-    except BaseException:
-        return await nn.edit(get_string("autopic_2").format(query))
-    await event.reply(file=ok, message=query)
-    rmtree(f"./resources/downloads/{query}/")
+    images = await get_google_images(query)
+    for img in images[:lmt]:
+        try:
+            await event.client.send_file(event.chat_id, file=img["original"])
+        except Exception as er:
+            LOGS.exception(er)
     await nn.delete()
 
 
@@ -168,22 +158,16 @@ async def reverse(event):
     link = alls["href"]
     text = alls.text
     await ult.edit(f"`Dimension ~ {x} : {y}`\nSauce ~ [{text}](google.com{link})")
-    gi = googleimagesdownload()
-    args = {
-        "keywords": text,
-        "limit": 2,
-        "format": "jpg",
-        "output_directory": "./resources/downloads/",
-    }
-    pth = await gi.download(args)
-    ok = pth[0][text]
-    await event.client.send_file(
-        event.chat_id,
-        ok,
-        album=True,
-        caption="Similar Images Realted to Search",
-    )
-    rmtree(f"./resources/downloads/{text}/")
+    images = await get_google_images(text)
+    for z in images[:2]:
+        try:
+            await event.client.send_file(
+                event.chat_id,
+                file=z["original"],
+                caption="Similar Images Realted to Search",
+            )
+        except Exception as er:
+            LOGS.exception(er)
     os.remove(file)
 
 

plugins/snips.py

@@ -88,9 +88,8 @@ async def rs(e):
 async def lsnote(e):
     if x := list_snip():
         sd = "SNIPS Found :\n\n"
-        await e.eor(sd + x)
-    else:
-        await e.eor("No Snips Found Here")
+        return await e.eor(sd + x)
+    await e.eor("No Snips Found Here")
 
 
 async def add_snips(e):

plugins/specialtools.py

@@ -35,14 +35,12 @@ import os
 import time
 from datetime import datetime as dt
 from random import choice
-from shutil import rmtree
 
 import pytz
 from bs4 import BeautifulSoup as bs
 from telethon.tl.types import DocumentAttributeVideo
 
-from pyUltroid.fns.google_image import googleimagesdownload
-from pyUltroid.fns.tools import metadata
+from pyUltroid.fns.tools import get_google_images, metadata
 
 from . import (
     HNDLR,
@@ -284,17 +282,9 @@ async def wall(event):
         return await event.eor("`Give me something to search..`")
     nn = await event.eor(get_string("com_1"))
     query = f"hd {inp}"
-    gi = googleimagesdownload()
-    args = {
-        "keywords": query,
-        "limit": 10,
-        "format": "jpg",
-        "output_directory": "./resources/downloads/",
-    }
-    await gi.download(args)
-    xx = choice(os.listdir(os.path.abspath(f"./resources/downloads/{query}/")))
-    await event.client.send_file(event.chat_id, f"./resources/downloads/{query}/{xx}")
-    rmtree(f"./resources/downloads/{query}/")
+    images = await get_google_images(query)
+    for z in range(5):
+        await event.client.send_file(event.chat_id, file=images[z]["original"])
     await nn.delete()
 
 

plugins/tools.py

@@ -39,6 +39,7 @@
 import glob
 import io
 import os
+import secrets
 from asyncio.exceptions import TimeoutError as AsyncTimeout
 
 try:
@@ -46,10 +47,15 @@ try:
 except ImportError:
     cv2 = None
 
+try:
+    from playwright.async_api import async_playwright
+except ImportError:
+    async_playwright = None
 try:
     from htmlwebshot import WebShot
 except ImportError:
     WebShot = None
+
 from telethon.errors.rpcerrorlist import MessageTooLongError, YouBlockedUserError
 from telethon.tl.types import (
     ChannelParticipantAdmin,
@@ -67,12 +73,12 @@ from . import (
     bash,
     check_filename,
     con,
+    download_file,
     eor,
-    fast_download,
     get_string,
 )
 from . import humanbytes as hb
-from . import inline_mention, is_url_ok, mediainfo, ultroid_cmd
+from . import inline_mention, is_url_ok, json_parser, mediainfo, ultroid_cmd
 
 
 @ultroid_cmd(pattern="tr( (.*)|$)", manager=True)
@@ -337,16 +343,16 @@ async def _(e):
 )
 async def lastname(steal):
     mat = steal.pattern_match.group(1).strip()
-    if not steal.is_reply and not mat:
-        return await steal.eor("`Use this command with reply or give Username/id...`")
+    message = await steal.get_reply_message()
     if mat:
         try:
             user_id = await steal.client.parse_id(mat)
         except ValueError:
             user_id = mat
-    message = await steal.get_reply_message()
-    if message:
-        user_id = message.sender.id
+    elif message:
+        user_id = message.sender_id
+    else:
+        return await steal.eor("`Use this command with reply or give Username/id...`")
     chat = "@SangMataInfo_bot"
     id = f"/search_id {user_id}"
     lol = await steal.eor(get_string("com_1"))
@@ -389,20 +395,37 @@ async def webss(event):
     xurl = event.pattern_match.group(1).strip()
     if not xurl:
         return await xx.eor(get_string("wbs_1"), time=5)
-    if not is_url_ok(xurl):
+    if not (await is_url_ok(xurl)):
         return await xx.eor(get_string("wbs_2"), time=5)
-    try:
-        shot = WebShot(
-            quality=88, flags=["--enable-javascript", "--no-stop-slow-scripts"]
-        )
-        pic = await shot.create_pic_async(url=xurl)
-    except FileNotFoundError:
-        pic = (
-            await fast_download(
-                f"https://shot.screenshotapi.net/screenshot?&url={xurl}&output=image&file_type=png&wait_for_event=load",
-                filename=check_filename("shot.png"),
+    path, pic = check_filename("shot.png"), None
+    if async_playwright:
+        try:
+            async with async_playwright() as playwright:
+                chrome = await playwright.chromium.launch()
+                page = await chrome.new_page()
+                await page.goto(xurl)
+                await page.screenshot(path=path, full_page=True)
+                pic = path
+        except Exception as er:
+            LOGS.exception(er)
+            await xx.respond(f"Error with playwright:\n`{er}`")
+    if WebShot and not pic:
+        try:
+            shot = WebShot(
+                quality=88, flags=["--enable-javascript", "--no-stop-slow-scripts"]
             )
-        )[0]
+            pic = await shot.create_pic_async(url=xurl)
+        except Exception as er:
+            LOGS.exception(er)
+    if not pic:
+        pic, msg = await download_file(
+            f"https://shot.screenshotapi.net/screenshot?&url={xurl}&output=image&file_type=png&wait_for_event=load",
+            path,
+            validate=True,
+        )
+        if msg:
+            await xx.edit(json_parser(msg, indent=1))
+            return
     if pic:
         await xx.reply(
             get_string("wbs_3").format(xurl),
@@ -420,12 +443,10 @@ async def magic(event):
         match = event.text.split(maxsplit=1)[1].strip()
     except IndexError:
         return await event.eor("`Provide url to turn into tiny...`")
-    match, id_ = match.split(), None
-    data = {}
-    if len(match) > 1:
-        data["id"] = match[1]
-    url = match[0]
-    data["link"] = url
+    data = {
+        "url": match.split()[0],
+        "id": match[1] if len(match) > 1 else secrets.token_urlsafe(6),
+    }
     data = await async_searcher(
         "https://tiny.ultroid.tech/api/new",
         data=data,