From 6c64f2a4e28cc0134d3b0bb2792cae69b3c69a30 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Thu, 24 Jun 2021 10:38:24 +0800 Subject: [PATCH] fix no target also require target name --- CHANGELOG.md | 3 ++- pyproject.toml | 2 +- src/plugins/nonebot_hk_reporter/config_manager.py | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e60587f..6485e76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - 增加了简单的单元测试 - 增加了管理员直接管理订阅的能力 -## [0.2.12] +## [0.2.12] - 2021-06-24 - 微博tag支持 +- 修复bug diff --git a/pyproject.toml b/pyproject.toml index c53998d..0fc95b3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot-hk-reporter" -version = "0.2.11" +version = "0.2.12" description = "Subscribe message from social medias" authors = ["felinae98 "] license = "MIT" diff --git a/src/plugins/nonebot_hk_reporter/config_manager.py b/src/plugins/nonebot_hk_reporter/config_manager.py index 97ed65b..bc3b154 100644 --- a/src/plugins/nonebot_hk_reporter/config_manager.py +++ b/src/plugins/nonebot_hk_reporter/config_manager.py @@ -49,7 +49,11 @@ def do_add_sub(add_sub: Type[Matcher]): @add_sub.got('platform', '{_prompt}', parse_platform) @add_sub.handle() async def init_id(bot: Bot, event: Event, state: T_State): - state['_prompt'] = '请输入订阅用户的id，详情查阅https://github.com/felinae98/nonebot-hk-reporter' + if platform_manager[state['platform']].has_target: + state['_prompt'] = '请输入订阅用户的id，详情查阅https://github.com/felinae98/nonebot-hk-reporter' + else: + state['id'] = 'default' + state['name'] = await platform_manager[state['platform']].get_account_name(Target('')) async def parse_id(bot: Bot, event: Event, state: T_State): target = str(event.get_message()).strip() @@ -93,9 +97,6 @@ def do_add_sub(add_sub: Type[Matcher]): @add_sub.got('tags', '{_prompt}', parser_tags) @add_sub.handle() async def add_sub_process(bot: Bot, event: Event, state: T_State): - if not platform_manager[state['platform']].has_target: - state['name'] = await platform_manager[state['platform']].get_account_name(Target('')) - state['id'] = 'default' config = Config() config.add_subscribe(state.get('_user_id') or event.group_id, user_type='group', target=state['id'],