chore: smol fix for video comments

while fetching next
namidaco · Jun 25, 2024 · 4d431db · 4d431db
1 parent 3bb2e12
commit 4d431db
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/lib/youtube/controller/youtube_current_info.dart b/lib/youtube/controller/youtube_current_info.dart
@@ -118,19 +118,20 @@ class _YoutubeCurrentInfoController {
   }
 
   /// specify [sortType] to force refresh. otherwise fetches next
-  Future<void> updateCurrentComments(String videoId, {CommentsSortType? sortType, bool initial = false}) async {
+  Future<void> updateCurrentComments(String videoId, {CommentsSortType? newSortType, bool initial = false}) async {
     final commentRes = _currentComments.value;
     if (commentRes == null) return;
+    if (initial == false && commentRes.canFetchNext == false) return;
 
-    if (initial == false && commentRes.canFetchNext && commentRes.isNotEmpty && sortType == null) {
+    if (initial == false && commentRes.canFetchNext && newSortType == null) {
       _isLoadingMoreComments.value = true;
       final didFetch = await commentRes.fetchNext();
       if (didFetch) _currentComments.refresh();
       _isLoadingMoreComments.value = false;
     } else {
       // -- fetch initial.
       _isLoadingInitialComments.value = true;
-      final initialContinuation = sortType == null ? _initialCommentsContinuation : commentRes.sorters[sortType] ?? _initialCommentsContinuation;
+      final initialContinuation = newSortType == null ? _initialCommentsContinuation : commentRes.sorters[newSortType] ?? _initialCommentsContinuation;
       if (initialContinuation != null) {
         final newRes = await YoutubeInfoController.comment.fetchComments(
           videoId: videoId,

diff --git a/lib/youtube/youtube_miniplayer.dart b/lib/youtube/youtube_miniplayer.dart
@@ -801,7 +801,7 @@ class YoutubeMiniPlayerState extends State<YoutubeMiniPlayer> {
                                                                           iconSize: 22.0,
                                                                           onPressed: () async => await YoutubeInfoController.current.updateCurrentComments(
                                                                             currentId,
-                                                                            sortType: YoutubeMiniplayerUiController.inst.currentCommentSort.value,
+                                                                            newSortType: YoutubeMiniplayerUiController.inst.currentCommentSort.value,
                                                                             initial: true,
                                                                           ),
                                                                           child: commFromCache
@@ -941,7 +941,7 @@ class YoutubeMiniPlayerState extends State<YoutubeMiniPlayer> {
                                                                   iconSize: 22.0,
                                                                   onPressed: () async => await YoutubeInfoController.current.updateCurrentComments(
                                                                     currentId,
-                                                                    sortType: YoutubeMiniplayerUiController.inst.currentCommentSort.value,
+                                                                    newSortType: YoutubeMiniplayerUiController.inst.currentCommentSort.value,
                                                                     initial: true,
                                                                   ),
                                                                   child: commFromCache

diff --git a/lib/youtube/yt_miniplayer_comments_subpage.dart b/lib/youtube/yt_miniplayer_comments_subpage.dart
@@ -97,7 +97,7 @@ class _YTMiniplayerCommentsSubpageState extends State<YTMiniplayerCommentsSubpag
                           if (currentId != null) {
                             await YoutubeInfoController.current.updateCurrentComments(
                               currentId,
-                              sortType: YoutubeMiniplayerUiController.inst.currentCommentSort.value,
+                              newSortType: YoutubeMiniplayerUiController.inst.currentCommentSort.value,
                               initial: true,
                             );
                           }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: namida
 description: A Beautiful and Feature-rich Music Player, With YouTube & Video Support Built in Flutter
 publish_to: "none"
-version: 2.8.05-beta+240625124
+version: 2.8.1-beta+240625124
 
 environment:
   sdk: ">=3.4.0 <4.0.0"