`message_id` changed to `.id`

Powers/plugins/bans.py

@@ -45,7 +45,7 @@ async def tban_usr(c: Gojo, m: Message):
         )
         await m.stop_propagation()
 
-    r_id = m.reply_to_message.message_id if m.reply_to_message else m.message_id
+    r_id = m.reply_to_message.id if m.reply_to_message else m.id
 
     if m.reply_to_message and len(m.text.split()) >= 2:
         reason = m.text.split(None, 2)[1]
@@ -340,11 +340,11 @@ async def kick_usr(c: Gojo, m: Message):
     reason = None
 
     if m.reply_to_message:
-        r_id = m.reply_to_message.message_id
+        r_id = m.reply_to_message.id
         if len(m.text.split()) >= 2:
             reason = m.text.split(None, 1)[1]
     else:
-        r_id = m.message_id
+        r_id = m.id
         if len(m.text.split()) >= 3:
             reason = m.text.split(None, 2)[2]
     try:
@@ -826,11 +826,11 @@ async def ban_usr(c: Gojo, m: Message):
 
     reason = None
     if m.reply_to_message:
-        r_id = m.reply_to_message.message_id
+        r_id = m.reply_to_message.id
         if len(m.text.split()) >= 2:
             reason = m.text.split(None, 1)[1]
     else:
-        r_id = m.message_id
+        r_id = m.id
         if len(m.text.split()) >= 3:
             reason = m.text.split(None, 2)[2]
 

Powers/plugins/dev.py

@@ -79,9 +79,9 @@ async def evaluate_code(c: Gojo, m: Message):
     sm = await m.reply_text("`Processing...`")
     cmd = m.text.split(None, maxsplit=1)[1]
 
-    reply_to_id = m.message_id
+    reply_to_id = m.id
     if m.reply_to_message:
-        reply_to_id = m.reply_to_message.message_id
+        reply_to_id = m.reply_to_message.id
 
     old_stderr = sys.stderr
     old_stdout = sys.stdout
@@ -140,9 +140,9 @@ async def execution(_, m: Message):
         return
     sm = await m.reply_text("`Processing...`")
     cmd = m.text.split(maxsplit=1)[1]
-    reply_to_id = m.message_id
+    reply_to_id = m.id
     if m.reply_to_message:
-        reply_to_id = m.reply_to_message.message_id
+        reply_to_id = m.reply_to_message.id
 
     process = await create_subprocess_shell(
         cmd,

Powers/plugins/filters.py

@@ -250,7 +250,7 @@ async def send_filter_reply(c: Gojo, m: Message, trigger: str):
                 m.chat.id,
                 getfilter["fileid"],
                 reply_markup=button,
-                reply_to_message_id=m.message_id,
+                reply_to_message_id=m.id,
             )
         else:
             await (await send_cmd(c, msgtype))(
@@ -259,7 +259,7 @@ async def send_filter_reply(c: Gojo, m: Message, trigger: str):
                 caption=textt,
                 #   parse_mode=enums.ParseMode.MARKDOWN,
                 reply_markup=button,
-                reply_to_message_id=m.message_id,
+                reply_to_message_id=m.id,
             )
     except Exception as ef:
         await m.reply_text(f"Error in filters: {ef}")

Powers/plugins/greetings.py

@@ -308,7 +308,7 @@ async def member_has_joined(c: Gojo, member: ChatMemberUpdated):
                 disable_web_page_preview=True,
             )
             if jj:
-                db.set_cleanwlcm_id(int(jj.message_id))
+                db.set_cleanwlcm_id(int(jj.id))
         except RPCError as e:
             print(e)
             return
@@ -374,7 +374,7 @@ async def member_has_left(c: Gojo, member: ChatMemberUpdated):
                 disable_web_page_preview=True,
             )
             if ooo:
-                db.set_cleangoodbye_id(int(ooo.message_id))
+                db.set_cleangoodbye_id(int(ooo.id))
             return
         except RPCError as e:
             print(e)

Powers/plugins/muting.py

@@ -52,7 +52,7 @@ async def tmute_usr(c: Gojo, m: Message):
         await m.reply_text(text="This user is an admin, I cannot mute them!")
         return
 
