Merge branch 'release/v1.7.0'

tor4kichi · Aug 5, 2024 · 914451c · 914451c
2 parents 81be548 + 740e427
commit 914451c
Show file tree

Hide file tree

Showing 15 changed files with 113 additions and 366 deletions.
diff --git a/Hohoema.Core/Helpers/ShareHelper.cs b/Hohoema.Core/Helpers/ShareHelper.cs
@@ -153,6 +153,7 @@ public static void Share(string title, string content)
             _ShareText = content;
             _ShareTitleText = title;
             DataTransferManager dataTransferManager = DataTransferManager.GetForCurrentView();
+            dataTransferManager.DataRequested -= DataTransferManager_DataRequested;
             dataTransferManager.DataRequested += DataTransferManager_DataRequested;
 
             DataTransferManager.ShowShareUI();

diff --git a/Hohoema.Core/Hohoema.Core.csproj b/Hohoema.Core/Hohoema.Core.csproj
@@ -270,7 +270,6 @@
     <Compile Include="Models\Player\Video\NicoVideoSessionProvider.cs" />
     <Compile Include="Models\Player\Video\NicoVideoTag.cs" />
     <Compile Include="Models\Player\Video\VideoStreamingSession\CachedVideoStreamingSession.cs" />
-    <Compile Include="Models\Player\Video\VideoStreamingSession\DmcVideoStreamingSession.cs" />
     <Compile Include="Models\Player\Video\VideoStreamingSession\IVideoStreamingSession.cs" />
     <Compile Include="Models\Player\Video\VideoStreamingSession\VideoStreamingSession.cs" />
     <Compile Include="Models\Playlist\HohoemaPlaylistPlayer.cs" />
@@ -378,7 +377,7 @@
       <Version>2.7.2</Version>
     </PackageReference>
     <PackageReference Include="NiconicoToolkit">
-      <Version>0.5.5</Version>
+      <Version>0.6.2</Version>
     </PackageReference>
     <PackageReference Include="ReactiveProperty">
       <Version>7.12.0</Version>

diff --git a/Hohoema.Core/Models/Niconico/Video/NicoVideoProvider.cs b/Hohoema.Core/Models/Niconico/Video/NicoVideoProvider.cs
@@ -329,32 +329,32 @@ public async ValueTask<NicoVideoOwner> ResolveVideoOwnerAsync(VideoId videoId, C
         }));
     }
 
