koishi-plugin-cfmrmod 1.0.6 → 1.0.8

package/README.md

@@ -1,6 +1,8 @@
 # koishi-plugin-cfmrmod
 
 Koishi 插件：搜索 CurseForge / Modrinth / MCMod，并渲染图片卡片。
+哥给个star吧
+Star就是我维护的动力🤤
 
 ## 使用方法
 

package/dist/cfmr/index.js

@@ -1893,6 +1893,28 @@ async function fetchCurseForgeDetail(id, apiKey, timeout, cfUrl = null) {
 }
 // 搜索入口 (MR)
 async function searchModrinth(query, type, timeout) {
+    // 先尝试直接通过ID/slug获取项目详情
+    try {
+        const project = await fetchJson(`${MR_BASE}/project/${encodeURIComponent(query)}`, {}, timeout);
+        if (project && project.slug) {
+            // 成功获取到项目,返回单个结果
+            return [{
+                    platform: 'Modrinth',
+                    id: project.slug,
+                    name: project.title,
+                    author: project.author || 'Unknown',
+                    summary: project.description,
+                    type,
+                    icon: project.icon_url,
+                    downloads: project.downloads || 0,
+                    updated: new Date(project.updated || project.published).toLocaleDateString()
+                }];
+        }
+    }
+    catch (e) {
+        // ID/slug获取失败,继续使用搜索API
+    }
+    // 使用搜索API
     const facet = MR_FACET_MAP[type];
     const url = `${MR_BASE}/search?query=${encodeURIComponent(query)}&facets=[["${facet}"]]&limit=20`;
     const json = await fetchJson(url, {}, timeout);
@@ -2029,8 +2051,10 @@ function apply(ctx, config) {
             '\n请输入序号查看详情 (p/n 翻页)';
     };
     const handleSearch = async (session, platform, type, keyword) => {
-        if (!keyword)
-            return session.send('请输入关键词');
+        if (!keyword) {
+            await session.send('请输入关键词');
+            return;
+        }
         let results = [];
         try {
             if (platform === 'mr')
@@ -2039,10 +2063,13 @@ function apply(ctx, config) {
                 results = await searchCurseForge(keyword, type, config.curseforgeApiKey, config.requestTimeout, config.curseforgeGameId);
         }
         catch (e) {
-            return session.send(`搜索出错: ${e.message}`);
+            await session.send(`搜索出错: ${e.message}`);
+            return;
+        }
+        if (!results.length) {
+            await session.send('未找到结果');
+            return;
         }
-        if (!results.length)
-            return session.send('未找到结果');
         if (results.length === 1) {
             const item = results[0];
             try {

package/dist/mcmod/index.js

@@ -564,7 +564,7 @@ async function drawModCard(url) {
         versions.forEach(v => {
             dummy.font = `14px "${font}"`;
             const lw = dummy.measureText(v.l).width + 10;
-            const lines = wrapText(dummy, v.v, 0, 0, contentW - lw, 20, 100, false) / 20;
+            const lines = wrapText(dummy, v.v, 0, 0, contentW - lw, 20, 500, false) / 20;
             extraH += lines * 20 + 10;
         });
     }
@@ -578,7 +578,7 @@ async function drawModCard(url) {
             const isHeader = node.tag === 'h';
             dummy.font = `${isHeader ? 'bold' : ''} ${isHeader ? 22 : 16}px "${font}"`;
             const lh = isHeader ? 32 : 26;
-            const lines = wrapText(dummy, node.val, 0, 0, contentW, lh, 100, false) / lh;
+            const lines = wrapText(dummy, node.val, 0, 0, contentW, lh, 5000, false) / lh;
             descH += lines * lh + (isHeader ? 15 : 10);
         }
         else if (node.type === 'i') {
@@ -2653,7 +2653,7 @@ function apply(ctx, config) {
                 const sentMessageIds = await session.send(listText);
                 searchStates.set(session.cid, {
                     results,
-                    page: 0,
+                    pageIndex: 0,
                     type: 'mod',
                     messageIds: Array.isArray(sentMessageIds) ? sentMessageIds : [sentMessageIds],
                     timer: setTimeout(() => {
@@ -2686,6 +2686,7 @@ function apply(ctx, config) {
         if (input === 'p' || input === 'n') {
             // 加入队列处理翻页，防止并发
             enqueue(session, 'page-turn', async () => {
+                var _a, _b;
                 // 重新获取状态，防止排队期间状态丢失
                 const currentState = searchStates.get(session.cid);
                 if (!currentState)
@@ -2693,10 +2694,11 @@ function apply(ctx, config) {
                 clearTimeout(currentState.timer);
                 currentState.timer = setTimeout(() => searchStates.delete(session.cid), TIMEOUT_MS);
                 const total = Math.ceil(currentState.results.length / PAGE_SIZE);
-                let newIndex = currentState.pageIndex;
-                if (input === 'n' && currentState.pageIndex < total - 1)
+                const currentPage = Number((_b = (_a = currentState.pageIndex) !== null && _a !== void 0 ? _a : currentState.page) !== null && _b !== void 0 ? _b : 0) || 0;
+                let newIndex = currentPage;
+                if (input === 'n' && currentPage < total - 1)
                     newIndex++;
-                else if (input === 'p' && currentState.pageIndex > 0)
+                else if (input === 'p' && currentPage > 0)
                     newIndex--;
                 else {
                     await session.send('没有更多页面了。');
@@ -2705,8 +2707,8 @@ function apply(ctx, config) {
                 // 撤回旧列表（可选，为了整洁）
                 await tryWithdraw(session, currentState.messageIds);
                 currentState.pageIndex = newIndex;
-                const newMsgIds = await session.send(formatListPage(currentState.results, currentState.pageIndex, currentState.type));
-                currentState.messageIds = newMsgIds;
+                const newMsgIds = await session.send(formatListPage(currentState.results, newIndex, currentState.type));
+                currentState.messageIds = Array.isArray(newMsgIds) ? newMsgIds : [newMsgIds];
             });
             return;
         }
@@ -2715,12 +2717,13 @@ function apply(ctx, config) {
         if (!isNaN(choice) && choice >= 1) {
             // 加入队列处理生成卡片
             enqueue(session, 'select-item', async () => {
-                var _a;
+                var _a, _b, _c;
                 const currentState = searchStates.get(session.cid);
                 if (!currentState)
                     return; // 状态可能已过期
                 const idx = choice - 1;
-                const pageStart = currentState.pageIndex * PAGE_SIZE;
+                const currentPage = Number((_b = (_a = currentState.pageIndex) !== null && _a !== void 0 ? _a : currentState.page) !== null && _b !== void 0 ? _b : 0) || 0;
+                const pageStart = currentPage * PAGE_SIZE;
                 const pageEnd = Math.min(pageStart + PAGE_SIZE, currentState.results.length);
                 if (choice < pageStart + 1 || choice > pageEnd) {
                     // 如果序号不在当前页，忽略或提示
@@ -2738,7 +2741,7 @@ function apply(ctx, config) {
                         if (currentState.type === 'author')
                             img = await drawAuthorCard(item.link);
                         else if (currentState.type === 'user') {
-                            const uid = ((_a = item.link.match(/\/(\d+)(?:\.html|\/)?$/)) === null || _a === void 0 ? void 0 : _a[1]) || '0';
+                            const uid = ((_c = item.link.match(/\/(\d+)(?:\.html|\/)?$/)) === null || _c === void 0 ? void 0 : _c[1]) || '0';
                             img = await drawCenterCardImpl(uid, logger);
                         }
                         else if (currentState.type === 'mod' || currentState.type === 'pack')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-cfmrmod",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Koishi 插件：搜索 CurseForge/Modrinth/MCMod 并渲染图片卡片",
   "main": "dist/index.js",
   "files": [