From 523374ed3db53754e7a0bf2c01802faebc79a470 Mon Sep 17 00:00:00 2001
From: Xhichn <sicenmail@gmail.com>
Date: Fri, 24 Mar 2023 21:44:05 +0800
Subject: [PATCH] Upload spiral abyss record for hoyolab user & clean

---
 .../AvatarInfo/AvatarInfoDbOperation.cs       |  2 +-
 .../GachaLogQueryStokenProvider.cs            |  2 +-
 .../SpiralAbyss/SpiralAbyssRecordService.cs   |  6 +-
 .../View/Page/LoginHoyoverseUserPage.xaml     |  8 ++-
 .../View/Page/LoginHoyoverseUserPage.xaml.cs  | 27 +++++----
 .../Snap.Hutao/Web/Hoyolab/Cookie.cs          |  3 +-
 .../Web/Hoyolab/Passport/PassportClientOs.cs  | 16 +++--
 .../Takumi/Event/Calculate/CalculateClient.cs | 19 +++---
 .../Web/Hutao/HomaSpiralAbyssClient.cs        | 60 ++++++++++++++-----
 9 files changed, 94 insertions(+), 49 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbOperation.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbOperation.cs
index 0a47f975..f15522f4 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbOperation.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbOperation.cs
@@ -93,7 +93,7 @@ internal sealed class AvatarInfoDbOperation
         Response<RecordPlayerInfo> playerInfoResponse;
         Response<Web.Hoyolab.Takumi.GameRecord.Avatar.CharacterWrapper> charactersResponse;
 
