Skip to content

Commit 9c057fb

Browse files
Added the parameter message_effect_id to the methods forwardMessage and copyMessage.
1 parent 6e6190b commit 9c057fb

File tree

4 files changed

+41
-12
lines changed

4 files changed

+41
-12
lines changed

telebot/__init__.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,7 +1827,8 @@ def forward_message(
18271827
message_thread_id: Optional[int]=None,
18281828
video_start_timestamp: Optional[int]=None,
18291829
direct_messages_topic_id: Optional[int]=None,
1830-
suggested_post_parameters: Optional[types.SuggestedPostParameters]=None) -> types.Message:
1830+
suggested_post_parameters: Optional[types.SuggestedPostParameters]=None,
1831+
message_effect_id: Optional[str]=None) -> types.Message:
18311832
"""
18321833
Use this method to forward messages of any kind.
18331834
@@ -1866,6 +1867,9 @@ def forward_message(
18661867
is automatically declined.
18671868
:type suggested_post_parameters: :class:`telebot.types.SuggestedPostParameters`
18681869
1870+
:param message_effect_id: Unique identifier of the message effect to be added to the message; only available when forwarding to private chats
1871+
:type message_effect_id: :obj:`str`
1872+
18691873
:return: On success, the sent Message is returned.
18701874
:rtype: :class:`telebot.types.Message`
18711875
"""
@@ -1877,7 +1881,7 @@ def forward_message(
18771881
self.token, chat_id, from_chat_id, message_id, disable_notification=disable_notification,
18781882
timeout=timeout, protect_content=protect_content, message_thread_id=message_thread_id,
18791883
video_start_timestamp=video_start_timestamp, direct_messages_topic_id=direct_messages_topic_id,
1880-
suggested_post_parameters=suggested_post_parameters
1884+
suggested_post_parameters=suggested_post_parameters, message_effect_id=message_effect_id
18811885
)
18821886
)
18831887

@@ -1901,7 +1905,8 @@ def copy_message(
19011905
allow_paid_broadcast: Optional[bool]=None,
19021906
video_start_timestamp: Optional[int]=None,
19031907
direct_messages_topic_id: Optional[int]=None,
1904-
suggested_post_parameters: Optional[types.SuggestedPostParameters]=None) -> types.MessageID:
1908+
suggested_post_parameters: Optional[types.SuggestedPostParameters]=None,
1909+
message_effect_id: Optional[str]=None) -> types.MessageID:
19051910
"""
19061911
Use this method to copy messages of any kind.
19071912
Service messages, paid media messages, giveaway messages, giveaway winners messages, and invoice messages can't be copied.
@@ -1973,6 +1978,9 @@ def copy_message(
19731978
is automatically declined.
19741979
:type suggested_post_parameters: :class:`telebot.types.SuggestedPostParameters`
19751980
1981+
:param message_effect_id: Unique identifier of the message effect to be added to the message; only available when copying to private chats
1982+
:type message_effect_id: :obj:`str`
1983+
19761984
:return: On success, the MessageId of the sent message is returned.
19771985
:rtype: :class:`telebot.types.MessageID`
19781986
"""
@@ -2006,7 +2014,7 @@ def copy_message(
20062014
message_thread_id=message_thread_id, reply_parameters=reply_parameters,
20072015
show_caption_above_media=show_caption_above_media, allow_paid_broadcast=allow_paid_broadcast,
20082016
video_start_timestamp=video_start_timestamp, direct_messages_topic_id=direct_messages_topic_id,
2009-
suggested_post_parameters=suggested_post_parameters
2017+
suggested_post_parameters=suggested_post_parameters, message_effect_id=message_effect_id
20102018
))
20112019

20122020

