PaiGramTeam/PaiGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PaiGram.git synced 2024-11-22 15:36:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 修复对话中 cancel 命令失效

Browse Source
This commit is contained in:
omg-xtao 2022-10-11 20:20:11 +08:00 committed by GitHub
parent 2ec6843370
commit 131af7f0c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/plugin.py
View File

@ -1,3 +1,4 @@
import copy
import datetime import datetime
import re import re
from importlib import import_module from importlib import import_module
@ -133,8 +134,12 @@ class _Conversation(_Plugin):
and isinstance(func := getattr(self, attr), Callable) and isinstance(func := getattr(self, attr), Callable)
and (handler_datas := getattr(func, _NORMAL_HANDLER_ATTR_NAME, None)) and (handler_datas := getattr(func, _NORMAL_HANDLER_ATTR_NAME, None))
): ):
conversation_data = getattr(func, _CONVERSATION_HANDLER_ATTR_NAME, None)
if attr == "cancel":
handler_datas = copy.deepcopy(handler_datas)
conversation_data = copy.deepcopy(conversation_data)
_handlers = self._make_handler(handler_datas) _handlers = self._make_handler(handler_datas)
if conversation_data := getattr(func, _CONVERSATION_HANDLER_ATTR_NAME, None): if conversation_data:
if (_type := conversation_data.pop("type")) == "entry": if (_type := conversation_data.pop("type")) == "entry":
entry_points.extend(_handlers) entry_points.extend(_handlers)
elif _type == "state": elif _type == "state":

8
plugins/other/post.py
View File

@ -31,7 +31,7 @@ CHECK_POST, SEND_POST, CHECK_COMMAND, GTE_DELETE_PHOTO = range(10900, 10904)
GET_POST_CHANNEL, GET_TAGS, GET_TEXT = range(10904, 10907) GET_POST_CHANNEL, GET_TAGS, GET_TEXT = range(10904, 10907)
class Post(Plugin.Conversation, BasePlugin): class Post(Plugin.Conversation, BasePlugin.Conversation):
"""文章推送""" """文章推送"""
MENU_KEYBOARD = ReplyKeyboardMarkup([["推送频道", "添加TAG"], ["编辑文字", "删除图片"], ["退出"]], True, True) MENU_KEYBOARD = ReplyKeyboardMarkup([["推送频道", "添加TAG"], ["编辑文字", "删除图片"], ["退出"]], True, True)
@ -83,14 +83,14 @@ class Post(Plugin.Conversation, BasePlugin):
post_text += f"[source](https://bbs.mihoyo.com/ys/article/{post_id})" post_text += f"[source](https://bbs.mihoyo.com/ys/article/{post_id})"
if len(post_text) >= MessageLimit.CAPTION_LENGTH: if len(post_text) >= MessageLimit.CAPTION_LENGTH:
await message.reply_markdown_v2(post_text) await message.reply_markdown_v2(post_text)
post_text = post_text[0 : MessageLimit.CAPTION_LENGTH] post_text = post_text[:MessageLimit.CAPTION_LENGTH]
await message.reply_text(f"警告！图片字符描述已经超过 {MessageLimit.CAPTION_LENGTH} 个字，已经切割并发送原文本") await message.reply_text(f"警告！图片字符描述已经超过 {MessageLimit.CAPTION_LENGTH} 个字，已经切割并发送原文本")
try: try:
if len(post_images) > 1: if len(post_images) > 1:
media = [InputMediaPhoto(img_info.data) for img_info in post_images] media = [InputMediaPhoto(img_info.data) for img_info in post_images]
media[0] = InputMediaPhoto(post_images[0].data, caption=post_text, parse_mode=ParseMode.MARKDOWN_V2) media[0] = InputMediaPhoto(post_images[0].data, caption=post_text, parse_mode=ParseMode.MARKDOWN_V2)
if len(media) > 10: if len(media) > 10:
media = media[0:10] media = media[:10]
await message.reply_text("获取到的图片已经超过10张，为了保证发送成功，已经删除一部分图片") await message.reply_text("获取到的图片已经超过10张，为了保证发送成功，已经删除一部分图片")
await message.reply_media_group(media) await message.reply_media_group(media)
elif len(post_images) == 1: elif len(post_images) == 1:
@ -273,7 +273,7 @@ class Post(Plugin.Conversation, BasePlugin):
await context.bot.send_photo( await context.bot.send_photo(
channel_id, photo=image.data, caption=post_text, parse_mode=ParseMode.MARKDOWN_V2 channel_id, photo=image.data, caption=post_text, parse_mode=ParseMode.MARKDOWN_V2
) )
elif len(post_images) == 0: elif not post_images:
await context.bot.send_message(channel_id, post_text, parse_mode=ParseMode.MARKDOWN_V2) await context.bot.send_message(channel_id, post_text, parse_mode=ParseMode.MARKDOWN_V2)
else: else:
await message.reply_text("图片获取错误", reply_markup=ReplyKeyboardRemove()) # excuse? await message.reply_text("图片获取错误", reply_markup=ReplyKeyboardRemove()) # excuse?