Skip to content

Commit 1b04174

Browse files
authored
Merge pull request eternnoir#2123 from Badiboy/master
Fix disable_web_page_preview in LinkPreviewOptions
2 parents e970dee + e5f5bb3 commit 1b04174

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

telebot/__init__.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,12 +1657,10 @@ def send_message(
16571657
logger.warning("Both 'link_preview_options' and 'disable_web_page_preview' parameters are set: conflicting, 'disable_web_page_preview' is deprecated")
16581658
else:
16591659
# create a LinkPreviewOptions object
1660-
link_preview_options = types.LinkPreviewOptions(
1661-
disable_web_page_preview=disable_web_page_preview
1662-
)
1660+
link_preview_options = types.LinkPreviewOptions(is_disabled=disable_web_page_preview)
16631661

1664-
if link_preview_options and (link_preview_options.disable_web_page_preview is None):
1665-
link_preview_options.disable_web_page_preview = self.disable_web_page_preview
1662+
if link_preview_options and (link_preview_options.is_disabled is None):
1663+
link_preview_options.is_disabled = self.disable_web_page_preview
16661664

16671665
return types.Message.de_json(
16681666
apihelper.send_message(
@@ -4433,12 +4431,10 @@ def edit_message_text(
44334431
logger.warning("Both 'link_preview_options' and 'disable_web_page_preview' parameters are set: conflicting, 'disable_web_page_preview' is deprecated")
44344432
else:
44354433
# create a LinkPreviewOptions object
4436-
link_preview_options = types.LinkPreviewOptions(
4437-
disable_web_page_preview=disable_web_page_preview
4438-
)
4434+
link_preview_options = types.LinkPreviewOptions(is_disabled=disable_web_page_preview)
44394435

4440-
if link_preview_options and (link_preview_options.disable_web_page_preview is None):
4441-
link_preview_options.disable_web_page_preview = self.disable_web_page_preview
4436+
if link_preview_options and (link_preview_options.is_disabled is None):
4437+
link_preview_options.is_disabled = self.disable_web_page_preview
44424438

44434439
result = apihelper.edit_message_text(
44444440
self.token, text, chat_id=chat_id, message_id=message_id, inline_message_id=inline_message_id,

telebot/async_telebot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2716,7 +2716,7 @@ async def send_message(
27162716

27172717
# create a LinkPreviewOptions object
27182718
link_preview_options = types.LinkPreviewOptions(
2719-
disable_web_page_preview=disable_web_page_preview
2719+
is_disabled=disable_web_page_preview
27202720
)
27212721

27222722
return types.Message.de_json(
@@ -5294,7 +5294,7 @@ async def edit_message_text(
52945294

52955295
# create a LinkPreviewOptions object
52965296
link_preview_options = types.LinkPreviewOptions(
5297-
disable_web_page_preview=disable_web_page_preview
5297+
is_disabled=disable_web_page_preview
52985298
)
52995299

53005300
result = await asyncio_helper.edit_message_text(self.token, text, chat_id, message_id, inline_message_id, parse_mode,

telebot/types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3821,7 +3821,7 @@ def __init__(
38213821
if link_preview_options:
38223822
logger.warning('Both "link_preview_options" and "disable_web_page_preview" parameters are set: conflicting, "disable_web_page_preview" is deprecated')
38233823
else:
3824-
self.link_preview_options: LinkPreviewOptions = LinkPreviewOptions(disable_web_page_preview)
3824+
self.link_preview_options: LinkPreviewOptions = LinkPreviewOptions(is_disabled=disable_web_page_preview)
38253825

38263826
def to_dict(self):
38273827
json_dict = {'message_text': self.message_text}

0 commit comments

Comments
 (0)