From 8e5e59ad0d16fd4a0026db727c50b064e533a554 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Thu, 29 Sep 2022 16:33:01 +0800
Subject: [PATCH] remove null check to cookie

---
 src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs         | 2 +-
 src/Snap.Hutao/Snap.Hutao/ViewModel/UserViewModel.cs          | 4 +---
 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/HttpClientExtensions.cs | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs
index b0b09917..eb72e4c7 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs
@@ -153,7 +153,7 @@ internal class UserService : IUserService
                 if (cookie.ContainsSToken())
                 {
                     // insert stoken directly
-                    userWithSameUid.Cookie!.InsertSToken(uid, cookie);
+                    userWithSameUid.Cookie.InsertSToken(uid, cookie);
                     return new(UserOptionResult.Upgraded, uid);
                 }
 
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/UserViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/UserViewModel.cs
index 7145c62b..d44a266a 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/UserViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/UserViewModel.cs
@@ -164,11 +164,9 @@ internal class UserViewModel : ObservableObject
     private void CopyCookie(User? user)
     {
         Verify.Operation(user != null, "待复制 Cookie 的用户不应为 null");
-
-        IInfoBarService infoBarService = Ioc.Default.GetRequiredService<IInfoBarService>();
         try
         {
-            Clipboard.SetText(user.Cookie?.ToString() ?? string.Empty);
+            Clipboard.SetText(user.Cookie.ToString());
             infoBarService.Success($"{user.UserInfo!.Nickname} 的 Cookie 复制成功");
         }
         catch (Exception e)
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/HttpClientExtensions.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/HttpClientExtensions.cs
index 9f5ac6b3..a412c055 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/HttpClientExtensions.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/HttpClientExtensions.cs
@@ -53,7 +53,7 @@ internal static class HttpClientExtensions
     /// <returns>客户端</returns>
     internal static HttpClient SetUser(this HttpClient httpClient, User user)
     {
-        httpClient.DefaultRequestHeaders.Set("Cookie", user.Cookie?.ToString() ?? string.Empty);
+        httpClient.DefaultRequestHeaders.Set("Cookie", user.Cookie.ToString());
         return httpClient;
     }