@@ -189,7 +189,7 @@ def cq_get_pic_url(filename):
189189 :param filename:
190190 :return: image url
191191 """
192- cqimg = os .path .join (CQ_IMAGE_ROOT , filename + '.cqimg' )
192+ cqimg = os .path .join (CQ_IMAGE_ROOT , filename + '.cqimg' )
193193 parser = ConfigParser ()
194194 parser .read (cqimg )
195195 url = parser ['image' ]['url' ]
@@ -269,7 +269,8 @@ def tg_get_pic_url(file_id: str, pic_type: str):
269269def photo_from_telegram (bot , update ):
270270 if update .message :
271271 tg_group_id = update .message .chat_id # telegram group id
272- qq_group_id , _ , forward_index = get_forward_index (tg_group_id = int (tg_group_id ))
272+ qq_group_id , _ , forward_index = get_forward_index (
273+ tg_group_id = int (tg_group_id ))
273274
274275 file_id = update .message .photo [- 1 ].file_id
275276 pic_url = tg_get_pic_url (file_id , 'jpg' )
@@ -283,7 +284,8 @@ def photo_from_telegram(bot, update):
283284 cq_send (update , text , qq_group_id )
284285 elif update .edited_message :
285286 tg_group_id = update .edited_message .chat_id # telegram group id
286- qq_group_id , _ , forward_index = get_forward_index (tg_group_id = int (tg_group_id ))
287+ qq_group_id , _ , forward_index = get_forward_index (
288+ tg_group_id = int (tg_group_id ))
287289
288290 file_id = update .edited_message .photo [- 1 ].file_id
289291 pic_url = tg_get_pic_url (file_id , 'jpg' )
@@ -325,21 +327,23 @@ def sticker_from_telegram(bot, update):
325327 qq_group_id , _ , forward_index = get_forward_index (
326328 tg_group_id = int (tg_group_id ))
327329 file_id = update .message .sticker .file_id
328- if JQ_MODE : # If use CQPro, send sticker as photo.
330+ if JQ_MODE : # If use CQPro, send sticker as photo.
329331 text = '[CQ:image,file=' + file_id + '.png]'
330- elif PIC_LINK_MODE [forward_index ]: # If not turn on JQ_MODE but enable Pic_link, send sticker with link.
332+ # If not turn on JQ_MODE but enable Pic_link, send sticker with link.
333+ elif PIC_LINK_MODE [forward_index ]:
331334 pic_url = tg_get_pic_url (file_id , 'png' )
332335 text = '[ ' + update .message .sticker .emoji + \
333336 ' sticker, 请点击查看' + pic_url + ' ]'
334- else : # Seem user set JQ_MODE and Pic_Link both False, only send emoji.
337+ else : # Seem user set JQ_MODE and Pic_Link both False, only send emoji.
335338 text = '[' + update .message .sticker .emoji + ' sticker]'
336339 cq_send (update , text , qq_group_id )
337340
338341
339342def text_from_telegram (bot , update ):
340343 if update .message :
341344 tg_group_id = update .message .chat_id # telegram group id
342- qq_group_id , _ , forward_index = get_forward_index (tg_group_id = int (tg_group_id ))
345+ qq_group_id , _ , forward_index = get_forward_index (
346+ tg_group_id = int (tg_group_id ))
343347
344348 text = update .message .text
345349 if text .startswith ('//' ): # feature, comment will no be send to qq
@@ -348,7 +352,8 @@ def text_from_telegram(bot, update):
348352 cq_send (update , text , qq_group_id )
349353 elif update .edited_message :
350354 tg_group_id = update .edited_message .chat_id # telegram group id
351- qq_group_id , _ , forward_index = get_forward_index (tg_group_id = int (tg_group_id ))
355+ qq_group_id , _ , forward_index = get_forward_index (
356+ tg_group_id = int (tg_group_id ))
352357
353358 text = update .edited_message .text
354359 if text .startswith ('//' ): # feature, comment will no be send to qq
@@ -357,12 +362,18 @@ def text_from_telegram(bot, update):
357362 cq_send (update , text , qq_group_id , edited = True )
358363
359364
360- global_vars .dp .add_handler (MessageHandler (Filters .text | Filters .command , text_from_telegram , edited_updates = True ), 100 ) # priority 100
361- global_vars .dp .add_handler (MessageHandler (Filters .sticker , sticker_from_telegram ), 100 )
362- global_vars .dp .add_handler (MessageHandler (Filters .audio , audio_from_telegram ), 100 )
363- global_vars .dp .add_handler (MessageHandler (Filters .photo , photo_from_telegram , edited_updates = True ), 100 )
364- global_vars .dp .add_handler (MessageHandler (Filters .document , document_from_telegram ), 100 )
365- global_vars .dp .add_handler (MessageHandler (Filters .video , video_from_telegram ), 100 )
365+ global_vars .dp .add_handler (MessageHandler (
366+ Filters .text | Filters .command , text_from_telegram , edited_updates = True ), 100 ) # priority 100
367+ global_vars .dp .add_handler (MessageHandler (
368+ Filters .sticker , sticker_from_telegram ), 100 )
369+ global_vars .dp .add_handler (MessageHandler (
370+ Filters .audio , audio_from_telegram ), 100 )
371+ global_vars .dp .add_handler (MessageHandler (
372+ Filters .photo , photo_from_telegram , edited_updates = True ), 100 )
373+ global_vars .dp .add_handler (MessageHandler (
374+ Filters .document , document_from_telegram ), 100 )
375+ global_vars .dp .add_handler (MessageHandler (
376+ Filters .video , video_from_telegram ), 100 )
366377
367378
368379@global_vars .qq_bot .listener ((RcvdGroupMessage , ), 100 ) # priority 100
@@ -379,10 +390,13 @@ def new(message):
379390 # replace special characters
380391 text = decode_cq_escape (text )
381392
382- text = cq_emoji_regex .sub (lambda x : chr (int (x .group (1 ))), text ) # replace [CQ:emoji,id=*]
383- text = cq_face_regex .sub (lambda x : qq_emoji_list [int (x .group (1 ))] if int (x .group (1 )) in qq_emoji_list else '\u2753 ' , text ) # replace [CQ:face,id=*]
393+ text = cq_emoji_regex .sub (lambda x : chr (
394+ int (x .group (1 ))), text ) # replace [CQ:emoji,id=*]
395+ text = cq_face_regex .sub (lambda x : qq_emoji_list [int (x .group (1 ))] if int (
396+ x .group (1 )) in qq_emoji_list else '\u2753 ' , text ) # replace [CQ:face,id=*]
384397 text = cq_bface_regex .sub ('\u2753 ' , text ) # replace bface to '?'
385- text = cq_sface_regex .sub (lambda x : qq_sface_list [int (x .group (1 )) & 255 ] if int (x .group (1 )) > 100000 and int (x .group (1 )) & 255 in qq_sface_list else '\u2753 ' , text ) # replace [CQ:sface,id=*], https://cqp.cc/t/26206
398+ text = cq_sface_regex .sub (lambda x : qq_sface_list [int (x .group (1 )) & 255 ] if int (x .group (1 )) > 100000 and int (
399+ x .group (1 )) & 255 in qq_sface_list else '\u2753 ' , text ) # replace [CQ:sface,id=*], https://cqp.cc/t/26206
386400
387401 def replace_name (qq_number ): # replace each qq number with preset id
388402 qq_number = qq_number .group (1 )
@@ -404,13 +418,18 @@ def replace_name(qq_number): # replace each qq number with preset id
404418 image_num = message_parts_count - 1
405419 if image_num == 0 :
406420 # send plain text message with bold group member name
407- full_msg_bold = '<b>' + get_qq_name (int (message .qq ), forward_index ) + '</b>: ' + text .strip ().replace ('<' , '<' ).replace ('>' , '>' )
408- global_vars .tg_bot .sendMessage (tg_group_id , full_msg_bold , parse_mode = 'HTML' )
421+ full_msg_bold = '<b>' + get_qq_name (int (message .qq ), forward_index ) + \
422+ '</b>: ' + text .strip ().replace ('<' , '<' ).replace ('>' , '>' )
423+ global_vars .tg_bot .sendMessage (
424+ tg_group_id , full_msg_bold , parse_mode = 'HTML' )
409425 else :
410426 if message_parts [0 ]:
411427 part_msg_bold = '<b>' + get_qq_name (int (message .qq ), forward_index ) + '</b>: ' + \
412- '(1/' + str (message_parts_count ) + ')' + message_parts [0 ].strip ().replace ('<' , '<' ).replace ('>' , '>' )
413- global_vars .tg_bot .sendMessage (tg_group_id , part_msg_bold , parse_mode = 'HTML' )
428+ '(1/' + str (message_parts_count ) + ')' + \
429+ message_parts [0 ].strip ().replace (
430+ '<' , '<' ).replace ('>' , '>' )
431+ global_vars .tg_bot .sendMessage (
432+ tg_group_id , part_msg_bold , parse_mode = 'HTML' )
414433 part_index = 1
415434 else :
416435 message_parts .pop (0 )
@@ -419,9 +438,11 @@ def replace_name(qq_number): # replace each qq number with preset id
419438 for matches in CQImage .PATTERN .finditer (message .text ):
420439 # replace QQ number to group member name, get full message text
421440 if message_parts_count == 1 :
422- part_msg = get_qq_name (int (message .qq ), forward_index ) + ': ' + message_parts [part_index ].strip ()
441+ part_msg = get_qq_name (
442+ int (message .qq ), forward_index ) + ': ' + message_parts [part_index ].strip ()
423443 else :
424- part_msg = get_qq_name (int (message .qq ), forward_index ) + ': ' + '(' + str (part_index + 1 ) + '/' + str (message_parts_count ) + ')' + message_parts [part_index ].strip ()
444+ part_msg = get_qq_name (int (message .qq ), forward_index ) + ': ' + '(' + str (
445+ part_index + 1 ) + '/' + str (message_parts_count ) + ')' + message_parts [part_index ].strip ()
425446 part_index += 1
426447 decode_cq_escape (part_msg )
427448 filename = matches .group (1 )
@@ -436,21 +457,24 @@ def replace_name(qq_number): # replace each qq number with preset id
436457 # gif pictures send as document
437458 if filename .lower ().endswith ('gif' ):
438459 try :
439- global_vars .tg_bot .sendDocument (tg_group_id , pic , caption = part_msg )
460+ global_vars .tg_bot .sendDocument (
461+ tg_group_id , pic , caption = part_msg )
440462 except BadRequest :
441463 # when error occurs, download picture and send link instead
442464 error (message )
443465 traceback .print_exc ()
444466 if pic_send_mode == 0 :
445467 cq_download_pic (filename )
446468 pic = get_short_url (SERVER_PIC_URL + filename )
447- global_vars .tg_bot .sendMessage (tg_group_id , pic + '\n ' + part_msg )
469+ global_vars .tg_bot .sendMessage (
470+ tg_group_id , pic + '\n ' + part_msg )
448471
449472 # jpg/png pictures send as photo
450473 else :
451474 try :
452475 # the first image in message attach full message text
453- global_vars .tg_bot .sendPhoto (tg_group_id , pic , caption = part_msg )
476+ global_vars .tg_bot .sendPhoto (
477+ tg_group_id , pic , caption = part_msg )
454478 except BadRequest :
455479 # when error occurs, download picture and send link instead
456480 error (message )
@@ -459,7 +483,8 @@ def replace_name(qq_number): # replace each qq number with preset id
459483 cq_download_pic (filename )
460484 my_url = get_short_url (SERVER_PIC_URL + filename )
461485 pic = my_url
462- global_vars .tg_bot .sendMessage (tg_group_id , pic + '\n ' + part_msg )
486+ global_vars .tg_bot .sendMessage (
487+ tg_group_id , pic + '\n ' + part_msg )
463488 return True
464489
465490
0 commit comments