fixed bugs

Powers/plugins/flood.py

@@ -329,7 +329,10 @@ dic = {}
 async def flood_watcher(c: Gojo, m: Message):
     c_id = m.chat.id
     Flood = Floods()
-    u_id = m.from_user.id
+    try:
+        u_id = m.from_user.id
+    except AttributeError:
+        return # Get this error when the message received is not by an user and return
     is_flood = Flood.is_chat(c_id)
     if not is_flood:
         return # return of chat is not in anti flood protection

Powers/plugins/formatting.py

@@ -1,3 +1,5 @@
+from random import choice
+
 from pyrogram import enums, filters
 from pyrogram.errors import MediaCaptionTooLong
 from pyrogram.types import CallbackQuery, Message
@@ -5,6 +7,7 @@ from pyrogram.types import CallbackQuery, Message
 from Powers import LOGGER
 from Powers.bot_class import Gojo
 from Powers.utils.custom_filters import command
+from Powers.utils.extras import StartPic
 from Powers.utils.kbhelpers import ikb
 
 
@@ -26,8 +29,9 @@ async def gen_formatting_kb(m):
     command(["markdownhelp", "formatting"]) & filters.private,
 )
 async def markdownhelp(_, m: Message):
-    await m.reply_text(
-        text=f"plugins.{__PLUGIN__}.help",
+    await m.reply_photo(
+        photo=str(choice(StartPic)),
+        caption=f"{__HELP__}",
         quote=True,
         reply_markup=(await gen_formatting_kb(m)),
     )
@@ -43,28 +47,28 @@ async def get_formatting_info(c: Gojo, q: CallbackQuery):
     if cmd == "md_formatting":
         
         txt = """<b>Markdown Formatting</b>
-        You can format your message using <b>bold</b>, <i>italic</i>, <u>underline</u>, <strike>strike</strike> and much more. Go ahead and experiment!
-
-        **Note**: It supports telegram user based formatting as well as html and markdown formattings.
-        <b>Supported markdown</b>:
-        - <code>`code words`</code>: Backticks are used for monospace fonts. Shows as: <code>code words</code>.
-        - <code>__italic__</code>: Underscores are used for italic fonts. Shows as: <i>italic words</i>.
-        - <code>**bold**</code>: Asterisks are used for bold fonts. Shows as: <b>bold words</b>.
-        - <code>```pre```</code>: To make the formatter ignore other formatting characters inside the text formatted with '```', like: <code>**bold** | *bold*</code>.
-        - <code>--underline--</code>: To make text <u>underline</u>.
-        - <code>~~strike~~</code>: Tildes are used for strikethrough. Shows as: <strike>strike</strike>.
-        - <code>||spoiler||</code>: Double vertical bars are used for spoilers. Shows as: <spoiler>Spoiler</spoiler>.
-        - <code>[hyperlink](example.com)</code>: This is the formatting used for hyperlinks. Shows as: <a href="https://example.com/">hyperlink</a>.
-        - <code>[My Button](buttonurl://example.com)</code>: This is the formatting used for creating buttons. This example will create a button named "My button" which opens <code>example.com</code> when clicked.
-        If you would like to send buttons on the same row, use the <code>:same</code> formatting.
-        <b>Example:</b>
-        <code>[button 1](buttonurl:example.com)</code>
-        <code>[button 2](buttonurl://example.com:same)</code>
-        <code>[button 3](buttonurl://example.com)</code>
-        This will show button 1 and 2 on the same line, while 3 will be underneath."""
+You can format your message using <b>bold</b>, <i>italic</i>, <u>underline</u>, <strike>strike</strike> and much more. Go ahead and experiment!
+
+**Note**: It supports telegram user based formatting as well as html and markdown formattings.
+<b>Supported markdown</b>:
+- <code>`code words`</code>: Backticks are used for monospace fonts. Shows as: <code>code words</code>.
+- <code>__italic__</code>: Underscores are used for italic fonts. Shows as: <i>italic words</i>.
+- <code>**bold**</code>: Asterisks are used for bold fonts. Shows as: <b>bold words</b>.
+- <code>```pre```</code>: To make the formatter ignore other formatting characters inside the text formatted with '```', like: <code>**bold** | *bold*</code>.
+- <code>--underline--</code>: To make text <u>underline</u>.
+- <code>~~strike~~</code>: Tildes are used for strikethrough. Shows as: <strike>strike</strike>.
+- <code>||spoiler||</code>: Double vertical bars are used for spoilers. Shows as: <spoiler>Spoiler</spoiler>.
+- <code>[hyperlink](example.com)</code>: This is the formatting used for hyperlinks. Shows as: <a href="https://example.com/">hyperlink</a>.
+- <code>[My Button](buttonurl://example.com)</code>: This is the formatting used for creating buttons. This example will create a button named "My button" which opens <code>example.com</code> when clicked.
+If you would like to send buttons on the same row, use the <code>:same</code> formatting.
+<b>Example:</b>
+<code>[button 1](buttonurl:example.com)</code>
+<code>[button 2](buttonurl://example.com:same)</code>
+<code>[button 3](buttonurl://example.com)</code>
+This will show button 1 and 2 on the same line, while 3 will be underneath."""
         try:
-            await q.message.edit_text(
-                text=txt,
+            await q.edit_message_caption(
+                caption=txt,
                 reply_markup=kb,
                 parse_mode=enums.ParseMode.HTML,
             )
@@ -74,46 +78,46 @@ async def get_formatting_info(c: Gojo, q: CallbackQuery):
                 text=txt,
                 parse_mode=enums.ParseMode.HTML,)
     elif cmd == "fillings":
-        await q.message.edit_text(
-            text="""<b>Fillings</b>
-
-      You can also customise the contents of your message with contextual data. For example, you could mention a user by name in the welcome message, or mention them in a filter!
-      You can use these to mention a user in notes too!
-
-      <b>Supported fillings:</b>
-      - <code>{first}</code>: The user's first name.
-      - <code>{last}</code>: The user's last name.
-      - <code>{fullname}</code>: The user's full name.
-      - <code>{username}</code>: The user's username. If they don't have one, mentions the user instead.
-      - <code>{mention}</code>: Mentions the user with their firstname.
-      - <code>{id}</code>: The user's ID.
-      - <code>{chatname}</code>: The chat's name.""",
+        await q.edit_message_caption(
+            caption="""<b>Fillings</b>
+
+You can also customise the contents of your message with contextual data. For example, you could mention a user by name in the welcome message, or mention them in a filter!
+You can use these to mention a user in notes too!
+
+<b>Supported fillings:</b>
+- <code>{first}</code>: The user's first name.
+- <code>{last}</code>: The user's last name.
+- <code>{fullname}</code>: The user's full name.
+- <code>{username}</code>: The user's username. If they don't have one, mentions the user instead.
+- <code>{mention}</code>: Mentions the user with their firstname.
+- <code>{id}</code>: The user's ID.
+- <code>{chatname}</code>: The chat's name.""",
             reply_markup=kb,
             parse_mode=enums.ParseMode.HTML,
         )
     elif cmd == "random_content":
-        await q.message.edit_text(
-            text="""<b>Random Content</b>
-
-      Another thing that can be fun, is to randomise the contents of a message. Make things a little more personal by changing welcome messages, or changing notes!
-
-      How to use random contents:
-      - %%%: This separator can be used to add "random" replies to the bot.
-      For example:
-      <code>hello
-      %%%
-      how are you</code>
-      This will randomly choose between sending the first message, "hello", or the second message, "how are you".
-      Use this to make Gojo feel a bit more customised! (only works in filters/notes)
-
-      Example welcome message::
-      - Every time a new user joins, they'll be presented with one of the three messages shown here.
-      -> /filter "hey"
-      hello there <code>{first}</code>!
-      %%%
-      Ooooh, <code>{first}</code> how are you?
-      %%%
-      Sup? <code>{first}</code>""",
+        await q.edit_message_caption(
+            caption="""<b>Random Content</b>
+
+Another thing that can be fun, is to randomise the contents of a message. Make things a little more personal by changing welcome messages, or changing notes!
+
+How to use random contents:
+- %%%: This separator can be used to add "random" replies to the bot.
+For example:
+<code>hello
+%%%
+how are you</code>
+This will randomly choose between sending the first message, "hello", or the second message, "how are you".
+Use this to make Gojo feel a bit more customised! (only works in filters/notes)
+
+Example welcome message::
+- Every time a new user joins, they'll be presented with one of the three messages shown here.
+-> /filter "hey"
+hello there <code>{first}</code>!
+%%%
+Ooooh, <code>{first}</code> how are you?
+%%%
+Sup? <code>{first}</code>""",
             reply_markup=kb,
             parse_mode=enums.ParseMode.HTML,
         )
@@ -124,10 +128,10 @@ async def get_formatting_info(c: Gojo, q: CallbackQuery):
 
 @Gojo.on_callback_query(filters.regex("^back."))
 async def send_mod_help(_, q: CallbackQuery):
-    await q.message.edit_text(
-        text="""Formatting
+    await q.edit_message_caption(
+        caption="""Formatting
 
-        Gojo supports a large number of formatting options to make your messages more expressive. Take a look by clicking the buttons below!""",
+Gojo supports a large number of formatting options to make your messages more expressive. Take a look by clicking the buttons below!""",
         reply_markup=(await gen_formatting_kb(q.message)),
     )
     await q.answer()

Powers/utils/start_utils.py

@@ -139,6 +139,8 @@ async def get_private_note(c: Gojo, m: Message, help_option: str):
         teks, button = await parse_button(text)
         button = await build_keyboard(button)
         button = ikb(button) if button else None
+        if not teks:
+            teks = "Here is your note"
         if button:
             try:
                 await m.reply_text(

Powers/utils/string.py

@@ -1,6 +1,6 @@
+from datetime import datetime, timedelta
 from html import escape
 from re import compile as compile_re
-from time import time
 from typing import List
 
 from pyrogram.enums import ChatType
@@ -19,13 +19,13 @@ async def extract_time(m: Message, time_val: str):
         if not time_num.isdigit():
             await m.reply("Unspecified amount of time.")
             return ""
-
+        initial_time = datetime.now()
         if unit == "m":
-            bantime = int(time() + int(time_num) * 60)
+            bantime = initial_time + timedelta(minutes=int(time_num))
         elif unit == "h":
-            bantime = int(time() + int(time_num) * 60 * 60)
-        elif unit == "s":
-            bantime = int(time() + int(time_num) * 24 * 60 * 60)
+            bantime = initial_time + timedelta(hours=int(time_num))
+        elif unit == "d":
+            bantime = initial_time + timedelta(days=int(time_num)) 
         else:
             # how even...?
             return ""
@@ -62,7 +62,6 @@ async def parse_button(text: str):
             prev = match.start(1) - 1
     else:
         note_data += markdown_note[prev:]
-
     return note_data, buttons