From b7bc87b8b63543e75db317f9ac52b73fe8cbae9c Mon Sep 17 00:00:00 2001
From: MingxuanGame <MingxuanGame@outlook.com>
Date: Sun, 3 Aug 2025 11:01:25 +0000
Subject: [PATCH] fix(signalr): fix SignalRMeta cannot be read

---
 app/models/metadata_hub.py  | 14 +++++++-------
 app/models/spectator_hub.py |  8 ++++----
 app/signalr/packet.py       | 14 +++++++++-----
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/models/metadata_hub.py b/app/models/metadata_hub.py
index 3206d03..a678d7f 100644
--- a/app/models/metadata_hub.py
+++ b/app/models/metadata_hub.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from enum import IntEnum
-from typing import ClassVar, Literal
+from typing import Annotated, ClassVar, Literal
 
 from app.models.signalr import SignalRMeta, SignalRUnionMessage, UserState
 
@@ -100,12 +100,12 @@ UserActivity = (
 
 
 class UserPresence(BaseModel):
-    activity: UserActivity | None = Field(
-        default=None, metadata=SignalRMeta(use_upper_case=True)
-    )
-    status: OnlineStatus | None = Field(
-        default=None, metadata=SignalRMeta(use_upper_case=True)
-    )
+    activity: Annotated[
+        UserActivity | None, Field(default=None), SignalRMeta(use_upper_case=True)
+    ]
+    status: Annotated[
+        OnlineStatus | None, Field(default=None), SignalRMeta(use_upper_case=True)
+    ]
 
     @property
     def pushable(self) -> bool:
diff --git a/app/models/spectator_hub.py b/app/models/spectator_hub.py
index a9e9042..9f35932 100644
--- a/app/models/spectator_hub.py
+++ b/app/models/spectator_hub.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import datetime
 from enum import IntEnum
-from typing import Any
+from typing import Annotated, Any
 
 from app.models.beatmap import BeatmapRankStatus
 from app.models.mods import APIMod
@@ -89,9 +89,9 @@ class LegacyReplayFrame(BaseModel):
     mouse_y: float | None = None
     button_state: int
 
-    header: FrameHeader | None = Field(
-        default=None, metadata=[SignalRMeta(member_ignore=True)]
-    )
+    header: Annotated[
+        FrameHeader | None, Field(default=None), SignalRMeta(member_ignore=True)
+    ]
 
 
 class FrameDataBundle(BaseModel):
diff --git a/app/signalr/packet.py b/app/signalr/packet.py
index be98c39..70c2276 100644
--- a/app/signalr/packet.py
+++ b/app/signalr/packet.py
@@ -126,15 +126,19 @@ class MsgpackProtocol:
     def process_object(v: Any, typ: type[BaseModel]) -> Any:
         if isinstance(v, list):
             d = {}
-            for i, f in enumerate(typ.model_fields.items()):
-                field, info = f
-                if info.exclude:
+            i = 0
+            for field, info in typ.model_fields.items():
+                metadata = next(
+                    (m for m in info.metadata if isinstance(m, SignalRMeta)), None
+                )
+                if metadata and metadata.member_ignore:
                     continue
                 anno = info.annotation
                 if anno is None:
                     d[camel_to_snake(field)] = v[i]
-                    continue
-                d[field] = MsgpackProtocol.validate_object(v[i], anno)
+                else:
+                    d[field] = MsgpackProtocol.validate_object(v[i], anno)
+                i += 1
             return d
         return v