Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Pyrogram #543

Open
wants to merge 13 commits into
base: alpha
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dnspython
heroku3
motor
pyrogram==2.0.58
tgcrypto
dnspython==2.2.0
heroku3==4.2.1
motor==3.3.2 # 2.5.1
pyrotgfork==2.1.33.11
PyTgCrypto==1.2.7
25 changes: 15 additions & 10 deletions userge/core/methods/messages/edit_message_text.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
from typing import Optional, Union, List

from pyrogram import enums
from pyrogram.types import InlineKeyboardMarkup, MessageEntity
from pyrogram.types import (
InlineKeyboardMarkup, MessageEntity,
LinkPreviewOptions
)

from userge import config
from ...ext import RawClient
Expand All @@ -31,7 +34,7 @@ async def edit_message_text(self, # pylint: disable=arguments-differ
log: Union[bool, str] = False,
parse_mode: Optional[enums.ParseMode] = None,
entities: List[MessageEntity] = None,
disable_web_page_preview: Optional[bool] = None,
link_preview_options: Optional[LinkPreviewOptions] = None,
reply_markup: InlineKeyboardMarkup = None
) -> Union['types.bound.Message', bool]:
"""\nExample:
Expand Down Expand Up @@ -72,7 +75,7 @@ async def edit_message_text(self, # pylint: disable=arguments-differ
List of special entities that appear in message text,
which can be specified instead of *parse_mode*.

disable_web_page_preview (``bool``, *optional*):
link_preview_options (:obj:`pyrogram.types.LinkPreviewOptions`, *optional*):
Disables link previews for links in this message.

reply_markup (:obj:`InlineKeyboardMarkup`, *optional*):
Expand All @@ -85,13 +88,15 @@ async def edit_message_text(self, # pylint: disable=arguments-differ
Raises:
RPCError: In case of a Telegram RPC error.
"""
msg = await super().edit_message_text(chat_id=chat_id,
message_id=message_id,
text=text,
parse_mode=parse_mode,
entities=entities,
disable_web_page_preview=disable_web_page_preview,
reply_markup=reply_markup)
msg = await super().edit_message_text(
chat_id=chat_id,
message_id=message_id,
text=text,
parse_mode=parse_mode,
entities=entities,
link_preview_options=link_preview_options,
reply_markup=reply_markup
)
module = inspect.currentframe().f_back.f_globals['__name__']
if log:
await self._channel.fwd_msg(msg, module if isinstance(log, bool) else log)
Expand Down
15 changes: 10 additions & 5 deletions userge/core/methods/messages/send_as_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from typing import Union, Optional

from pyrogram.parser import Parser
from pyrogram.types import ReplyParameters

from userge import logging
from ... import types
Expand Down Expand Up @@ -74,11 +75,15 @@ async def send_as_file(self,
doc = io.BytesIO(text.encode())
doc.name = filename

msg = await self.send_document(chat_id=chat_id,
document=doc,
caption=caption[:1024],
disable_notification=True,
reply_to_message_id=reply_to_message_id)
msg = await self.send_document(
chat_id=chat_id,
document=doc,
caption=caption[:1024],
disable_notification=True,
reply_parameters=ReplyParameters(
message_id=reply_to_message_id
)
)
module = inspect.currentframe().f_back.f_globals['__name__']
if log:
await self._channel.fwd_msg(msg, module if isinstance(log, bool) else log)
Expand Down
32 changes: 19 additions & 13 deletions userge/core/methods/messages/send_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@

from pyrogram.types import (
InlineKeyboardMarkup, ReplyKeyboardMarkup,
ReplyKeyboardRemove, ForceReply, MessageEntity)
ReplyKeyboardRemove, ForceReply, MessageEntity,
LinkPreviewOptions, ReplyParameters
)
from pyrogram import enums

from userge import config
Expand All @@ -33,7 +35,7 @@ async def send_message(self, # pylint: disable=arguments-differ
log: Union[bool, str] = False,
parse_mode: Optional[enums.ParseMode] = None,
entities: List[MessageEntity] = None,
disable_web_page_preview: Optional[bool] = None,
link_preview_options: Optional[LinkPreviewOptions] = None,
disable_notification: Optional[bool] = None,
reply_to_message_id: Optional[int] = None,
schedule_date: Optional[datetime] = None,
Expand Down Expand Up @@ -77,7 +79,7 @@ async def send_message(self, # pylint: disable=arguments-differ
List of special entities that appear in message text,
which can be specified instead of *parse_mode*.

disable_web_page_preview (``bool``, *optional*):
link_preview_options (:obj:`pyrogram.types.LinkPreviewOptions`, *optional*):
Disables link previews for links in this message.

disable_notification (``bool``, *optional*):
Expand All @@ -102,16 +104,20 @@ async def send_message(self, # pylint: disable=arguments-differ
Returns:
:obj:`Message`: On success, the sent text message or True is returned.
"""
msg = await super().send_message(chat_id=chat_id,
text=text,
parse_mode=parse_mode,
entities=entities,
disable_web_page_preview=disable_web_page_preview,
disable_notification=disable_notification,
reply_to_message_id=reply_to_message_id,
schedule_date=schedule_date,
protect_content=protect_content,
reply_markup=reply_markup)
msg = await super().send_message(
chat_id=chat_id,
text=text,
parse_mode=parse_mode,
entities=entities,
link_preview_options=link_preview_options,
disable_notification=disable_notification,
reply_parameters=ReplyParameters(
message_id=reply_to_message_id
),
schedule_date=schedule_date,
protect_content=protect_content,
reply_markup=reply_markup
)
module = inspect.currentframe().f_back.f_globals['__name__']
if log:
await self._channel.fwd_msg(msg, module if isinstance(log, bool) else log)
Expand Down
Loading