Skip to content

Commit e8dc92a

Browse files
committed
Pull some duplicated data out.
1 parent b570d46 commit e8dc92a

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

metabot/modules/reminders.py

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -163,23 +163,23 @@ def _daily_messages(multibot, records): # pylint: disable=too-many-branches,too
163163
def reminder_send(bot, groupid, text, photo):
164164
"""Send a message with the given photo + caption, falling back to plain text."""
165165

166+
base = {
167+
'chat_id': groupid,
168+
'disable_notification': True,
169+
'parse_mode': 'HTML',
170+
}
171+
166172
logging.info('Sending reminder to %s.', groupid)
167173
try:
168174
if photo:
169175
try:
170-
return bot.send_photo(chat_id=groupid,
171-
photo=photo,
172-
caption=text,
173-
parse_mode='HTML',
174-
disable_notification=True)
176+
return bot.send_photo(**base, photo=photo, caption=text)
175177
except ntelebot.errors.TooLong: # See https://github.com/nmlorg/metabot/issues/76.
176178
logging.info('Downgrading to plain text.')
177179

178-
return bot.send_message(chat_id=groupid,
180+
return bot.send_message(**base,
179181
text=_truncate(text, ntelebot.limits.message_text_length_max),
180-
parse_mode='HTML',
181-
disable_web_page_preview=True,
182-
disable_notification=True)
182+
disable_web_page_preview=True)
183183
except ntelebot.errors.Error:
184184
logging.exception('While sending to %s:\n%s', groupid, text)
185185

@@ -189,19 +189,21 @@ def reminder_edit(bot, lastmessage, text):
189189

190190
groupid = lastmessage['chat']['id']
191191
message_id = lastmessage['message_id']
192+
base = {
193+
'chat_id': groupid,
194+
'message_id': message_id,
195+
'parse_mode': 'HTML',
196+
}
197+
192198
logging.info('Editing reminder %s/%s.', groupid, message_id)
193199
try:
194200
if lastmessage.get('caption'):
195-
return bot.edit_message_caption(chat_id=groupid,
196-
message_id=message_id,
201+
return bot.edit_message_caption(**base,
197202
caption=_truncate(
198-
text, ntelebot.limits.message_caption_length_max),
199-
parse_mode='HTML')
203+
text, ntelebot.limits.message_caption_length_max))
200204

201-
return bot.edit_message_text(chat_id=groupid,
202-
message_id=message_id,
205+
return bot.edit_message_text(**base,
203206
text=_truncate(text, ntelebot.limits.message_text_length_max),
204-
parse_mode='HTML',
205207
disable_web_page_preview=True)
206208
except ntelebot.errors.Unmodified:
207209
logging.exception('While editing %s/%s:\n%s', groupid, message_id, text)

0 commit comments

Comments
 (0)