LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-01-26 09:14:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix InlineBuilder.photo/document and clearer errors

Browse Source
This commit is contained in:
Lonami Exo 2018-10-12 11:50:36 +02:00
parent 32c884d543
commit 9ee415749d
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
telethon/tl/custom/__init__.py
View File

@ -5,7 +5,7 @@ from .messagebutton import MessageButton
from .forward import Forward from .forward import Forward
from .message import Message from .message import Message
from .button import Button from .button import Button
from .inline import InlineBuilder from .inlinebuilder import InlineBuilder
from .inlineresult import InlineResult from .inlineresult import InlineResult
from .inlineresults import InlineResults from .inlineresults import InlineResults
from .conversation import Conversation from .conversation import Conversation

19
telethon/tl/custom/inline.py → telethon/tl/custom/inlinebuilder.py
View File

@ -115,10 +115,10 @@ class InlineBuilder:
Same as ``file`` for `client.send_file Same as ``file`` for `client.send_file
<telethon.client.uploads.UploadMethods.send_file>`. <telethon.client.uploads.UploadMethods.send_file>`.
""" """
fh = self._client.upload_file(file, use_cache=types.InputPhoto) fh = await self._client.upload_file(file, use_cache=types.InputPhoto)
if not isinstance(fh, types.InputPhoto): if not isinstance(fh, types.InputPhoto):
r = await self._client(functions.messages.UploadMediaRequest( r = await self._client(functions.messages.UploadMediaRequest(
types.InputPeerEmpty(), media=types.InputMediaUploadedPhoto(fh) types.InputPeerSelf(), media=types.InputMediaUploadedPhoto(fh)
)) ))
fh = utils.get_input_photo(r.photo) fh = utils.get_input_photo(r.photo)
@ -177,9 +177,9 @@ class InlineBuilder:
type = 'document' type = 'document'
use_cache = types.InputDocument if use_cache else None use_cache = types.InputDocument if use_cache else None
fh = self._client.upload_file(file, use_cache=use_cache) fh = await self._client.upload_file(file, use_cache=use_cache)
if not isinstance(fh, types.InputDocument): if not isinstance(fh, types.InputDocument):
attributes, mime_type = utils.get_attributes( attributes, mime_type = utils.get_attributes(
file, file,
mime_type=mime_type, mime_type=mime_type,
attributes=attributes, attributes=attributes,
@ -188,7 +188,7 @@ class InlineBuilder:
video_note=video_note video_note=video_note
) )
r = await self._client(functions.messages.UploadMediaRequest( r = await self._client(functions.messages.UploadMediaRequest(
types.InputPeerEmpty(), media=types.InputMediaUploadedDocument( types.InputPeerSelf(), media=types.InputMediaUploadedDocument(
fh, fh,
mime_type=mime_type, mime_type=mime_type,
attributes=attributes, attributes=attributes,
@ -249,8 +249,13 @@ class InlineBuilder:
text=None, parse_mode=(), link_preview=True, text=None, parse_mode=(), link_preview=True,
geo=None, period=60, contact=None, game=False, buttons=None geo=None, period=60, contact=None, game=False, buttons=None
): ):
if sum(1 for x in (text, geo, contact, game) if x) != 1: args = (text, geo, contact, game)
raise ValueError('Can only use one of text, geo, contact or game') if sum(1 for x in args if x) != 1:
raise ValueError(
'Must set exactly one of text, geo, contact or game (set {})'
.format(', '.join(x[0] for x in zip(
'text geo contact game'.split(), args) if x[1]) or 'none')
)
markup = self._client.build_reply_markup(buttons, inline_only=True) markup = self._client.build_reply_markup(buttons, inline_only=True)
if text: if text: