Bug fixes V0.0.5

Co-authored-by: Aditya <me@xditya.me>
Co-authored-by: Danish <danish@ultroid.tech>
Co-authored-by: buddhhu <buddhuu@users.noreply.github.com>
Co-authored-by: sppidy <sppidy@users.noreply.github.com>
Co-authored-by: Arnab Paryali <Arnabxd@users.noreply.github.com>
Co-authored-by: divkix <divkix@users.noreply.github.com>
Co-authored-by: hellboi_atul <hellboi-atul@users.noreply.github.com>
Co-authored-by: Programming Error <error@notavailable.live>
Co-authored-by: New-dev0 <New-dev0@notavailable.live>

Author: 9 people

Dockerfile

@@ -4,17 +4,18 @@
 # PLease read the GNU Affero General Public License in <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 
 FROM ultroidteam/ultroid:0.0.3
-RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \
-    dpkg -i ./google-chrome-stable_current_amd64.deb; apt -fqqy install && \
-    rm ./google-chrome-stable_current_amd64.deb
-RUN wget -O chromedriver.zip http://chromedriver.storage.googleapis.com/$(curl -sS chromedriver.storage.googleapis.com/LATEST_RELEASE)/chromedriver_linux64.zip  && \
-    unzip chromedriver.zip chromedriver -d /usr/bin/ && \
-    rm chromedriver.zip
+#RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \
+#    dpkg -i ./google-chrome-stable_current_amd64.deb; apt -fqqy install && \
+#    rm ./google-chrome-stable_current_amd64.deb
+#RUN wget -O chromedriver.zip http://chromedriver.storage.googleapis.com/$(curl -sS chromedriver.storage.googleapis.com/LATEST_RELEASE)/chromedriver_linux64.zip  && \
+#    unzip chromedriver.zip chromedriver -d /usr/bin/ && \
+#    rm chromedriver.zip
 RUN curl --silent --location https://deb.nodesource.com/setup_15.x | bash -
-RUN apt-get install -y nodejs sudo
+RUN apt-get install -y nodejs
 RUN git clone https://github.com/TeamUltroid/Ultroid.git /root/TeamUltroid/
-WORKDIR /root/TeamUltroid/
 RUN git clone https://github.com/1Danish-00/glitch_me.git && pip install -e ./glitch_me
+WORKDIR /root/TeamUltroid/
 RUN pip install -r requirements.txt
-RUN npm install -g npm@7.7.0 && npm install
+RUN rm -rf /usr/local/lib/python3.9/site-packages/.wh*
+RUN npm install -g npm@7.9.0 && npm install
 RUN npm run build

README.md