-    r_id = m.reply_to_message.message_id if m.reply_to_message else m.message_id
+    r_id = m.reply_to_message.id if m.reply_to_message else m.id
 
     if m.reply_to_message and len(m.text.split()) >= 2:
         reason = m.text.split(None, 2)[1]
@@ -319,11 +319,11 @@ async def mute_usr(c: Gojo, m: Message):
 
     reason = None
     if m.reply_to_message:
-        r_id = m.reply_to_message.message_id
+        r_id = m.reply_to_message.id
         if len(m.text.split()) >= 2:
             reason = m.text.split(None, 1)[1]
     else:
-        r_id = m.message_id
+        r_id = m.id
         if len(m.text.split()) >= 3:
             reason = m.text.split(None, 2)[2]
     try:

Powers/plugins/notes.py

@@ -210,7 +210,7 @@ async def get_raw_note(c: Gojo, m: Message, note: str):
         return
 
     getnotes = db.get_note(m.chat.id, note)
-    msg_id = m.reply_to_message.message_id if m.reply_to_message else m.message_id
+    msg_id = m.reply_to_message.id if m.reply_to_message else m.id
 
     msgtype = getnotes["msgtype"]
     if not getnotes:
@@ -328,7 +328,7 @@ async def local_notes(_, m: Message):
         await m.reply_text(f"There are no notes in <b>{m.chat.title}</b>.")
         return
 
-    msg_id = m.reply_to_message.message_id if m.reply_to_message else m.message_id
+    msg_id = m.reply_to_message.id if m.reply_to_message else m.id
 
     curr_pref = db_settings.get_privatenotes(m.chat.id)
     if curr_pref:

Powers/plugins/pin.py

