Fixes v0.0.8.1

* Fixed YouTube
* Fixed Shutdown
* Button In asst Fixed
* Fixed paste & open
* Anime
* Minor bugs

Co-authored-by: Aditya <[email protected]>
Co-authored-by: Error <[email protected]>
Co-authored-by: Anonymous <[email protected]>

Dockerfile

@@ -13,6 +13,7 @@ RUN git clone https://github.com/TeamUltroid/Ultroid.git /root/TeamUltroid/
 WORKDIR /root/TeamUltroid/
 
 RUN pip3 install --no-cache-dir -r requirements.txt
+
 RUN npm install -g [email protected] -g
 RUN npm install
 RUN npm run build

assistant/start.py

@@ -76,39 +76,41 @@ async def ultroid(event):
                     )
                 ],
             )
+    else:
         if (
             not is_added(event.sender_id)
             and str(event.sender_id) not in owner_and_sudos()
         ):
             add_user(event.sender_id)
-        ok = ""
-        u = await event.client.get_entity(event.chat_id)
-        if not udB.get("STARTMSG"):
-            if udB.get("PMBOT") == "True":
-                ok = "You can contact my master using this bot!!\n\nSend your Message, I will Deliver it To Master."
-            await event.reply(
-                f"Hey there [{get_display_name(u)}](tg://user?id={u.id}), this is Ultroid Assistant of [{ultroid_bot.me.first_name}](tg://user?id={ultroid_bot.uid})!\n\n{ok}",
-                buttons=[Button.inline("Info.", data="ownerinfo")],
-            )
+        if str(event.sender_id) not in owner_and_sudos():
+            ok = ""
+            u = await event.client.get_entity(event.chat_id)
+            if not udB.get("STARTMSG"):
+                if udB.get("PMBOT") == "True":
+                    ok = "You can contact my master using this bot!!\n\nSend your Message, I will Deliver it To Master."
+                await event.reply(
+                    f"Hey there [{get_display_name(u)}](tg://user?id={u.id}), this is Ultroid Assistant of [{ultroid_bot.me.first_name}](tg://user?id={ultroid_bot.uid})!\n\n{ok}",
+                    buttons=[Button.inline("Info.", data="ownerinfo")],
+                )
+            else:
+                me = f"[{ultroid_bot.me.first_name}](tg://user?id={ultroid_bot.uid})"
+                mention = f"[{get_display_name(u)}](tg://user?id={u.id})"
+                await event.reply(
+                    Redis("STARTMSG").format(me=me, mention=mention),
+                    buttons=[Button.inline("Info.", data="ownerinfo")],
+                )
         else:
-            me = f"[{ultroid_bot.me.first_name}](tg://user?id={ultroid_bot.uid})"
-            mention = f"[{get_display_name(u)}](tg://user?id={u.id})"
-            await event.reply(
-                Redis("STARTMSG").format(me=me, mention=mention),
-                buttons=[Button.inline("Info.", data="ownerinfo")],
-            )
-    else:
-        name = get_display_name(event.sender_id)
-        if event.pattern_match.group(1) == "set":
-            await event.reply(
-                "Choose from the below options -",
-                buttons=_settings,
-            )
-        else:
-            await event.reply(
-                get_string("ast_3").format(name),
-                buttons=_start,
-            )
+            name = get_display_name(event.sender_id)
+            if event.pattern_match.group(1) == "set":
+                await event.reply(
+                    "Choose from the below options -",
+                    buttons=_settings,
+                )
+            else:
+                await event.reply(
+                    get_string("ast_3").format(name),
+                    buttons=_start,
+                )
 
 
 @callback("mainmenu")

plugins/__init__.py

@@ -30,7 +30,7 @@ except ModuleNotFoundError:
 
 
 start_time = time.time()
-ultroid_version = "v0.0.8"
+ultroid_version = "v0.0.8.1"
 OWNER_NAME = ultroid_bot.me.first_name
 OWNER_ID = ultroid_bot.me.id
 

plugins/anime.py

@@ -39,7 +39,6 @@ async def airing_anime(event):
         await event.delete()
 
 
-"""
 @ultroid_cmd(pattern="anime ?(.*)")
 async def anilist(event):
     name = event.pattern_match.group(1)
@@ -50,7 +49,6 @@ async def anilist(event):
     msg = f"**{title}**\n{year} | {episodes} Episodes.\n\n{info}"
     await event.reply(msg, file=banner, link_preview=True)
     await x.delete()
-"""
 
 
 @ultroid_cmd(pattern="character ?(.*)")

plugins/bot.py

@@ -122,7 +122,7 @@ async def shutdownbot(ult):
     await shutdown(ult)
 
 
-@ultroid_bot.on(events.NewMessage(pattern=f"\\{HNDLR}logs$"))
+@ultroid_bot.on(events.NewMessage(pattern=f"\\{HNDLR}logs ?(.*)"))
 async def _(event):
     if event.fwd_from:
         return

plugins/converter.py

@@ -193,7 +193,7 @@ async def _(event):
             try:
                 await xx.edit(f"```{d}```")
             except BaseException:
