cc98-cli 0.5.0 → 0.5.1

package/dist/tui/controller.js

@@ -8,7 +8,7 @@ import { EMOJI_CATEGORIES, getEmojiArt, renderCc98Logo, renderEmojiCode } from "
 import { navItems, settingsItems } from "./navigation.js";
 import { getStatus } from "./state/store.js";
 import { asArray, asNumber, asObject, chatItem, chatMessageItems, flattenBoards, genericItem, historyItem, isAbortError, jsonPreviewLines, loadChatUserNames, mapLimit, noticeItem, overviewStats, topicItem, unreadStats, userItem } from "./helpers.js";
-import { appendTopicPosts, buildTopicReader, currentTopicPost, findTopicPostByFloor, getTopicPageInfo, jumpToPage, FLOORS_PER_PAGE } from "./topic-reader.js";
+import { appendTopicPosts, buildTopicReader, currentTopicLine, currentTopicPost, findTopicPostByFloor, getTopicPageInfo, jumpToPage, replaceTopicPosts, FLOORS_PER_PAGE } from "./topic-reader.js";
 export class TuiController {
     state;
     client;
@@ -23,6 +23,7 @@ export class TuiController {
     settingsStore = new SettingsStore();
     updateChecked = false;
     autoSigninChecked = false;
+    listReturnState;
     constructor(state, client, tokenStore, render, close, nextSignal, abortCurrent, webVpnOptions) {
         this.state = state;
         this.client = client;
@@ -54,6 +55,7 @@ export class TuiController {
         this.state.parentList = undefined;
         this.state.currentBoard = undefined;
         this.state.currentChat = undefined;
+        this.state.listPaging = undefined;
         this.render();
         try {
             // 加载快捷键配置
@@ -74,6 +76,7 @@ export class TuiController {
             this.state.viewTitle = next.title;
             this.state.items = next.items;
             this.state.stats = next.stats;
+            this.state.listPaging = next.paging;
             if (next.overview) {
                 this.state.overview = next.overview;
             }
@@ -90,6 +93,9 @@ export class TuiController {
             if (version === this.loadVersion) {
                 this.state.loading = false;
                 this.render();
+                if (this.state.listPaging?.hasMore) {
+                    void this.ensureListWindowFilled(this.nextSignal());
+                }
                 if (shouldAutoSignin) {
                     void this.runAutoSignin();
                 }
@@ -189,9 +195,7 @@ export class TuiController {
     }
     handleSearchKey(key) {
         if (this.keybindings.matches(key, "searchClose")) {
-            this.state.modal = null;
-            this.state.searchQuery = "";
-            this.render();
+            this.closeSearch();
             return;
         }
         if (this.keybindings.matches(key, "searchToggleMode")) {
@@ -215,7 +219,7 @@ export class TuiController {
             const selected = this.state.searchResults[this.state.itemIndex];
             if (selected) {
                 // 有选中项：打开
-                this.state.modal = null;
+                this.restoreSearchOriginForActivation();
                 void this.activateContentItem(selected, this.nextSignal());
             }
             else if (this.state.searchQuery.trim()) {
@@ -402,7 +406,7 @@ export class TuiController {
         }
         // r：刷新
         if (this.keybindings.matches(key, "topicRefresh") && this.state.topic) {
-            void this.openTopic(this.state.topic.topicId, true, this.nextSignal());
+            void this.refreshCurrentTopic(this.nextSignal());
             return;
         }
         // s：收藏
@@ -493,9 +497,20 @@ export class TuiController {
             void this.load(true);
     }
     handleContentKey(key) {
+        if ((key === "\t" || key === "\x1b[Z") && this.state.tabs.length > 1) {
+            this.switchTab(key === "\x1b[Z" ? -1 : 1);
+            return;
+        }
+        if (/^[1-9]$/.test(key) && this.state.tabs.length > 1) {
+            this.switchTabToIndex(Number(key) - 1);
+            return;
+        }
         if (this.keybindings.matches(key, "listNext")) {
+            const previousIndex = this.state.itemIndex;
+            const shouldAdvanceAfterLoad = previousIndex >= this.state.items.length - 1;
             this.state.itemIndex = Math.min(Math.max(0, this.state.items.length - 1), this.state.itemIndex + 1);
             this.render();
+            void this.checkListAutoLoad(shouldAdvanceAfterLoad ? previousIndex + 1 : undefined);
             return;
         }
         if (this.keybindings.matches(key, "listPrev")) {
@@ -525,13 +540,22 @@ export class TuiController {
         if (this.keybindings.matches(key, "menu"))
             this.openMenu();
     }
+    switchTab(delta) {
+        const current = Math.max(0, this.state.tabs.findIndex((tab) => tab.id === this.state.tabId));
+        const next = (current + delta + this.state.tabs.length) % this.state.tabs.length;
+        this.switchTabToIndex(next);
+    }
+    switchTabToIndex(index) {
+        const tab = this.state.tabs[index];
+        if (!tab || tab.id === this.state.tabId)
+            return;
+        this.state.tabId = tab.id;
+        void this.load(true);
+    }
     leave() {
         this.abortCurrent();
         if (this.state.mode === "topic") {
-            this.state.mode = "list";
-            this.state.focus = "content";
-            this.state.status = "";
-            this.render();
+            void this.leaveTopic();
             return;
         }
         if (this.state.parentList) {
@@ -543,8 +567,139 @@ export class TuiController {
         this.state.status = "";
         this.render();
     }
+    rememberListReturnState() {
+        if (this.state.mode !== "list")
+            return;
+        this.listReturnState = {
+            itemIndex: this.state.itemIndex,
+            scroll: this.state.scroll,
+            paging: this.cloneListPaging(this.state.listPaging)
+        };
+    }
+    async leaveTopic() {
+        const listReturn = this.listReturnState;
+        this.state.mode = "list";
+        this.state.focus = "content";
+        this.state.status = "";
+        this.state.topic = undefined;
+        if (listReturn) {
+            this.state.itemIndex = Math.min(Math.max(0, this.state.items.length - 1), listReturn.itemIndex);
+            this.state.listPaging = this.cloneListPaging(listReturn.paging);
+            this.state.scroll = listReturn.paging?.anchorOnReturn ? this.state.itemIndex : listReturn.scroll;
+            this.listReturnState = undefined;
+        }
+        this.render();
+        if (this.state.listPaging?.anchorOnReturn) {
+            await this.ensureListWindowFilled(this.nextSignal());
+        }
+    }
+    async ensureListWindowFilled(signal) {
+        const paging = this.state.listPaging;
+        if (!paging?.hasMore || this.state.loadingMore)
+            return;
+        const capacity = Math.max(1, this.state.listViewportCapacity || 10);
+        const targetLength = this.state.scroll + capacity;
+        while (this.state.items.length < targetLength && paging.hasMore && !this.state.loadingMore) {
+            const previousLength = this.state.items.length;
+            await this.loadNextListPage(signal);
+            if (this.state.items.length === previousLength)
+                break;
+        }
+    }
+    async checkListAutoLoad(advanceToIndex) {
+        const paging = this.state.listPaging;
+        if (!paging?.hasMore || this.state.loadingMore)
+            return;
+        const capacity = Math.max(1, this.state.listViewportCapacity || 10);
+        const visibleEnd = this.state.scroll + capacity;
+        if (this.state.items.length <= visibleEnd || this.state.itemIndex >= this.state.items.length - 2) {
+            await this.loadNextListPage(this.nextSignal());
+            if (advanceToIndex !== undefined && advanceToIndex < this.state.items.length) {
+                this.state.itemIndex = advanceToIndex;
+                this.state.status = "";
+                this.render();
+            }
+        }
+    }
+    async loadNextListPage(signal) {
+        const paging = this.state.listPaging;
+        if (!paging?.hasMore || this.state.loadingMore)
+            return;
+        this.state.loadingMore = true;
+        this.render();
+        try {
+            const nextItems = await this.fetchNextListPage(paging, signal);
+            this.state.items.push(...nextItems);
+            paging.loaded += nextItems.length;
+            if (paging.kind !== "favorite-board-topics") {
+                paging.hasMore = nextItems.length >= paging.size;
+            }
+            this.state.stats = this.state.stats.map((item) => {
+                if (item.title === "版面主题" && paging.kind === "favorite-board-topics") {
+                    return { ...item, detail: `${paging.loaded} 条` };
+                }
+                if (["主题", "新帖流", "最新新帖", "关注用户", "收藏更新"].includes(item.title)) {
+                    return { ...item, detail: `${this.state.items.length} 条` };
+                }
+                return item;
+            });
+            this.state.status = paging.hasMore ? "已加载更多" : "已到底";
+        }
+        catch (error) {
+            if (!isAbortError(error))
+                this.state.status = error instanceof Error ? error.message : "加载失败";
+        }
+        finally {
+            this.state.loadingMore = false;
+            this.render();
+        }
+    }
+    async fetchNextListPage(paging, signal) {
+        if (paging.kind === "new-topics") {
+            const topics = asArray(await this.client.getNewTopics(paging.loaded, paging.size, false, signal));
+            return topics.map((topic) => topicItem(topic));
+        }
+        if (paging.kind === "followee-topics") {
+            const topics = asArray(await this.client.getFolloweeTopics(paging.loaded, paging.size, false, signal));
+            return topics.map((topic) => topicItem(topic));
+        }
+        if (paging.kind === "favorite-board-topics") {
+            return this.fetchNextFavoriteBoardTopics(paging, signal);
+        }
+        const order = paging.kind === "favorite-updates" ? 1 : 0;
+        const topics = asArray(await this.client.getFavoriteTopics(paging.loaded, paging.size, order, 0, false, signal));
+        return topics.map((topic) => topicItem(topic));
+    }
+    async fetchNextFavoriteBoardTopics(paging, signal) {
+        const take = Math.max(1, Math.min(20, paging.size));
+        if ((paging.buffer?.length ?? 0) >= take) {
+            const items = paging.buffer?.splice(0, take) ?? [];
+            paging.hasMore = (paging.buffer?.length ?? 0) > 0 || (paging.boardCursors?.some((cursor) => cursor.hasMore) ?? false);
+            return items;
+        }
+        const cursors = paging.boardCursors?.filter((cursor) => cursor.hasMore) ?? [];
+        if (cursors.length === 0) {
+            const items = paging.buffer?.splice(0, take) ?? [];
+            paging.hasMore = (paging.buffer?.length ?? 0) > 0;
+            return items;
+        }
+        const batches = await mapLimit(cursors, 3, async (cursor) => {
+            const topics = asArray(await this.client.getBoardTopics(cursor.boardId, cursor.loaded, cursor.size, false, false, signal));
+            cursor.loaded += topics.length;
+            cursor.hasMore = topics.length >= cursor.size;
+            return topics.map((topic) => topicItem(topic, { title: cursor.title, boardId: cursor.boardId }));
+        });
+        const merged = [...(paging.buffer ?? []), ...batches.flat()]
+            .sort((left, right) => (right.sortTime ?? 0) - (left.sortTime ?? 0));
+        paging.buffer = merged;
+        paging.hasMore = paging.buffer.length > 0 || cursors.some((cursor) => cursor.hasMore);
+        return paging.buffer.splice(0, take);
+    }
     refresh() {
-        if (this.state.currentBoard) {
+        if (this.state.mode === "topic" && this.state.topic) {
+            void this.refreshCurrentTopic(this.nextSignal());
+        }
+        else if (this.state.currentBoard) {
             void this.openBoard(this.state.currentBoard.boardId, this.state.currentBoard.title, true, this.nextSignal(), false);
         }
         else if (this.state.currentChat) {
@@ -556,6 +711,7 @@ export class TuiController {
     }
     openSearch() {
         this.state.modal = "search";
+        this.state.searchOrigin = { itemIndex: this.state.itemIndex, scroll: this.state.scroll };
         this.state.searchQuery = "";
         this.state.searchResults = [];
         this.state.searchMode = "topics";
@@ -563,6 +719,29 @@ export class TuiController {
         this.state.itemIndex = 0;
         this.render();
     }
+    closeSearch() {
+        const origin = this.state.searchOrigin;
+        this.state.modal = null;
+        this.state.searchOrigin = undefined;
+        this.state.searchQuery = "";
+        this.state.searchResults = [];
+        if (origin) {
+            this.state.itemIndex = origin.itemIndex;
+            this.state.scroll = origin.scroll;
+        }
+        this.render();
+    }
+    restoreSearchOriginForActivation() {
+        const origin = this.state.searchOrigin;
+        this.state.modal = null;
+        this.state.searchOrigin = undefined;
+        this.state.searchQuery = "";
+        this.state.searchResults = [];
+        if (origin) {
+            this.state.itemIndex = origin.itemIndex;
+            this.state.scroll = origin.scroll;
+        }
+    }
     getSearchScope() {
         // 根据当前位置确定搜索范围
         if (this.state.currentBoard) {
@@ -598,9 +777,19 @@ export class TuiController {
         this.state.userDetail = undefined;
         this.render();
     }
+    setTabs(tabs, defaultId) {
+        this.state.tabs = tabs;
+        if (!tabs.some((tab) => tab.id === this.state.tabId)) {
+            this.state.tabId = defaultId;
+        }
+    }
     async loadView(view, force, signal) {
+        if (view !== "new" && view !== "following") {
+            this.setTabs([{ id: "default", label: "" }], "default");
+        }
         switch (view) {
             case "hot": {
+                this.setTabs([{ id: "default", label: "" }], "default");
                 const [index, unread] = await Promise.all([
                     this.client.getForumIndex(force, signal),
                     this.client.getUnreadCount(force, signal)
@@ -612,14 +801,46 @@ export class TuiController {
                     title: "十大",
                     items: hotTopics.map((topic) => topicItem(topic)),
                     stats: unreadStats(unreadObject),
-                    overview: overviewStats(indexObject, unreadObject)
+                    overview: overviewStats(indexObject, unreadObject),
+                    status: "十大：j/k 选择  Enter 打开  r 刷新"
                 };
             }
             case "new": {
-                const topics = asArray(await this.client.getNewTopics(0, 12, force, signal));
-                return { title: "最新", items: topics.map((topic) => topicItem(topic)), stats: [{ title: "新帖流", detail: `${topics.length} 条` }] };
+                this.setTabs([
+                    { id: "new-latest", label: "最新" },
+                    { id: "new-random", label: "随机" },
+                    { id: "new-recommendation", label: "推荐" }
+                ], "new-latest");
+                if (this.state.tabId === "new-recommendation") {
+                    const topics = asArray(await this.client.getRandomRecommendations(10, true, signal));
+                    return {
+                        title: "新帖 · 推荐",
+                        items: topics.map((topic) => topicItem(topic)),
+                        stats: [{ title: "推荐", detail: `${topics.length} 条` }],
+                        status: "新帖：Tab 切换  j/k 选择  Enter 打开  r 换一批"
+                    };
+                }
+                if (this.state.tabId === "new-random") {
+                    const topics = asArray(await this.client.getRandomTopics(20, true, signal));
+                    return {
+                        title: "新帖 · 随机",
+                        items: topics.map((topic) => topicItem(topic)),
+                        stats: [{ title: "随机新帖", detail: `${topics.length} 条` }],
+                        status: "新帖：Tab 切换  j/k 选择  Enter 打开  r 换一批"
+                    };
+                }
+                const size = 20;
+                const topics = asArray(await this.client.getNewTopics(0, size, force, signal));
+                return {
+                    title: "新帖 · 最新",
+                    items: topics.map((topic) => topicItem(topic)),
+                    stats: [{ title: "最新新帖", detail: `${topics.length} 条` }],
+                    status: "新帖：Tab 切换  j/k 选择  Enter 打开  r 刷新",
+                    paging: { kind: "new-topics", loaded: topics.length, size, hasMore: topics.length >= size, anchorOnReturn: true }
+                };
             }
             case "boards": {
+                this.setTabs([{ id: "default", label: "" }], "default");
                 const sections = asArray(await this.client.getAllBoards(force, signal));
                 const boards = flattenBoards(sections);
                 return {
@@ -630,15 +851,37 @@ export class TuiController {
                 };
             }
             case "following": {
-                const topics = asArray(await this.client.getFolloweeTopics(0, 12, force, signal));
-                return {
-                    title: "关注",
-                    items: topics.map((topic) => topicItem(topic)),
-                    stats: [{ title: "关注动态", detail: `${topics.length} 条` }, { title: "缓存", detail: "30s" }],
-                    status: "关注：j/k 选择  Enter 打开帖子  h 返回  r 刷新"
-                };
+                this.setTabs([
+                    { id: "follow-boards", label: "版面" },
+                    { id: "follow-users", label: "用户" },
+                    { id: "follow-favorites", label: "追踪" }
+                ], "follow-boards");
+                if (this.state.tabId === "follow-users") {
+                    const size = 20;
+                    const topics = asArray(await this.client.getFolloweeTopics(0, size, force, signal));
+                    return {
+                        title: "关注 · 用户",
+                        items: topics.map((topic) => topicItem(topic)),
+                        stats: [{ title: "关注用户", detail: `${topics.length} 条` }],
+                        status: "关注：Tab 切换  j/k 选择  Enter 打开  r 刷新",
+                        paging: { kind: "followee-topics", loaded: topics.length, size, hasMore: topics.length >= size, anchorOnReturn: true }
+                    };
+                }
+                if (this.state.tabId === "follow-favorites") {
+                    const size = 20;
+                    const topics = asArray(await this.client.getFavoriteTopics(0, size, 1, 0, force, signal));
+                    return {
+                        title: "关注 · 追踪",
+                        items: topics.map((topic) => topicItem(topic)),
+                        stats: [{ title: "收藏更新", detail: `${topics.length} 条` }],
+                        status: "关注：Tab 切换  j/k 选择  Enter 打开  r 刷新",
+                        paging: { kind: "favorite-updates", loaded: topics.length, size, hasMore: topics.length >= size, anchorOnReturn: true }
+                    };
+                }
+                return this.loadFavoriteBoardTopics(force, signal);
             }
             case "favorite": {
+                this.setTabs([{ id: "default", label: "" }], "default");
                 const [meRaw, sectionsRaw, topicFavorites] = await Promise.all([
                     this.client.getMe(force, signal),
                     this.client.getAllBoards(false, signal),
@@ -647,12 +890,20 @@ export class TuiController {
                 const customBoards = asArray(asObject(meRaw).customBoards).filter((id) => typeof id === "number");
                 const allBoards = flattenBoards(asArray(sectionsRaw));
                 const boardById = new Map(allBoards.filter((board) => board.boardId !== undefined).map((board) => [board.boardId, board]));
+                const boardPageSize = 5;
                 const topicGroups = await mapLimit(customBoards, 3, async (boardId) => {
                     const board = boardById.get(boardId);
-                    const topics = asArray(await this.client.getBoardTopics(boardId, 0, 3, false, force, signal));
-                    return topics.map((topic) => topicItem(topic, board));
+                    const topics = asArray(await this.client.getBoardTopics(boardId, 0, boardPageSize, false, force, signal));
+                    return { boardId, board, topics: topics.map((topic) => topicItem(topic, board)), hasMore: topics.length >= boardPageSize };
                 });
-                const boardTopics = topicGroups.flat().sort((left, right) => (right.sortTime ?? 0) - (left.sortTime ?? 0)).slice(0, 12);
+                const boardTopics = topicGroups.flatMap((group) => group.topics).sort((left, right) => (right.sortTime ?? 0) - (left.sortTime ?? 0));
+                const boardCursors = topicGroups.map((group) => ({
+                    boardId: group.boardId,
+                    title: group.board?.title ?? `#${group.boardId}`,
+                    loaded: group.topics.length,
+                    size: boardPageSize,
+                    hasMore: group.hasMore
+                }));
                 return {
                     title: "收藏",
                     items: [
@@ -667,7 +918,15 @@ export class TuiController {
                         { title: "收藏主题", detail: `${asArray(topicFavorites).length} 条` },
                         { title: "版面主题", detail: `${boardTopics.length} 条` }
                     ],
-                    status: "收藏：j/k 选择  Enter 打开  h 返回  r 刷新"
+                    status: "收藏：j/k 选择  Enter 打开  h 返回  r 刷新",
+                    paging: {
+                        kind: "favorite-board-topics",
+                        loaded: boardTopics.length,
+                        size: Math.max(12, customBoards.length * boardPageSize),
+                        hasMore: boardCursors.some((cursor) => cursor.hasMore),
+                        anchorOnReturn: true,
+                        boardCursors
+                    }
                 };
             }
             case "messages": {
@@ -736,6 +995,46 @@ export class TuiController {
             }
         }
     }
+    async loadFavoriteBoardTopics(force, signal) {
+        const [meRaw, sectionsRaw] = await Promise.all([
+            this.client.getMe(force, signal),
+            this.client.getAllBoards(false, signal)
+        ]);
+        const customBoards = asArray(asObject(meRaw).customBoards).filter((id) => typeof id === "number");
+        const allBoards = flattenBoards(asArray(sectionsRaw));
+        const boardById = new Map(allBoards.filter((board) => board.boardId !== undefined).map((board) => [board.boardId, board]));
+        const boardPageSize = 5;
+        const topicGroups = await mapLimit(customBoards, 3, async (boardId) => {
+            const board = boardById.get(boardId);
+            const topics = asArray(await this.client.getBoardTopics(boardId, 0, boardPageSize, false, force, signal));
+            return { boardId, board, topics: topics.map((topic) => topicItem(topic, board)), hasMore: topics.length >= boardPageSize };
+        });
+        const boardTopics = topicGroups.flatMap((group) => group.topics).sort((left, right) => (right.sortTime ?? 0) - (left.sortTime ?? 0));
+        const boardCursors = topicGroups.map((group) => ({
+            boardId: group.boardId,
+            title: group.board?.title ?? `#${group.boardId}`,
+            loaded: group.topics.length,
+            size: boardPageSize,
+            hasMore: group.hasMore
+        }));
+        return {
+            title: "关注 · 版面",
+            items: boardTopics,
+            stats: [
+                { title: "关注版面", detail: `${customBoards.length} 个` },
+                { title: "版面主题", detail: `${boardTopics.length} 条` }
+            ],
+            status: "关注：Tab 切换  j/k 选择  Enter 打开  r 刷新",
+            paging: {
+                kind: "favorite-board-topics",
+                loaded: boardTopics.length,
+                size: Math.max(12, customBoards.length * boardPageSize),
+                hasMore: boardCursors.some((cursor) => cursor.hasMore),
+                anchorOnReturn: true,
+                boardCursors
+            }
+        };
+    }
     async activateSetting(selected) {
         if (!selected)
             return;
@@ -839,6 +1138,7 @@ export class TuiController {
     }
     async activateContentItem(selected, signal) {
         if (selected.topicId !== undefined) {
+            this.rememberListReturnState();
             await this.openTopic(selected.topicId, false, signal);
             return;
         }
@@ -864,11 +1164,6 @@ export class TuiController {
             this.openEmojiCategory(selected.meta.slice("emoji-category:".length));
             return;
         }
-        if (selected.meta?.startsWith("emoji-batch:")) {
-            this.state.status = "继续向下选择具体表情，Enter 放大预览";
-            this.render();
-            return;
-        }
         if (selected.meta?.startsWith("emoji:")) {
             this.openEmojiDetail(selected.meta.slice("emoji:".length));
             return;
@@ -884,7 +1179,7 @@ export class TuiController {
         this.state.status = "当前条目不可进入";
         this.render();
     }
-    async openTopic(topicId, force, signal) {
+    async openTopic(topicId, force, signal, restore) {
         this.state.mode = "topic";
         this.state.loading = true;
         this.state.error = undefined;
@@ -893,11 +1188,15 @@ export class TuiController {
         this.state.scroll = 0;
         this.render();
         try {
+            const from = restore ? Math.max(0, restore.floor - 1) : 0;
+            const size = 10;
             const [topicRaw, postsRaw] = await Promise.all([
                 this.client.getTopic(topicId, force, signal),
-                this.client.getTopicPosts(topicId, 0, 10, force, signal)
+                this.client.getTopicPosts(topicId, from, size, force, signal)
             ]);
-            this.state.topic = buildTopicReader(topicId, asObject(topicRaw), asArray(postsRaw), 10);
+            this.state.topic = buildTopicReader(topicId, asObject(topicRaw), asArray(postsRaw), size, from);
+            if (restore)
+                this.restoreTopicPosition(restore);
             this.state.loading = false;
             this.state.status = "";
         }
@@ -913,6 +1212,31 @@ export class TuiController {
             void this.preloadTopicImages(this.state.topic);
         }
     }
+    async refreshCurrentTopic(signal) {
+        const topic = this.state.topic;
+        if (!topic)
+            return;
+        const restore = this.getTopicRestoreTarget(topic);
+        await this.openTopic(topic.topicId, true, signal, restore);
+    }
+    getTopicRestoreTarget(topic) {
+        const post = currentTopicPost(topic, topic.cursorLine);
+        return {
+            floor: post?.floor ?? 1,
+            lineOffset: post ? Math.max(0, topic.cursorLine - post.lineStart) : 0,
+            loaded: topic.loaded
+        };
+    }
+    restoreTopicPosition(target) {
+        const topic = this.state.topic;
+        if (!topic)
+            return;
+        const post = findTopicPostByFloor(topic, target.floor);
+        if (!post)
+            return;
+        topic.cursorLine = Math.min(post.lineEnd, post.lineStart + target.lineOffset);
+        this.state.scroll = topic.cursorLine;
+    }
     async openBoard(boardId, title, force, signal, pushParent = true) {
         if (pushParent)
             this.snapshotParent();
@@ -921,6 +1245,7 @@ export class TuiController {
         this.state.viewTitle = title;
         this.state.focus = "content";
         this.state.currentBoard = { boardId, title };
+        this.state.listPaging = undefined;
         this.state.itemIndex = 0;
         this.state.scroll = 0;
         this.render();
@@ -946,6 +1271,7 @@ export class TuiController {
         this.state.error = undefined;
         this.state.viewTitle = `私信: ${title}`;
         this.state.focus = "content";
+        this.state.listPaging = undefined;
         this.state.itemIndex = 0;
         this.state.scroll = 0;
         this.render();
@@ -1042,9 +1368,7 @@ export class TuiController {
             return;
         const pageInfo = getTopicPageInfo(topic, topic.cursorLine);
         if (pageInfo.currentPage > 1) {
-            topic.cursorLine = jumpToPage(topic, pageInfo.currentPage - 1);
-            this.state.status = "";
-            this.render();
+            await this.jumpToTopicPage(pageInfo.currentPage - 1, this.nextSignal());
         }
     }
     async jumpToTopicPage(page, signal) {
@@ -1057,13 +1381,9 @@ export class TuiController {
             this.render();
             return;
         }
-        // 如果目标页未加载，需要加载到该页
         const targetFloor = (page - 1) * FLOORS_PER_PAGE + 1;
-        while (topic.hasMore && !findTopicPostByFloor(topic, targetFloor)) {
-            const previousLoaded = topic.loaded;
-            await this.loadNextTopicPage(signal, true);
-            if (topic.loaded === previousLoaded)
-                break;
+        if (!findTopicPostByFloor(topic, targetFloor)) {
+            await this.loadTopicWindow(targetFloor, signal);
         }
         const post = findTopicPostByFloor(topic, targetFloor);
         if (post) {
@@ -1075,6 +1395,30 @@ export class TuiController {
         }
         this.render();
     }
+    async loadTopicWindow(startFloor, signal) {
+        const topic = this.state.topic;
+        if (!topic || this.state.loadingMore)
+            return;
+        const from = Math.max(0, startFloor - 1);
+        this.state.loadingMore = true;
+        this.render();
+        try {
+            const posts = asArray(await this.client.getTopicPosts(topic.topicId, from, topic.size, false, signal));
+            replaceTopicPosts(topic, posts, from);
+            topic.hasMore = from + posts.length < topic.totalFloors;
+            this.state.scroll = 0;
+            this.state.status = "";
+            void this.preloadTopicImages(topic);
+        }
+        catch (error) {
+            if (!isAbortError(error))
+                this.state.status = error instanceof Error ? error.message : "加载失败";
+        }
+        finally {
+            this.state.loadingMore = false;
+            this.render();
+        }
+    }
     async loadNextTopicPage(signal, quiet = false) {
         const topic = this.state.topic;
         if (!topic?.hasMore || this.state.loadingMore)
@@ -1108,11 +1452,8 @@ export class TuiController {
             this.render();
             return;
         }
-        while (topic.hasMore && !findTopicPostByFloor(topic, floor)) {
-            const previousLoaded = topic.loaded;
-            await this.loadNextTopicPage(signal, true);
-            if (topic.loaded === previousLoaded)
-                break;
+        if (!findTopicPostByFloor(topic, floor)) {
+            await this.loadTopicWindow(floor, signal);
         }
         const post = findTopicPostByFloor(topic, floor);
         topic.cursorLine = post?.lineStart ?? topic.cursorLine;
@@ -1139,8 +1480,9 @@ export class TuiController {
             case "favorite-topics":
             case "favorite-updates": {
                 const order = action === "favorite-updates" ? 1 : 0;
-                const topics = asArray(await this.client.getFavoriteTopics(0, 11, order, 0, false, signal));
-                this.openReadOnlyList(action === "favorite-updates" ? "收藏更新" : "收藏主题", topics.map((topic) => topicItem(topic)), [{ title: "主题", detail: `${topics.length}` }]);
+                const size = 20;
+                const topics = asArray(await this.client.getFavoriteTopics(0, size, order, 0, false, signal));
+                this.openReadOnlyList(action === "favorite-updates" ? "收藏更新" : "收藏主题", topics.map((topic) => topicItem(topic)), [{ title: "主题", detail: `${topics.length}` }], { kind: action === "favorite-updates" ? "favorite-updates" : "favorite-topics", loaded: topics.length, size, hasMore: topics.length >= size, anchorOnReturn: true });
                 return;
             }
             case "favorite-groups": {
@@ -1359,12 +1701,7 @@ export class TuiController {
         const topic = this.state.topic;
         if (!topic)
             return undefined;
-        for (const post of topic.posts) {
-            const line = post.lines.find((entry) => entry.line === topic.cursorLine);
-            if (line)
-                return line;
-        }
-        return undefined;
+        return currentTopicLine(topic, topic.cursorLine);
     }
     /**
      * Preload images for topic in background
@@ -1589,24 +1926,14 @@ export class TuiController {
             this.render();
             return;
         }
-        const items = [];
-        for (let index = 0; index < category.codes.length; index += 20) {
-            const batch = category.codes.slice(index, index + 20);
-            const batchNumber = Math.floor(index / 20) + 1;
-            items.push({
-                title: `${category.label} 第 ${batchNumber} 批`,
-                meta: `emoji-batch:${category.id}:${batchNumber}`,
-                detail: `${batch[0]} - ${batch.at(-1)} · ${batch.length} 个`
-            });
-            for (const code of batch) {
-                const art = getEmojiArt(code);
-                items.push({
-                    title: `[${code}]`,
-                    meta: `emoji:${code}`,
-                    detail: art ? `${category.label} · ${art.width}x${art.height}px` : category.label
-                });
-            }
-        }
+        const items = category.codes.map((code) => {
+            const art = getEmojiArt(code);
+            return {
+                title: `[${code}]`,
+                meta: `emoji:${code}`,
+                detail: art ? `${category.label} · ${art.width}x${art.height}px` : category.label
+            };
+        });
         this.openReadOnlyList(category.label, items, [
             { title: "分类", detail: category.label },
             { title: "数量", detail: `${category.codes.length} 个` },
@@ -1635,7 +1962,7 @@ export class TuiController {
     }
     async openAccountSwitcher() {
         try {
-            const accounts = await this.tokenStore.listAccounts();
+            const accounts = (await this.tokenStore.listAccounts()).filter((account) => account.account !== "default");
             const currentAccount = await this.tokenStore.getCurrentAccountName();
             if (accounts.length === 0) {
                 this.state.modal = "info";
@@ -1654,7 +1981,7 @@ export class TuiController {
             this.state.viewTitle = "切换账号";
             this.state.items = items;
             this.state.stats = [{ title: "账号数", detail: `${accounts.length}` }];
-            this.state.itemIndex = accounts.findIndex(a => a.account === currentAccount);
+            this.state.itemIndex = Math.max(0, accounts.findIndex(a => a.account === currentAccount));
             this.state.scroll = 0;
             this.state.focus = "content";
             this.state.mode = "list";
@@ -1752,11 +2079,12 @@ export class TuiController {
         const users = asArray(await this.client.getUsers(ids, false, signal));
         this.openReadOnlyList(type === "follower" ? "粉丝列表" : "关注列表", users.map((user) => userItem(user)), [{ title: "用户", detail: `${users.length}` }]);
     }
-    openReadOnlyList(title, items, stats) {
+    openReadOnlyList(title, items, stats, paging) {
         this.snapshotParent();
         this.state.viewTitle = title;
         this.state.items = items;
         this.state.stats = stats;
+        this.state.listPaging = paging;
         this.state.itemIndex = 0;
         this.state.scroll = 0;
         this.state.focus = "content";
@@ -1775,6 +2103,7 @@ export class TuiController {
             itemIndex: this.state.itemIndex,
             scroll: this.state.scroll,
             status: this.state.status,
+            paging: this.cloneListPaging(this.state.listPaging),
             parent: this.state.parentList
         };
     }
@@ -1788,6 +2117,7 @@ export class TuiController {
         this.state.itemIndex = parent.itemIndex;
         this.state.scroll = parent.scroll;
         this.state.status = parent.status;
+        this.state.listPaging = this.cloneListPaging(parent.paging);
         this.state.parentList = parent.parent;
         this.state.currentBoard = undefined;
         this.state.currentChat = undefined;
@@ -1796,6 +2126,15 @@ export class TuiController {
         this.state.focus = "content";
         this.render();
     }
+    cloneListPaging(paging) {
+        if (!paging)
+            return undefined;
+        return {
+            ...paging,
+            boardCursors: paging.boardCursors?.map((cursor) => ({ ...cursor })),
+            buffer: paging.buffer?.map((itemValue) => ({ ...itemValue }))
+        };
+    }
     async checkUpdate(forceShow = false) {
         if (forceShow) {
             this.state.status = "正在检查 GitHub Release...";