nonebot-plugin-maimaidx 3.1.0__tar.gz → 3.1.2__tar.gz

{nonebot_plugin_maimaidx-3.1.0 → nonebot_plugin_maimaidx-3.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-maimaidx
-Version: 3.1.0
+Version: 3.1.2
 Summary: maimaidx plugin for nonebot2
 Author-email: Yuri-YuzuChaN <806235364@qq.com>
 License-Expression: MIT

{nonebot_plugin_maimaidx-3.1.0 → nonebot_plugin_maimaidx-3.1.2}/nonebot_plugin_maimaidx/__init__.py

@@ -15,7 +15,7 @@ from .resources import plate_table_dir, rating_table_dir
 
 scheduler = require("nonebot_plugin_apscheduler")
 
-from nonebot_plugin_apscheduler import scheduler  # noqa: F811
+from nonebot_plugin_apscheduler import scheduler
 
 __plugin_meta__ = PluginMetadata(
     name="nonebot-plugin-maimaidx",

{nonebot_plugin_maimaidx-3.1.0 → nonebot_plugin_maimaidx-3.1.2}/nonebot_plugin_maimaidx/commands/__init__.py

@@ -5,3 +5,4 @@ from . import mai_guess as mai_guess
 from . import mai_score as mai_score
 from . import mai_search as mai_search
 from . import mai_table as mai_table
+from . import oauth_message as oauth_message

{nonebot_plugin_maimaidx-3.1.0 → nonebot_plugin_maimaidx-3.1.2}/nonebot_plugin_maimaidx/commands/mai_base.py

@@ -53,7 +53,24 @@ from .depend import (
     GetUserAndAuth,
     GetUserAndAuthOrNone,
 )
-from .oauth_message import *
+from .oauth_message import (
+    BINDING_TEMPORARY_FAILED_MSG,
+    DIVINGFISH_AUTHORIZE_MSG,
+    DIVINGFISH_BIND_FAILED_MSG,
+    DIVINGFISH_BIND_SUCCESS_MSG,
+    DIVINGFISH_CODE_FAILED_MSG,
+    DIVINGFISH_CODE_TEMPORARY_FAILED_MSG,
+    DIVINGFISH_INVALID_CODE_MSG,
+    DIVINGFISH_MISMATCH_MSG,
+    DIVINGFISH_NO_SESSION_MSG,
+    DIVINGFISH_OAUTH_ERROR,
+    DIVINGFISH_SESSION_TTL,
+    GROUP_BIND_GUIDE,
+    INVALID_CODE_MSG,
+    LXNS_AUTHORIZE_MSG,
+    LXNS_ERROR,
+    OAUTH_FAILED_MSG,
+)
 
 pending_bindings = PendingBindingStore()
 

{nonebot_plugin_maimaidx-3.1.0 → nonebot_plugin_maimaidx-3.1.2}/nonebot_plugin_maimaidx/core/alias_sse_push.py

@@ -7,7 +7,7 @@ import httpx
 from nonebot import get_bot
 from nonebot.adapters.onebot.v11 import (
     Bot,
-    Message,
+    MessageSegment,
 )
 
 from ..config import log, maiconfig
@@ -68,17 +68,6 @@ async def iter_sse(lines: AsyncIterator[str]) -> AsyncIterator[SSEMessage]:
         )
 
 
-def forward_msg(info: list[Message], self_id: int) -> list:
-    forward_msg_list = []
-    for msg in info:
-        data = {
-            "type": "node",
-            "data": {"name": "Bot", "uin": str(self_id), "content": msg},
-        }
-        forward_msg_list.append(data)
-    return forward_msg_list
-
-
 async def push_alias(push: PushAliasStatus):
     bot: Bot = get_bot()
 
@@ -87,16 +76,16 @@ async def push_alias(push: PushAliasStatus):
         return
     group_list = await bot.get_group_list()
     group_ids: set[int] = set({g["group_id"] for g in group_list})
-    message = []
-    for num, item in enumerate(push.status):
+    message = [
+        MessageSegment.text(
+            "检测到新的别名申请，可使用同意别名指令进行投票，点击下方链接查看详情："
+            f"「{VOTE_URL}」\n如果不需要接收推送消息，请使用「关闭别名推送」指令关闭推送"
+        )
+    ]
+    for item in push.status:
         song_id = item.song_id
         alias_name = item.apply_alias
         song = mai.total_list.by_id(song_id)
-        if num == 0 and push.type == "Apply":
-            message.append(
-                "检测到新的别名申请，可使用同意别名指令进行投票，点击下方链接查看详情："
-                f"「{VOTE_URL}」\n如果不需要接收推送消息，请使用「关闭别名推送」指令关闭推送"
-            )
         if push.type == "Apply":
             message.append(
                 dedent(f"""\
@@ -107,9 +96,7 @@ async def push_alias(push: PushAliasStatus):
             """).strip()
                 + await draw_chart_info(song)
             )
-    if not message:
-        return
-    forward = forward_msg(message, bot.self_id)
+    forward = [MessageSegment.node_custom(bot.self_id, "Bot", msg) for msg in message]
     for gid in group_ids:
         if gid in alias.push.disable:
             continue
@@ -117,7 +104,7 @@ async def push_alias(push: PushAliasStatus):
             await bot.send_group_forward_msg(group_id=gid, message=forward)
             await asyncio.sleep(5)
         except Exception:
-            continue
+            log.exception(f"群：「{gid}」推送消息失败")
 
 
 async def sse_alias_server():

{nonebot_plugin_maimaidx-3.1.0 → nonebot_plugin_maimaidx-3.1.2}/nonebot_plugin_maimaidx/core/merge/__init__.py

@@ -248,7 +248,7 @@ async def merge_alias_data(
     if lxns_aliases is not None:
         for item in lxns_aliases.aliases:
             song_id = item.song_id
-            if song_id > 1000:
+            if song_id > 1000 and song_id < 100000:
                 song_id += 10000
             add_aliases(song_id, item.aliases)
 

{nonebot_plugin_maimaidx-3.1.0 → nonebot_plugin_maimaidx-3.1.2}/nonebot_plugin_maimaidx/core/utils/calc.py

@@ -25,7 +25,7 @@ def calc_ds(rating: float, achievements: float) -> float:
     return round(rating / (a * get_base_ra(achievements)), 1)
 
 
-def dx_score(dx: int) -> int:
+def dx_score(dx: float) -> int:
     """
     获取DX评分星星数量
 
@@ -34,15 +34,15 @@ def dx_score(dx: int) -> int:
     Returns:
         `int` 返回星星数量
     """
-    if dx <= 85:
+    if dx < 85:
         result = 0
-    elif dx <= 90:
+    elif dx < 90:
         result = 1
-    elif dx <= 93:
+    elif dx < 93:
         result = 2
-    elif dx <= 95:
+    elif dx < 95:
         result = 3
-    elif dx <= 97:
+    elif dx < 97:
         result = 4
     else:
         result = 5

{nonebot_plugin_maimaidx-3.1.0 → nonebot_plugin_maimaidx-3.1.2}/nonebot_plugin_maimaidx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-maimaidx
-Version: 3.1.0
+Version: 3.1.2
 Summary: maimaidx plugin for nonebot2
 Author-email: Yuri-YuzuChaN <806235364@qq.com>
 License-Expression: MIT

{nonebot_plugin_maimaidx-3.1.0 → nonebot_plugin_maimaidx-3.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-maimaidx"
-version = "3.1.0"
+version = "3.1.2"
 authors = [
   { name="Yuri-YuzuChaN", email="806235364@qq.com" },
 ]
@@ -42,6 +42,8 @@ ignore = [
     "PLE0704",
     "RUF012",
     "B008",
+    "E402",
+    "F811",
     "S110",
     "S112"
 ]