💥 修复类型错误 (#75)

* 🐛 修正赋值类型为 EventType

* 🚨 补全override

* 🐛 修正参数类型

* ♻️ 重构部分事件模型

* 🐛 修正适配器中的 Bot 类型引用

* 🔥 移除不需要的条件判断

* 💥 修改事件类中的时间戳属性名称

* 🐛 修正事件类中的时间戳属性名称

* 🔥 移除 MessageSegment 的类型收窄

* 🐛 修正 Bot 类中的适配器引用和类型注解

* 🐛 修正 MessageEvent 类中的 original_message 类型校验

* 🧪 统一测试替身与共享 fixture

将重复的 DummyAdapter/DummyBot 和局部 fixture 收敛到 tests/fake 与 conftest，减少测试样板并提升一致性。顺带修复若干测试类型收窄问题，保持现有测试语义不变。

* ✅ 修复测试

* ✅ 修正 DummyBot 构造函数中的适配器初始化逻辑

* 🐛 修正 Bot 类中的消息类型检查逻辑

* 🐛 添加对 Event.timestamp 旧行为的兜底

Author: shoucandanghehe

nonebot/adapters/discord/adapter.py

@@ -9,7 +9,7 @@
 from typing import Any, cast
 from typing_extensions import override
 
-from nonebot.adapters import Adapter as BaseAdapter
+from nonebot.adapters import Adapter as BaseAdapter, Bot as BaseBot
 
 from nonebot.compat import type_validate_json, type_validate_python
 from nonebot.drivers import URL, Driver, ForwardDriver, Request, WebSocket
@@ -22,7 +22,7 @@
 from .bot import Bot
 from .commands import sync_application_command
 from .config import BotInfo, Config
-from .event import Event, MessageEvent, ReadyEvent, event_classes
+from .event import Event, EventType, MessageEvent, ReadyEvent, event_classes
 from .exception import ApiNotAvailable
 from .payload import (
     Dispatch,
@@ -471,12 +471,12 @@ def payload_to_event(cls, payload: Dispatch) -> Event:
                 f"Unknown payload type: {payload.type}, detail: {payload!r}",
             )
             event = type_validate_python(Event, payload.data)
-            event.__type__ = payload.type
+            event.__type__ = EventType(payload.type)
             return event
         return type_validate_python(cast("type[Event]", EventClass), payload.data)
 
     @override
-    async def _call_api(self, bot: Bot, api: str, **data: Any) -> Any:
+    async def _call_api(self, bot: BaseBot, api: str, **data: Any) -> Any:
         log("DEBUG", f"Calling API <y>{api}</y>")
         api_handler = getattr(self, f"_api_{api}", None)
         if api_handler is None:

nonebot/adapters/discord/api/__init__.py

@@ -149,12 +149,10 @@
     IntegrationCreate,
     IntegrationDelete,
     IntegrationUpdate,
-    Interaction,
     InteractionCallbackAutocomplete,
     InteractionCallbackData,
     InteractionCallbackMessage,
     InteractionCallbackModal,
-    InteractionCreate,
     InteractionData,
     InteractionResponse,
     Invite,
@@ -174,23 +172,13 @@
     MentionableOption,
     MessageActivity,
     MessageComponentData,
-    MessageCreate,
-    MessageDelete,
-    MessageDeleteBulk,
     MessageGet,
     MessageInteraction,
     MessageInteractionMetadata,
-    MessagePollVoteAdd,
-    MessagePollVoteRemove,
-    MessageReactionAdd,
-    MessageReactionRemove,
-    MessageReactionRemoveAll,
-    MessageReactionRemoveEmoji,
     MessageReference,
     MessageSend,
     MessageSnapshot,
     MessageSnapshotMessage,
-    MessageUpdate,
     ModalSubmitData,
     ModifyChannelParams,
     ModifyGuildIncidentActionsParams,
@@ -263,7 +251,6 @@
     ThreadMetadata,
     ThreadUpdate,
     TriggerMetadata,
-    TypingStart,
     UnavailableGuild,
     UpdatePresence,
     UpdateVoiceState,
@@ -549,14 +536,12 @@
     "IntegrationDelete",
     "IntegrationExpireBehaviors",
     "IntegrationUpdate",
-    "Interaction",
     "InteractionCallbackAutocomplete",
     "InteractionCallbackData",
     "InteractionCallbackMessage",
     "InteractionCallbackModal",
     "InteractionCallbackType",
     "InteractionContextType",
-    "InteractionCreate",
     "InteractionData",
     "InteractionResponse",
     "InteractionType",
@@ -584,26 +569,16 @@
     "MessageActivity",
     "MessageActivityType",
     "MessageComponentData",
-    "MessageCreate",
-    "MessageDelete",
-    "MessageDeleteBulk",
     "MessageFlag",
     "MessageGet",
     "MessageInteraction",
     "MessageInteractionMetadata",
-    "MessagePollVoteAdd",
-    "MessagePollVoteRemove",
-    "MessageReactionAdd",
-    "MessageReactionRemove",
-    "MessageReactionRemoveAll",
-    "MessageReactionRemoveEmoji",
     "MessageReference",
     "MessageReferenceType",
     "MessageSend",
     "MessageSnapshot",
     "MessageSnapshotMessage",
     "MessageType",
-    "MessageUpdate",
     "Missing",
     "MissingOrNullable",
     "ModalSubmitData",
@@ -699,7 +674,6 @@
     "TimeStampStyle",
     "TriggerMetadata",
     "TriggerType",
-    "TypingStart",
     "UnavailableGuild",
     "UpdatePresence",
     "UpdatePresenceStatusType",