diff --git a/pyrogram/methods/messages/get_chat_history.py b/pyrogram/methods/messages/get_chat_history.py index b384c6ba..99445c19 100644 --- a/pyrogram/methods/messages/get_chat_history.py +++ b/pyrogram/methods/messages/get_chat_history.py @@ -1,20 +1,21 @@ -# Pyrogram - Telegram MTProto API Client Library for Python +# Pyrofork - Telegram MTProto API Client Library for Python # Copyright (C) 2017-present Dan +# Copyright (C) 2022-present Mayuri-Chan # -# This file is part of Pyrogram. +# This file is part of Pyrofork. # -# Pyrogram is free software: you can redistribute it and/or modify +# Pyrofork is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published # by the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# Pyrogram is distributed in the hope that it will be useful, +# Pyrofork is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with Pyrogram. If not, see . +# along with Pyrofork. If not, see . from datetime import datetime from typing import Union, Optional, AsyncGenerator @@ -30,7 +31,9 @@ async def get_chunk( limit: int = 0, offset: int = 0, from_message_id: int = 0, - from_date: datetime = utils.zero_datetime() + from_date: datetime = utils.zero_datetime(), + min_id: int = 0, + max_id: int = 0 ): messages = await client.invoke( raw.functions.messages.GetHistory( @@ -39,8 +42,8 @@ async def get_chunk( offset_date=utils.datetime_to_timestamp(from_date), add_offset=offset, limit=limit, - max_id=0, - min_id=0, + max_id=max_id, + min_id=min_id, hash=0 ), sleep_threshold=60 @@ -56,7 +59,9 @@ class GetChatHistory: limit: int = 0, offset: int = 0, offset_id: int = 0, - offset_date: datetime = utils.zero_datetime() + offset_date: datetime = utils.zero_datetime(), + min_id: int = 0, + max_id: int = 0 ) -> Optional[AsyncGenerator["types.Message", None]]: """Get messages from a chat history. @@ -84,6 +89,12 @@ class GetChatHistory: offset_date (:py:obj:`~datetime.datetime`, *optional*): Pass a date as offset to retrieve only older messages starting from that date. + min_id: (``int``, *optional*): + The minimum message id. you will not get any message which have id smaller than min_id. + + max_id: (``int``, *optional*): + The maximum message id. you will not get any message which have id greater than max_id. + Returns: ``Generator``: A generator yielding :obj:`~pyrogram.types.Message` objects. @@ -104,7 +115,9 @@ class GetChatHistory: limit=limit, offset=offset, from_message_id=offset_id, - from_date=offset_date + from_date=offset_date, + min_id=min_id, + max_id=max_id ) if not messages: