Rename Message.message_id to Message.id

delivrance · delivrance · commit 274650cda974 · 2022-04-24T11:56:06.000+02:00
diff --git a/pyrogram/methods/chats/iter_dialogs.py b/pyrogram/methods/chats/iter_dialogs.py
@@ -93,7 +93,7 @@ async def iter_dialogs(
 
             last = dialogs[-1]
 
-            offset_id = last.top_message.message_id
+            offset_id = last.top_message.id
             offset_date = last.top_message.date
             offset_peer = await self.resolve_peer(last.chat.id)
 
diff --git a/pyrogram/methods/messages/iter_history.py b/pyrogram/methods/messages/iter_history.py
@@ -89,7 +89,7 @@ async def iter_history(
             if not messages:
                 return
 
-            offset_id = messages[-1].message_id + (1 if reverse else 0)
+            offset_id = messages[-1].id + (1 if reverse else 0)
 
             for message in messages:
                 yield message
diff --git a/pyrogram/methods/messages/search_global.py b/pyrogram/methods/messages/search_global.py
@@ -102,7 +102,7 @@ async def search_global(
 
             offset_date = last.date
             offset_peer = await self.resolve_peer(last.chat.id)
-            offset_id = last.message_id
+            offset_id = last.id
 
             for message in messages:
                 yield message
diff --git a/pyrogram/methods/messages/send_message.py b/pyrogram/methods/messages/send_message.py
@@ -149,7 +149,7 @@ async def send_message(
             )
 
             return types.Message(
-                message_id=r.id,
+                id=r.id,
                 chat=types.Chat(
                     id=peer_id,
                     type=enums.ChatType.PRIVATE,
diff --git a/pyrogram/types/bots_and_keyboards/callback_query.py b/pyrogram/types/bots_and_keyboards/callback_query.py
@@ -203,7 +203,7 @@ async def edit_message_text(
         if self.inline_message_id is None:
             return await self._client.edit_message_text(
                 chat_id=self.message.chat.id,
-                message_id=self.message.message_id,
+                message_id=self.message.id,
                 text=text,
                 parse_mode=parse_mode,
                 disable_web_page_preview=disable_web_page_preview,
@@ -274,7 +274,7 @@ async def edit_message_media(
         if self.inline_message_id is None:
             return await self._client.edit_message_media(
                 chat_id=self.message.chat.id,
-                message_id=self.message.message_id,
+                message_id=self.message.id,
                 media=media,
                 reply_markup=reply_markup
             )
@@ -307,7 +307,7 @@ async def edit_message_reply_markup(
         if self.inline_message_id is None:
             return await self._client.edit_message_reply_markup(
                 chat_id=self.message.chat.id,
-                message_id=self.message.message_id,
+                message_id=self.message.id,
                 reply_markup=reply_markup
             )
         else:
diff --git a/pyrogram/types/messages_and_media/message.py b/pyrogram/types/messages_and_media/message.py
diff --git a/pyrogram/utils.py b/pyrogram/utils.py

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ async def send_message(`
`149`	`149`	`)`
`150`	`150`
`151`	`151`	`return types.Message(`
`152`		`- message_id=r.id,`
	`152`	`+ id=r.id,`
`153`	`153`	`chat=types.Chat(`
`154`	`154`	`id=peer_id,`
`155`	`155`	`type=enums.ChatType.PRIVATE,`