telebot/apihelper.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,8 @@ def get_chat_member(token, chat_id, user_id):
432432
def forward_message(
433433
token, chat_id, from_chat_id, message_id,
434434
disable_notification=None, timeout=None, protect_content=None, message_thread_id=None,
435-
video_start_timestamp=None, direct_messages_topic_id=None, suggested_post_parameters=None):
435+
video_start_timestamp=None, direct_messages_topic_id=None, suggested_post_parameters=None,
436+
message_effect_id=None):
436437
method_url = r'forwardMessage'
437438
payload = {'chat_id': chat_id, 'from_chat_id': from_chat_id, 'message_id': message_id}
438439
if disable_notification is not None:
@@ -449,13 +450,16 @@ def forward_message(
449450
payload['direct_messages_topic_id'] = direct_messages_topic_id
450451
if suggested_post_parameters is not None:
451452
payload['suggested_post_parameters'] = suggested_post_parameters.to_json()
453+
if message_effect_id:
454+
payload['message_effect_id'] = message_effect_id
452455
return _make_request(token, method_url, params=payload)
453456

454457

455458
def copy_message(token, chat_id, from_chat_id, message_id, caption=None, parse_mode=None, caption_entities=None,
456459
disable_notification=None, reply_markup=None, timeout=None, protect_content=None, message_thread_id=None,
457460
reply_parameters=None, show_caption_above_media=None, allow_paid_broadcast=None,
458-
video_start_timestamp=None, direct_messages_topic_id=None, suggested_post_parameters=None):
461+
video_start_timestamp=None, direct_messages_topic_id=None, suggested_post_parameters=None,
462+
message_effect_id=None):
459463
method_url = r'copyMessage'
460464
payload = {'chat_id': chat_id, 'from_chat_id': from_chat_id, 'message_id': message_id}
461465
if caption is not None:
@@ -486,6 +490,8 @@ def copy_message(token, chat_id, from_chat_id, message_id, caption=None, parse_m
486490
payload['direct_messages_topic_id'] = direct_messages_topic_id
487491
if suggested_post_parameters is not None:
488492
payload['suggested_post_parameters'] = suggested_post_parameters.to_json()
493+
if message_effect_id:
494+
payload['message_effect_id'] = message_effect_id
489495
return _make_request(token, method_url, params=payload)
490496

491497
def send_checklist(

telebot/async_telebot.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3355,7 +3355,8 @@ async def forward_message(
33553355
message_thread_id: Optional[int]=None,
33563356
video_start_timestamp: Optional[int]=None,
33573357
direct_messages_topic_id: Optional[int]=None,
3358-
suggested_post_parameters: Optional[types.SuggestedPostParameters]=None) -> types.Message:
3358+
suggested_post_parameters: Optional[types.SuggestedPostParameters]=None,
3359+
message_effect_id: Optional[str]=None) -> types.Message:
33593360
"""
33603361
Use this method to forward messages of any kind.
33613362
@@ -3394,6 +3395,9 @@ async def forward_message(
33943395
is automatically declined.
33953396
:type suggested_post_parameters: :class:`telebot.types.SuggestedPostParameters`
33963397
3398+
:param message_effect_id: Unique identifier of the message effect to be added to the message; only available when forwarding to private chats
3399+
:type message_effect_id: :obj:`str`
3400+
33973401
:return: On success, the sent Message is returned.
33983402
:rtype: :class:`telebot.types.Message`
33993403
"""
@@ -3404,7 +3408,8 @@ async def forward_message(
34043408
await asyncio_helper.forward_message(self.token, chat_id=chat_id, from_chat_id=from_chat_id, message_id=message_id,
34053409
disable_notification=disable_notification, protect_content=protect_content,
34063410
timeout=timeout, message_thread_id=message_thread_id, video_start_timestamp=video_start_timestamp,
3407-
direct_messages_topic_id=direct_messages_topic_id, suggested_post_parameters=suggested_post_parameters)
3411+
direct_messages_topic_id=direct_messages_topic_id, suggested_post_parameters=suggested_post_parameters,
3412+
message_effect_id=message_effect_id)
34083413
)
34093414

