Skip to content

Commit abd7ce2

Browse files
committed
Change sticker_from_telegram() to fix #13
1 parent 230ef94 commit abd7ce2

1 file changed

Lines changed: 16 additions & 13 deletions

File tree

plugins/_100_text_forward.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -298,37 +298,40 @@ def photo_from_telegram(bot, update):
298298

299299
def video_from_telegram(bot, update):
300300
tg_group_id = update.message.chat_id # telegram group id
301-
qq_group_id, _, forward_index = get_forward_index(tg_group_id=int(tg_group_id))
301+
qq_group_id, _, forward_index = get_forward_index(
302+
tg_group_id=int(tg_group_id))
302303
text = '[视频]'
303304
cq_send(update, text, qq_group_id)
304305

305306

306307
def audio_from_telegram(bot, update):
307308
tg_group_id = update.message.chat_id # telegram group id
308-
qq_group_id, _, forward_index = get_forward_index(tg_group_id=int(tg_group_id))
309+
qq_group_id, _, forward_index = get_forward_index(
310+
tg_group_id=int(tg_group_id))
309311
text = '[音频]'
310312
cq_send(update, text, qq_group_id)
311313

312314

313315
def document_from_telegram(bot, update):
314316
tg_group_id = update.message.chat_id # telegram group id
315-
qq_group_id, _, forward_index = get_forward_index(tg_group_id=int(tg_group_id))
317+
qq_group_id, _, forward_index = get_forward_index(
318+
tg_group_id=int(tg_group_id))
316319
text = '[文件]'
317320
cq_send(update, text, qq_group_id)
318321

319322

320323
def sticker_from_telegram(bot, update):
321324
tg_group_id = update.message.chat_id # telegram group id
322-
qq_group_id, _, forward_index = get_forward_index(tg_group_id=int(tg_group_id))
323-
324-
if PIC_LINK_MODE[forward_index]:
325-
file_id = update.message.sticker.file_id
325+
qq_group_id, _, forward_index = get_forward_index(
326+
tg_group_id=int(tg_group_id))
327+
file_id = update.message.sticker.file_id
328+
if JQ_MODE: # If use CQPro, send sticker as photo.
329+
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.
326331
pic_url = tg_get_pic_url(file_id, 'png')
327-
if JQ_MODE:
328-
text = '[CQ:image,file=' + file_id + '.png]'
329-
else:
330-
text = '[ ' + update.message.sticker.emoji + ' sticker, 请点击查看' + pic_url + ' ]'
331-
else:
332+
text = '[ ' + update.message.sticker.emoji + \
333+
' sticker, 请点击查看' + pic_url + ' ]'
334+
else: # Seem user set JQ_MODE and Pic_Link both False, only send emoji.
332335
text = '[' + update.message.sticker.emoji + ' sticker]'
333336
cq_send(update, text, qq_group_id)
334337

@@ -471,7 +474,7 @@ def drive_mode_on(forward_index, tg_group_id, tg_user, qq_group_id, qq):
471474

472475

473476
@command_listener('[pic link off]', description='disable pic link mode, only available when JQ_MODE=False')
474-
def drive_mode_on(forward_index, tg_group_id, tg_user, qq_group_id, qq):
477+
def drive_mode_off(forward_index, tg_group_id, tg_user, qq_group_id, qq):
475478
if JQ_MODE:
476479
return
477480
PIC_LINK_MODE[forward_index] = False

0 commit comments

Comments
 (0)