dsh-live2dwaifu 0.7.0 → 0.7.1

package/lib/index.js

@@ -59,12 +59,12 @@ function pickOwnMeme(mood) {
 }
 
 /** 按模式挑一张配图，返回可直接用的 URL */
-function pickImage(mode, mood) {
+function pickImage(mode, mood, label) {
   const m = MEMES_MODES.includes(mode) ? mode : 'off';
   if (m === 'off') return null;
   const pool = [];
   if (m === 'own' || m === 'both') {
-    const f = pickOwnMeme(mood);
+    const f = (label && pickOwnMemeByLabel(label)) || pickOwnMeme(mood);
     if (f) pool.push('/dsh-live2d/ownmeme/' + encodeURIComponent(f));
   }
   if (m === 'external' || m === 'both') {
@@ -118,7 +118,30 @@ function splitChoices(raw) {
   return { text: raw.slice(0, m.index).trim(), choices };
 }
 
-/** 粗判情绪，配图用 */
+/** 先摘「||图:名字」，再摘「||选项1|选项2」 */
+function splitMeta(raw) {
+  let text = String(raw || '');
+  let imageLabel = '';
+  const imgMatch = /\|\|\s*图\s*[:：]\s*([^\n|]+)\s*$/m.exec(text);
+  if (imgMatch) {
+    imageLabel = imgMatch[1].trim().replace(/^["“「『']+|["”」』']+$/g, '');
+    text = (text.slice(0, imgMatch.index) + text.slice(imgMatch.index + imgMatch[0].length)).trim();
+  }
+  const parsed = splitChoices(text);
+  return { text: parsed.text, choices: parsed.choices, imageLabel };
+}
+
+/** 按名字取自带那张 */
+function pickOwnMemeByLabel(label) {
+  const items = readOwnMemes();
+  if (!items.length || !label) return null;
+  const key = String(label).trim();
+  const hit =
+    items.find((it) => it.label === key) ||
+    items.find((it) => String(it.file).replace(/\.\w+$/, '') === key) ||
+    items.find((it) => key && String(it.label).includes(key));
+  return hit ? hit.file : null;
+}
 function guessMood(text) {
   const s = String(text || '');
   if (/[气烦讨厌]/.test(s)) return '生气';
@@ -472,6 +495,14 @@ async function handle(req, res, ctx) {
       '他说：' + text,
       '回他一句。只输出这句话本身：一到三句，短，口语，像发消息。不要解释，不要加引号，不要旁白，不要括号里的动作。',
       st.choices ? '如果你想让他挑，可以在最后另起一行写 ||选项一|选项二，最多三项。' : '',
+      st.memesMode === 'own' || st.memesMode === 'both'
+        ? '如果你想附一张贴图，就在最后另起一行写 ||图:名字。能挑的名字有：' +
+          readOwnMemes()
+            .map((it) => it.label)
+            .filter(Boolean)
+            .join('、') +
+          '。不想配就别写。'
+        : '',
     ]
       .filter(Boolean)
       .join('\n\n');
@@ -483,7 +514,7 @@ async function handle(req, res, ctx) {
       return sendJson(res, 502, { error: '生成失败：' + (e instanceof Error ? e.message : String(e)) });
     }
     LAST_ACTIVE.at = Date.now();
-    const parsed = splitChoices(reply || '');
+    const parsed = splitMeta(reply || '');
     let line = parsed.text;
     let choices = st.choices ? parsed.choices : [];
     if (line.length > 240) line = line.slice(0, 240);
@@ -492,7 +523,14 @@ async function handle(req, res, ctx) {
     }
     if (!line && !choices.length) return sendJson(res, 200, { ok: true, reply: '', id });
     const moodNow = guessMood(line);
-    const image = st.memesMode !== 'off' && Math.random() < 0.35 ? pickImage(st.memesMode, moodNow) : null;
+    const image =
+      st.memesMode === 'off'
+        ? null
+        : parsed.imageLabel
+          ? pickImage(st.memesMode, moodNow, parsed.imageLabel)
+          : Math.random() < 0.35
+            ? pickImage(st.memesMode, moodNow)
+            : null;
 
     writeChat(id, hist.concat([
       { role: 'user', text, at: Date.now() },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-live2dwaifu",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "给 DSH 网页右下角请一个 Live2D 角色：会眨眼、会呼吸、视线跟着鼠标、点她有反应、说话时嘴动、心情变了眉毛跟着动。模型不用内置——谁装谁放自己的文件夹；支持自定义 .exp3.json 表情和 .motion3.json 动作，卡片能拖能缩，背景可换。",
   "type": "module",
   "main": "lib/index.js",