(feat): Add offset_date and offset_message_id in get_dialogs and search_global

Author: SpEcHiDe

pyrogram/methods/chats/get_dialogs.py

@@ -17,6 +17,7 @@
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
 from asyncio import sleep
+from datetime import datetime
 from typing import AsyncGenerator, Optional
 
 import pyrogram
@@ -28,7 +29,9 @@ async def get_dialogs(
         self: "pyrogram.Client",
         limit: int = 0,
         pinned_only: bool = False,
-        chat_list: int = 0
+        chat_list: int = 0,
+        offset_date: datetime = utils.zero_datetime(),
+        offset_message_id: int = 0,
     ) -> Optional[AsyncGenerator["types.Dialog", None]]:
         """Get a user's dialogs sequentially.
 
@@ -46,6 +49,12 @@ async def get_dialogs(
             chat_list (``int``, *optional*):
                 Chat list from which to get the dialogs; Only Main (0) and Archive (1) chat lists are supported. Defaults to (0) Main chat list.
 
+            offset_date (:py:obj:`~datetime.datetime`, *optional*):
+                The date starting from which the dialogs need to be fetched. Use 0 or any date in the future to get results from the last dialog.
+
+            offset_message_id (``int``, *optional*):
+                The message identifier of the last message in the last found dialog, or 0 for the first request.
+
         Returns:
             ``Generator``: A generator yielding :obj:`~pyrogram.types.Dialog` objects.
 
@@ -60,8 +69,7 @@ async def get_dialogs(
         total = limit or (1 << 31) - 1
         request_limit = min(100, total)
 
-        offset_date = 0
-        offset_id = 0
+        offset_date = utils.datetime_to_timestamp(offset_date)
         offset_peer = raw.types.InputPeerEmpty()
 
         seen_dialog_ids = set()
@@ -70,7 +78,7 @@ async def get_dialogs(
             r = await self.invoke(
                 raw.functions.messages.GetDialogs(
                     offset_date=offset_date,
-                    offset_id=offset_id,
+                    offset_id=offset_message_id,
                     offset_peer=offset_peer,
                     limit=request_limit,
                     hash=0,
@@ -125,7 +133,7 @@ async def get_dialogs(
             if last.top_message is None:
                 return
 
-            offset_id = last.top_message.id
+            offset_message_id = last.top_message.id
             offset_date = utils.datetime_to_timestamp(last.top_message.date)
             offset_peer = await self.resolve_peer(last.chat.id)
 

pyrogram/methods/messages/search_global.py

@@ -17,6 +17,7 @@
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
 from asyncio import sleep
+from datetime import datetime
 from typing import AsyncGenerator, Optional
 
 import pyrogram
@@ -31,6 +32,8 @@ async def search_global(
         limit: int = 0,
         chat_list: int = 0,
         chat_type_filter: "enums.ChatType" = None,
+        offset_date: datetime = utils.zero_datetime(),
+        offset_message_id: int = 0,
     ) -> Optional[AsyncGenerator["types.Message", None]]:
         """Search messages globally from all of your chats.
 
@@ -62,6 +65,12 @@ async def search_global(
             chat_type_filter (:obj:`~pyrogram.enums.ChatType`, *optional*):
                 Additional filter for type of the chat (:obj:`~pyrogram.enums.ChatType.PRIVATE`, :obj:`~pyrogram.enums.ChatType.GROUP`, :obj:`~pyrogram.enums.ChatType.CHANNEL`) of the searched messages; pass None to search for messages in all chats.
 
+            offset_date (:py:obj:`~datetime.datetime`, *optional*):
+                The date starting from which the dialogs need to be fetched. Use 0 or any date in the future to get results from the last dialog.
+
+            offset_message_id (``int``, *optional*):
+                The message identifier of the last message in the last found dialog, or 0 for the first request.
+
         Returns:
             ``Generator``: A generator yielding :obj:`~pyrogram.types.Message` objects.
 
@@ -83,9 +92,8 @@ async def search_global(
         total = abs(limit) or (1 << 31)
         limit = min(100, total)
 
-        offset_date = 0
+        offset_date = utils.datetime_to_timestamp(offset_date)
         offset_peer = raw.types.InputPeerEmpty()
-        offset_id = 0
 
         while True:
             messages = await utils.parse_messages(
@@ -99,7 +107,7 @@ async def search_global(
                         max_date=0,
                         offset_rate=offset_date,
                         offset_peer=offset_peer,
-                        offset_id=offset_id,
+                        offset_id=offset_message_id,
                         limit=limit,
                         folder_id=chat_list,
                         broadcasts_only=(chat_type_filter == enums.ChatType.CHANNEL) if chat_type_filter else None,
@@ -118,7 +126,7 @@ async def search_global(
 
             offset_date = utils.datetime_to_timestamp(last.date)
             offset_peer = await self.resolve_peer(last.chat.id)
-            offset_id = last.id
+            offset_message_id = last.id
 
             for message in messages:
                 await sleep(0)