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.

Sign up for GitHub

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

Jump to bottom

bot API 7.10 #2395

Merged
merged 7 commits into from
Sep 18, 2024
Merged

bot API 7.10 #2395

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ebe88d
added purchased paid media
coder2020official Sep 6, 2024
e3081fb
added payload to sendpaidmedia
coder2020official Sep 6, 2024
155608e
prize_star_count and everything related to star giveaways
coder2020official Sep 6, 2024
ad70e7f
Update README.md
coder2020official Sep 6, 2024
f116f92
fix tests
coder2020official Sep 6, 2024
e7d0672
Merge branch 'botapi-710' of https://github.com/coder2020official/pyT…
coder2020official Sep 6, 2024
3759a95
Fixes from review
coder2020official Sep 16, 2024
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
7 changes: 6 additions & 1 deletion telebot/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3146,6 +3146,7 @@ def send_paid_media(
show_caption_above_media: Optional[bool]=None, disable_notification: Optional[bool]=None,
protect_content: Optional[bool]=None, reply_parameters: Optional[types.ReplyParameters]=None,
reply_markup: Optional[REPLY_MARKUP_TYPES]=None, business_connection_id: Optional[str]=None,
payload: Optional[str]=None
) -> types.Message:
"""
Use this method to send paid media to channel chats. On success, the sent Message is returned.
Expand Down Expand Up @@ -3188,6 +3189,9 @@ def send_paid_media(
:param business_connection_id: Identifier of a business connection, in which the message will be sent
:type business_connection_id: :obj:`str`

:param payload: Bot-defined paid media payload, 0-128 bytes. This will not be displayed to the user, use it for your internal processes.
:type payload: :obj:`str`

:return: On success, the sent Message is returned.
:rtype: :class:`telebot.types.Message`
"""
Expand All @@ -3196,7 +3200,8 @@ def send_paid_media(
self.token, chat_id, star_count, media, caption=caption, parse_mode=parse_mode,
caption_entities=caption_entities, show_caption_above_media=show_caption_above_media,
disable_notification=disable_notification, protect_content=protect_content,
reply_parameters=reply_parameters, reply_markup=reply_markup, business_connection_id=business_connection_id)
reply_parameters=reply_parameters, reply_markup=reply_markup, business_connection_id=business_connection_id,
media_payload=payload)
)


Expand Down
4 changes: 3 additions & 1 deletion telebot/apihelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ def send_paid_media(
token, chat_id, star_count, media,
caption=None, parse_mode=None, caption_entities=None, show_caption_above_media=None,
disable_notification=None, protect_content=None, reply_parameters=None, reply_markup=None,
business_connection_id=None):
business_connection_id=None, media_payload=None):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why parameter named "media_payload", but not "payload"?

I propose to set it to "payload" to keep naming consistency, and rename internal "payload" to something else. May be "_payload".

method_url = r'sendPaidMedia'
media_json, files = convert_input_media_array(media)
payload = {'chat_id': chat_id, 'star_count': star_count, 'media': media_json}
Expand All @@ -552,6 +552,8 @@ def send_paid_media(
payload['reply_markup'] = _convert_markup(reply_markup)
if business_connection_id:
payload['business_connection_id'] = business_connection_id
if media_payload:
payload['payload'] = media_payload
return _make_request(
token, method_url, params=payload,
method='post' if files else 'get',
Expand Down
9 changes: 7 additions & 2 deletions telebot/async_telebot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4627,7 +4627,8 @@ async def send_paid_media(
caption: Optional[str]=None, parse_mode: Optional[str]=None, caption_entities: Optional[List[types.MessageEntity]]=None,
show_caption_above_media: Optional[bool]=None, disable_notification: Optional[bool]=None,
protect_content: Optional[bool]=None, reply_parameters: Optional[types.ReplyParameters]=None,
reply_markup: Optional[REPLY_MARKUP_TYPES]=None, business_connection_id: Optional[str]=None) -> types.Message:
reply_markup: Optional[REPLY_MARKUP_TYPES]=None, business_connection_id: Optional[str]=None,
payload: Optional[str]=None) -> types.Message:
"""
Use this method to send paid media to channel chats. On success, the sent Message is returned.

Expand Down Expand Up @@ -4669,6 +4670,9 @@ async def send_paid_media(
:param business_connection_id: Identifier of a business connection, in which the message will be sent
:type business_connection_id: :obj:`str`

:param payload: Bot-defined paid media payload, 0-128 bytes. This will not be displayed to the user, use it for your internal processes.
:type payload: :obj:`str`

:return: On success, the sent Message is returned.
:rtype: :class:`telebot.types.Message`
"""
Expand All @@ -4677,7 +4681,8 @@ async def send_paid_media(
self.token, chat_id, star_count, media, caption=caption, parse_mode=parse_mode,
caption_entities=caption_entities, show_caption_above_media=show_caption_above_media,
disable_notification=disable_notification, protect_content=protect_content,
reply_parameters=reply_parameters, reply_markup=reply_markup, business_connection_id=business_connection_id))
reply_parameters=reply_parameters, reply_markup=reply_markup, business_connection_id=business_connection_id,
media_payload=payload))

async def send_media_group(
self, chat_id: Union[int, str],
Expand Down
5 changes: 4 additions & 1 deletion telebot/asyncio_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ async def send_paid_media(
token, chat_id, star_count, media,
caption=None, parse_mode=None, caption_entities=None, show_caption_above_media=None,
disable_notification=None, protect_content=None, reply_parameters=None, reply_markup=None,
business_connection_id=None):
business_connection_id=None, media_payload=None):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same here.

method_url = r'sendPaidMedia'
media_json, files = convert_input_media_array(media)
payload = {'chat_id': chat_id, 'star_count': star_count, 'media': media_json}
Expand All @@ -542,6 +542,9 @@ async def send_paid_media(
payload['reply_markup'] = _convert_markup(reply_markup)
if business_connection_id:
payload['business_connection_id'] = business_connection_id
if media_payload:
payload['payload'] = media_payload

return await _process_request(
token, method_url, params=payload,
method='post' if files else 'get',
Expand Down