修复消息 cookie 的刷新问题 (#269)

Author: Richasy

src/App/Pages/WebPlayerPage.xaml.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Bili Copilot. All rights reserved.
 
 using Bili.Copilot.App.Controls.Base;
+using Bili.Copilot.Libs.Provider;
 using Bili.Copilot.Models.App.Args;
 using Microsoft.Web.WebView2.Core;
 using Windows.Storage;
@@ -93,6 +94,13 @@ private async void OnNavigationCompletedAsync(WebView2 sender, CoreWebView2Navig
     {
         LoadingOverlay.IsOpen = false;
 
+        var cookies = await sender.CoreWebView2.CookieManager.GetCookiesAsync(sender.Source.AbsoluteUri);
+        var cookieDict = cookies.Select(p => (p.Name, p.Value)).ToDictionary();
+        if (cookieDict.ContainsKey("bili_jct"))
+        {
+            AuthorizeProvider.SaveCookies(cookieDict);
+        }
+
         // 注入 js.
         var cleanFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/WebPlayer.js"));
         var cleanContent = await FileIO.ReadTextAsync(cleanFile);

src/App/Pages/WebSignInPage.xaml.cs

@@ -58,6 +58,12 @@ private async void OnNavigationCompletedAsync(WebView2 sender, Microsoft.Web.Web
                 if (_isVerify)
                 {
                     SettingsToolkit.WriteLocalSetting(Models.Constants.App.SettingNames.IsWebSignIn, true);
+
+                    if (cookieDict.ContainsKey("bili_jct"))
+                    {
+                        AuthorizeProvider.SaveCookies(cookieDict);
+                    }
+
                     CoreViewModel.BackCommand.Execute(default);
                     return;
                 }

src/Libs/Libs.Provider/AccountProvider/AccountProvider.cs

@@ -507,7 +507,7 @@ public async Task<ChatSessionListView> GetChatSessionsAsync()
             { "end_ts", _chatSessionOffset.ToString() },
         };
 
-        var request = await HttpProvider.GetRequestMessageAsync(HttpMethod.Get, Account.ChatSessions, queryParameters, needRid: true, needCookie: true);
+        var request = await HttpProvider.GetRequestMessageAsync(HttpMethod.Get, Account.ChatSessions, queryParameters, needRid: true, needCookie: true, forceNoToken: true);
         var response = await HttpProvider.Instance.SendAsync(request);
         var sessionResult = await HttpProvider.ParseAsync<ServerResponse<ChatSessionListResponse>>(response);
         _chatSessionOffset = sessionResult.Data.SessionList.LastOrDefault()?.SessionTimestamp ?? 0;

src/Libs/Libs.Provider/AuthorizeProvider/AuthorizeProvider.Extension.cs

@@ -89,6 +89,28 @@ private set
     /// </summary>
     public string CurrentUserId { get; private set; }
 
+    /// <summary>
+    /// 保存Cookie.
+    /// </summary>
+    /// <param name="cookies">Cookie 信息.</param>
+    public static void SaveCookies(Dictionary<string, string> cookies)
+    {
+        var localCookies = GetCookieDict();
+        foreach (var cookie in cookies)
+        {
+            if (localCookies.ContainsKey(cookie.Key))
+            {
+                localCookies[cookie.Key] = cookie.Value;
+            }
+            else
+            {
+                localCookies.Add(cookie.Key, cookie.Value);
+            }
+        }
+
+        SettingsToolkit.WriteLocalSetting(SettingNames.LocalCookie, JsonSerializer.Serialize(localCookies));
+    }
+
     internal static void GenerateAppKey(Dictionary<string, string> queryParameters, RequestClientType clientType, bool onlyAppKey = false)
     {
         if (clientType == RequestClientType.IOS)
@@ -204,28 +226,6 @@ internal async Task<TokenInfo> InternalRefreshTokenAsync()
 
     private static long GetNowMilliSeconds() => DateTimeOffset.Now.ToLocalTime().ToUnixTimeMilliseconds();
 
-    /// <summary>
-    /// 保存Cookie.
-    /// </summary>
-    /// <param name="cookies">Cookie 信息.</param>
-    private static void SaveCookies(Dictionary<string, string> cookies)
-    {
-        var localCookies = GetCookieDict();
-        foreach (var cookie in cookies)
-        {
-            if (localCookies.ContainsKey(cookie.Key))
-            {
-                localCookies[cookie.Key] = cookie.Value;
-            }
-            else
-            {
-                localCookies.Add(cookie.Key, cookie.Value);
-            }
-        }
-
-        SettingsToolkit.WriteLocalSetting(SettingNames.LocalCookie, JsonSerializer.Serialize(localCookies));
-    }
-
     private static void SaveCookie(CookieInfo cookieInfo)
     {
         var cookies = cookieInfo.Cookies.Select(p => (p.Name, p.Value)).ToDictionary();

src/ViewModels/Components/NotificationViewModel/NotificationViewModel.cs

@@ -29,13 +29,13 @@ private NotificationViewModel()
 
     private static async Task CheckVideoDynamicNotificationsAsync()
     {
-        var lastSeen = SettingsToolkit.ReadLocalSetting(SettingNames.LastReadVideoDynamicId, string.Empty);
+        var lastSeen = Convert.ToInt64(SettingsToolkit.ReadLocalSetting(SettingNames.LastReadVideoDynamicId, string.Empty));
         var latestDynamics = await CommunityProvider.Instance.GetDynamicVideoListAsync(true);
         if (latestDynamics != null)
         {
             var dynamics = latestDynamics.Dynamics.Where(p => p.DynamicType != Models.Constants.Community.DynamicItemType.Forward).ToList();
-            var currentSeen = SettingsToolkit.ReadLocalSetting(SettingNames.LastReadVideoDynamicId, string.Empty);
-            if (currentSeen != lastSeen)
+            var currentSeen = Convert.ToInt64(SettingsToolkit.ReadLocalSetting(SettingNames.LastReadVideoDynamicId, string.Empty));
+            if (currentSeen > lastSeen)
             {
                 // 有更新，发送通知.
                 for (var i = 0; i < 3; i++)
@@ -47,7 +47,7 @@ private static async Task CheckVideoDynamicNotificationsAsync()
 
                     var d = dynamics.ElementAt(i);
 
-                    if (d.Id == lastSeen)
+                    if (Convert.ToInt64(d.Id) <= lastSeen)
                     {
                         break;
                     }