xuthus/LittlePaimon
1
0
Fork 0
mirror of https://github.com/xuthus83/LittlePaimon.git synced 2025-04-12 23:29:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 fix 抽卡记录导入 bug

Browse Source
This commit is contained in:
CMHopeSunshine 2022-09-07 23:49:17 +08:00
parent 493cbbcff0
commit 7dd9e95fe9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LittlePaimon/plugins/NoticeAndRequest/__init__.py
View File

@ -169,8 +169,6 @@ async def _(event: MessageEvent, regex_dict: dict = RegexDict()):
if not target: if not target:
target = [event.group_id] target = [event.group_id]
for t in target: for t in target:
if not t.isdigit() and t != '全部':
await ban_greet.finish('请输入要禁用｜启用群欢迎的正确的群号')
if t == '全部': if t == '全部':
config.group_ban = ['全部'] if type in {'禁用', '关闭'} else [] config.group_ban = ['全部'] if type in {'禁用', '关闭'} else []
elif type in {'禁用', '关闭'}: elif type in {'禁用', '关闭'}:

6
LittlePaimon/plugins/Paimon_Gacha_Log/data_source.py
View File

@ -174,7 +174,7 @@ async def get_gacha_log_img(user_id: str, uid: str, nickname: str):
def create_import_command(user_id: int): def create_import_command(user_id: int):
def file_rule(event: NoticeEvent): def file_rule(event: NoticeEvent):
if isinstance(event, GroupUploadNoticeEvent) or event.notice_type == 'offline_file': if isinstance(event, GroupUploadNoticeEvent) or event.notice_type == 'offline_file':
return event.get_user_id() == str(user_id) return event.dict()['user_id'] == user_id
return False return False
import_cmd = on_notice(priority=12, rule=Rule(file_rule), expire_time=datetime.timedelta(minutes=5), temp=True) import_cmd = on_notice(priority=12, rule=Rule(file_rule), expire_time=datetime.timedelta(minutes=5), temp=True)
@ -193,7 +193,7 @@ def create_import_command(user_id: int):
new_num = 0 new_num = 0
uid = data['info']['uid'] uid = data['info']['uid']
logger.info('原神抽卡记录', '➤', {'用户': user_id, 'UID': uid}, '导入抽卡记录', True) logger.info('原神抽卡记录', '➤', {'用户': user_id, 'UID': uid}, '导入抽卡记录', True)
gacha_log, _ = load_history_info(event.get_user_id(), uid) gacha_log, _ = load_history_info(str(event_data['user_id']), uid)
for item in data['list']: for item in data['list']:
pool_name = GACHA_TYPE_LIST[item['gacha_type']] pool_name = GACHA_TYPE_LIST[item['gacha_type']]
item_info = GachaItem.parse_obj(item) item_info = GachaItem.parse_obj(item)
@ -203,7 +203,7 @@ def create_import_command(user_id: int):
for i in gacha_log.item_list.values(): for i in gacha_log.item_list.values():
i.sort(key=lambda x: (x.time, x.id)) i.sort(key=lambda x: (x.time, x.id))
gacha_log.update_time = datetime.datetime.now() gacha_log.update_time = datetime.datetime.now()
save_gacha_log_info(event.get_user_id(), uid, gacha_log) save_gacha_log_info(str(event_data['user_id']), uid, gacha_log)
if new_num == 0: if new_num == 0:
await import_cmd.send(f'UID{uid}抽卡记录导入完成，本次没有新增数据', at_sender=True) await import_cmd.send(f'UID{uid}抽卡记录导入完成，本次没有新增数据', at_sender=True)
else: else: