Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

code style

Browse Source
This commit is contained in:
DismissedLight
2023-12-12 21:40:18 +08:00
parent c67dfea819
commit d740632c27
6 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Snap.Hutao/Snap.Hutao/Service/User/IUserCollectionService.cs
View File

@@ -20,6 +20,8 @@ internal interface IUserCollectionService
UserGameRole? GetUserGameRoleByUid(string uid);
ValueTask RemoveUserAsync(BindingUser user);
ValueTask<ValueResult<UserOptionResult, string>> TryCreateAndAddUserFromCookieAsync(Cookie cookie, bool isOversea);
bool TryGetUserByMid(string mid, [NotNullWhen(true)] out BindingUser? user);
}

2
src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs
View File

@@ -153,7 +153,7 @@ internal sealed partial class UserCollectionService : IUserCollectionService
if (newUser is null)
{
return new(UserOptionResult.Invalid, SH.ServiceUserProcessCookieRequestUserInfoFailed);
return new(UserOptionResult.CookieInvalid, SH.ServiceUserProcessCookieRequestUserInfoFailed);
}
await GetUserCollectionAsync().ConfigureAwait(false);

6
src/Snap.Hutao/Snap.Hutao/Service/User/UserOptionResult.cs
View File

@@ -17,15 +17,15 @@ internal enum UserOptionResult
/// <summary>
/// Cookie不完整
/// </summary>
Incomplete,
CookieIncomplete,
/// <summary>
/// Cookie信息已经失效
/// </summary>
Invalid,
CookieInvalid,
/// <summary>
/// 用户的Cookie成功更新
/// </summary>
Updated,
CookieUpdated,
}

6
src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs
View File

@@ -63,7 +63,7 @@ internal sealed partial class UserService : IUserService, IUserServiceUnsafe
if (string.IsNullOrEmpty(mid))
{
return new(UserOptionResult.Invalid, SH.ServiceUserProcessCookieNoMid);
return new(UserOptionResult.CookieInvalid, SH.ServiceUserProcessCookieNoMid);
}
// 检查 mid 对应用户是否存在
@@ -74,7 +74,7 @@ internal sealed partial class UserService : IUserService, IUserServiceUnsafe
if (!cookie.TryGetSToken(isOversea, out Cookie? stoken))
{
return new(UserOptionResult.Invalid, SH.ServiceUserProcessCookieNoSToken);
return new(UserOptionResult.CookieInvalid, SH.ServiceUserProcessCookieNoSToken);
}
user.SToken = stoken;
@@ -82,7 +82,7 @@ internal sealed partial class UserService : IUserService, IUserServiceUnsafe
user.CookieToken = cookie.TryGetCookieToken(out Cookie? cookieToken) ? cookieToken : user.CookieToken;
await userDbService.UpdateUserAsync(user.Entity).ConfigureAwait(false);
return new(UserOptionResult.Updated, mid);
return new(UserOptionResult.CookieUpdated, mid);
}
public async ValueTask<bool> RefreshCookieTokenAsync(Model.Entity.User user)

2
src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
View File

@@ -305,7 +305,7 @@
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
<PackageReference Include="QRCoder" Version="1.4.3" />
<PackageReference Include="Snap.Discord.GameSDK" Version="1.5.0" />
<PackageReference Include="Snap.Hutao.SourceGeneration" Version="1.0.1">
<PackageReference Include="Snap.Hutao.SourceGeneration" Version="1.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

118
src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs
View File

