🥵🥵🥵

apps/entertainment.js

@@ -1,7 +1,7 @@
 import plugin from '../../../lib/plugins/plugin.js'
 import { Config } from '../utils/config.js'
 import { generateHello } from '../utils/randomMessage.js'
-import { generateAudio } from '../utils/tts.js'
+import { generateVitsAudio } from '../utils/tts.js'
 import fs from 'fs'
 import { emojiRegex, googleRequestUrl } from '../utils/emoj/index.js'
 import fetch from 'node-fetch'
@@ -304,7 +304,7 @@ ${translateLangLabels}
     let sendable = message
     logger.info(`打招呼给群聊${groupId}：` + message)
     if (Config.defaultUseTTS) {
-      let audio = await generateAudio(message, Config.defaultTTSRole)
+      let audio = await generateVitsAudio(message, Config.defaultTTSRole)
       sendable = segment.record(audio)
     }
     if (!groupId) {
@@ -362,7 +362,7 @@ ${translateLangLabels}
                   }
                 }
                 try {
-                  audio = await generateAudio(message, defaultVitsTTSRole, '中日混合（中文用[ZH][ZH]包裹起来，日文用[JA][JA]包裹起来）')
+                  audio = await generateVitsAudio(message, defaultVitsTTSRole, '中日混合（中文用[ZH][ZH]包裹起来，日文用[JA][JA]包裹起来）')
                 } catch (err) {
                   logger.error(err)
                 }

apps/management.js

@@ -8,7 +8,7 @@ import {
   getVitsRoleList,
   getVoicevoxRoleList,
   makeForwardMsg,
-  parseDuration, processList,
+  parseDuration,
   renderUrl
 } from '../utils/common.js'
 import SydneyAIClient from '../utils/SydneyAIClient.js'
@@ -20,8 +20,6 @@ import loader from '../../../lib/plugins/loader.js'
 import VoiceVoxTTS, { supportConfigurations as voxRoleList } from '../utils/tts/voicevox.js'
 import { supportConfigurations as azureRoleList } from '../utils/tts/microsoft-azure.js'
 
-let isWhiteList = true
-let isSetGroup = true
 export class ChatgptManagement extends plugin {
   constructor (e) {
     super({
@@ -195,21 +193,6 @@ export class ChatgptManagement extends plugin {
           fnc: 'enablePrivateChat',
           permission: 'master'
         },
-        {
-          reg: '^#chatgpt(设置|添加)对话[白黑]名单$',
-          fnc: 'setList',
-          permission: 'master'
-        },
-        {
-          reg: '^#chatgpt(查看)?对话[白黑]名单(帮助)?$',
-          fnc: 'checkList',
-          permission: 'master'
-        },
-        {
-          reg: '^#chatgpt(删除|移除)对话[白黑]名单$',
-          fnc: 'delList',
-          permission: 'master'
-        },
         {
           reg: '^#(设置|修改)管理密码',
           fnc: 'setAdminPassword',
@@ -440,126 +423,6 @@ azure语音：Azure 语音是微软 Azure 平台提供的一项语音服务，
     return true
   }
 
-  async setList (e) {
-    this.setContext('saveList')
-    isWhiteList = e.msg.includes('白')
-    const listType = isWhiteList ? '对话白名单' : '对话黑名单'
-    await this.reply(`请发送需要添加的${listType}号码，默认设置为添加群号，需要添加QQ号时在前面添加^(例如：^123456)。`, e.isGroup)
-    return false
-  }
-
-  async saveList (e) {
-    if (!this.e.msg) return
-    const listType = isWhiteList ? '对话白名单' : '对话黑名单'
-    const regex = /^\^?[1-9]\d{5,9}$/
-    const wrongInput = []
-    const inputSet = new Set()
-    const inputList = this.e.msg.split(/[,，]/).reduce((acc, value) => {
-      if (value.length > 11 || !regex.test(value)) {
-        wrongInput.push(value)
-      } else if (!inputSet.has(value)) {
-        inputSet.add(value)
-        acc.push(value)
-      }
-      return acc
-    }, [])
-    if (!inputList.length) {
-      let replyMsg = '名单更新失败，请在检查输入是否正确后重新输入。'
-      if (wrongInput.length) replyMsg += `\n${wrongInput.length ? '检测到以下错误输入："' + wrongInput.join('，') + '"，已自动忽略。' : ''}`
-      await this.reply(replyMsg, e.isGroup)
-      return false
-    }
-    let [whitelist, blacklist] = processList(Config.whitelist, Config.blacklist)
-    whitelist = [...inputList, ...whitelist]
-    blacklist = [...inputList, ...blacklist]
-    if (listType === '对话白名单') {
-      Config.whitelist = Array.from(new Set(whitelist))
-    } else {
-      Config.blacklist = Array.from(new Set(blacklist))
-    }
-    let replyMsg = `${listType}已更新，可通过\n"#chatgpt查看${listType}" 查看最新名单\n"#chatgpt移除${listType}" 管理名单${wrongInput.length ? '\n检测到以下错误输入："' + wrongInput.join('，') + '"，已自动忽略。' : ''}`
-    if (e.isPrivate) {
-      replyMsg += `\n当前${listType}为：${listType === '对话白名单' ? Config.whitelist : Config.blacklist}`
-    }
-    await this.reply(replyMsg, e.isGroup)
-    this.finish('saveList')
-  }
-
-  async checkList (e) {
-    if (e.msg.includes('帮助')) {
-      await this.reply('默认设置为添加群号，需要拉黑QQ号时在前面添加^(例如：^123456)，可一次性混合输入多个配置号码，错误项会自动忽略。具体使用指令可通过 "#指令表搜索名单" 查看，白名单优先级高于黑名单。')
-      return true
-    }
-    isWhiteList = e.msg.includes('白')
-    const list = isWhiteList ? Config.whitelist : Config.blacklist
-    const listType = isWhiteList ? '白名单' : '黑名单'
-    const replyMsg = list.length ? `当前${listType}为：${list}` : `当前没有设置任何${listType}`
-    await this.reply(replyMsg, e.isGroup)
-    return false
-  }
-
-  async delList (e) {
-    isWhiteList = e.msg.includes('白')
-    const listType = isWhiteList ? '对话白名单' : '对话黑名单'
-    let replyMsg = ''
-    if (Config.whitelist.length === 0 && Config.blacklist.length === 0) {
-      replyMsg = '当前对话(白|黑)名单都是空哒，请先添加吧~'
-    } else if ((listType === '对话白名单' && !Config.whitelist.length) || (listType === '对话黑名单' && !Config.blacklist.length)) {
-      replyMsg = `当前${listType}为空，请先添加吧~`
-    }
-    if (replyMsg) {
-      await this.reply(replyMsg, e.isGroup)
-      return false
-    }
-    this.setContext('confirmDelList')
-    await this.reply(`请发送需要删除的${listType}号码，号码间使用,隔开。输入‘全部删除’清空${listType}。${e.isPrivate ? '\n当前' + listType + '为：' + (listType === '对话白名单' ? Config.whitelist : Config.blacklist) : ''}`, e.isGroup)
-    return false
-  }
-
-  async confirmDelList (e) {
-    if (!this.e.msg) return
-    const isAllDeleted = this.e.msg.trim() === '全部删除'
-    const regex = /^\^?[1-9]\d{5,9}$/
-    const wrongInput = []
-    const inputSet = new Set()
-    const inputList = this.e.msg.split(/[,，]/).reduce((acc, value) => {
-      if (value.length > 11 || !regex.test(value)) {
-        wrongInput.push(value)
-      } else if (!inputSet.has(value)) {
-        inputSet.add(value)
-        acc.push(value)
-      }
-      return acc
-    }, [])
-    if (!inputList.length && !isAllDeleted) {
-      let replyMsg = '名单更新失败，请在检查输入是否正确后重新输入。'
-      if (wrongInput.length) replyMsg += `${wrongInput.length ? '\n检测到以下错误输入："' + wrongInput.join('，') + '"，已自动忽略。' : ''}`
-      await this.reply(replyMsg, e.isGroup)
-      return false
-    }
-    let [whitelist, blacklist] = processList(Config.whitelist, Config.blacklist)
-    if (isAllDeleted) {
-      Config.whitelist = isWhiteList ? [] : whitelist
-      Config.blacklist = !isWhiteList ? [] : blacklist
-    } else {
-      for (const element of inputList) {
-        if (isWhiteList) {
-          Config.whitelist = whitelist.filter(item => item !== element)
-        } else {
-          Config.blacklist = blacklist.filter(item => item !== element)
-        }
-      }
-    }
-    const listType = isWhiteList ? '对话白名单' : '对话黑名单'
-    let replyMsg = `${listType}已更新，可通过 "#chatgpt查看${listType}" 命令查看最新名单${wrongInput.length ? '\n检测到以下错误输入："' + wrongInput.join('，') + '"，已自动忽略。' : ''}`
-    if (e.isPrivate) {
-      const list = isWhiteList ? Config.whitelist : Config.blacklist
-      replyMsg = list.length ? `\n当前${listType}为：${list}` : `当前没有设置任何${listType}`
-    }
-    await this.reply(replyMsg, e.isGroup)
-    this.finish('confirmDelList')
-  }
-
   async enablePrivateChat (e) {
     Config.enablePrivateChat = !!e.msg.match(/(允许|打开|同意)/)
     await this.reply('设置成功', e.isGroup)

guoba.support.js

@@ -42,13 +42,17 @@ export function supportGuoba () {
         {
           field: 'whitelist',
           label: '对话白名单',
-          bottomHelpMessage: '只有在白名单内的QQ号或群组才能使用本插件进行对话。如果需要添加QQ号，请在号码前面加上^符号（例如：^123456），多个号码之间请用英文逗号(,)隔开。白名单优先级高于黑名单。',
+          bottomHelpMessage: '默认设置为添加群号。优先级高于黑名单。\n' +
+              '注意：需要添加QQ号时在前面添加^(例如：^123456)，此全局添加白名单，即除白名单以外的所有人都不能使用插件对话。\n' +
+              '如果需要在某个群里独享moment，即群聊中只有白名单上的qq号能用，则使用（群号^qq）的格式(例如：123456^123456)。\n' +
+              '白名单优先级：混合制 > qq > 群号。\n' +
+              '黑名单优先级: 群号 > qq > 混合制。',
           component: 'Input'
         },
         {
           field: 'blacklist',
           label: '对话黑名单',
-          bottomHelpMessage: '名单内的群或QQ号将无法使用本插件进行对话。如果需要添加QQ号，请在QQ号前面加上^符号（例如：^123456），并用英文逗号（,）将各个号码分隔开。',
+          bottomHelpMessage: '参考白名单设置规则。',
           component: 'Input'
         },
         {
@@ -834,7 +838,22 @@ export function supportGuoba () {
       setConfigData (data, { Result }) {
         for (let [keyPath, value] of Object.entries(data)) {
           // 处理黑名单
-          if (keyPath === 'blacklist' || keyPath === 'whitelist' || keyPath === 'blockWords' || keyPath === 'promptBlockWords' || keyPath === 'initiativeChatGroups') { value = value.toString().split(/[,，;；\|]/) }
+          if (keyPath === 'blockWords' || keyPath === 'promptBlockWords' || keyPath === 'initiativeChatGroups') { value = value.toString().split(/[,，;；\|]/) }
+          if (keyPath === 'blacklist' || keyPath === 'whitelist') {
+            // 6-10位数的群号或qq
+            const regex = /^\^?[1-9]\d{5,9}(\^[1-9]\d{5,9})?$/
+            const inputSet = new Set()
+            value = value.toString().split(/[,，;；|\s]/).reduce((acc, item) => {
+              item = item.trim()
+              if (!inputSet.has(item) && regex.test(item)) {
+                if (item.length <= 11 || (item.length <= 21 && item.length > 11 && !item.startsWith('^'))) {
+                  inputSet.add(item)
+                  acc.push(item)
+                }
+              }
+              return acc
+            }, [])
+          }
           if (Config[keyPath] !== value) { Config[keyPath] = value }
         }
         // 正确储存azureRoleSelect结果

package.json

@@ -30,7 +30,10 @@
     "random": "^4.1.0",
     "undici": "^5.21.0",
     "uuid": "^9.0.0",
-    "ws": "^8.13.0"
+    "ws": "^8.13.0",
+    "js-tiktoken": "^1.0.5",
+    "quick-lru": "6.1.1"
+
   },
   "optionalDependencies": {
     "@node-rs/jieba": "^1.6.2",