@@ -46,7 +46,7 @@ Get the [Necessary Variables](#Necessary-Variables) and then click the button be
 ### Local Deploy - Easy Method
 - Linux - `bash -c "$(curl -fsSL https://git.io/JY9UM)"`
 - Windows - `cd desktop ; wget https://del.dog/raw/ultroid-termux -o locals.py ; python locals.py`
-- Termux - `sh -c "$(curl -fsSL https://del.dog/raw/ultroid-termux)"`
+- Termux - `sh -c "$(curl -fsSL https://del.dog/raw/ultroid-termux-deploy)"`
 
 ### Local Deploy - Traditional Method
 - Get your [Necessary Variables](#Necessary-Variables)

assistant/inlinestuff.py

@@ -121,7 +121,7 @@ async def _(e):
             text=f"**File:**\n{file_name}",
             buttons=bitton,
         )
-    except:
+    except BaseException:
         lnk = e.builder.article(
             title="fl2lnk",
             text="File not found",

assistant/othervars.py

@@ -783,12 +783,43 @@ async def chbot(event):
         buttons=[
             [Button.inline("Cʜᴀᴛ Bᴏᴛ  Oɴ", data="onchbot")],
             [Button.inline("Cʜᴀᴛ Bᴏᴛ  Oғғ", data="ofchbot")],
+            [Button.inline("Bᴏᴛ Wᴇʟᴄᴏɴᴇ", data="bwel")],
             [Button.inline("« Bᴀᴄᴋ", data="setter")],
         ],
         link_preview=False,
     )
 
 
+@callback("bwel")
+@owner
+async def name(event):
+    await event.delete()
+    pru = event.sender_id
+    var = "STARTMSG"
+    name = "Bot Welcome Message:"
+    async with event.client.conversation(pru) as conv:
+        await conv.send_message(
+            "**BOT WELCOME MSG**\nEnter the msg which u want to show when someone start your assistant Bot.\n\nUse /cancel to terminate the operation.",
+        )
+        response = conv.wait_event(events.NewMessage(chats=pru))
+        response = await response
+        themssg = response.message.message
+        if themssg == "/cancel":
+            return await conv.send_message(
+                "Cancelled!!",
+                buttons=get_back_button("chatbot"),
+            )
+        else:
+            await setit(event, var, themssg)
+            await conv.send_message(
+                "{} changed to {}".format(
+                    name,
+                    themssg,
+                ),
+                buttons=get_back_button("chatbot"),
+            )
+
+
 @callback("onchbot")
 @owner
 async def chon(event):

assistant/start.py

@@ -10,6 +10,7 @@
 from pyUltroid.functions.asst_fns import *
 from pyUltroid.misc._decorators import sed
 from telethon import Button, events
+from telethon.utils import get_display_name
 
 from plugins import *
 
@@ -28,14 +29,23 @@ async def assistant(event):
         if not is_added(event.sender_id) and event.sender_id not in sed:
             add_user(event.sender_id)
         ok = ""
-        if udB.get("PMBOT") == "True":
-            ok = "You can contact my master using this bot!!\n\nSend your Message, I will Deliver it To Master."
         if event.is_private and event.sender_id in sed:
             return
-        await event.reply(
-            f"Hey there, this is Ultroid Assistant of {OWNER_NAME}!\n\n{ok}",
-            buttons=[Button.url("Know More", url="https://t.me/TeamUltroid")],
-        )
+        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, this is Ultroid Assistant of {OWNER_NAME}!\n\n{ok}",
+                buttons=[Button.url("Know More", url="https://t.me/TeamUltroid")],
+            )
+        else:
+            u = await event.client.get_entity(event.chat_id)
+            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.url("Know More", url="https://t.me/TeamUltroid")],
+            )
 
 
 @asst_cmd("start ?(.*)")

plugins/_help.py

@@ -26,7 +26,7 @@ async def ult(ult):
                 output = f"**Plugin** - `{plug}`\n"
                 for i in HELP[plug]:
                     output += i
-                output += "\n© @TheUltroid"
+                output += "\n© @TeamUltroid"
                 await eor(ult, output)
             elif plug in CMD_HELP:
                 kk = f"Plugin Name-{plug}\n\n✘ Commands Available -\n\n"

plugins/_tagnotifs.py

@@ -18,8 +18,11 @@
     ),
 )
 async def all_messages_catcher(e):
-    if udB.get("TAG_LOG") is not None:
-        NEEDTOLOG = int(udB.get("TAG_LOG"))
+    if udB.get("TAG_LOG"):
+        try:
+            NEEDTOLOG = int(udB.get("TAG_LOG"))
+        except Exception:
+            return LOGS.warning("you given Wrong Grp/Channel ID in TAG_LOG.")
         x = await ultroid_bot.get_entity(e.sender_id)
         if x.bot or x.verified:
             return

plugins/admintools.py

@@ -30,6 +30,12 @@
 • `{i}unpin (all) <reply to message>`
     Unpin the message(s) in the chat.
 
+• `{i}pinned`
+   Get pinned message in the current chat.
+
+• `{i}listpinned`
+   Get all pinned messages in current chat.
+
 • `{i}purge <reply to message>`
     Purge all messages from the replied message.
 
@@ -51,7 +57,7 @@
 from telethon.errors import BadRequestError
 from telethon.errors.rpcerrorlist import UserIdInvalidError
 from telethon.tl.functions.channels import EditAdminRequest
