koishi-plugin-aka-60s-api 0.1.8 → 0.2.0

package/lib/index.d.ts

@@ -2,6 +2,7 @@ import { Context, Schema } from 'koishi';
 export declare const name = "aka-60s-api";
 export declare const inject: string[];
 export interface Config {
+    apiBaseUrl: string;
     cooldownTime: number;
     enableLog: boolean;
     scheduleWhitelist: string[];

package/lib/index.js

@@ -31,6 +31,7 @@ var name = "aka-60s-api";
 var inject = ["database"];
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
+    apiBaseUrl: import_koishi.Schema.string().default("http://172.0.0.1:4399").description("60s 服务 URL（不含 /v2 路径）"),
     cooldownTime: import_koishi.Schema.number().default(30).min(5).max(300).description("冷却时间(秒)"),
     enableLog: import_koishi.Schema.boolean().default(true).description("启用日志记录"),
     scheduleWhitelist: import_koishi.Schema.array(String).default([]).description("定时发送群组白名单频道ID列表（为空=不发送）")
@@ -61,6 +62,8 @@ var Config = import_koishi.Schema.intersect([
 ]);
 function apply(ctx, config) {
   const logger = ctx.logger("aka-60s-api");
+  const normalizedApiBaseUrl = (config.apiBaseUrl || "http://172.0.0.1:4399").replace(/\/$/, "");
+  const buildApiUrl = /* @__PURE__ */ __name((path) => `${normalizedApiBaseUrl}${path}`, "buildApiUrl");
   const cooldowns = /* @__PURE__ */ new Map();
   let scheduleInterval = null;
   let aiNewsScheduleInterval = null;
@@ -117,7 +120,7 @@ function apply(ctx, config) {
   async function get60sNewsImage() {
     try {
       logInfo("60s API: 开始获取新闻图片");
-      const response = await ctx.http.get("http://192.168.50.55:4399/v2/60s", {
+      const response = await ctx.http.get(buildApiUrl("/v2/60s"), {
         params: {
           encoding: "image"
         },
@@ -138,7 +141,7 @@ function apply(ctx, config) {
   async function getTodayInHistory() {
     try {
       logInfo("60s API: 开始获取历史上的今天");
-      const response = await ctx.http.get("http://192.168.50.55:4399/v2/today-in-history", {
+      const response = await ctx.http.get(buildApiUrl("/v2/today-in-history"), {
         params: {
           encoding: "json"
         },
@@ -159,7 +162,7 @@ function apply(ctx, config) {
   async function getZhihuTrends() {
     try {
       logInfo("60s API: 开始获取知乎话题榜");
-      const response = await ctx.http.get("http://192.168.50.55:4399/v2/zhihu", {
+      const response = await ctx.http.get(buildApiUrl("/v2/zhihu"), {
         params: {
           encoding: "json"
         },
@@ -180,7 +183,7 @@ function apply(ctx, config) {
   async function getAiNews(params) {
     try {
       logInfo("60s API: 开始获取AI快报", params);
-      const response = await ctx.http.get("http://192.168.50.55:4399/v2/ai-news", {
+      const response = await ctx.http.get(buildApiUrl("/v2/ai-news"), {
         params: {
           date: params.date,
           all: params.all,
@@ -199,7 +202,7 @@ function apply(ctx, config) {
   async function getMoyuDaily(encoding = "text") {
     try {
       logInfo("60s API: 开始获取摸鱼日报", { encoding });
-      const response = await ctx.http.get("http://192.168.50.55:4399/v2/moyu", {
+      const response = await ctx.http.get(buildApiUrl("/v2/moyu"), {
         params: {
           encoding
         },
@@ -216,7 +219,7 @@ function apply(ctx, config) {
   async function getGoldPrice(encoding = "text") {
     try {
       logInfo("60s API: 开始获取今日金价", { encoding });
-      const response = await ctx.http.get("http://192.168.50.55:4399/v2/gold-price", {
+      const response = await ctx.http.get(buildApiUrl("/v2/gold-price"), {
         params: {
           encoding
         },
@@ -233,7 +236,7 @@ function apply(ctx, config) {
   async function getFuelPrice(params) {
     try {
       logInfo("60s API: 开始获取今日油价", params);
-      const response = await ctx.http.get("http://192.168.50.55:4399/v2/fuel-price", {
+      const response = await ctx.http.get(buildApiUrl("/v2/fuel-price"), {
         params: {
           region: params.region,
           encoding: params.encoding || "text"
@@ -268,42 +271,29 @@ function apply(ctx, config) {
   }
   __name(sendNewsToChannels, "sendNewsToChannels");
   function formatAiNewsText(data) {
-    const formatOne = /* @__PURE__ */ __name((item) => {
-      const header = `🤖 ${item.date} AI资讯快报`;
-      const lines = item.news.map((newsItem, index) => {
-        const source = newsItem.source ? `（${newsItem.source}）` : "";
-        return `${index + 1}. ${newsItem.title}${source}
-${newsItem.detail}
-🔗 ${newsItem.link}`;
-      });
-      return [header, ...lines].join("\n\n");
-    }, "formatOne");
-    if (Array.isArray(data)) {
-      return data.map(formatOne).join("\n\n");
-    }
-    return formatOne(data);
+    const items = normalizeAiNewsData(data).flatMap((item) => item.news);
+    return items.map((newsItem, index) => `${index + 1}. ${newsItem.title}
+${newsItem.link}`).join("\n\n");
   }
   __name(formatAiNewsText, "formatAiNewsText");
-  function formatAiNewsSummary(data) {
-    const summaryLength = 80;
-    const formatOne = /* @__PURE__ */ __name((item) => {
-      const header = `🤖 ${item.date} AI资讯快报（摘要）`;
-      const lines = item.news.map((newsItem, index) => {
-        const source = newsItem.source ? `（${newsItem.source}）` : "";
-        const detail = (newsItem.detail || "").replace(/\s+/g, " ").trim();
-        const shortDetail = detail.length > summaryLength ? `${detail.slice(0, summaryLength)}...` : detail;
-        return `${index + 1}. ${newsItem.title}${source}
-${shortDetail}
-🔗 ${newsItem.link}`;
-      });
-      return [header, ...lines].join("\n\n");
-    }, "formatOne");
-    if (Array.isArray(data)) {
-      return data.map(formatOne).join("\n\n");
-    }
-    return formatOne(data);
+  function formatAiNewsMarkdown(data) {
+    const items = normalizeAiNewsData(data).flatMap((item) => item.news);
+    return items.map((newsItem) => `- [${newsItem.title}](${newsItem.link})`).join("\n");
+  }
+  __name(formatAiNewsMarkdown, "formatAiNewsMarkdown");
+  function toTitleLinkData(data) {
+    return normalizeAiNewsData(data).map((item) => ({
+      date: item.date,
+      news: item.news.map((newsItem) => ({
+        title: newsItem.title,
+        detail: "",
+        link: newsItem.link,
+        source: "",
+        date: newsItem.date
+      }))
+    }));
   }
-  __name(formatAiNewsSummary, "formatAiNewsSummary");
+  __name(toTitleLinkData, "toTitleLinkData");
   function formatDate(date) {
     const year = date.getFullYear();
     const month = `${date.getMonth() + 1}`.padStart(2, "0");
@@ -790,7 +780,7 @@ ${shortDetail}
       return "获取知乎话题榜失败，请稍后重试";
     }
   });
-  ctx.command("AI快报 [date]", "获取AI资讯快报").option("date", "-d <date> 指定日期 (格式: YYYY-MM-DD)").option("all", "-a 获取所有日期").option("encoding", "-e <encoding> 编码方式 text/json/markdown/summary").action(async (argv, date) => {
+  ctx.command("AI快报 [date]", "获取AI资讯快报").option("date", "-d <date> 指定日期 (格式: YYYY-MM-DD)").option("all", "-a 获取所有日期").option("encoding", "-e <encoding> 编码方式 text/json/markdown").action(async (argv, date) => {
     const userId = argv.session.userId;
     if (!checkCooldown(userId)) {
       const now = Date.now();
@@ -807,27 +797,20 @@ ${shortDetail}
         const dates = getRecentAiNewsDates();
         const data = await fetchAiNewsByDates(dates);
         if (!data.length) return "未获取到近两天的AI快报数据";
-        if (encoding === "summary") {
-          return await argv.session.send(formatAiNewsSummary(data));
-        }
         if (encoding === "json") {
-          return await argv.session.send(JSON.stringify(data, null, 2));
+          await argv.session.send(JSON.stringify(toTitleLinkData(data), null, 2));
+          return;
         }
         if (encoding === "markdown") {
-          const markdownResponses = await Promise.all(
-            dates.map((item) => getAiNews({ date: item, encoding: "markdown" }))
-          );
-          return await argv.session.send(markdownResponses.filter(Boolean).join("\n\n"));
+          await argv.session.send(formatAiNewsMarkdown(data));
+          return;
         }
         const message2 = formatAiNewsText(data);
         if (config.aiUseForward && argv.session.platform === "onebot") {
-          return await argv.session.send((0, import_koishi.h)("figure", {}, [message2]));
+          await argv.session.send((0, import_koishi.h)("figure", {}, [message2]));
+          return;
         }
-        return await argv.session.send(message2);
-      }
-      if (encoding === "markdown") {
-        const response2 = await getAiNews({ date: targetDate, all, encoding: "markdown" });
-        await argv.session.send(response2);
+        await argv.session.send(message2);
         return;
       }
       if (encoding === "json") {
@@ -836,22 +819,16 @@ ${shortDetail}
           logError("60s API: AI快报返回错误", { code: response2.code, message: response2.message });
           return `获取AI快报失败: ${response2.message || "未知错误"}`;
         }
-        await argv.session.send(JSON.stringify(response2.data, null, 2));
+        await argv.session.send(JSON.stringify(toTitleLinkData(response2.data), null, 2));
         return;
       }
-      if (encoding === "summary") {
+      if (encoding === "markdown") {
         const response2 = await getAiNews({ date: targetDate, all, encoding: "json" });
         if (response2.code !== 200 || !response2.data) {
           logError("60s API: AI快报返回错误", { code: response2.code, message: response2.message });
           return `获取AI快报失败: ${response2.message || "未知错误"}`;
         }
-        const message2 = formatAiNewsSummary(response2.data);
-        if (config.aiUseForward && argv.session.platform === "onebot") {
-          const forwardMessage = (0, import_koishi.h)("figure", {}, [message2]);
-          await argv.session.send(forwardMessage);
-        } else {
-          await argv.session.send(message2);
-        }
+        await argv.session.send(formatAiNewsMarkdown(response2.data));
         return;
       }
       const response = await getAiNews({ date: targetDate, all, encoding: "json" });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-aka-60s-api",
   "description": "调用60s API转发信息的工具 - 个人用",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [