From cac8621284123665945dcf865c7fb64e4465d237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= <Dorowolf314@gmail.com>
Date: Thu, 8 Jun 2023 22:49:58 +0800
Subject: [PATCH] Update maimai

---
 modules/github/__init__.py        |  2 +-
 modules/maimai/__init__.py        | 44 ++++++++++++++++---------------
 modules/maimai/locales/zh_cn.json |  2 +-
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/modules/github/__init__.py b/modules/github/__init__.py
index 9c254ef7..4eb26c5e 100644
--- a/modules/github/__init__.py
+++ b/modules/github/__init__.py
@@ -18,7 +18,7 @@ async def _(msg: Bot.MessageSession):
     await repo.repo(msg)
 
 
-@github.handle(('user <name> {{github.help.user}}'))
+@github.handle(('(org|user) <name> {{github.help.user}}'))
 async def _(msg: Bot.MessageSession):
     await user.user(msg)
 
diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py
index 3dfe4870..1b44ffe5 100644
--- a/modules/maimai/__init__.py
+++ b/modules/maimai/__init__.py
@@ -138,28 +138,30 @@ async def _(msg: Bot.MessageSession):
 
 
 
-@mai.handle('b40 [<username>] {{maimai.help.b40}}')
-async def _(msg: Bot.MessageSession):
-    username = msg.parsed_msg.get('<username>', None)
-    if username is None and msg.target.senderFrom == "QQ":
-        payload = {'qq': msg.session.sender}
-    else:
-        if username is None:
-            await msg.finish(msg.locale.t("maimai.message.no_username"))
-        payload = {'username': username}
-    img, success = await generate(payload)
-    if success == 400:
-        await msg.finish(msg.locale.t("maimai.message.user_not_found"))
-    elif success == 403:
-        await msg.finish(msg.locale.t("maimai.message.forbidden"))
-    else:
-        if img:
-            await msg.finish([BImage(img)])
-
-
-
-@mai.handle('b50 [<username>] {{maimai.help.b50}}')
+#@mai.handle('b40 [<username>] {{maimai.help.b40}}')
+#async def _(msg: Bot.MessageSession):
+#    username = msg.parsed_msg.get('<username>', None)
+#    if username is None and msg.target.senderFrom == "QQ":
+#        payload = {'qq': msg.session.sender}
+#    else:
+#        if username is None:
+#            await msg.finish(msg.locale.t("maimai.message.no_username"))
+#        payload = {'username': username}
+#    img, success = await generate(payload)
+#    if success == 400:
+#        await msg.finish(msg.locale.t("maimai.message.user_not_found"))
+#    elif success == 403:
+#        await msg.finish(msg.locale.t("maimai.message.forbidden"))
+#    else:
+#        if img:
+#            await msg.finish([BImage(img)])
+
+
+
+@mai.handle('(b40|b50) [<username>] {{maimai.help.b50}}')
 async def _(msg: Bot.MessageSession):
+    if 'b40' in msg.parsed_msg:
+        await msg.sendMessage(msg.locale.t("maimai.message.b40.deprecated"))
     username = msg.parsed_msg.get('<username>', None)
     if username is None and msg.target.senderFrom == "QQ":
         payload = {'qq': msg.session.sender, 'b50': True}
diff --git a/modules/maimai/locales/zh_cn.json b/modules/maimai/locales/zh_cn.json
index 7852b4d9..d7169fa6 100644
--- a/modules/maimai/locales/zh_cn.json
+++ b/modules/maimai/locales/zh_cn.json
@@ -1,5 +1,4 @@
 {
-    "maimai.help.b40": "查询 B40 信息。（仅限大陆版 Maimai）",
     "maimai.help.b50": "查询 B50 信息。（仅限大陆版 Maimai）",
     "maimai.help.desc": "查询 Maimai 相关内容。",
     "maimai.help.inner": "根据定数或定数范围搜索歌曲。",
@@ -9,6 +8,7 @@
     "maimai.help.search": "根据歌名（或一部分）搜索歌曲。",
     "maimai.help.song": "查询 Maimai 歌曲或谱面的信息。",
     "maimai.message.chart_not_found": "未找到符合要求的谱面。",
+    "maimai.message.b40.deprecated": "B40 已弃用，即将查询 B50……",
     "maimai.message.forbidden": "此用户禁止了其他人获取数据。",
     "maimai.message.inner": "以下为定数 ${rating} 的曲目列表：",
     "maimai.message.inner.range": "以下为定数 ${rating}-${rating_max} 的曲目列表：",