From 76bef8a725d78e02b08311b75e43d3691b000d7d Mon Sep 17 00:00:00 2001 From: xiayingLIULI <88604496+xiayingLIULI@users.noreply.github.com> Date: Mon, 22 Aug 2022 00:40:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AF=B9=E7=B1=B3=E6=B8=B8=E7=A4=BEcookie?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=EF=BC=8C=E6=95=B4=E5=90=88?= =?UTF-8?q?=E7=B1=B3=E6=B8=B8=E7=A4=BE=E7=AD=BE=E5=88=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/query_user/bind/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/genshin/query_user/bind/__init__.py b/plugins/genshin/query_user/bind/__init__.py index 8cb3be7d..38a8ac74 100644 --- a/plugins/genshin/query_user/bind/__init__.py +++ b/plugins/genshin/query_user/bind/__init__.py @@ -93,6 +93,8 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg: Message print(cookie) cookie_json = json.loads(cookie) print(cookie_json) + if 'login_ticket' not in cookie_json: + await bind.finish("请发送正确的cookie！") login_ticket = cookie_json['login_ticket'] # try: res = await AsyncHttpx.get(url=bbs_Cookie_url.format(login_ticket)) From a9eadca46cf351b2372a3e0ada77113a9132b333 Mon Sep 17 00:00:00 2001 From: xiayingLIULI <88604496+xiayingLIULI@users.noreply.github.com> Date: Mon, 22 Aug 2022 00:42:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=20=E5=AF=B9=E7=B1=B3=E6=B8=B8=E7=A4=BEcook?= =?UTF-8?q?ie=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=EF=BC=8C=E6=95=B4?= =?UTF-8?q?=E5=90=88=E7=B1=B3=E6=B8=B8=E7=A4=BE=E7=AD=BE=E5=88=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/query_user/genshin_sign/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/genshin/query_user/genshin_sign/__init__.py b/plugins/genshin/query_user/genshin_sign/__init__.py index 18463bf4..5a6c2464 100644 --- a/plugins/genshin/query_user/genshin_sign/__init__.py +++ b/plugins/genshin/query_user/genshin_sign/__init__.py @@ -51,9 +51,9 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command()): # await genshin_matcher.finish("请更新cookie！") if cmd == "原神我硬签": try: + await genshin_matcher.send("正在进行签到...", at_sender=True) msg = await genshin_sign(uid) return_data = await mihoyobbs_sign(event.user_id) - await genshin_matcher.send(return_data) logger.info( f"(USER {event.user_id}, " f"GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'}) UID：{uid} 原神签到" @@ -70,7 +70,7 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command()): await u.clear_sign_time(uid) next_date = await Genshin.random_sign_time(uid) add_job(event.user_id, uid, next_date) - msg += f"\n因开启自动签到\n下一次签到时间为：{next_date.replace(microsecond=0)}" + msg += f"\n{return_data}\n因开启自动签到\n下一次签到时间为：{next_date.replace(microsecond=0)}" except Exception as e: msg = "原神签到失败..请尝试检查cookie或报告至管理员！" logger.info( From 52d23c4a8d153fc87d09ca0a8e3b771120be5a5f Mon Sep 17 00:00:00 2001 From: xiayingLIULI <88604496+xiayingLIULI@users.noreply.github.com> Date: Mon, 22 Aug 2022 11:44:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=83=BD=E5=9C=A8?= =?UTF-8?q?=E7=BE=A4=E8=81=8A=E4=B8=AD=E6=9F=A5=E7=9C=8B=E6=88=91=E7=9A=84?= =?UTF-8?q?cookie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/query_user/genshin_sign/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/genshin/query_user/genshin_sign/__init__.py b/plugins/genshin/query_user/genshin_sign/__init__.py index 5a6c2464..99585662 100644 --- a/plugins/genshin/query_user/genshin_sign/__init__.py +++ b/plugins/genshin/query_user/genshin_sign/__init__.py @@ -44,6 +44,8 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command()): uid = await Genshin.get_user_uid(event.user_id) if cmd == "查看我的cookie": my_cookie = await Genshin.get_user_cookie(uid, True) + if isinstance(event, GroupMessageEvent): + await genshin_matcher.finish("请私聊查看您的cookie！") await genshin_matcher.finish("您的cookie为" + my_cookie) if not uid or not await Genshin.get_user_cookie(uid, True): await genshin_matcher.finish("请先绑定uid和cookie！") From e73c50982350afa2e68629357d0942061fa74385 Mon Sep 17 00:00:00 2001 From: xiayingLIULI <88604496+xiayingLIULI@users.noreply.github.com> Date: Mon, 22 Aug 2022 13:33:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B1=B3=E6=B8=B8?= =?UTF-8?q?=E7=A4=BE=E7=AD=BE=E5=88=B0=E5=9C=A8=E6=97=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?cookie=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/query_user/mihoyobbs_sign/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/genshin/query_user/mihoyobbs_sign/__init__.py b/plugins/genshin/query_user/mihoyobbs_sign/__init__.py index 8e61f828..43e59352 100644 --- a/plugins/genshin/query_user/mihoyobbs_sign/__init__.py +++ b/plugins/genshin/query_user/mihoyobbs_sign/__init__.py @@ -38,16 +38,18 @@ mihoyobbs_matcher = on_command( @mihoyobbs_matcher.handle() async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command()): - await mihoyobbs_matcher.send("提交米游社签到申请") + await mihoyobbs_matcher.send("提交米游社签到申请", at_sender=True) return_data = await mihoyobbs_sign(event.user_id) if return_data: - await mihoyobbs_matcher.finish(return_data) + await mihoyobbs_matcher.finish(return_data, at_sender=True) else: - await mihoyobbs_matcher.finish("米游社签到失败，请查看控制台输出") + await mihoyobbs_matcher.finish("米游社签到失败，请查看控制台输出", at_sender=True) async def mihoyobbs_sign(user_id): uid = await Genshin.get_user_uid(user_id) + if not uid: + await mihoyobbs_matcher.finish("请先绑定uid和cookie！", at_sender=True) stuid = await Genshin.get_stuid(uid) stoken = await Genshin.get_stoken(uid) cookie = await Genshin.get_user_cookie(uid) From 1dc8cb2a9809a6bcec00f91161c784da3c47156c Mon Sep 17 00:00:00 2001 From: xiayingLIULI <88604496+xiayingLIULI@users.noreply.github.com> Date: Mon, 22 Aug 2022 13:45:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B1=B3=E6=B8=B8?= =?UTF-8?q?=E7=A4=BE=E7=AD=BE=E5=88=B0=E5=9C=A8=E6=97=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?cookie=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/query_user/mihoyobbs_sign/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/genshin/query_user/mihoyobbs_sign/__init__.py b/plugins/genshin/query_user/mihoyobbs_sign/__init__.py index 43e59352..4298183c 100644 --- a/plugins/genshin/query_user/mihoyobbs_sign/__init__.py +++ b/plugins/genshin/query_user/mihoyobbs_sign/__init__.py @@ -48,7 +48,7 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command()): async def mihoyobbs_sign(user_id): uid = await Genshin.get_user_uid(user_id) - if not uid: + if not uid or not await Genshin.get_user_cookie(uid, True): await mihoyobbs_matcher.finish("请先绑定uid和cookie！", at_sender=True) stuid = await Genshin.get_stuid(uid) stoken = await Genshin.get_stoken(uid) From 09ce812faf7dbe1993c00a2bad2c684f127eca64 Mon Sep 17 00:00:00 2001 From: HibiKier <45528451+HibiKier@users.noreply.github.com> Date: Mon, 22 Aug 2022 20:39:03 +0800 Subject: [PATCH 6/6] Update __init__.py --- plugins/genshin/query_user/bind/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/genshin/query_user/bind/__init__.py b/plugins/genshin/query_user/bind/__init__.py index 38a8ac74..cc77b022 100644 --- a/plugins/genshin/query_user/bind/__init__.py +++ b/plugins/genshin/query_user/bind/__init__.py @@ -94,7 +94,7 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg: Message cookie_json = json.loads(cookie) print(cookie_json) if 'login_ticket' not in cookie_json: - await bind.finish("请发送正确的cookie！") + await bind.finish("请发送正确完整的cookie！") login_ticket = cookie_json['login_ticket'] # try: res = await AsyncHttpx.get(url=bbs_Cookie_url.format(login_ticket))