-    public async Task<WatchPageResponse> GetWatchPageResponseAsync(VideoId videoId, bool noHisotry = false)
+    public async Task<NicoVideoWatchApiResponse> GetWatchPageResponseAsync(VideoId videoId, bool noHisotry = false)
     {
         if (_niconicoSession.ServiceStatus.IsOutOfService())
         {
             return null;
         }
 
-        WatchPageResponse data = await _niconicoSession.ToolkitContext.Video.VideoWatch.GetInitialWatchDataAsync(videoId, !noHisotry, !noHisotry);
-        if (data.WatchApiResponse?.WatchApiData is not null and var watchData)
+        var data = await _niconicoSession.ToolkitContext.Video.VideoWatch.GetWatchDataAsync(videoId);
+        if (data.Data.Response is not null and var watchData)
         {
             _ = UpdateCache(videoId, info =>
             {
-                WatchApiVideo video = watchData.Video;
+                var video = watchData.Video;
                 info.VideoAliasId = videoId;
                 info.Title = video.Title;
                 info.Length = TimeSpan.FromSeconds(video.Duration);
-                info.PostedAt = video.RegisteredAt.DateTime;
-                info.ThumbnailUrl = video.Thumbnail.Url.OriginalString;
+                info.PostedAt = video.RegisteredAt;
+                info.ThumbnailUrl = video.Thumbnail.Url;
                 info.Description = video.Description;
 
                 if (watchData.Owner is not null and var userOwner)
                 {
                     info.Owner = new NicoVideoOwner()
                     {
                         ScreenName = userOwner.Nickname,
-                        IconUrl = userOwner.IconUrl.OriginalString,
+                        IconUrl = userOwner.IconUrl,
                         OwnerId = userOwner.Id.ToString(),
                         UserType = OwnerType.User
                     };
@@ -370,7 +370,7 @@ public async Task<WatchPageResponse> GetWatchPageResponseAsync(VideoId videoId,
                     };
                 }
 
-                return (watchData.Video.IsDeleted, default);
+                return (watchData.Video.IsDeleted.Value, default);
             });
         }
 

diff --git a/Hohoema.Core/Models/Player/Video/Comment/CommentClient.cs b/Hohoema.Core/Models/Player/Video/Comment/CommentClient.cs
@@ -34,7 +34,7 @@ public CommentClient(NiconicoSession niconicoSession, string rawVideoid)
     public string RawVideoId { get; }
     public string VideoOwnerId => _watchApiData!.Owner.Id.ToString();
 
-    internal DmcWatchApiData? _watchApiData { get; set; }
+    internal NicoVideoWatchApiResponse.Response? _watchApiData { get; set; }
 
 
     private readonly NiconicoSession _niconicoSession;
@@ -48,7 +48,7 @@ public async Task<CommentPostResult> SubmitComment(string comment, TimeSpan posi
         Guard.IsNotNull(_watchApiData);
 
         VideoId videoId = _watchApiData.Video.Id;
-        NiconicoToolkit.Video.Watch.Thread mainThread = _watchApiData.Comment.Threads.First(x => x.ForkLabel == ThreadTargetForkConstants.Main);
+        NiconicoToolkit.Video.Watch.NicoVideoWatchApiResponse.Thread mainThread = _watchApiData.Comment.Threads.First(x => x.ForkLabel == ThreadTargetForkConstants.Main);
         string threadId = mainThread.Id.ToString();
 
         bool isPostCompleted = false;
@@ -86,7 +86,7 @@ public bool IsAllowAnnonimityComment
         {
             if (_watchApiData == null) { return false; }
 
-            return _watchApiData.Channel == null && _watchApiData.Community == null;
+            return _watchApiData.Channel == null;
         }
     }
 
@@ -154,7 +154,7 @@ private async Task<string> GetPostKeyLatestAsync(string threadForkLabel, Cancell
         if (threadForkLabel == ThreadTargetForkConstants.Main)
         {
             Guard.IsNotNull(_watchApiData);
-            NiconicoToolkit.Video.Watch.Thread thread = _watchApiData.Comment.Threads.First(x => x.ForkLabel == ThreadTargetForkConstants.Main);
+            NiconicoToolkit.Video.Watch.NicoVideoWatchApiResponse.Thread thread = _watchApiData.Comment.Threads.First(x => x.ForkLabel == ThreadTargetForkConstants.Main);
             ThreadPostKeyResponse res = await _nvCommentApi.GetPostKeyAsync(thread.Id.ToString(), ct);
             Guard.IsTrue(res.IsSuccess);
 
@@ -163,7 +163,7 @@ private async Task<string> GetPostKeyLatestAsync(string threadForkLabel, Cancell
         else if (threadForkLabel == ThreadTargetForkConstants.Easy)
         {
             Guard.IsNotNull(_watchApiData);
-            NiconicoToolkit.Video.Watch.Thread thread = _watchApiData.Comment.Threads.First(x => x.ForkLabel == ThreadTargetForkConstants.Easy);
+            NiconicoToolkit.Video.Watch.NicoVideoWatchApiResponse.Thread thread = _watchApiData.Comment.Threads.First(x => x.ForkLabel == ThreadTargetForkConstants.Easy);
             ThreadEasyPostKeyResponse res = await _nvCommentApi.GetEasyPostKeyAsync(thread.Id.ToString(), ct);
             Guard.IsTrue(res.IsSuccess);