npm - koishi-plugin-my-pig-group-friends - Versions diffs - 1.1.1 → 1.1.3 - Mend

koishi-plugin-my-pig-group-friends 1.1.1 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/config.d.ts CHANGED Viewed

@@ -14,10 +14,14 @@ export interface Config {
     logPath: string;
     llmLocationEnabled: boolean;
     llmLocationModel: string;
+    llmLocationCustomContext: string;
+    imageSearchPrompt: string;
     unsplashAccessKey: string;
+    pexelsApiKey: string;
+    backgroundFetchMode: 'auto' | 'always' | 'never';
+    backgroundFetchTimeoutMs: number;
     logRetentionDays: number;
     experimentalAutoDetect: boolean;
     debug: boolean;
-    emojiFont: 'Noto Color Emoji' | 'Twemoji' | 'System';
 }
 export declare const Config: Schema<Config>;

package/lib/index.js CHANGED Viewed

@@ -101,6 +101,13 @@ async function generateFootprintCard(ctx, config, data, userInfo, platform, back
     return "image/jpeg";
   }, "sniffMime");
   const inlineMaxBytes = 900 * 1024;
+  const fetchTimeoutMs = config.backgroundFetchTimeoutMs ?? 8e3;
+  const shouldServerFetch = /* @__PURE__ */ __name((url) => {
+    const mode = config.backgroundFetchMode || "auto";
+    if (mode === "never") return false;
+    if (mode === "always") return true;
+    return !/^https?:\/\/(images|source)\.unsplash\.com\//i.test(url);
+  }, "shouldServerFetch");
   const fetchToDataUrl = /* @__PURE__ */ __name(async (url) => {
     const normalized = normalizeImageUrl(url);
     if (config.debug) ctx.logger("pig").debug(`Normalized background URL: ${normalized}`);
@@ -122,12 +129,17 @@ async function generateFootprintCard(ctx, config, data, userInfo, platform, back
       }
     }
     if (/^https?:\/\//i.test(normalized)) {
+      if (!shouldServerFetch(normalized)) {
+        if (config.debug) {
+          ctx.logger("pig").debug(`Skip server-side fetch for background: ${normalized}`);
+        }
+        return normalized;
+      }
       try {
         if (config.debug) ctx.logger("pig").debug(`Server-side fetching background: ${normalized}`);
         const response = await ctx.http(normalized, {
           responseType: "arraybuffer",
-          timeout: 8e3,
-          // Reduced from 15s to 8s for better responsiveness
+          timeout: fetchTimeoutMs,
           headers: {
             "User-Agent": "Mozilla/5.0",
             "Accept": "image/avif,image/webp,image/apng,image/*,*/*;q=0.8"
@@ -177,7 +189,7 @@ async function generateFootprintCard(ctx, config, data, userInfo, platform, back
   }
   const now = /* @__PURE__ */ new Date();
   const dateStr = `${now.getFullYear()}年${now.getMonth() + 1}月${now.getDate()}日`;
-  const emojiFont = config.emojiFont === "System" ? "" : `"${config.emojiFont}", `;
+  const bgCssValue = bgImage ? `url("${bgImage}")` : "none";
   const html = `
 <!DOCTYPE html>
 <html>
@@ -195,12 +207,18 @@ async function generateFootprintCard(ctx, config, data, userInfo, platform, back
     width: 1080px;
     height: 1920px;
     overflow: hidden;
-    /* Prioritize system fonts with wide Unicode coverage for emoji and CJK support */
-    font-family: ${emojiFont}"Noto Sans CJK SC", "Noto Sans SC", "Source Han Sans SC", "Microsoft YaHei", "WenQuanYi Micro Hei", "Droid Sans Fallback", "PingFang SC", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji";
+    /* Default emoji font set to Noto Color Emoji to maintain layout consistency */
+    font-family: "Noto Sans CJK SC", "Noto Sans SC", "Source Han Sans SC", "Microsoft YaHei", "WenQuanYi Micro Hei", "Droid Sans Fallback", "PingFang SC", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica Neue", Arial, sans-serif, "Noto Color Emoji", "Apple Color Emoji", "Segoe UI Emoji";
     background: #f0f0f2;
-    --bg-image: url('${bgImage}');
+    --bg-image: ${bgCssValue};
   }
+  /* Specific class for the pig emoji to use Twemoji */
+  .twemoji {
+    font-family: "Twemoji", "Noto Color Emoji", sans-serif;
+  }
   .wrapper {
     position: relative;
     width: 100%;
@@ -215,10 +233,9 @@ async function generateFootprintCard(ctx, config, data, userInfo, platform, back
     inset: 0;
     width: 100%;
     height: 100%;
+    display: block;
+    object-fit: cover;
     background-color: #d1d1d6;
-    background-image: var(--bg-image);
-    background-size: cover;
-    background-position: center;
     z-index: 0;
   }
@@ -376,7 +393,7 @@ async function generateFootprintCard(ctx, config, data, userInfo, platform, back
   .message-text {
     font-size: 56px;
     line-height: 1.25;
-    font-weight: 800;
+    font-weight: 900;
     color: #1d1d1f;
     letter-spacing: -0.03em;
     word-break: break-word;
@@ -390,8 +407,11 @@ async function generateFootprintCard(ctx, config, data, userInfo, platform, back
     box-decoration-break: clone;
     -webkit-box-decoration-break: clone;
     display: inline-block;
+    font-weight: 900;
+    letter-spacing: -0.01em;
   }
   .divider {
     height: 2px;
     background: rgba(0,0,0,0.08);
@@ -424,14 +444,14 @@ async function generateFootprintCard(ctx, config, data, userInfo, platform, back
   .location-pill span {
     font-size: 26px;
-    font-weight: 700;
+    font-weight: 800;
     color: #ffffff;
     letter-spacing: 0.02em;
   }
   .landmark-name {
     font-size: 38px;
-    font-weight: 800;
+    font-weight: 900;
     color: #1d1d1f;
     letter-spacing: -0.01em;
     padding-left: 6px;
@@ -463,7 +483,7 @@ async function generateFootprintCard(ctx, config, data, userInfo, platform, back
 </head>
 <body>
   <div class="wrapper">
-    <div class="bg-image"></div>
+    <img class="bg-image" src="${bgImage || ""}" alt="" />
     <div class="bg-overlay"></div>
     <div class="card-container">
@@ -482,7 +502,7 @@ async function generateFootprintCard(ctx, config, data, userInfo, platform, back
           <div class="message-body">
             <div class="message-text">
-              今天 🐷猪醒在<br/>
+              今天 <span class="twemoji">🐷</span>猪醒在<br/>
               <span class="highlight">${data.location.landmarkZh || data.location.landmark}</span>
             </div>
           </div>
@@ -498,7 +518,7 @@ async function generateFootprintCard(ctx, config, data, userInfo, platform, back
             </div>
             <div class="brand-tag">
-              <div class="brand-icon">🐷</div>
+              <div class="brand-icon"><span class="twemoji">🐷</span></div>
               <div class="brand-name">Pig Travel</div>
             </div>
           </div>
@@ -1066,6 +1086,50 @@ async function searchUnsplashPhoto(ctx, accessKey, query, debug = false) {
 }
 __name(searchUnsplashPhoto, "searchUnsplashPhoto");
+// src/services/pexels.ts
+var PEXELS_API_BASE = "https://api.pexels.com/v1";
+async function searchPexelsPhoto(ctx, apiKey, query, debug = false) {
+  if (!apiKey) {
+    if (debug) ctx.logger("pig").debug("Pexels: No API key provided");
+    return null;
+  }
+  try {
+    if (debug) ctx.logger("pig").debug(`Pexels: Searching for "${query}"`);
+    const response = await ctx.http.get(
+      `${PEXELS_API_BASE}/search`,
+      {
+        params: {
+          query,
+          per_page: 1,
+          orientation: "landscape"
+        },
+        headers: {
+          Authorization: apiKey
+        },
+        timeout: 1e4
+      }
+    );
+    if (response.photos && response.photos.length > 0) {
+      let photoUrl = response.photos[0].src.large2x || response.photos[0].src.large;
+      if (photoUrl.includes("w=")) {
+        photoUrl = photoUrl.replace(/w=\d+/, "w=1080");
+      } else if (photoUrl.includes("?")) {
+        photoUrl += "&w=1080";
+      } else {
+        photoUrl += "?w=1080";
+      }
+      if (debug) ctx.logger("pig").debug(`Pexels: Found photo URL: ${photoUrl}`);
+      return photoUrl;
+    }
+    if (debug) ctx.logger("pig").debug("Pexels: No photos found for query");
+    return null;
+  } catch (e) {
+    ctx.logger("pig").warn(`Pexels API error: ${e}`);
+    return null;
+  }
+}
+__name(searchPexelsPhoto, "searchPexelsPhoto");
 // src/services/location.ts
 var LOCATION_CATEGORIES = [
   "自然奇观（峡谷、瀑布、火山、冰川、沙漠绿洲等）",
@@ -1080,13 +1144,43 @@ var LOCATION_CATEGORIES = [
   "神秘与奇特之地（地质奇观、UFO小镇、怪异地貌等）"
 ];
 var CONTINENTS = ["亚洲", "欧洲", "非洲", "北美洲", "南美洲", "大洋洲", "南极洲"];
+function getSunriseTimezoneHint() {
+  const now = /* @__PURE__ */ new Date();
+  const utcHour = now.getUTCHours();
+  const targetLocalHour = 6;
+  const idealOffset = targetLocalHour - utcHour;
+  const normalizeOffset = /* @__PURE__ */ __name((offset) => {
+    if (offset < -12) return offset + 24;
+    if (offset > 14) return offset - 24;
+    return offset;
+  }, "normalizeOffset");
+  const minOffset = normalizeOffset(idealOffset - 1);
+  const maxOffset = normalizeOffset(idealOffset + 1);
+  const getRegionByOffset = /* @__PURE__ */ __name((offset) => {
+    if (offset >= 9 && offset <= 12) return "东亚、澳大利亚东部、太平洋岛屿";
+    if (offset >= 5 && offset <= 8) return "南亚、东南亚、中亚";
+    if (offset >= 2 && offset <= 4) return "中东、东欧、东非";
+    if (offset >= -1 && offset <= 1) return "西欧、西非";
+    if (offset >= -5 && offset <= -2) return "南美洲东部、大西洋";
+    if (offset >= -8 && offset <= -6) return "北美洲西部、太平洋东部";
+    if (offset >= -12 && offset <= -9) return "太平洋中部、夏威夷、阿拉斯加";
+    return "全球各地";
+  }, "getRegionByOffset");
+  const formatOffset = /* @__PURE__ */ __name((offset) => offset >= 0 ? `UTC+${offset}` : `UTC${offset}`, "formatOffset");
+  return {
+    utcOffsetRange: `${formatOffset(minOffset)} 到 ${formatOffset(maxOffset)}`,
+    regionHint: getRegionByOffset(idealOffset)
+  };
+}
+__name(getSunriseTimezoneHint, "getSunriseTimezoneHint");
 function getRandomPromptHints() {
   const category = LOCATION_CATEGORIES[Math.floor(Math.random() * LOCATION_CATEGORIES.length)];
   const continent = CONTINENTS[Math.floor(Math.random() * CONTINENTS.length)];
   const hotCountries = ["法国", "日本", "意大利", "美国", "英国", "中国", "西班牙", "泰国", "澳大利亚"];
   const shuffled = hotCountries.sort(() => Math.random() - 0.5);
   const avoidCountries = shuffled.slice(0, 3 + Math.floor(Math.random() * 4)).join("、");
-  return { category, continent, avoidCountries };
+  const sunriseHint = getSunriseTimezoneHint();
+  return { category, continent, avoidCountries, sunriseHint };
 }
 __name(getRandomPromptHints, "getRandomPromptHints");
 var LOCATION_GENERATION_PROMPT = `你是一位资深旅行探险家，专门发掘世界各地的独特目的地。
@@ -1121,12 +1215,23 @@ async function generateLocationWithLLM(ctx, config) {
       return getRandomStaticLocation();
     }
     const hints = getRandomPromptHints();
-    const userPrompt = `请生成一个位于【${hints.continent}】的【${hints.category}】类型的旅游目的地。
+    let userPrompt = `请生成一个【${hints.category}】类型的旅游目的地。
-特别要求：这次请避开 ${hints.avoidCountries} 这些热门国家，选择一个更独特、更少人知道的地方。
+🌅 时区要求（重要）：当前 UTC 时间是 ${(/* @__PURE__ */ new Date()).getUTCHours()}:${String((/* @__PURE__ */ new Date()).getUTCMinutes()).padStart(2, "0")}，请选择一个正处于日出时段（当地时间约 5:00-7:00）的地点。
+符合条件的时区范围大约是 ${hints.sunriseHint.utcOffsetRange}，对应地区包括：${hints.sunriseHint.regionHint}。
+如果上述地区没有合适的【${hints.category}】类型目的地，可以适当放宽到邻近时区，但优先选择正在迎接日出的地方。
+特别要求：请避开 ${hints.avoidCountries} 这些热门国家，选择一个更独特、更少人知道的地方。要求这个地方在地理位置或文化上具有独特性。`;
+    if (config.llmLocationCustomContext) {
+      userPrompt += `
+此外，请参考以下用户提供的偏好或上下文：${config.llmLocationCustomContext}`;
+    }
+    userPrompt += `
 直接输出JSON，不要有任何其他文字。`;
-    if (config.debug) ctx.logger("pig").debug(`Location prompt hints: ${hints.continent}, ${hints.category}`);
+    if (config.debug) ctx.logger("pig").debug(`Location prompt hints: sunrise=${hints.sunriseHint.regionHint}, category=${hints.category}`);
     const messages = [
       new import_messages.SystemMessage(LOCATION_GENERATION_PROMPT),
       new import_messages.HumanMessage(userPrompt)
@@ -1137,29 +1242,37 @@ async function generateLocationWithLLM(ctx, config) {
     const location = parseLocationResponse(content);
     if (location) {
       ctx.logger("pig").info(`LLM generated location: ${location.landmarkZh} (${location.landmark}), ${location.countryZh}`);
-      if (config.unsplashAccessKey) {
+      if (config.unsplashAccessKey || config.pexelsApiKey) {
+        const template = config.imageSearchPrompt || "{landmark} {country} landscape";
+        const formatQuery = /* @__PURE__ */ __name((tmpl) => tmpl.replace("{landmark}", location.landmark).replace("{country}", location.country).replace("{city}", location.city || "").trim(), "formatQuery");
         const searchQueries = [
+          formatQuery(template),
+          // Primary: User template
           `${location.landmark} ${location.country}`,
-          // Most specific: landmark + country
+          // Fallback 1: specific
           location.city ? `${location.city} ${location.country}` : null,
-          // City + country
-          `${location.country} landscape`,
-          // Country landscape
+          // Fallback 2: city
           location.country
-          // Just country name
+          // Fallback 3: country
         ].filter(Boolean);
         let photoUrl = null;
         for (const query of searchQueries) {
-          if (config.debug) ctx.logger("pig").debug(`Searching Unsplash for: ${query}`);
-          photoUrl = await searchUnsplashPhoto(ctx, config.unsplashAccessKey, query, config.debug);
+          if (config.unsplashAccessKey) {
+            if (config.debug) ctx.logger("pig").debug(`Searching Unsplash for: ${query}`);
+            photoUrl = await searchUnsplashPhoto(ctx, config.unsplashAccessKey, query, config.debug);
+          }
+          if (!photoUrl && config.pexelsApiKey) {
+            if (config.debug) ctx.logger("pig").debug(`Searching Pexels for: ${query}`);
+            photoUrl = await searchPexelsPhoto(ctx, config.pexelsApiKey, query, config.debug);
+          }
           if (photoUrl) {
-            if (config.debug) ctx.logger("pig").info(`Using Unsplash photo: ${photoUrl}`);
+            ctx.logger("pig").info(`Found photo URL: ${photoUrl}`);
             location.landscapeUrl = photoUrl;
             break;
           }
         }
         if (!photoUrl && config.debug) {
-          ctx.logger("pig").debug("All Unsplash searches returned no results, using LLM-generated URL");
+          ctx.logger("pig").debug("All image searches returned no results, using LLM-generated URL fallback");
         }
       }
       return location;
@@ -1190,7 +1303,8 @@ function parseLocationResponse(content) {
       landscapeUrl: data.landscapeUrl
     };
     if (!location.landscapeUrl.startsWith("http")) {
-      location.landscapeUrl = `https://images.unsplash.com/featured/?${encodeURIComponent(location.landmark)},${encodeURIComponent(location.country)}`;
+      const query = `${encodeURIComponent(location.landmark)},${encodeURIComponent(location.country)}`;
+      location.landscapeUrl = `https://images.unsplash.com/featured/?${query}`;
     }
     return location;
   } catch (e) {
@@ -1303,17 +1417,21 @@ var import_koishi = require("koishi");
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
     outputMode: import_koishi.Schema.union(["text", "image"]).default("image").description("输出模式：text 纯文本，image 生成精美卡片"),
-    emojiFont: import_koishi.Schema.union([
-      import_koishi.Schema.const("System").description("系统默认"),
-      import_koishi.Schema.const("Noto Color Emoji").description("Noto Color Emoji"),
-      import_koishi.Schema.const("Twemoji").description("Twemoji (Twitter Emoji)")
-    ]).default("System").description("Emoji 字体偏好（需确保容器内已安装相应字体）"),
     travelMessageTemplate: import_koishi.Schema.string().default("去了 {landmark}，{country}！📸").description("旅行消息模板（可用变量：{landmark} 地标名, {country} 国家名）")
   }).description("基础设置"),
   import_koishi.Schema.object({
     llmLocationEnabled: import_koishi.Schema.boolean().default(false).description("启用后使用 LLM 动态生成全球旅行地点，关闭则使用预设地点库"),
     llmLocationModel: import_koishi.Schema.dynamic("model").description("用于生成地点的模型（推荐使用快速模型如 gemini-flash）"),
-    unsplashAccessKey: import_koishi.Schema.string().role("secret").default("").description("用于获取高质量风景背景图（从 unsplash.com/developers 免费申请）")
+    llmLocationCustomContext: import_koishi.Schema.string().role("textarea").default("").description("自定义生成上下文（如：关注北欧神话、赛博朋克风格建筑等，留空则完全随机）"),
+    imageSearchPrompt: import_koishi.Schema.string().default("{landmark} {country} landscape").description("搜图关键词模板（可用变量：{landmark} 地标英文名, {country} 国家英文名, {city} 城市英文名）"),
+    unsplashAccessKey: import_koishi.Schema.string().role("secret").default("").description("Unsplash API Access Key (可选)"),
+    pexelsApiKey: import_koishi.Schema.string().role("secret").default("").description("Pexels API Key (可选，作为 Unsplash 的补充)"),
+    backgroundFetchMode: import_koishi.Schema.union([
+      import_koishi.Schema.const("auto").description("自动：尽量内联远程图片，遇到易超时域名则直接使用 URL"),
+      import_koishi.Schema.const("always").description("强制服务端拉取并内联（更稳但可能慢）"),
+      import_koishi.Schema.const("never").description("不进行服务端拉取，直接使用 URL")
+    ]).default("auto").description("背景图服务端拉取策略"),
+    backgroundFetchTimeoutMs: import_koishi.Schema.number().default(8e3).description("背景图服务端拉取超时（毫秒）")
   }).description("地点与图片 🌍"),
   import_koishi.Schema.object({
     aigcEnabled: import_koishi.Schema.boolean().default(false).description("启用后使用 AI 生成小猪旅行插画（需要 media-luna 插件）"),

package/lib/services/pexels.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+import { Context } from 'koishi';
+/**
+ * Search for a photo on Pexels and return the large-sized URL
+ * @returns The photo URL or null if not found/error
+ */
+export declare function searchPexelsPhoto(ctx: Context, apiKey: string, query: string, debug?: boolean): Promise<string | null>;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-my-pig-group-friends",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [