🚨 Fix typing

Author: j1g5awi

nonebot_plugin_mcstatus/__init__.py

@@ -1,18 +1,16 @@
+from typing import cast
+
 import nonebot
-from nonebot.plugin import on_shell_command, require
-from nonebot.params import ShellCommandArgs
-from nonebot.adapters.onebot.v11 import (
-    Bot,
-    MessageEvent,
-    PrivateMessageEvent,
-    GroupMessageEvent,
-)
-from nonebot import get_bots
 from mcstatus import MinecraftServer
+from nonebot import get_bots
+from nonebot.adapters.onebot.v11 import (Bot, GroupMessageEvent, MessageEvent,
+                                         PrivateMessageEvent)
+from nonebot.params import ShellCommandArgs
+from nonebot.plugin import on_shell_command, require
 
-from nonebot_plugin_mcstatus.parser import ArgNamespace, mc_parser
+from nonebot_plugin_mcstatus.data import Data, ServerList
 from nonebot_plugin_mcstatus.handle import Handle
-from nonebot_plugin_mcstatus.data import Data
+from nonebot_plugin_mcstatus.parser import ArgNamespace, mc_parser
 
 scheduler = require("nonebot_plugin_apscheduler").scheduler
 
@@ -23,7 +21,7 @@
 @scheduler.scheduled_job("cron", minute="*/5", id="mcstatus")
 async def _():
     data = Data()
-    server_list = data.get_server_list()
+    server_list = cast(ServerList, data.get_server_list())
     bots = nonebot.get_bots()
 
     for type in server_list:
@@ -33,6 +31,7 @@ async def _():
                     ping = await MinecraftServer.lookup(server.address).async_ping()
                     status = True
                 except:
+                    ping = None
                     status = False
                 if status != server.status:
                     server.status = status

nonebot_plugin_mcstatus/data.py

@@ -1,6 +1,7 @@
-import yaml
 from pathlib import Path
-from typing import Optional, Union, List, Dict
+from typing import Dict, List, Optional, Union, cast
+
+import yaml
 from pydantic import BaseModel
 
 
@@ -46,7 +47,7 @@ def add_server(
         user_id: Optional[int] = None,
         group_id: Optional[int] = None,
     ):
-        server_list = self.get_server_list(user_id, group_id)
+        server_list = cast(List[Server], self.get_server_list(user_id, group_id))
         if server not in server_list:
             server_list.append(server)
 
@@ -67,7 +68,7 @@ def remove_server(
         server_list = list(
             filter(
                 lambda server: server.name != name,
-                self.get_server_list(user_id, group_id),
+                cast(List[Server], self.get_server_list(user_id, group_id)),
             )
         )
 

nonebot_plugin_mcstatus/handle.py

@@ -1,6 +1,8 @@
+from typing import List, cast
+
 from mcstatus import MinecraftServer
 
-from nonebot_plugin_mcstatus.data import Server, Data
+from nonebot_plugin_mcstatus.data import Data, Server
 from nonebot_plugin_mcstatus.parser import Namespace
 
 
@@ -11,6 +13,7 @@ async def check(cls, args: Namespace) -> str:
             ping = await MinecraftServer.lookup(args.address).async_ping()
             status = True
         except:
+            ping = None
             status = False
 
         return (
@@ -48,7 +51,7 @@ async def list(cls, args: Namespace) -> str:
         if server_list:
             result = "本群关注服务器列表如下：\n" + "\n".join(
                 f"[{'o' if server.status else 'x'}] {server.name} ({server.address})"
-                for server in server_list
+                for server in cast(List[Server], server_list)
             )
         else:
             result = "本群关注服务器列表为空！"