diff --git a/gsuid_core/bot.py b/gsuid_core/bot.py index 22d3777..a77d978 100644 --- a/gsuid_core/bot.py +++ b/gsuid_core/bot.py @@ -142,7 +142,7 @@ class Bot: _options: List[str] = [] for option in option_list: if isinstance(option, Button): - _options.append(option.text) + _options.append(option.data) else: _options.append(option) diff --git a/gsuid_core/client.py b/gsuid_core/client.py index 45c8a83..7e2e68c 100644 --- a/gsuid_core/client.py +++ b/gsuid_core/client.py @@ -48,7 +48,7 @@ class GsClient: user_type='direct', user_pm=1, group_id=None, - user_id='444836641', + user_id='511', content=content, ) msg_send = msgjson.encode(msg) diff --git a/gsuid_core/handler.py b/gsuid_core/handler.py index 062f2c9..dba50a7 100644 --- a/gsuid_core/handler.py +++ b/gsuid_core/handler.py @@ -71,7 +71,7 @@ async def msg_process(msg: MessageReceive) -> Event: async def handle_event(ws: _Bot, msg: MessageReceive): # 获取用户权限,越小越高 - user_pm = await get_user_pml(msg) + msg.user_pm = user_pm = await get_user_pml(msg) event = await msg_process(msg) logger.info('[收到事件]', event=event) diff --git a/gsuid_core/message_models.py b/gsuid_core/message_models.py index f4a5e7b..1bc04c0 100644 --- a/gsuid_core/message_models.py +++ b/gsuid_core/message_models.py @@ -5,8 +5,8 @@ from msgspec import Struct class Button(Struct): text: str - data: Optional[str] # 具体数据 - pressed_text: Optional[str] # 按下之后显示的值 + data: str # 具体数据 + pressed_text: Optional[str] = None # 按下之后显示的值 style: Literal[0, 1] = 1 # 0灰色线框,1蓝色线框 action: Literal[0, 1, 2] = 2 # 0跳转按钮,1回调按钮,2命令按钮 permisson: Literal[0, 1, 2, 3] = 2 # 0指定用户,1管理者,2所有人可按,3指定身份组