Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 14:22:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1014 from xiayingLIULI/main

Browse Source 
对米游社cookie进行判断，整合米游社签到信息
This commit is contained in:
HibiKier 2022-08-22 20:41:32 +08:00 committed by GitHub
commit 34da04bba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/genshin/query_user/bind/__init__.py
View File

@ -93,6 +93,8 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg: Message
print(cookie) print(cookie)
cookie_json = json.loads(cookie) cookie_json = json.loads(cookie)
print(cookie_json) print(cookie_json)
if 'login_ticket' not in cookie_json:
await bind.finish("请发送正确完整的cookie！")
login_ticket = cookie_json['login_ticket'] login_ticket = cookie_json['login_ticket']
# try: # try:
res = await AsyncHttpx.get(url=bbs_Cookie_url.format(login_ticket)) res = await AsyncHttpx.get(url=bbs_Cookie_url.format(login_ticket))

6
plugins/genshin/query_user/genshin_sign/__init__.py
View File

@ -44,6 +44,8 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command()):
uid = await Genshin.get_user_uid(event.user_id) uid = await Genshin.get_user_uid(event.user_id)
if cmd == "查看我的cookie": if cmd == "查看我的cookie":
my_cookie = await Genshin.get_user_cookie(uid, True) 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) await genshin_matcher.finish("您的cookie为" + my_cookie)
if not uid or not await Genshin.get_user_cookie(uid, True): if not uid or not await Genshin.get_user_cookie(uid, True):
await genshin_matcher.finish("请先绑定uid和cookie！") await genshin_matcher.finish("请先绑定uid和cookie！")
@ -51,9 +53,9 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command()):
# await genshin_matcher.finish("请更新cookie！") # await genshin_matcher.finish("请更新cookie！")
if cmd == "原神我硬签": if cmd == "原神我硬签":
try: try:
await genshin_matcher.send("正在进行签到...", at_sender=True)
msg = await genshin_sign(uid) msg = await genshin_sign(uid)
return_data = await mihoyobbs_sign(event.user_id) return_data = await mihoyobbs_sign(event.user_id)
await genshin_matcher.send(return_data)
logger.info( logger.info(
f"(USER {event.user_id}, " f"(USER {event.user_id}, "
f"GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'}) UID：{uid} 原神签到" f"GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'}) UID：{uid} 原神签到"
@ -70,7 +72,7 @@ async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command()):
await u.clear_sign_time(uid) await u.clear_sign_time(uid)
next_date = await Genshin.random_sign_time(uid) next_date = await Genshin.random_sign_time(uid)
add_job(event.user_id, uid, next_date) 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: except Exception as e:
msg = "原神签到失败..请尝试检查cookie或报告至管理员！" msg = "原神签到失败..请尝试检查cookie或报告至管理员！"
logger.info( logger.info(

8
plugins/genshin/query_user/mihoyobbs_sign/__init__.py
View File

@ -38,16 +38,18 @@ mihoyobbs_matcher = on_command(
@mihoyobbs_matcher.handle() @mihoyobbs_matcher.handle()
async def _(event: MessageEvent, cmd: Tuple[str, ...] = Command()): 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) return_data = await mihoyobbs_sign(event.user_id)
if return_data: if return_data:
await mihoyobbs_matcher.finish(return_data) await mihoyobbs_matcher.finish(return_data, at_sender=True)
else: else:
await mihoyobbs_matcher.finish("米游社签到失败，请查看控制台输出") await mihoyobbs_matcher.finish("米游社签到失败，请查看控制台输出", at_sender=True)
async def mihoyobbs_sign(user_id): async def mihoyobbs_sign(user_id):
uid = await Genshin.get_user_uid(user_id) uid = await Genshin.get_user_uid(user_id)
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) stuid = await Genshin.get_stuid(uid)
stoken = await Genshin.get_stoken(uid) stoken = await Genshin.get_stoken(uid)
cookie = await Genshin.get_user_cookie(uid) cookie = await Genshin.get_user_cookie(uid)