-                what, key = get_paste(message)
+                what, key = get_paste(d)
                 if "neko" in what:
                     await xx.edit(
                         f"**MESSAGE EXCEEDS TELEGRAM LIMITS**\n\nSo Pasted It On [NEKOBIN](https://nekobin.com/{key})"

plugins/deezer.py

@@ -11,3 +11,74 @@
 • `{i}deez <search query (| flac)>`
     Download songs from Deezer
 """
+import os
+import time
+from json.decoder import JSONDecodeError
+from urllib.request import urlretrieve
+
+import requests as r
+from telethon.tl.types import DocumentAttributeAudio
+
+from . import *
+
+
+@ultroid_cmd(
+    pattern="deez ?(.*)",
+)
+async def siesace(e):
+    song = e.pattern_match.group(1)
+    if not song:
+        return await eod(e, "Give me Something to Search")
+    quality = "mp3"
+    if "| flac" in song:
+        try:
+            song = song.split("|")[0]
+            quality = "flac"
+        except Exception as ex:
+            await eod(e, f"`{str(ex)}`")
+    hmm = time.time()
+    lol = await eor(e, "`Searching on Deezer...`")
+    sung = song.replace(" ", "%20")
+    url = f"https://jostapi.herokuapp.com/deezer?query={sung}&quality={quality}&count=1"
+    try:
+        k = (r.get(url)).json()[0]
+    except IndexError:
+        return await eod(lol, "`Song Not Found.. `")
+    except JSONDecodeError:
+        return await eod(
+            lol, f"`Tell `[sɪᴘᴀᴋ](tg://user?id=1303895686)`to turn on API.`"
+        )
+    try:
+        title = k["title"]
+        urrl = k["raw_link"]
+        img = k["album"]["cover_xl"]
+        duration = k["duration"]
+        singers = k["artist"]["name"]
+    except Exception as ex:
+        return await eod(lol, f"`{str(ex)}`")
+    urlretrieve(urrl, title + "." + quality)
+    urlretrieve(img, title + ".jpg")
+    okk = await uploader(
+        title + "." + quality,
+        title + "." + quality,
+        hmm,
+        lol,
+        "Uploading " + title + "...",
+    )
+    await ultroid_bot.send_file(
+        e.chat_id,
+        okk,
+        caption="`" + title + "`" + "\n`From Deezer`",
+        attributes=[
+            DocumentAttributeAudio(
+                duration=int(duration),
+                title=title,
+                performer=singers,
+            )
+        ],
+        supports_streaming=True,
+        thumb=title + ".jpg",
+    )
+    await lol.delete()
+    os.remove(title + "." + quality)
+    os.remove(title + ".jpg")

plugins/download_upload.py

@@ -126,6 +126,8 @@ async def download(event):
                     hmm = " | stream"
                 if " | stream" in hmm:
                     metadata = extractMetadata(createParser(res.name))
+                    if not metadata:
+                        return await event.reply(file=res, supports_streaming=True)
                     wi = 512
                     hi = 512
                     duration = 0

plugins/saavn.py

@@ -15,7 +15,6 @@
 
 import os
 import time
-from json.decoder import JSONDecodeError
 from urllib.request import urlretrieve
 
 import requests as r
@@ -71,65 +70,3 @@ async def siesace(e):
     await lol.delete()
     os.remove(title + ".mp3")
     os.remove(title + ".jpg")
-
-
-@ultroid_cmd(
-    pattern="deez ?(.*)",
-)
-async def siesace(e):
-    song = e.pattern_match.group(1)
-    if not song:
-        return await eod(e, "Give me Something to Search")
-    quality = "mp3"
-    if "| flac" in song:
-        try:
-            song = song.split("|")[0]
-            quality = "flac"
-        except Exception as ex:
-            await eod(e, f"`{str(ex)}`")
-    hmm = time.time()
-    lol = await eor(e, "`Searching on Deezer...`")
-    sung = song.replace(" ", "%20")
-    url = f"https://jostapi.herokuapp.com/deezer?query={sung}&quality={quality}&count=1"
-    try:
-        k = (r.get(url)).json()[0]
-    except IndexError:
-        return await eod(lol, "`Song Not Found.. `")
-    except JSONDecodeError:
-        return await eod(
-            lol, f"`Tell `[sɪᴘᴀᴋ](tg://user?id=1303895686)`to turn on API.`"
-        )
-    try:
-        title = k["title"]
-        urrl = k["raw_link"]
-        img = k["album"]["cover_xl"]
-        duration = k["duration"]
-        singers = k["artist"]["name"]
-    except Exception as ex:
-        return await eod(lol, f"`{str(ex)}`")
-    urlretrieve(urrl, title + "." + quality)
-    urlretrieve(img, title + ".jpg")
-    okk = await uploader(
-        title + "." + quality,
-        title + "." + quality,
-        hmm,
-        lol,
-        "Uploading " + title + "...",
-    )
-    await ultroid_bot.send_file(
-        e.chat_id,
-        okk,
-        caption="`" + title + "`" + "\n`From Deezer`",
-        attributes=[
-            DocumentAttributeAudio(
-                duration=int(duration),
-                title=title,
-                performer=singers,
-            )
-        ],
-        supports_streaming=True,
-        thumb=title + ".jpg",
-    )
-    await lol.delete()
-    os.remove(title + "." + quality)
-    os.remove(title + ".jpg")

plugins/utilities.py

@@ -63,7 +63,6 @@ import os
 import time
 from datetime import datetime as dt
 
-import pytz
 import requests
 from telegraph import Telegraph
 from telegraph import upload_file as uf
@@ -75,7 +74,7 @@ from telethon.tl.functions.channels import (
     LeaveChannelRequest,
 )
 from telethon.tl.functions.contacts import GetBlockedRequest
-from telethon.tl.functions.messages import AddChatUserRequest
+from telethon.tl.functions.messages import AddChatUserRequest, GetAllStickersRequest
 from telethon.tl.functions.photos import GetUserPhotosRequest
 from telethon.tl.types import Channel, Chat, InputMediaPoll, Poll, PollAnswer, User
 from telethon.utils import get_input_location
@@ -202,6 +201,11 @@ async def stats(
         ct = (await ultroid_bot(GetBlockedRequest(1, 0))).count
     except AttributeError:
         ct = 0
+    try:
+        sp = await ultroid_bot(GetAllStickersRequest(0))
+        sp_count = len(sp.sets)
+    except BaseException:
+        sp_count = 0
     full_name = inline_mention(await ultroid_bot.get_me())
     response = f"🔸 **Stats for {full_name}** \n\n"
     response += f"**Private Chats:** {private_chats} \n"
@@ -217,7 +221,8 @@ async def stats(
     response += f"**  •• **`Admin Rights: {admin_in_broadcast_channels - creator_in_channels}` \n"
     response += f"**Unread:** {unread} \n"
     response += f"**Unread Mentions:** {unread_mentions} \n"
-    response += f"**Blocked Users:** {ct}\n\n"
+    response += f"**Blocked Users:** {ct}\n"
+    response += f"**Total Stickers Pack Installed :** `{sp_count}`\n\n"
     response += f"**__It Took:__** {stop_time:.02f}s \n"
     await ok.edit(response)
 

plugins/vcplugin.py

@@ -27,15 +27,16 @@
 • `{i}rmvcaccess <id/username/reply to msg>`
     Remove access of Voice Chat Bot.
 
-• **Voice Chat Bot Commands**
+• **Voice Chat - Bot Commands**
    `/play ytsearch : song-name`
    `/play youtube link`
    `/current`
    `/skip`
    `/exitVc`
-
 """
 
+from os import remove
+
 from pyUltroid.functions.vc_sudos import add_vcsudo, del_vcsudo, get_vcsudos, is_vcsudo
 from telethon.tl.functions.channels import GetFullChannelRequest as getchat
 from telethon.tl.functions.phone import CreateGroupCallRequest as startvc
@@ -79,7 +80,15 @@ async def _(e):
     LOGS.info(er)
     LOGS.info(out)
     if er:
-        await zz.edit(f"Failed {er}\n\n{out}")
+        msg = f"Failed {er}\n\n{out}"
+        if len(msg) > 4096:
+            with open("vc-error.txt", "w") as f:
+                f.write(msg.replace("`", ""))
+            await e.reply(file="vc-error.txt")
+            await zz.delete()
+            remove("vc-error.txt")
+            return
+        await zz.edit(msg)
 
 
 @ultroid_cmd(

requirements.txt

@@ -1,3 +1,3 @@
-py-Ultroid==2021.6.17
+py-Ultroid==2021.6.18.1
 Shazamio
 https://github.com/New-dev0/Telethon/archive/BETTER.zip

src/handlers/playFile.ts

@@ -58,8 +58,8 @@ export const filePlayHandler = Composer.command('playFile', async (ctx) => {
                     parse_mode: 'HTML',
                     ...Markup.inlineKeyboard([
                         [
-                            Markup.button.callback('Pause', `pause:${escapeHtml(id)}`),
-                            Markup.button.callback('Skip', `skip:${escapeHtml(id)}`)
+                            Markup.button.callback('Pause', `pause:${id}`),
+                            Markup.button.callback('Skip', `skip:${id}`)
                         ],
                         [
                             Markup.button.callback('Exit', `exitVc`),

strings/strings/ka.yml

@@ -1,7 +1,7 @@
 name: Kannada
 natively: ಕನ್ನಡ
 
-author:
+authors:
   - anishgowda21
 
 #commons

vcstarter.py

@@ -4,7 +4,7 @@ from json.decoder import JSONDecodeError
 
 from aiohttp import web
 from aiohttp.http_websocket import WSMsgType
-from pyUltroid import vcbot, udB
+from pyUltroid import udB, vcbot
 from pyUltroid.dB.database import Var
 from telethon import TelegramClient
 from telethon.tl.functions.channels import GetFullChannelRequest
@@ -174,7 +174,7 @@ if vcbot:
     def main():
         app = web.Application()
         app.router.add_route("GET", "/", websocket_handler)
-        web.run_app(app, host="localhost", port=6969)
+        web.run_app(app, host="127.0.0.1", port=6969)
 
     vcbot.start()
     main()