@@ -163,23 +163,23 @@ def _daily_messages(multibot, records): # pylint: disable=too-many-branches,too
163
163
def reminder_send (bot , groupid , text , photo ):
164
164
"""Send a message with the given photo + caption, falling back to plain text."""
165
165
166
+ base = {
167
+ 'chat_id' : groupid ,
168
+ 'disable_notification' : True ,
169
+ 'parse_mode' : 'HTML' ,
170
+ }
171
+
166
172
logging .info ('Sending reminder to %s.' , groupid )
167
173
try :
168
174
if photo :
169
175
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 )
175
177
except ntelebot .errors .TooLong : # See https://github.com/nmlorg/metabot/issues/76.
176
178
logging .info ('Downgrading to plain text.' )
177
179
178
- return bot .send_message (chat_id = groupid ,
180
+ return bot .send_message (** base ,
179
181
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 )
183
183
except ntelebot .errors .Error :
184
184
logging .exception ('While sending to %s:\n %s' , groupid , text )
185
185
@@ -189,19 +189,21 @@ def reminder_edit(bot, lastmessage, text):
189
189
190
190
groupid = lastmessage ['chat' ]['id' ]
191
191
message_id = lastmessage ['message_id' ]
192
+ base = {
193
+ 'chat_id' : groupid ,
194
+ 'message_id' : message_id ,
195
+ 'parse_mode' : 'HTML' ,
196
+ }
197
+
192
198
logging .info ('Editing reminder %s/%s.' , groupid , message_id )
193
199
try :
194
200
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 ,
197
202
caption = _truncate (
198
- text , ntelebot .limits .message_caption_length_max ),
199
- parse_mode = 'HTML' )
203
+ text , ntelebot .limits .message_caption_length_max ))
200
204
201
- return bot .edit_message_text (chat_id = groupid ,
202
- message_id = message_id ,
205
+ return bot .edit_message_text (** base ,
203
206
text = _truncate (text , ntelebot .limits .message_text_length_max ),
204
- parse_mode = 'HTML' ,
205
207
disable_web_page_preview = True )
206
208
except ntelebot .errors .Unmodified :
207
209
logging .exception ('While editing %s/%s:\n %s' , groupid , message_id , text )
0 commit comments