@@ -24,20 +24,20 @@ async def pin_message(_, m: Message):
                 disable_notification=disable_notification,
             )
             LOGGER.info(
-                f"{m.from_user.id} pinned msgid-{m.reply_to_message.message_id} in {m.chat.id}",
+                f"{m.from_user.id} pinned msgid-{m.reply_to_message.id} in {m.chat.id}",
             )
 
             if m.chat.username:
                 # If chat has a username, use this format
                 link_chat_id = m.chat.username
                 message_link = (
-                    f"https://t.me/{link_chat_id}/{m.reply_to_message.message_id}"
+                    f"https://t.me/{link_chat_id}/{m.reply_to_message.id}"
                 )
             elif (str(m.chat.id)).startswith("-100"):
                 # If chat does not have a username, use this
                 link_chat_id = (str(m.chat.id)).replace("-100", "")
                 message_link = (
-                    f"https://t.me/c/{link_chat_id}/{m.reply_to_message.message_id}"
+                    f"https://t.me/c/{link_chat_id}/{m.reply_to_message.id}"
                 )
             await m.reply_text(
                 text=f"I have Pinned [this message]({message_link})!",
@@ -65,9 +65,9 @@ async def pin_message(_, m: Message):
 async def unpin_message(c: Gojo, m: Message):
     try:
         if m.reply_to_message:
-            await c.unpin_chat_message(m.chat.id, m.reply_to_message.message_id)
+            await c.unpin_chat_message(m.chat.id, m.reply_to_message.id)
             LOGGER.info(
-                f"{m.from_user.id} unpinned msgid: {m.reply_to_message.message_id} in {m.chat.id}",
+                f"{m.from_user.id} unpinned msgid: {m.reply_to_message.id} in {m.chat.id}",
             )
             await m.reply_text(text="Unpinned last message.")
         else:
@@ -163,10 +163,10 @@ async def anti_channel_pin(_, m: Message):
 async def pinned_message(c: Gojo, m: Message):
     chat_title = m.chat.title
     chat = await c.get_chat(chat_id=m.chat.id)
-    msg_id = m.reply_to_message.message_id if m.reply_to_message else m.message_id
+    msg_id = m.reply_to_message.id if m.reply_to_message else m.id
 
     if chat.pinned_message:
-        pinned_id = chat.pinned_message.message_id
+        pinned_id = chat.pinned_message.id
         if m.chat.username:
             link_chat_id = m.chat.username
             message_link = f"https://t.me/{link_chat_id}/{pinned_id}"

Powers/plugins/purge.py

@@ -15,7 +15,7 @@ async def purge(c: Gojo, m: Message):
         return
 
     if m.reply_to_message:
-        message_ids = list(range(m.reply_to_message.message_id, m.message_id))
+        message_ids = list(range(m.reply_to_message.id, m.id))
 
         def divide_chunks(l: list, n: int = 100):
             for i in range(0, len(l), n):
@@ -108,7 +108,7 @@ async def del_msg(c: Gojo, m: Message):
         await m.delete()
         await c.delete_messages(
             chat_id=m.chat.id,
-            message_ids=m.reply_to_message.message_id,
+            message_ids=m.reply_to_message.id,
         )
     else:
         await m.reply_text(text="What do you wanna delete?")

Powers/plugins/report.py

@@ -75,7 +75,7 @@ async def report_watcher(c: Gojo, m: Message):
     db = Reporting(m.chat.id)
 
     if (m.chat and m.reply_to_message) and (db.get_settings()):
-        reported_msg_id = m.reply_to_message.message_id
+        reported_msg_id = m.reply_to_message.id
         reported_user = m.reply_to_message.from_user
         chat_name = m.chat.title or m.chat.username
         admin_list = await c.get_chat_members(m.chat.id, filter=cmf.ADMINISTRATORS)
@@ -125,7 +125,7 @@ async def report_watcher(c: Gojo, m: Message):
         )
 
         LOGGER.info(
-            f"{m.from_user.id} reported msgid-{m.reply_to_message.message_id} to admins in {m.chat.id}",
+            f"{m.from_user.id} reported msgid-{m.reply_to_message.id} to admins in {m.chat.id}",
         )
         await m.reply_text(
             (

Powers/plugins/rules.py

@@ -11,7 +11,7 @@ from Powers.utils.custom_filters import command, admin_filter
 @Gojo.on_message(command("rules") & filters.group)
 async def get_rules(_, m: Message):
     db = Rules(m.chat.id)
-    msg_id = m.reply_to_message.message_id if m.reply_to_message else m.message_id
+    msg_id = m.reply_to_message.id if m.reply_to_message else m.id
 
     rules = db.get_rules()
     LOGGER.info(f"{m.from_user.id} fetched rules in {m.chat.id}")

Powers/plugins/warns.py

@@ -21,13 +21,13 @@ from pyrogram.types import (
 )
 async def warn(c: Gojo, m: Message):
     if m.reply_to_message:
-        r_id = m.reply_to_message.message_id
+        r_id = m.reply_to_message.id
         if len(m.text.split()) >= 2:
             reason = m.text.split(None, 1)[1]
         else:
             reason = None
     elif not m.reply_to_message:
-        r_id = m.message_id
+        r_id = m.id
         if len(m.text.split()) >= 3:
             reason = m.text.split(None, 2)[2]
         else:

Powers/plugins/watchers.py

@@ -24,15 +24,15 @@ gban_db = GBan()
 @Gojo.on_message(filters.linked_channel)
 async def antichanpin_cleanlinked(c: Gojo, m: Message):
     try:
-        msg_id = m.message_id
+        msg_id = m.id
         pins_db = Pins(m.chat.id)
         curr = pins_db.get_settings()
         if curr["antichannelpin"]:
             await c.unpin_chat_message(chat_id=m.chat.id, message_id=msg_id)
-            LOGGER.info(f"AntiChannelPin: msgid-{m.message_id} unpinned in {m.chat.id}")
+            LOGGER.info(f"AntiChannelPin: msgid-{m.id} unpinned in {m.chat.id}")
         if curr["cleanlinked"]:
             await c.delete_messages(m.chat.id, msg_id)
-            LOGGER.info(f"CleanLinked: msgid-{m.message_id} cleaned in {m.chat.id}")
+            LOGGER.info(f"CleanLinked: msgid-{m.id} cleaned in {m.chat.id}")
     except ChatAdminRequired:
         await m.reply_text(
             "Disabled antichannelpin as I don't have enough admin rights!",
@@ -182,7 +182,7 @@ async def gban_watcher(c: Gojo, m: Message):
     if _banned:
         try:
             await m.chat.ban_member(m.from_user.id)
-            await m.delete(m.message_id)  # Delete users message!
+            await m.delete(m.id)  # Delete users message!
             user_gbanned = await mention_html(m.from_user.first_name, m.from_user.id)
             await m.reply_text(
                 text=f"""This user ({user_gbanned}) has been banned globally!