Skip to content

Commit 470db44

Browse files
committed
1 parent 3c6f3b3 commit 470db44

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

metabot/modules/reminders.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
from metabot.util import pickleutil
1717

1818
PERIOD = 60 * 10 # Run modinit.periodic every 10 minutes.
19-
PLAIN_TEXT_LIMIT = 4096
20-
PHOTO_TEXT_LIMIT = 1024
2119

2220

2321
def modinit(multibot): # pylint: disable=missing-docstring
@@ -139,7 +137,7 @@ def _daily_messages(multibot, records): # pylint: disable=too-many-branches,too
139137
updmessage = bot.send_message(
140138
chat_id=groupid,
141139
reply_to_message_id=last.message['message_id'],
142-
text=_truncate(updtext, PLAIN_TEXT_LIMIT),
140+
text=_truncate(updtext, ntelebot.limits.message_text_length_max),
143141
parse_mode='HTML',
144142
disable_web_page_preview=True,
145143
disable_notification=True)
@@ -178,7 +176,7 @@ def reminder_send(bot, groupid, text, photo):
178176

179177
try:
180178
return bot.send_message(chat_id=groupid,
181-
text=_truncate(text, PLAIN_TEXT_LIMIT),
179+
text=_truncate(text, ntelebot.limits.message_text_length_max),
182180
parse_mode='HTML',
183181
disable_web_page_preview=True,
184182
disable_notification=True)
@@ -196,12 +194,13 @@ def reminder_edit(bot, lastmessage, text):
196194
if lastmessage.get('caption'):
197195
return bot.edit_message_caption(chat_id=groupid,
198196
message_id=message_id,
199-
caption=_truncate(text, PHOTO_TEXT_LIMIT),
197+
caption=_truncate(
198+
text, ntelebot.limits.message_caption_length_max),
200199
parse_mode='HTML')
201200

202201
return bot.edit_message_text(chat_id=groupid,
203202
message_id=message_id,
204-
text=_truncate(text, PLAIN_TEXT_LIMIT),
203+
text=_truncate(text, ntelebot.limits.message_text_length_max),
205204
parse_mode='HTML',
206205
disable_web_page_preview=True)
207206
except ntelebot.errors.Unmodified:
@@ -391,7 +390,8 @@ def _handle_alerts(bot, records, groupid, alerts):
391390
message = None
392391
try:
393392
message = bot.send_message(chat_id=groupid,
394-
text=_truncate(text, PLAIN_TEXT_LIMIT),
393+
text=_truncate(text,
394+
ntelebot.limits.message_text_length_max),
395395
parse_mode='HTML',
396396
disable_web_page_preview=True,
397397
disable_notification=True,

metabot/modules/test_reminders.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ def test_quick_diff():
10481048
def test_truncation(daily_messages, monkeypatch): # pylint: disable=redefined-outer-name
10491049
"""Verify that message limits are correctly enforced."""
10501050

1051-
monkeypatch.setattr('metabot.modules.reminders.PLAIN_TEXT_LIMIT', 40)
1051+
monkeypatch.setattr('ntelebot.limits.message_text_length_max', 40)
10521052

10531053
assert daily_messages(True) == """
10541054
modulestestbot/-1002000002000:

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ authors = [
99
requires-python = '>=3.8'
1010
dependencies = [
1111
'googlemaps',
12-
'ntelebot >= 0.4.2',
12+
'ntelebot >= 0.4.3',
1313
'pytz',
1414
'PyYAML >= 5.1',
1515
'requests',

0 commit comments

Comments
 (0)