34103415
async def copy_message(
@@ -3426,7 +3431,8 @@ async def copy_message(
34263431
allow_paid_broadcast: Optional[bool]=None,
34273432
video_start_timestamp: Optional[bool]=None,
34283433
direct_messages_topic_id: Optional[int]=None,
3429-
suggested_post_parameters: Optional[types.SuggestedPostParameters]=None) -> types.MessageID:
3434+
suggested_post_parameters: Optional[types.SuggestedPostParameters]=None,
3435+
message_effect_id: Optional[str]=None) -> types.MessageID:
34303436
"""
34313437
Use this method to copy messages of any kind.
34323438
If some of the specified messages can't be found or copied, they are skipped. Service messages, paid media messages, giveaway messages, giveaway winners messages,
@@ -3499,6 +3505,9 @@ async def copy_message(
34993505
is automatically declined.
35003506
:type suggested_post_parameters: :class:`telebot.types.SuggestedPostParameters`
35013507
3508+
:param message_effect_id: Unique identifier of the message effect to be added to the message; only available when forwarding to private chats
3509+
:type message_effect_id: :obj:`str`
3510+
35023511
:return: On success, the MessageId of the sent message is returned.
35033512
:rtype: :class:`telebot.types.MessageID`
35043513
"""
@@ -3533,7 +3542,8 @@ async def copy_message(
35333542
reply_parameters=reply_parameters, reply_markup=reply_markup, timeout=timeout,
35343543
message_thread_id=message_thread_id, show_caption_above_media=show_caption_above_media,
35353544
allow_paid_broadcast=allow_paid_broadcast, video_start_timestamp=video_start_timestamp,
3536-
direct_messages_topic_id=direct_messages_topic_id, suggested_post_parameters=suggested_post_parameters
3545+
direct_messages_topic_id=direct_messages_topic_id, suggested_post_parameters=suggested_post_parameters,
3546+
message_effect_id=message_effect_id
35373547
)
35383548
)
35393549

telebot/asyncio_helper.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ async def forward_message(
434434
token, chat_id, from_chat_id, message_id,
435435
disable_notification=None, timeout=None, protect_content=None,
436436
message_thread_id=None, video_start_timestamp=None, direct_messages_topic_id=None,
437-
suggested_post_parameters=None):
437+
suggested_post_parameters=None, message_effect_id=None):
438438
method_url = r'forwardMessage'
439439
payload = {'chat_id': chat_id, 'from_chat_id': from_chat_id, 'message_id': message_id}
440440
if disable_notification is not None:
@@ -451,13 +451,16 @@ async def forward_message(
451451
payload['direct_messages_topic_id'] = direct_messages_topic_id
452452
if suggested_post_parameters is not None:
453453
payload['suggested_post_parameters'] = suggested_post_parameters.to_json()
454+
if message_effect_id:
455+
payload['message_effect_id'] = message_effect_id
454456
return await _process_request(token, method_url, params=payload)
455457

456458

457459
async def copy_message(token, chat_id, from_chat_id, message_id, caption=None, parse_mode=None, caption_entities=None,
458460
disable_notification=None,
459461
reply_markup=None, timeout=None, protect_content=None, message_thread_id=None, reply_parameters=None, show_caption_above_media=None,
460-
allow_paid_broadcast=None, video_start_timestamp=None, direct_messages_topic_id=None, suggested_post_parameters=None):
462+
allow_paid_broadcast=None, video_start_timestamp=None, direct_messages_topic_id=None, suggested_post_parameters=None,
463+
message_effect_id=None):
461464
method_url = r'copyMessage'
462465
payload = {'chat_id': chat_id, 'from_chat_id': from_chat_id, 'message_id': message_id}
463466
if caption is not None:
@@ -488,6 +491,8 @@ async def copy_message(token, chat_id, from_chat_id, message_id, caption=None, p
488491
payload['direct_messages_topic_id'] = direct_messages_topic_id
489492
if suggested_post_parameters is not None:
490493
payload['suggested_post_parameters'] = suggested_post_parameters.to_json()
494+
if message_effect_id:
495+
payload['message_effect_id'] = message_effect_id
491496
return await _process_request(token, method_url, params=payload)
492497

493498
async def send_checklist(

0 commit comments

Comments
 (0)