-from telethon.tl.types import ChatAdminRights
+from telethon.tl.types import ChatAdminRights, InputMessagesFilterPinned
 
 from . import *
 
@@ -427,4 +433,48 @@ async def editer(edit):
         i = i + 1
 
 
+@ultroid_cmd(pattern="pinned")
+async def get_pinned(event):
+    x = await eor(event, get_string("com_1"))
+    chat_id = (str(event.chat_id)).replace("-100", "")
+    chat_name = (await event.get_chat()).title
+    tem = ""
+    c = 0
+
+    async for i in ultroid.iter_messages(
+        event.chat_id, filter=InputMessagesFilterPinned
+    ):
+        c += 1
+        tem += f"The pinned message in {chat_name} can be found <a href=https://t.me/c/{chat_id}/{i.id}>here.</a>"
+        if c == 1:
+            return await x.edit(tem, parse_mode="html")
+
+    if tem == "":
+        return await eod(x, "There is no pinned message in chat!", time=5)
+
+
+@ultroid_cmd(pattern="listpinned")
+async def get_all_pinned(event):
+    x = await eor(event, get_string("com_1"))
+    chat_id = (str(event.chat_id)).replace("-100", "")
+    chat_name = (await event.get_chat()).title
+    a = ""
+    c = 1
+    async for i in ultroid.iter_messages(
+        event.chat_id, filter=InputMessagesFilterPinned
+    ):
+        a += f"{c}. <a href=https://t.me/c/{chat_id}/{i.id}>Go to message.</a>\n"
+        c += 1
+
+    if c == 1:
+        m = f"<b>The pinned message in {chat_name}:</b>\n\n"
+    else:
+        m = f"<b>List of pinned message(s) in {chat_name}:</b>\n\n"
+
+    if a == "":
+        return await eod(x, "There is no message pinned in this group!", time=5)
+
+    await x.edit(m + a, parse_mode="html")
+
+
 HELP.update({f"{__name__.split('.')[1]}": f"{__doc__.format(i=HNDLR)}"})

plugins/afk.py

@@ -42,6 +42,10 @@
 @ultroid_bot.on(events.NewMessage(outgoing=True))
 @ultroid_bot.on(events.MessageEdited(outgoing=True))
 async def set_not_afk(event):
+    if event.is_private:
+        if Redis("PMSETTING") == "True":
+            if not is_approved(event.chat_id):
+                return
     global USER_AFK
     global afk_time
     global last_afk_message
@@ -106,11 +110,10 @@ async def set_not_afk(event):
     events.NewMessage(incoming=True, func=lambda e: bool(e.mentioned or e.is_private)),
 )
 async def on_afk(event):
-    if event.fwd_from:
-        return
     if event.is_private:
-        if not is_approved(event.chat_id):
-            return
+        if Redis("PMSETTING") == "True":
+            if not is_approved(event.chat_id):
+                return
     global USER_AFK
     global afk_time
     global last_afk_message
@@ -156,8 +159,6 @@ async def on_afk(event):
 
 @ultroid_cmd(pattern=r"afk ?(.*)")
 async def _(event):
-    if event.fwd_from:
-        return
     reply = await event.get_reply_message()
     global USER_AFK
     global afk_time

plugins/blacklist.py

@@ -34,7 +34,7 @@ async def af(e):
     if e.is_group:
         if not e._chat.admin_rights:
             return await eod(e, "`You are Not Admin Here`")
-    wrd = e.pattern_match.group(1)
+    wrd = (e.pattern_match.group(1)).lower()
     chat = e.chat_id
     if not (wrd):
         return await eod(e, "`Give the word to blacklist..`")
@@ -48,7 +48,7 @@ async def rf(e):
     if e.is_group:
         if not e._chat.admin_rights:
             return await eod(e, "`You are Not Admin Here`")
-    wrd = e.pattern_match.group(1)
+    wrd = (e.pattern_match.group(1)).lower()
     chat = e.chat_id
     if not wrd:
         return await eod(e, "`Give the word to remove from blacklist..`")
@@ -71,12 +71,9 @@ async def lsnote(e):
 
 @ultroid_bot.on(events.NewMessage(incoming=True))
 async def bl(e):