-        if (userAndUid.Uid.Region == "cn_gf01" || userAndUid.Uid.Region == "cn_qd01")
+        if (!userAndUid.User.IsOversea)
         {
             GameRecordClient gameRecordClient = Ioc.Default.GetRequiredService<GameRecordClient>();
             playerInfoResponse = await gameRecordClient
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryStokenProvider.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryStokenProvider.cs
index 701129c8..ea1d6bbc 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryStokenProvider.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryStokenProvider.cs
@@ -38,7 +38,7 @@ internal sealed class GachaLogQueryStokenProvider : IGachaLogQueryProvider
     {
         if (UserAndUid.TryFromUser(userService.Current, out UserAndUid? userAndUid))
         {
-            if (userAndUid.Uid.Region != "cn_gf01" && userAndUid.Uid.Region != "cn_qd01")
+            if (userAndUid.User.IsOversea)
             {
                 return new(false, "Unsupported for hoyoverse account");
             }
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs b/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs
index f2fd9c83..b821eeb5 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs
@@ -75,15 +75,15 @@ internal class SpiralAbyssRecordService : ISpiralAbyssRecordService
         Response<Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss> response;
 
         // server determination
-        if (userAndUid.Uid.Region == "cn_gf01" || userAndUid.Uid.Region == "cn_qd01")
+        if (userAndUid.User.IsOversea)
         {
-            response = await gameRecordClient
+            response = await gameRecordClientOs
             .GetSpiralAbyssAsync(userAndUid, schedule)
             .ConfigureAwait(false);
         }
         else
         {
-            response = await gameRecordClientOs
+            response = await gameRecordClient
             .GetSpiralAbyssAsync(userAndUid, schedule)
             .ConfigureAwait(false);
         }
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml
index 864e844d..c4626f20 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml
@@ -27,13 +27,15 @@
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <TextBox 
+            <TextBox
+                TextChanging="TextBoxOnTextChanging"
+                InputScope="Number"
+                MaxLength="9"
                 Grid.Column="0"
                 Width="240"
-                MaxLength="9"
                 x:Name="UidInput"
                 Margin="0,0,16,0"
-                PlaceholderText="请填写通行证ID"
+                PlaceholderText="Please fill in your User ID here"
                 HorizontalAlignment="Right"/>
             <Button
                 Grid.Column="1"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml.cs
index 7d15c6ec..fe5f5786 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml.cs
@@ -2,27 +2,25 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Microsoft.Web.WebView2.Core;
 using Snap.Hutao.Service.Abstraction;
 using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.Service.User;
-using Snap.Hutao.View.Dialog;
 using Snap.Hutao.Web.Hoyolab;
-using Snap.Hutao.Web.Hoyolab.Passport;
 using Snap.Hutao.Web.Hoyolab.Takumi.Auth;
 using Snap.Hutao.Web.Response;
-using System.Diagnostics.Eventing.Reader;
 
 namespace Snap.Hutao.View.Page;
 
 /// <summary>
-/// 登录米哈游通行证页面
+/// 鐧诲綍绫冲搱娓搁�氳璇侀〉闈�
 /// </summary>
 [HighQuality]
 internal sealed partial class LoginHoyoverseUserPage : Microsoft.UI.Xaml.Controls.Page
 {
     /// <summary>
-    /// 构造一个新的登录米哈游通行证页面
+    /// 鏋勯�犱竴涓柊鐨勭櫥褰曠背鍝堟父閫氳璇侀〉闈�
     /// </summary>
     public LoginHoyoverseUserPage()
     {
@@ -65,14 +63,14 @@ internal sealed partial class LoginHoyoverseUserPage : Microsoft.UI.Xaml.Control
         if (uid.Length != 9)
         {
             await ThreadHelper.SwitchToMainThreadAsync();
-            infoBarService.Warning($"请在页面右上方的输入框处填写你的通行证 ID!");
+            infoBarService.Information($"璇峰湪椤甸潰鍙充笂鏂圭殑杈撳叆妗嗗濉啓浣犵殑閫氳璇� ID!");
             return;
         }
 
         Cookie loginTicketCookie = Cookie.FromCoreWebView2Cookies(cookies);
         loginTicketCookie["login_uid"] = uid;
 
-        // 使用 loginTicket 获取 stoken
+        // 浣跨敤 loginTicket 鑾峰彇 stoken
         Response<ListWrapper<NameToken>> multiTokenResponse = await Ioc.Default
             .GetRequiredService<AuthClientOs>()
             .GetMultiTokenByLoginTicketAsync(loginTicketCookie, token)
@@ -86,7 +84,7 @@ internal sealed partial class LoginHoyoverseUserPage : Microsoft.UI.Xaml.Control
         Dictionary<string, string> multiTokenMap = multiTokenResponse.Data.List.ToDictionary(n => n.Name, n => n.Token);
         Cookie hoyoLabCookie = Cookie.Parse($"stoken={multiTokenMap["stoken"]}; stuid={uid}");
 
-        // 处理 cookie 并添加用户
+        // 澶勭悊 cookie 骞舵坊鍔犵敤鎴�
         (UserOptionResult result, string nickname) = await Ioc.Default
             .GetRequiredService<IUserService>()
             .ProcessInputOsCookieAsync(hoyoLabCookie)
@@ -104,16 +102,16 @@ internal sealed partial class LoginHoyoverseUserPage : Microsoft.UI.Xaml.Control
                     vm.SelectedUser = vm.Users.Single();
                 }
 
-                infoBarService.Success($"用户 [{nickname}] 添加成功");
+                infoBarService.Success($"鐢ㄦ埛 [{nickname}] 娣诲姞鎴愬姛");
                 break;
             case UserOptionResult.Incomplete:
-                infoBarService.Information($"此 Cookie 不完整，操作失败");
+                infoBarService.Information($"姝� Cookie 涓嶅畬鏁达紝鎿嶄綔澶辫触");
                 break;
             case UserOptionResult.Invalid:
-                infoBarService.Information($"此 Cookie 无效，操作失败");
+                infoBarService.Information($"姝� Cookie 鏃犳晥锛屾搷浣滃け璐�");
                 break;
             case UserOptionResult.Updated:
-                infoBarService.Success($"用户 [{nickname}] 更新成功");
+                infoBarService.Success($"鐢ㄦ埛 [{nickname}] 鏇存柊鎴愬姛");
                 break;
             default:
                 throw Must.NeverHappen();
@@ -124,4 +122,9 @@ internal sealed partial class LoginHoyoverseUserPage : Microsoft.UI.Xaml.Control
     {
         HandleCurrentCookieAsync(CancellationToken.None).SafeForget();
     }
+
+    private void TextBoxOnTextChanging(TextBox sender, TextBoxTextChangingEventArgs args)
+    {
+        sender.Text = new(sender.Text.Where(char.IsDigit).ToArray());
+    }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Cookie.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Cookie.cs
index dc1cce1c..93d7265f 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Cookie.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Cookie.cs
@@ -118,8 +118,9 @@ internal sealed partial class Cookie
 
     /// <summary>
     /// 鎻愬彇鍏朵腑鐨� stoken 淇℃伅
+    /// Used for hoyolab account.
     /// </summary>
-    /// <param name="cookie">鍚湁 Stoken 鐨� cookie</param>
+    /// <param name="cookie">A cookie contains stoken and stuid, without mid.</param>
     /// <returns>鏄惁鑾峰彇鎴愬姛</returns>
     public bool TryGetAsStokenV1([NotNullWhen(true)] out Cookie? cookie)
     {
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Passport/PassportClientOs.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Passport/PassportClientOs.cs
index 2dd06f7a..6c29d9bc 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Passport/PassportClientOs.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Passport/PassportClientOs.cs
@@ -44,14 +44,16 @@ internal sealed class PassportClientOs
     public async Task<Response<UidCookieToken>> GetCookieAccountInfoBySTokenAsync(User user, CancellationToken token = default)
     {
         Response<UidCookieToken>? resp = null;
-        string? stoken = user.SToken["stoken"];
 
-        if (stoken == null || user.Aid == null)
+        if (user.SToken == null)
         {
             return Response.Response.DefaultIfNull(resp);
         }
 
-        StokenData data = new(stoken, user.Aid);
+        string stoken = user.SToken.GetValueOrDefault(Cookie.STOKEN)!;
+
+        // Post json with stoken and uid (stuid/ltuid)
+        StokenData data = new(stoken, user.Aid!);
         resp = await httpClient
             .SetUser(user, CookieType.SToken)
             .TryCatchPostAsJsonAsync<StokenData, Response<UidCookieToken>>(ApiOsEndpoints.AccountGetCookieTokenBySToken, data, options, logger, token)
@@ -70,14 +72,16 @@ internal sealed class PassportClientOs
     public async Task<Response<LtokenWrapper>> GetLtokenBySTokenAsync(User user, CancellationToken token)
     {
         Response<LtokenWrapper>? resp = null;
-        string? stoken = user.SToken["stoken"];
 
-        if (stoken == null || user.Aid == null)
+        if (user.SToken == null)
         {
             return Response.Response.DefaultIfNull(resp);
         }
 
-        StokenData data = new(stoken, user.Aid);
+        string stoken = user.SToken.GetValueOrDefault(Cookie.STOKEN)!;
+
+        // Post json with stoken and uid (stuid/ltuid)
+        StokenData data = new(stoken, user.Aid!);
         resp = await httpClient
             .SetUser(user, CookieType.SToken)
             .TryCatchPostAsJsonAsync<StokenData, Response<LtokenWrapper>>(ApiOsEndpoints.AccountGetLtokenByStoken, data, options, logger, token)
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 79e0ff46..6199ca06 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
@@ -80,18 +80,20 @@ internal sealed class CalculateClient
         Response<ListWrapper<Avatar>>? resp;
 
         // 鏍规嵁 uid 鎵�灞炴湇鍔″櫒閫夋嫨 referer 涓� api
-        string referer = ApiOsEndpoints.ActHoyolabReferer;
-        string endpoint = ApiOsEndpoints.CalculateOsSyncAvatarList;
+        string referer;
+        string endpoint;
 
-        if (userAndUid.Uid.Region == "cn_gf01" || userAndUid.Uid.Region == "cn_qd01")
+        if (userAndUid.User.IsOversea)
         {
-            referer = ApiEndpoints.WebStaticMihoyoReferer;
-            endpoint = ApiEndpoints.CalculateSyncAvatarList;
+            referer = ApiOsEndpoints.ActHoyolabReferer;
+            endpoint = ApiOsEndpoints.CalculateOsSyncAvatarList;
             httpClient.SetUser(userAndUid.User, CookieType.CookieToken);
         }
         else
         {
-            httpClient.SetUser(userAndUid.User, CookieType.Cookie);
+            referer = ApiEndpoints.WebStaticMihoyoReferer;
+            endpoint = ApiEndpoints.CalculateSyncAvatarList;
+            httpClient.SetUser(userAndUid.User, CookieType.CookieToken);
         }
 
         do
@@ -129,7 +131,7 @@ internal sealed class CalculateClient
     public async Task<Response<AvatarDetail>> GetAvatarDetailAsync(UserAndUid userAndUid, Avatar avatar, CancellationToken token = default)
     {
         Response<AvatarDetail>? resp;
-        if (userAndUid.Uid.Region == "cn_gf01" || userAndUid.Uid.Region == "cn_qd01")
+        if (!userAndUid.User.IsOversea)
         {
             resp = await httpClient
             .SetUser(userAndUid.User, CookieType.CookieToken)
@@ -139,10 +141,11 @@ internal sealed class CalculateClient
         else
         {
             resp = await httpClient
-            .SetUser(userAndUid.User, CookieType.Cookie)
+            .SetUser(userAndUid.User, CookieType.CookieToken)
             .TryCatchGetFromJsonAsync<Response<AvatarDetail>>(ApiOsEndpoints.CalculateOsSyncAvatarDetail(avatar.Id, userAndUid.Uid.Value), options, logger, token)
             .ConfigureAwait(false);
         }
+
         return Response.Response.DefaultIfNull(resp);
     }
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaSpiralAbyssClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaSpiralAbyssClient.cs
index 440e2596..076c9b2e 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaSpiralAbyssClient.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaSpiralAbyssClient.cs
@@ -23,6 +23,7 @@ internal sealed class HomaSpiralAbyssClient
 {
     private readonly HttpClient httpClient;
     private readonly GameRecordClient gameRecordClient;
+    private readonly GameRecordClientOs gameRecordClientOs;
     private readonly JsonSerializerOptions options;
     private readonly ILogger<HomaSpiralAbyssClient> logger;
 
@@ -33,10 +34,11 @@ internal sealed class HomaSpiralAbyssClient
     /// <param name="gameRecordClient">娓告垙璁板綍瀹㈡埛绔�</param>
     /// <param name="options">json搴忓垪鍖栭�夐」</param>
     /// <param name="logger">鏃ュ織鍣�</param>
-    public HomaSpiralAbyssClient(HttpClient httpClient, GameRecordClient gameRecordClient, JsonSerializerOptions options, ILogger<HomaSpiralAbyssClient> logger)
+    public HomaSpiralAbyssClient(HttpClient httpClient, GameRecordClient gameRecordClient, GameRecordClientOs gameRecordClientOs, JsonSerializerOptions options, ILogger<HomaSpiralAbyssClient> logger)
     {
         this.httpClient = httpClient;
         this.gameRecordClient = gameRecordClient;
+        this.gameRecordClientOs = gameRecordClientOs;
         this.options = options;
         this.logger = logger;
     }
@@ -186,25 +188,55 @@ internal sealed class HomaSpiralAbyssClient
     /// <returns>鐜╁璁板綍</returns>
     public async Task<SimpleRecord?> GetPlayerRecordAsync(UserAndUid userAndUid, CancellationToken token = default)
     {
-        Response<PlayerInfo> playerInfoResponse = await gameRecordClient
+        if (userAndUid.User.IsOversea)
+        {
+            // for oversea server
+            Response<PlayerInfo> playerInfoResponse = await gameRecordClientOs
             .GetPlayerInfoAsync(userAndUid, token)
             .ConfigureAwait(false);
 
-        if (playerInfoResponse.IsOk())
-        {
-            Response<CharacterWrapper> charactersResponse = await gameRecordClient
-                .GetCharactersAsync(userAndUid, playerInfoResponse.Data, token)
-                .ConfigureAwait(false);
-
-            if (charactersResponse.IsOk())
+            if (playerInfoResponse.IsOk())
             {
-                Response<SpiralAbyss> spiralAbyssResponse = await gameRecordClient
-                .GetSpiralAbyssAsync(userAndUid, SpiralAbyssSchedule.Current, token)
-                .ConfigureAwait(false);
+                Response<CharacterWrapper> charactersResponse = await gameRecordClientOs
+                    .GetCharactersAsync(userAndUid, playerInfoResponse.Data, token)
+                    .ConfigureAwait(false);
 
-                if (spiralAbyssResponse.IsOk())
+                if (charactersResponse.IsOk())
                 {
-                    return new(userAndUid.Uid.Value, charactersResponse.Data.Avatars, spiralAbyssResponse.Data);
+                    Response<SpiralAbyss> spiralAbyssResponse = await gameRecordClientOs
+                    .GetSpiralAbyssAsync(userAndUid, SpiralAbyssSchedule.Current, token)
+                    .ConfigureAwait(false);
+
+                    if (spiralAbyssResponse.IsOk())
+                    {
+                        return new(userAndUid.Uid.Value, charactersResponse.Data.Avatars, spiralAbyssResponse.Data);
+                    }
+                }
+            }
+        }
+        else
+        {
+            // for cn server
+            Response<PlayerInfo> playerInfoResponse = await gameRecordClient
+            .GetPlayerInfoAsync(userAndUid, token)
+            .ConfigureAwait(false);
+
+            if (playerInfoResponse.IsOk())
+            {
+                Response<CharacterWrapper> charactersResponse = await gameRecordClient
+                    .GetCharactersAsync(userAndUid, playerInfoResponse.Data, token)
+                    .ConfigureAwait(false);
+
+                if (charactersResponse.IsOk())
+                {
+                    Response<SpiralAbyss> spiralAbyssResponse = await gameRecordClient
+                    .GetSpiralAbyssAsync(userAndUid, SpiralAbyssSchedule.Current, token)
+                    .ConfigureAwait(false);
+
+                    if (spiralAbyssResponse.IsOk())
+                    {
+                        return new(userAndUid.Uid.Value, charactersResponse.Data.Avatars, spiralAbyssResponse.Data);
+                    }
                 }
             }
         }