xuthus/LittlePaimon
1
0
Fork 0
mirror of https://github.com/xuthus83/LittlePaimon.git synced 2024-10-21 16:27:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 修复更新抽卡记录失败时未移除任务的问题 #458

Browse Source
This commit is contained in:
CMHopeSunshine 2023-07-06 11:30:15 +08:00
parent 06c1340f76
commit 9ec623046c
2 changed files with 75 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.pre-commit-config.yaml
View File

@ -13,12 +13,6 @@ repos:
args: [--config, pyproject.toml] args: [--config, pyproject.toml]
stages: [commit] stages: [commit]
- repo: https://github.com/pycqa/isort
rev: 5.12.0
hooks:
- id: isort
stages: [commit]
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: 23.3.0 rev: 23.3.0
hooks: hooks:

149
LittlePaimon/plugins/Paimon_Gacha_Log/__init__.py
View File

@ -1,97 +1,99 @@
import time import time
from typing import Union
from asyncio import get_running_loop from asyncio import get_running_loop
from typing import Union
from urllib.parse import quote from urllib.parse import quote
from nonebot import on_command from nonebot import on_command
from nonebot.adapters.onebot.v11 import ( from nonebot.adapters.onebot.v11 import (
ActionFailed,
Bot, Bot,
MessageEvent,
GroupMessageEvent, GroupMessageEvent,
PrivateMessageEvent, ActionFailed, MessageEvent,
PrivateMessageEvent,
) )
from nonebot.plugin import PluginMetadata from nonebot.plugin import PluginMetadata
from LittlePaimon.utils import logger, NICKNAME from LittlePaimon.utils import NICKNAME, logger
from LittlePaimon.utils.message import CommandPlayer, CommandUID
from LittlePaimon.utils.api import get_authkey_by_stoken from LittlePaimon.utils.api import get_authkey_by_stoken
from LittlePaimon.utils.message import CommandPlayer, CommandUID
from .data_source import ( from .data_source import (
get_gacha_log_img,
get_gacha_log_data,
create_import_command, create_import_command,
gacha_log_to_UIGF, gacha_log_to_UIGF,
get_gacha_log_data,
get_gacha_log_img,
) )
__plugin_meta__ = PluginMetadata( __plugin_meta__ = PluginMetadata(
name="原神抽卡记录分析", name="原神抽卡记录分析",
description="小派蒙的原神抽卡记录模块", description="小派蒙的原神抽卡记录模块",
usage='', usage="",
extra={ extra={
'type': '原神抽卡记录', "type": "原神抽卡记录",
"author": "惜月 <277073121@qq.com>", "author": "惜月 <277073121@qq.com>",
"version": "3.0.0", "version": "3.0.0",
'priority': 10, "priority": 10,
}, },
) )
update_log = on_command( update_log = on_command(
'更新抽卡记录', "更新抽卡记录",
aliases={'抽卡记录更新', '获取抽卡记录'}, aliases={"抽卡记录更新", "获取抽卡记录"},
priority=12, priority=12,
block=True, block=True,
state={ state={
'pm_name': '更新抽卡记录', "pm_name": "更新抽卡记录",
'pm_description': '*通过stoken更新原神抽卡记录', "pm_description": "*通过stoken更新原神抽卡记录",
'pm_usage': '更新抽卡记录(uid)', "pm_usage": "更新抽卡记录(uid)",
'pm_priority': 1, "pm_priority": 1,
}, },
) )
show_log = on_command( show_log = on_command(
'查看抽卡记录', "查看抽卡记录",
aliases={'抽卡记录', '查询抽卡记录'}, aliases={"抽卡记录", "查询抽卡记录"},
priority=12, priority=12,
block=True, block=True,
state={ state={
'pm_name': '查看抽卡记录', "pm_name": "查看抽卡记录",
'pm_description': '*查看你的抽卡记录分析', "pm_description": "*查看你的抽卡记录分析",
'pm_usage': '查看抽卡记录(uid)', "pm_usage": "查看抽卡记录(uid)",
'pm_priority': 2, "pm_priority": 2,
}, },
) )
import_log = on_command( import_log = on_command(
'导入抽卡记录', "导入抽卡记录",
aliases={'抽卡记录导入'}, aliases={"抽卡记录导入"},
priority=12, priority=12,
block=True, block=True,
state={ state={
'pm_name': '导入抽卡记录', "pm_name": "导入抽卡记录",
'pm_description': '导入符合UIGF标准的抽卡记录json文件，发送命令后，于5分钟内上传json文件即可', "pm_description": "导入符合UIGF标准的抽卡记录json文件，发送命令后，于5分钟内上传json文件即可",
'pm_usage': '导入抽卡记录', "pm_usage": "导入抽卡记录",
'pm_priority': 3, "pm_priority": 3,
}, },
) )
export_log = on_command( export_log = on_command(
'导出抽卡记录', "导出抽卡记录",
aliases={'抽卡记录导出'}, aliases={"抽卡记录导出"},
priority=12, priority=12,
block=True, block=True,
state={ state={
'pm_name': '导出抽卡记录', "pm_name": "导出抽卡记录",
'pm_description': '导出符合UIGF标准的抽卡记录json文件', "pm_description": "导出符合UIGF标准的抽卡记录json文件",
'pm_usage': '导出抽卡记录', "pm_usage": "导出抽卡记录",
'pm_priority': 4, "pm_priority": 4,
}, },
) )
gacha_url = on_command( gacha_url = on_command(
'查看抽卡记录链接', "查看抽卡记录链接",
aliases={'导出抽卡记录链接'}, aliases={"导出抽卡记录链接"},
priority=11, priority=11,
block=True, block=True,
state={ state={
'pm_name': '查看抽卡记录链接', "pm_name": "查看抽卡记录链接",
'pm_description': '*获取你的抽卡记录链接', "pm_description": "*获取你的抽卡记录链接",
'pm_usage': '查看抽卡记录链接(uid)', "pm_usage": "查看抽卡记录链接(uid)",
'pm_priority': 5, "pm_priority": 5,
}, },
) )
@ -101,51 +103,53 @@ running_show = []
@update_log.handle() @update_log.handle()
async def _(event: MessageEvent, player=CommandPlayer(1)): async def _(event: MessageEvent, player=CommandPlayer(1)):
if f'{player[0].user_id}-{player[0].uid}' in running_update: if f"{player[0].user_id}-{player[0].uid}" in running_update:
await update_log.finish(f'UID{player[0].uid}已经在获取抽卡记录中，请勿重复发送') await update_log.finish(f"UID{player[0].uid}已经在获取抽卡记录中，请勿重复发送")
else: else:
running_update.append(f'{player[0].user_id}-{player[0].uid}') running_update.append(f"{player[0].user_id}-{player[0].uid}")
await update_log.send(f'开始为UID{player[0].uid}更新抽卡记录，请稍候...')
try: try:
await update_log.send(f"开始为UID{player[0].uid}更新抽卡记录，请稍候...")
result = await get_gacha_log_data(player[0].user_id, player[0].uid) result = await get_gacha_log_data(player[0].user_id, player[0].uid)
await update_log.send(result or 'Stoken已失效，请重新绑定或刷新cookie之后再更新', at_sender=True) await update_log.send(
result or "Stoken已失效，请重新绑定或刷新cookie之后再更新", at_sender=True
)
except Exception as e: except Exception as e:
logger.info('原神抽卡记录', f'➤➤更新抽卡记录时出现错误：<r>{e}</r>') logger.info("原神抽卡记录", f"➤➤更新抽卡记录时出现错误：<r>{e}</r>")
await update_log.send(f'更新抽卡记录时出现错误：{e}') await update_log.send(f"更新抽卡记录时出现错误：{e}")
finally: finally:
running_update.remove(f'{player[0].user_id}-{player[0].uid}') running_update.remove(f"{player[0].user_id}-{player[0].uid}")
@show_log.handle() @show_log.handle()
async def _(event: MessageEvent, player=CommandPlayer(1)): async def _(event: MessageEvent, player=CommandPlayer(1)):
if f'{player[0].user_id}-{player[0].uid}' in running_show: if f"{player[0].user_id}-{player[0].uid}" in running_show:
await update_log.finish(f'UID{player[0].uid}已经在绘制抽卡记录分析中，请勿重复发送') await update_log.finish(f"UID{player[0].uid}已经在绘制抽卡记录分析中，请勿重复发送")
else: else:
logger.info( logger.info(
'原神抽卡记录', "原神抽卡记录",
'➤', "➤",
{'用户': player[0].user_id, 'UID': player[0].uid}, {"用户": player[0].user_id, "UID": player[0].uid},
'开始绘制抽卡记录图片', "开始绘制抽卡记录图片",
True, True,
) )
running_show.append(f'{player[0].user_id}-{player[0].uid}') running_show.append(f"{player[0].user_id}-{player[0].uid}")
await update_log.send(f'开始为UID{player[0].uid}绘制抽卡记录分析，请稍候...')
try: try:
await update_log.send(f"开始为UID{player[0].uid}绘制抽卡记录分析，请稍候...")
result = await get_gacha_log_img( result = await get_gacha_log_img(
player[0].user_id, player[0].uid, event.sender.nickname player[0].user_id, player[0].uid, event.sender.nickname
) )
await show_log.send(result, at_sender=True) await show_log.send(result, at_sender=True)
except Exception as e: except Exception as e:
logger.info('原神抽卡记录', f'➤➤绘制抽卡记录图片时出现错误：<r>{e}</r>') logger.info("原神抽卡记录", f"➤➤绘制抽卡记录图片时出现错误：<r>{e}</r>")
await update_log.send(f'绘制抽卡记录分析时出现错误：{e}') await update_log.send(f"绘制抽卡记录分析时出现错误：{e}")
finally: finally:
running_show.remove(f'{player[0].user_id}-{player[0].uid}') running_show.remove(f"{player[0].user_id}-{player[0].uid}")
@import_log.handle() @import_log.handle()
async def _(event: Union[GroupMessageEvent, PrivateMessageEvent]): async def _(event: Union[GroupMessageEvent, PrivateMessageEvent]):
create_import_command(event.user_id) create_import_command(event.user_id)
await import_log.finish('请在5分钟内，上传或发送符合UIGF标准的抽卡记录json文件', at_sender=True) await import_log.finish("请在5分钟内，上传或发送符合UIGF标准的抽卡记录json文件", at_sender=True)
@export_log.handle() @export_log.handle()
@ -155,7 +159,7 @@ async def _(
player=CommandPlayer(1), player=CommandPlayer(1),
): ):
state, msg, path = gacha_log_to_UIGF(player[0].user_id, player[0].uid) state, msg, path = gacha_log_to_UIGF(player[0].user_id, player[0].uid)
if not state: if not (state and path):
await export_log.finish(msg, at_sender=True) await export_log.finish(msg, at_sender=True)
else: else:
try: try:
@ -168,23 +172,19 @@ async def _(
user_id=event.user_id, file=str(path.absolute()), name=path.name user_id=event.user_id, file=str(path.absolute()), name=path.name
) )
except Exception as e: except Exception as e:
await export_log.finish(f'上传文件失败，错误信息：{e}', at_sender=True) await export_log.finish(f"上传文件失败，错误信息：{e}", at_sender=True)
@gacha_url.handle() @gacha_url.handle()
async def _( async def _(bot: Bot, event: MessageEvent, uid: str = CommandUID()):
bot: Bot,
event: MessageEvent,
uid: str = CommandUID()
):
await gacha_url.send("正在获取抽卡记录链接") await gacha_url.send("正在获取抽卡记录链接")
logger.info('获取抽卡记录链接', '开始执行') logger.info("获取抽卡记录链接", "开始执行")
authkey, state, _ = await get_authkey_by_stoken(str(event.user_id), uid) authkey, state, _ = await get_authkey_by_stoken(str(event.user_id), uid)
if not state: if not state:
return authkey return authkey
if authkey == {}: if authkey == {}:
await gacha_url.finish(authkey, at_sender=True) await gacha_url.finish(authkey, at_sender=True)
region = 'cn_qd01' if uid[0] == '5' else 'cn_gf01' region = "cn_qd01" if uid[0] == "5" else "cn_gf01"
url = ( url = (
f"https://hk4e-api.mihoyo.com/event/gacha_info/api/getGachaLog?" f"https://hk4e-api.mihoyo.com/event/gacha_info/api/getGachaLog?"
f"authkey_ver=1&sign_type=2&auth_appid=webview_gacha&init_type=301&" f"authkey_ver=1&sign_type=2&auth_appid=webview_gacha&init_type=301&"
@ -218,13 +218,14 @@ async def _(
"send_group_forward_msg", group_id=event.group_id, messages=msgs "send_group_forward_msg", group_id=event.group_id, messages=msgs
) )
loop = get_running_loop() loop = get_running_loop()
loop.call_later(85, loop.call_later(
lambda: loop.create_task(bot.delete_msg(message_id=msg['message_id']))) 85, lambda: loop.create_task(bot.delete_msg(message_id=msg["message_id"]))
)
except ActionFailed: except ActionFailed:
logger.info('抽卡记录', '➤抽卡记录链接合并转发<r>发送失败</r>，尝试以普通信息发送') logger.info("抽卡记录", "➤抽卡记录链接合并转发<r>发送失败</r>，尝试以普通信息发送")
try: try:
await gacha_url.finish(f"UID{uid}的抽卡记录链接为：\n{url}") await gacha_url.finish(f"UID{uid}的抽卡记录链接为：\n{url}")
except ActionFailed as e: except ActionFailed as e:
logger.info('抽卡记录', f'➤抽卡记录链接<r>发送失败</r>，{e}') logger.info("抽卡记录", f"➤抽卡记录链接<r>发送失败</r>，{e}")
except Exception as e: except Exception as e:
logger.info('抽卡记录', f'➤抽卡记录链接<r>发送失败</r>，报错信息：{e}') logger.info("抽卡记录", f"➤抽卡记录链接<r>发送失败</r>，报错信息：{e}")