-    if e.is_group:
-        if not e._chat.admin_rights:
-            return
-    xx = e.text
     chat = e.chat_id
     x = get_blacklist(int(chat))
+    xx = (e.text).lower()
     if x and xx:
         if " " in xx:
             xx = xx.split(" ")

plugins/bot.py

@@ -124,7 +124,11 @@ async def cmds(event):
     pattern="restart$",
 )
 async def restartbt(ult):
-    await restart(ult)
+    if not Var.HEROKU_API:
+        await eor(ult, "`Restarting..`")
+        await bash("pkill python3 && python3 -m pyUltroid")
+    else:
+        await restart(ult)
 
 
 @ultroid_cmd(
@@ -144,6 +148,7 @@ async def _(ult):
     await ultroid.send_file(
         ult.chat_id,
         file="ultroid.log",
+        thumb="resources/extras/logo_rdm.png",
         caption=f"**Ultroid Logs.**\nPasted [here](https://nekobin.com/{key}) too!",
     )
     await xx.edit("Done")

plugins/broadcast.py

@@ -32,8 +32,9 @@
 
 @ultroid_cmd(pattern="add ?(.*)", allow_sudo=False)
 async def broadcast_adder(event):
-    if not event.text[4] == " ":  # weird fix
-        return
+    if len(event.text) > 4:
+        if not event.text[4] == " ":  # weird fix
+            return
     msgg = event.pattern_match.group(1)
     x = await eor(event, get_string("bd_1"))
     aldone = new = crsh = 0
@@ -93,8 +94,9 @@ async def broadcast_adder(event):
 
 @ultroid_cmd(pattern="rem ?(.*)", allow_sudo=False)
 async def broadcast_remover(event):
-    if not event.text[4] == " ":  # weird fix
-        return
+    if len(event.text) > 4:
+        if not event.text[4] == " ":  # weird fix
+            return
     chat_id = event.pattern_match.group(1)
     x = await eor(event, get_string("com_1"))
     if chat_id == "all":
@@ -130,7 +132,7 @@ async def list_all(event):
         name = ""
         try:
             name = (await ultroid.get_entity(int(channel))).title
-        except:
+        except BaseException:
             name = ""
         msg += f"=> **{name}** [`{channel}`]\n"
     msg += f"\nTotal {get_no_channels()} channels."

plugins/channelhacks.py

@@ -88,9 +88,9 @@ async def _(e):
             return
     async for msg in ultroid_bot.iter_messages(int(c), reverse=True):
         try:
-            await asyncio.sleep(0.5)
+            await asyncio.sleep(0.7)
             await ultroid_bot.send_message(int(d), msg)
-        except:
+        except BaseException:
             pass
     await z.edit("Done")
 
@@ -158,7 +158,7 @@ async def list_all(event):
         name = ""
         try:
             name = (await ultroid.get_entity(int(channel))).title
-        except:
+        except BaseException:
             name = ""
         msg += f"=> **{name}** [`{channel}`]\n"
     msg += f"\nTotal {get_no_source_channels()} channels."
@@ -242,7 +242,7 @@ async def list_all(event):
         name = ""
         try:
             name = (await ultroid.get_entity(int(channel))).title
-        except:
+        except BaseException:
             name = ""
         msg += f"=> **{name}** [`{channel}`]\n"
     msg += f"\nTotal {get_no_destinations()} channels."

plugins/core.py

@@ -42,7 +42,7 @@ async def inline_handler(event):
     input_str = event.pattern_match.group(1)
     plug = [*PLUGINS]
     plugs = []
-    if input_str == None or input_str == "":
+    if input_str is None or input_str == "":
         for i in plug:
             try:
                 plugs.append(

plugins/dm.py

@@ -16,6 +16,9 @@
 
 @ultroid_cmd(pattern="dm ?(.*)")
 async def dm(e):
+    if len(e.text) > 3:
+        if not e.text[3] == " ":  # weird fix
+            return
     d = e.pattern_match.group(1)
     c = d.split(" ")
     try: