fix抽卡记录导出

Paimon_Gacha_Log/__init__.py

@@ -53,16 +53,19 @@ async def ckjl(bot: Bot, event: Union[MessageEvent, GroupMessageEvent], msg: Mes
 
 @gacha_log_update.handle()
 async def update_ckjl(event: MessageEvent, msg: Message = CommandArg()):
+    url = None
+    if msg:
+        msg = str(msg)
+        match = re.search(r'(https://webstatic.mihoyo.com/.*#/log)', msg)
+        if match:
+            url = match.group(1)
+            msg = msg.replace(url, '')
     uid, msg, user_id, use_cache = await get_uid_in_msg(event, msg)
     if not uid:
         await gacha_log_update.finish('请把uid给派蒙哦，比如获取抽卡记录100000001 链接', at_sender=True)
-    if msg:
+    if msg and not url:
-        match = re.search(r'(https://webstatic.mihoyo.com/.*#/log)', msg)
+        await gacha_log_update.finish('你这个抽卡链接不对哦，应该是以https://开头、#/log结尾的！', at_sender=True)
-        if match:
+    if not msg and not url:
-            url = str(match.group(1))
-        else:
-            await gacha_log_update.finish('你这个抽卡链接不对哦，应该是以https://开头、#/log结尾的！', at_sender=True)
-    else:
         with open(os.path.join(data_path, 'user_gacha_log.json'), 'r', encoding="utf-8") as f:
             user_data = json.load(f)
             if user_id in user_data and uid in user_data[user_id]:

Paimon_Gacha_Log/api.py

@@ -32,14 +32,12 @@ async def checkApi(url):
     try:
         async with ClientSession() as session:
             r = await session.get(url)
-            s = (await r.read()).decode("utf-8")
+            j = await r.json()
-            j = json.loads(s)
     except Exception as e:
-        # print("API请求解析出错：\n", traceback.format_exc())
         return f'API请求解析出错：{e}'
 
     if not j["data"]:
-        if j["message"] == "authkey valid error":
+        if j["message"] == "authkey error":
             return "authkey错误，请重新获取链接给派蒙！"
         elif j["message"] == "authkey timeout":
             return "authkey已过期，请重新获取链接给派蒙！"

Paimon_Gacha_Log/gacha_logs.py

@@ -18,8 +18,7 @@ async def getGachaLogs(url, gachaTypeId):
         api = getApi(url, gachaTypeId, size, page, end_id)
         async with ClientSession() as session:
             r = await session.get(api)
-            s = (await r.read()).decode("utf-8")
+            j = await r.json()
-            j = json.loads(s)
             gacha = j["data"]["list"]
             if not len(gacha):
                 break
@@ -53,7 +52,6 @@ def mergeDataFunc(localData, gachaData):
                 if flaglist[i] == 0:
                     gachaGet = bannerGet[i]
                     tempData.insert(0, gachaGet)
-            # print("追加", len(tempData), "条记录", flush=True)
             for i in tempData:
                 localData["gachaLog"][banner].insert(0, i)
 

Paimon_Plugins/chat.py

@@ -39,7 +39,7 @@ chat_lmt = FreqLimiter2(60)
 
 
 def create_matcher(chat_word: str, pattern: str, cooldown: int, pro: float, responses):
-    hammer = on_regex(pattern, priority=14, temp=True)
+    hammer = on_regex(pattern, priority=10)
 
     @hammer.handle()
     async def handler(event: GroupMessageEvent):