From 6414b377da0eb86c9630d51602750c57d3dda225 Mon Sep 17 00:00:00 2001
From: bggRGjQaUbCoE <githubaccount56556@proton.me>
Date: Mon, 5 May 2025 11:49:57 +0800
Subject: [PATCH] revert: mainlist req

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
---
 lib/grpc/grpc_repo.dart                   | 8 ++++++--
 lib/http/reply.dart                       | 3 +++
 lib/pages/article/controller.dart         | 1 +
 lib/pages/common/reply_controller.dart    | 4 ++++
 lib/pages/dynamics_detail/controller.dart | 1 +
 lib/pages/video/reply/controller.dart     | 1 +
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/grpc/grpc_repo.dart b/lib/grpc/grpc_repo.dart
index 45be6480..7d4e4b13 100644
--- a/lib/grpc/grpc_repo.dart
+++ b/lib/grpc/grpc_repo.dart
@@ -253,6 +253,7 @@ class GrpcRepo {
     required int oid,
     required Mode mode,
     required String? offset,
+    required Int64? cursorNext,
   }) async {
     return await _request(
       GrpcUrl.mainList,
@@ -260,8 +261,11 @@ class GrpcRepo {
         oid: Int64(oid),
         type: Int64(type),
         rpid: Int64(0),
-        mode: mode,
-        pagination: FeedPagination(offset: offset ?? ''),
+        cursor: CursorReq(
+          mode: mode,
+          next: cursorNext,
+        ),
+        // pagination: FeedPagination(offset: offset ?? ''),
       ),
       MainListReply.fromBuffer,
     );
diff --git a/lib/http/reply.dart b/lib/http/reply.dart
index 351fa64a..dc1521a5 100644
--- a/lib/http/reply.dart
+++ b/lib/http/reply.dart
@@ -11,6 +11,7 @@ import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:dio/dio.dart';
+import 'package:fixnum/fixnum.dart';
 
 class ReplyHttp {
   static Options get _options =>
@@ -128,6 +129,7 @@ class ReplyHttp {
     required int oid,
     required Mode mode,
     required String? offset,
+    required Int64? cursorNext,
     required bool antiGoodsReply,
   }) async {
     dynamic res = await GrpcRepo.mainList(
@@ -135,6 +137,7 @@ class ReplyHttp {
       oid: oid,
       mode: mode,
       offset: offset,
+      cursorNext: cursorNext,
     );
     if (res['status']) {
       MainListReply mainListReply = res['data'];
diff --git a/lib/pages/article/controller.dart b/lib/pages/article/controller.dart
index 829856b3..52063512 100644
--- a/lib/pages/article/controller.dart
+++ b/lib/pages/article/controller.dart
@@ -174,6 +174,7 @@ class ArticleController extends ReplyController<MainListReply> {
       type: commentType,
       oid: commentId,
       mode: mode.value,
+      cursorNext: cursorNext,
       offset: paginationReply?.nextOffset,
       antiGoodsReply: antiGoodsReply,
     );
diff --git a/lib/pages/common/reply_controller.dart b/lib/pages/common/reply_controller.dart
index 4681307c..8ac7f4aa 100644
--- a/lib/pages/common/reply_controller.dart
+++ b/lib/pages/common/reply_controller.dart
@@ -18,6 +18,7 @@ import 'package:PiliPlus/utils/request_utils.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:easy_debounce/easy_throttle.dart';
+import 'package:fixnum/fixnum.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -33,6 +34,7 @@ abstract class ReplyController<R> extends CommonListController<R, ReplyInfo> {
   late final bool isLogin = Accounts.main.isLogin;
 
   dynamic upMid;
+  Int64? cursorNext;
   FeedPaginationReply? paginationReply;
   late Rx<Mode> mode = Mode.MAIN_LIST_HOT.obs;
   late bool hasUpTop = false;
@@ -74,6 +76,7 @@ abstract class ReplyController<R> extends CommonListController<R, ReplyInfo> {
   @override
   bool customHandleResponse(bool isRefresh, Success response) {
     MainListReply data = response.response;
+    cursorNext = data.cursor.next;
     paginationReply = data.paginationReply;
     count.value = data.subjectControl.count.toInt();
     if (isRefresh) {
@@ -89,6 +92,7 @@ abstract class ReplyController<R> extends CommonListController<R, ReplyInfo> {
 
   @override
   Future onRefresh() {
+    cursorNext = null;
     paginationReply = null;
     return super.onRefresh();
   }
diff --git a/lib/pages/dynamics_detail/controller.dart b/lib/pages/dynamics_detail/controller.dart
index 28fc54bc..61e646b4 100644
--- a/lib/pages/dynamics_detail/controller.dart
+++ b/lib/pages/dynamics_detail/controller.dart
@@ -58,6 +58,7 @@ class DynamicDetailController extends ReplyController<MainListReply> {
         type: type,
         oid: oid,
         mode: mode.value,
+        cursorNext: cursorNext,
         offset: paginationReply?.nextOffset,
         antiGoodsReply: antiGoodsReply,
       );
diff --git a/lib/pages/video/reply/controller.dart b/lib/pages/video/reply/controller.dart
index 3ffee3c7..e18a2680 100644
--- a/lib/pages/video/reply/controller.dart
+++ b/lib/pages/video/reply/controller.dart
@@ -44,6 +44,7 @@ class VideoReplyController extends ReplyController<MainListReply>
   Future<LoadingState<MainListReply>> customGetData() => ReplyHttp.mainList(
         oid: aid,
         mode: mode.value,
+        cursorNext: cursorNext,
         offset: paginationReply?.nextOffset,
         antiGoodsReply: antiGoodsReply,
       );