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 playerInfoResponse; Response charactersResponse; - if (userAndUid.Uid.Region == "cn_gf01" || userAndUid.Uid.Region == "cn_qd01") + if (!userAndUid.User.IsOversea) { GameRecordClient gameRecordClient = Ioc.Default.GetRequiredService(); 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 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 @@ -