@@ -52,8 +52,11 @@ internal sealed partial class UserViewModel : ObservableObject
get => selectedUser ??= userService.Current;
set
{
// Pre select the chosen role to avoid multiple UserChangedMessage
value?.SetSelectedUserGameRole(value.UserGameRoles.FirstOrFirstOrDefault(role => role.IsChosen), false);
if (value is { SelectedUserGameRole: null })
{
// Pre select the chosen role to avoid multiple UserChangedMessage
value.SetSelectedUserGameRole(value.UserGameRoles.FirstOrFirstOrDefault(role => role.IsChosen), false);
}
if (SetProperty(ref selectedUser, value))
{
@@ -87,13 +90,13 @@ internal sealed partial class UserViewModel : ObservableObject
infoBarService.Success(SH.FormatViewModelUserAdded(uid));
break;
case UserOptionResult.Incomplete:
case UserOptionResult.CookieIncomplete:
infoBarService.Information(SH.ViewModelUserIncomplete);
break;
case UserOptionResult.Invalid:
case UserOptionResult.CookieInvalid:
infoBarService.Information(SH.ViewModelUserInvalid);
break;
case UserOptionResult.Updated:
case UserOptionResult.CookieUpdated:
infoBarService.Success(SH.FormatViewModelUserUpdated(uid));
break;
default:
@@ -118,16 +121,16 @@ internal sealed partial class UserViewModel : ObservableObject
[Command("AddUserCommand")]
private Task AddUserAsync()
{
return AddUserCoreAsync(false).AsTask();
return AddUserByManualInputCookieAsync(false).AsTask();
}
[Command("AddOverseaUserCommand")]
private Task AddOverseaUserAsync()
{
return AddUserCoreAsync(true).AsTask();
return AddUserByManualInputCookieAsync(true).AsTask();
}
private async ValueTask AddUserCoreAsync(bool isOversea)
private async ValueTask AddUserByManualInputCookieAsync(bool isOversea)
{
// ContentDialog must be created by main thread.
await taskContext.SwitchToMainThreadAsync();
@@ -140,9 +143,7 @@ internal sealed partial class UserViewModel : ObservableObject
if (result.TryGetValue(out string rawCookie))
{
Cookie cookie = Cookie.Parse(rawCookie);
(UserOptionResult optionResult, string uid) = await userService.ProcessInputCookieAsync(cookie, isOversea).ConfigureAwait(false);
await HandleUserOptionResultAsync(optionResult, uid).ConfigureAwait(false);
}
}
@@ -150,22 +151,21 @@ internal sealed partial class UserViewModel : ObservableObject
[Command("LoginMihoyoUserCommand")]
private void LoginMihoyoUser()
{
if (runtimeOptions.IsWebView2Supported)
{
navigationService.Navigate<LoginMihoyoUserPage>(INavigationAwaiter.Default);
}
else
{
infoBarService.Warning(SH.CoreWebView2HelperVersionUndetected);
}
NavigateToLoginPage<LoginMihoyoUserPage>();
}
[Command("LoginHoyoverseUserCommand")]
private void LoginHoyoverseUser()
{
NavigateToLoginPage<LoginHoyoverseUserPage>();
}
private void NavigateToLoginPage<TPage>()
where TPage : Page
{
if (runtimeOptions.IsWebView2Supported)
{
navigationService.Navigate<LoginHoyoverseUserPage>(INavigationAwaiter.Default);
navigationService.Navigate<TPage>(INavigationAwaiter.Default);
}
else
{
@@ -192,9 +192,7 @@ internal sealed partial class UserViewModel : ObservableObject
if (sTokenResponse.IsOk())
{
Cookie stokenV2 = Cookie.FromLoginResult(sTokenResponse.Data);
(UserOptionResult optionResult, string uid) = await userService.ProcessInputCookieAsync(stokenV2, false).ConfigureAwait(false);
await HandleUserOptionResultAsync(optionResult, uid).ConfigureAwait(false);
}
}
@@ -202,17 +200,19 @@ internal sealed partial class UserViewModel : ObservableObject
[Command("RemoveUserCommand")]
private async Task RemoveUserAsync(User? user)
{
if (user is not null)
if (user is null)
{
try
{
await userService.RemoveUserAsync(user).ConfigureAwait(false);
infoBarService.Success(SH.FormatViewModelUserRemoved(user.UserInfo?.Nickname));
}
catch (UserdataCorruptedException ex)
{
infoBarService.Error(ex);
}
return;
}
try
{
await userService.RemoveUserAsync(user).ConfigureAwait(false);
infoBarService.Success(SH.FormatViewModelUserRemoved(user.UserInfo?.Nickname));
}
catch (UserdataCorruptedException ex)
{
infoBarService.Error(ex);
}
}
@@ -243,44 +243,42 @@ internal sealed partial class UserViewModel : ObservableObject
[Command("RefreshCookieTokenCommand")]
private async Task RefreshCookieTokenAsync()
{
if (SelectedUser is not null)
if (SelectedUser is null)
{
if (await userService.RefreshCookieTokenAsync(SelectedUser).ConfigureAwait(false))
{
infoBarService.Success(SH.ViewUserRefreshCookieTokenSuccess);
}
else
{
infoBarService.Warning(SH.ViewUserRefreshCookieTokenWarning);
}
return;
}
if (await userService.RefreshCookieTokenAsync(SelectedUser).ConfigureAwait(false))
{
infoBarService.Success(SH.ViewUserRefreshCookieTokenSuccess);
}
else
{
infoBarService.Warning(SH.ViewUserRefreshCookieTokenWarning);
}
}
[Command("ClaimSignInRewardCommand")]
private async Task ClaimSignInRewardAsync(AppBarButton? appBarButton)
{
if (SelectedUser is not null)
if (!UserAndUid.TryFromUser(SelectedUser, out UserAndUid? userAndUid))
{
if (UserAndUid.TryFromUser(SelectedUser, out UserAndUid? userAndUid))
{
(bool isOk, string message) = await signInService.ClaimRewardAsync(userAndUid).ConfigureAwait(false);
if (isOk)
{
infoBarService.Success(message);
}
else
{
await taskContext.SwitchToMainThreadAsync();
FlyoutBase.ShowAttachedFlyout(appBarButton);
infoBarService.Warning(message);
}
}
else
{
infoBarService.Warning(SH.MustSelectUserAndUid);
}
infoBarService.Warning(SH.MustSelectUserAndUid);
return;
}
(bool isOk, string message) = await signInService.ClaimRewardAsync(userAndUid).ConfigureAwait(false);
if (isOk)
{
infoBarService.Success(message);
return;
}
// Manual webview
await taskContext.SwitchToMainThreadAsync();
FlyoutBase.ShowAttachedFlyout(appBarButton);
infoBarService.Warning(message);
}
[Command("OpenDocumentationCommand")]