From 2c320fe7e6f8c1d8bef8e907c98c660e378aedb8 Mon Sep 17 00:00:00 2001
From: qhy040404 <qhy040404@163.com>
Date: Wed, 20 Dec 2023 15:49:18 +0800
Subject: [PATCH] revert some region

---
 .../Snap.Hutao/Web/Hoyolab/Takumi/Binding/GenAuthKeyData.cs  | 2 +-
 .../Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs     | 2 +-
 .../Web/Hoyolab/Takumi/Event/Calculate/CalculateClient.cs    | 2 +-
 .../Web/Hoyolab/Takumi/GameRecord/Avatar/CharacterData.cs    | 5 +++--
 .../Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Avatar/Role.cs  | 5 ++---
 .../Web/Hoyolab/Takumi/GameRecord/BasicRoleInfo.cs           | 5 ++---
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Binding/GenAuthKeyData.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Binding/GenAuthKeyData.cs
index de71b91f..a5a4bba5 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Binding/GenAuthKeyData.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Binding/GenAuthKeyData.cs
@@ -25,7 +25,7 @@ internal sealed class GenAuthKeyData
         AuthAppId = authAppId;
         GameBiz = gameBiz;
         GameUid = int.Parse(uid.Value, CultureInfo.InvariantCulture);
-        Region = uid.Region.Value;
+        Region = uid.Region;
     }
 
     /// <summary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs
index 275c7414..53a48daa 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs
@@ -17,7 +17,7 @@ internal sealed class SignInData
     public SignInData(PlayerUid uid, bool isOversea)
     {
         ActivityId = isOversea ? ApiOsEndpoints.SignInRewardActivityId : ApiEndpoints.LunaActivityId;
-        Region = uid.Region.Value;
+        Region = uid.Region;
         Uid = uid.Value;
     }
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/Calculate/CalculateClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/Calculate/CalculateClient.cs
index fb1777fc..0a875ae8 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/Calculate/CalculateClient.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/Calculate/CalculateClient.cs
@@ -55,7 +55,7 @@ internal sealed partial class CalculateClient
     public async ValueTask<List<Avatar>> GetAvatarsAsync(UserAndUid userAndUid, CancellationToken token = default)
     {
         int currentPage = 1;
-        SyncAvatarFilter filter = new() { Uid = userAndUid.Uid.Value, Region = userAndUid.Uid.Region.Value };
+        SyncAvatarFilter filter = new() { Uid = userAndUid.Uid.Value, Region = userAndUid.Uid.Region };
 
         List<Avatar> avatars = [];
         Response<ListWrapper<Avatar>>? resp;
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Avatar/CharacterData.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Avatar/CharacterData.cs
index 5bf07d7d..10dbcae5 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Avatar/CharacterData.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Avatar/CharacterData.cs
@@ -20,7 +20,7 @@ internal sealed class CharacterData
     {
         CharacterIds = characterIds;
         Uid = uid.Value;
-        Server = uid.Region.Value;
+        Server = uid.Region;
     }
 
     /// <summary>
@@ -39,5 +39,6 @@ internal sealed class CharacterData
     /// 服务器
     /// </summary>
     [JsonPropertyName("server")]
-    public string Server { get; }
+    [JsonConverter(typeof(RegionConverter))]
+    public Region Server { get; }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Avatar/Role.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Avatar/Role.cs
index 4adcbf77..b54e899d 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Avatar/Role.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Avatar/Role.cs
@@ -22,11 +22,10 @@ internal sealed class Role
     public string Nickname { get; set; } = default!;
 
     /// <summary>
-    /// 服务器
+    /// 服务器名称
     /// </summary>
     [JsonPropertyName("region")]
-    [JsonConverter(typeof(RegionConverter))]
-    public Region Region { get; set; } = default!;
+    public string Region { get; set; } = default!;
 
     /// <summary>
     /// 等级
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/BasicRoleInfo.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/BasicRoleInfo.cs
index 75980f1e..80142c67 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/BasicRoleInfo.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/BasicRoleInfo.cs
@@ -23,11 +23,10 @@ internal sealed class BasicRoleInfo
     public string Nickname { get; set; } = default!;
 
     /// <summary>
-    /// 区域代码
+    /// 服务器名称
     /// </summary>
     [JsonPropertyName("region")]
-    [JsonConverter(typeof(RegionConverter))]
-    public Region Region { get; set; } = default!;
+    public string Region { get; set; } = default!;
 
     /// <summary>
     /// 等级