mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-29 13:27:47 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/asyncio-dev' into asyncio-dev

Browse Source
This commit is contained in:
Dan 2019-08-03 10:49:09 +02:00
commit 1540fd4f22
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pyrogram/client/methods/messages/read_history.py
View File

@ -23,7 +23,7 @@ from ...ext import BaseClient
class ReadHistory(BaseClient): class ReadHistory(BaseClient):
def read_history( async def read_history(
self, self,
chat_id: Union[int, str], chat_id: Union[int, str],
max_id: int = 0 max_id: int = 0
@ -53,7 +53,7 @@ class ReadHistory(BaseClient):
app.read_history("pyrogramlounge", 123456) app.read_history("pyrogramlounge", 123456)
""" """
peer = self.resolve_peer(chat_id) peer = await self.resolve_peer(chat_id)
if isinstance(peer, types.InputPeerChannel): if isinstance(peer, types.InputPeerChannel):
q = functions.channels.ReadHistory( q = functions.channels.ReadHistory(
@ -66,6 +66,6 @@ class ReadHistory(BaseClient):
max_id=max_id max_id=max_id
) )
self.send(q) await self.send(q)
return True return True

8
pyrogram/client/parser/parser.py
View File

@ -30,7 +30,7 @@ class Parser:
self.html = HTML(client) self.html = HTML(client)
self.markdown = Markdown(client) self.markdown = Markdown(client)
def parse(self, text: str, mode: Union[str, None] = object): async def parse(self, text: str, mode: Union[str, None] = object):
text = str(text).strip() text = str(text).strip()
if mode == object: if mode == object:
@ -48,13 +48,13 @@ class Parser:
mode = mode.lower() mode = mode.lower()
if mode == "combined": if mode == "combined":
return self.markdown.parse(text) return await self.markdown.parse(text)
if mode in ["markdown", "md"]: if mode in ["markdown", "md"]:
return self.markdown.parse(text, True) return await self.markdown.parse(text, True)
if mode == "html": if mode == "html":
return self.html.parse(text) return await self.html.parse(text)
raise ValueError('parse_mode must be one of {} or None. Not "{}"'.format( raise ValueError('parse_mode must be one of {} or None. Not "{}"'.format(
", ".join('"{}"'.format(m) for m in pyrogram.Client.PARSE_MODES[:-1]), ", ".join('"{}"'.format(m) for m in pyrogram.Client.PARSE_MODES[:-1]),