增加文案优先获取群头衔

apps/bym.js

@@ -5,9 +5,6 @@ import { customSplitRegex, filterResponseChunk } from '../utils/text.js'
 import core, { roleMap } from '../model/core.js'
 import { formatDate } from '../utils/common.js'
 
-/** 使机器人可以对其第一人称回应 */
-const reg_chatgpt_for_firstperson_call = Config.enableBYM ? Config.assistantLabel : `Chatgpt-plugin-bot-name-${Math.floor(10000 + Math.random() * 90000)}`;
-
 export class bym extends plugin {
   constructor() {
     super({
@@ -18,7 +15,6 @@ export class bym extends plugin {
       priority: 5000,
       rule: [
         {
-          reg: reg_chatgpt_for_firstperson_call,
           fnc: 'bym',
           priority: '-1000000',
           log: false

apps/tts_voice_help.js

@@ -146,9 +146,8 @@ export class voicechangehelp extends plugin {
                     permission: 'master'
                 },
                 {
-                    reg: /^#(chat)?gpt偷(图|表情包?)$/i,
+                    reg: /^#偷(图|表情包?)$/i,
                     fnc: 'save_EmojiImg',
-                    permission: 'master'
                 },
                 {
                     reg: /^#(chat)?gptsf语音模型(创建|删除|列表|上传|新增)$/i,
@@ -478,8 +477,34 @@ export class voicechangehelp extends plugin {
         }
     }
 
-    /** /^#(chat)?gpt偷(图|表情包?)$/i */
+    async checkStealImgWhitelist(e) {
+        let whitelist = Config.stealImgWhitelist || [];
+        if (typeof whitelist === 'string') {
+            whitelist = whitelist.length > 0 ? whitelist.split(',').map(item => item.trim()) : [];
+        }
+        if (whitelist.length === 0) return true;
+        if (e.isMaster) return true;
+
+        const userId = e.sender?.user_id?.toString() || '';
+        const groupId = e.isGroup && e.group_id ? e.group_id.toString() : '';
+        for (const item of whitelist) {
+            if (!item) continue;
+            if (item.startsWith('^')) {
+                if (item.slice(1) === userId) return true;
+            } else if (item.includes('^')) {
+                const [g, q] = item.split('^');
+                if (e.isGroup && g === groupId && q === userId) return true;
+            } else if (e.isGroup && item === groupId) {
+                return true;
+            }
+        }
+        e.reply('你没有使用该指令的权限', true);
+        return false;
+    }
+
+    /** /^#偷(图|表情包?)$/i */
     async save_EmojiImg(e) {
+        if (!await this.checkStealImgWhitelist(e)) return false;
         await parseSourceImg(e);
         if (!e.img || !e.img.length) {
             e.reply(`请引用图片或将图片一起发送后重试`, true);
@@ -517,8 +542,11 @@ export class voicechangehelp extends plugin {
         }
 
         if (!emotions.includes(emotion)) {
-            e.reply('未能确定该表情包类别\nError: ' + aiText, true);
-            return true;
+            // Gemini 在部分地区会返回 FAILED_PRECONDITION / User location is not supported。
+            // 偷表情不应该因此失败：识别失败时兜底保存到 cute 分类。
+            logger.warn(`[偷表情] 表情类别识别失败，已使用默认分类 cute：${aiText || '无返回'}`);
+            emotion = 'cute';
+            analysis = '识别失败，默认分类';
         }
 
         const directory = path.join(process.cwd(), 'data', 'chatgpt', 'sendEmojiTool', emotion);

apps/派蒙meme.js

@@ -21,10 +21,6 @@ const baseUrl = Config.meme_baseUrl
  * @type {boolean}
  */
 const reply = Config.meme_reply
-/**
- * 是否强制使用#触发命令
- */
-const forceSharp = Config.meme_forceSharp
 /**
  * 主人保护，撅主人时会被反撅 (暂时只支持QQ)
  * @type {boolean}
@@ -50,6 +46,10 @@ let protectList = ['lash', 'do', 'beat_up', 'little_do', 'fast_do', 'qi', 'fast_
  */
 const MEME_USAGE_REDIS_PREFIX = 'Yz:paimon_meme_usage:'
 
+function escapeRegExp(str = '') {
+  return String(str).replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+}
+
 export class memes extends plugin {
   constructor() {
     let option = {
@@ -60,7 +60,7 @@ export class memes extends plugin {
       /** https://oicqjs.github.io/oicq/#events */
       event: 'message',
       /** 优先级，数字越小等级越高 */
-      priority: 5000,
+      priority: 1000,
       rule: [
         {
           /** 命令正则匹配 */
@@ -98,7 +98,7 @@ export class memes extends plugin {
 
     }
     Object.keys(keyMap).forEach(key => {
-      let reg = forceSharp ? `^#${key}` : `^#?${key}`
+      let reg = `^\\s*#?${escapeRegExp(key)}`
       option.rule.push({
         /** 命令正则匹配 */
         reg,
@@ -179,7 +179,7 @@ export class memes extends plugin {
     }
     let rules = []
     Object.keys(keyMap).forEach(key => {
-      let reg = forceSharp ? `^#${key}` : `^#?${key}`
+      let reg = `^\\s*#?${escapeRegExp(key)}`
       rules.push({
         /** 命令正则匹配 */
         reg,
@@ -366,6 +366,7 @@ export class memes extends plugin {
      */
   async memes(e) {
     if (Config.meme_turnOff) return false;
+    if (Config.meme_forceSharp && !String(e.msg || '').trimStart().startsWith('#')) return false;
 
     // meme响应CD
     let lastTime = await redis.get(`Yz:paimon_meme_cd:${e.group_id}:${e.sender.user_id || e.user_id}`);
@@ -396,7 +397,10 @@ export class memes extends plugin {
     // 替换原有的硬编码匹配逻辑
     let target = findLongestMatchingKey(msg, keyMap);
 
+    if (!target) return false
     let targetCode = keyMap[target]
+    let info = infos[targetCode]
+    if (!info?.params_type) return false
     // let target = e.msg.replace(/^#?meme(s)?/, '')
     let text1 = _.trimStart(e.msg, '#').replace(target, '')
     if (text1.trim() === '详情' || text1.trim() === '帮助') {
@@ -406,7 +410,6 @@ export class memes extends plugin {
 
     let [text, args = ''] = text1.split('#')
     let formData = new FormData()
-    let info = infos[targetCode]
     let fileLoc
 
     // 提取 @ 信息并获取用户详情缓存