mirror of
https://github.com/ikechan8370/chatgpt-plugin.git
synced 2025-12-17 13:57:10 +00:00
Merge branch 'ikechan8370:v2' into v2
This commit is contained in:
ifeif
GitHub
commit
4a6cad2e4e
6 changed files with 79 additions and 71 deletions
|
|
@ -803,7 +803,7 @@ export class chatgpt extends plugin {
|
|||
if (!msg || e.msg?.startsWith('#')) {
|
||||
return false
|
||||
}
|
||||
if ((e.isGroup || e.group_id) && !(e.atme || e.atBot)) {
|
||||
if ((e.isGroup || e.group_id) && !(e.atme || e.atBot || (e.at === e.self_id))) {
|
||||
return false
|
||||
}
|
||||
if (e.user_id == getUin(e)) return false
|
||||
|
|
@ -1639,7 +1639,7 @@ export class chatgpt extends plugin {
|
|||
opt.groupId = e.group_id
|
||||
opt.qq = e.sender.user_id
|
||||
opt.nickname = e.sender.card
|
||||
opt.groupName = e.group.name
|
||||
opt.groupName = e.group.name || e.group_name
|
||||
opt.botName = e.isGroup ? (e.group.pickMember(getUin(e)).card || e.group.pickMember(getUin(e)).nickname) : e.bot.nickname
|
||||
let master = (await getMasterQQ())[0]
|
||||
if (master && e.group) {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import { translate, translateLangSupports } from '../utils/translate.js'
|
|||
import AzureTTS from '../utils/tts/microsoft-azure.js'
|
||||
import VoiceVoxTTS from '../utils/tts/voicevox.js'
|
||||
import { URL } from 'node:url'
|
||||
import { getBots } from '../utils/bot.js'
|
||||
|
||||
let useSilk = false
|
||||
try {
|
||||
|
|
@ -350,7 +351,7 @@ ${translateLangLabels}
|
|||
let groupId = e.msg.replace(/^#chatgpt打招呼/, '')
|
||||
logger.info(groupId)
|
||||
groupId = parseInt(groupId)
|
||||
if (groupId && !e.bot.getGroupList().get(groupId)) {
|
||||
if (groupId && !e.bot.gl.get(groupId)) {
|
||||
await e.reply('机器人不在这个群里！')
|
||||
return
|
||||
}
|
||||
|
|
@ -379,74 +380,77 @@ ${translateLangLabels}
|
|||
continue
|
||||
}
|
||||
let groupId = parseInt(element)
|
||||
if (this.e.bot.getGroupList().get(groupId)) {
|
||||
// 打招呼概率
|
||||
if (Math.floor(Math.random() * 100) < Config.helloProbability) {
|
||||
let message = await generateHello()
|
||||
logger.info(`打招呼给群聊${groupId}：` + message)
|
||||
if (Config.defaultUseTTS) {
|
||||
let audio
|
||||
const [defaultVitsTTSRole, defaultAzureTTSRole, defaultVoxTTSRole] = [Config.defaultTTSRole, Config.azureTTSSpeaker, Config.voicevoxTTSSpeaker]
|
||||
let ttsSupportKinds = []
|
||||
if (Config.azureTTSKey) ttsSupportKinds.push(1)
|
||||
if (Config.ttsSpace) ttsSupportKinds.push(2)
|
||||
if (Config.voicevoxSpace) ttsSupportKinds.push(3)
|
||||
if (!ttsSupportKinds.length) {
|
||||
logger.warn('没有配置任何语音服务！')
|
||||
return false
|
||||
}
|
||||
const randomIndex = Math.floor(Math.random() * ttsSupportKinds.length)
|
||||
switch (ttsSupportKinds[randomIndex]) {
|
||||
case 1 : {
|
||||
const isEn = AzureTTS.supportConfigurations.find(config => config.code === defaultAzureTTSRole)?.language.includes('en')
|
||||
if (isEn) {
|
||||
message = (await translate(message, '英')).replace('\n', '')
|
||||
}
|
||||
audio = await AzureTTS.generateAudio(message, {
|
||||
defaultAzureTTSRole
|
||||
})
|
||||
break
|
||||
let bots = this.e ? [this.e.bot] : getBots()
|
||||
for (let bot of bots) {
|
||||
if (bot.gl?.get(groupId)) {
|
||||
// 打招呼概率
|
||||
if (Math.floor(Math.random() * 100) < Config.helloProbability) {
|
||||
let message = await generateHello()
|
||||
logger.info(`打招呼给群聊${groupId}：` + message)
|
||||
if (Config.defaultUseTTS) {
|
||||
let audio
|
||||
const [defaultVitsTTSRole, defaultAzureTTSRole, defaultVoxTTSRole] = [Config.defaultTTSRole, Config.azureTTSSpeaker, Config.voicevoxTTSSpeaker]
|
||||
let ttsSupportKinds = []
|
||||
if (Config.azureTTSKey) ttsSupportKinds.push(1)
|
||||
if (Config.ttsSpace) ttsSupportKinds.push(2)
|
||||
if (Config.voicevoxSpace) ttsSupportKinds.push(3)
|
||||
if (!ttsSupportKinds.length) {
|
||||
logger.warn('没有配置任何语音服务！')
|
||||
return false
|
||||
}
|
||||
case 2 : {
|
||||
if (Config.autoJapanese) {
|
||||
const randomIndex = Math.floor(Math.random() * ttsSupportKinds.length)
|
||||
switch (ttsSupportKinds[randomIndex]) {
|
||||
case 1 : {
|
||||
const isEn = AzureTTS.supportConfigurations.find(config => config.code === defaultAzureTTSRole)?.language.includes('en')
|
||||
if (isEn) {
|
||||
message = (await translate(message, '英')).replace('\n', '')
|
||||
}
|
||||
audio = await AzureTTS.generateAudio(message, {
|
||||
defaultAzureTTSRole
|
||||
})
|
||||
break
|
||||
}
|
||||
case 2 : {
|
||||
if (Config.autoJapanese) {
|
||||
try {
|
||||
message = await translate(message, '日')
|
||||
} catch (err) {
|
||||
logger.error(err)
|
||||
}
|
||||
}
|
||||
try {
|
||||
message = await translate(message, '日')
|
||||
audio = await generateVitsAudio(message, defaultVitsTTSRole, '中日混合（中文用[ZH][ZH]包裹起来，日文用[JA][JA]包裹起来）')
|
||||
} catch (err) {
|
||||
logger.error(err)
|
||||
}
|
||||
break
|
||||
}
|
||||
try {
|
||||
audio = await generateVitsAudio(message, defaultVitsTTSRole, '中日混合（中文用[ZH][ZH]包裹起来，日文用[JA][JA]包裹起来）')
|
||||
} catch (err) {
|
||||
logger.error(err)
|
||||
case 3 : {
|
||||
message = (await translate(message, '日')).replace('\n', '')
|
||||
try {
|
||||
audio = await VoiceVoxTTS.generateAudio(message, {
|
||||
speaker: defaultVoxTTSRole
|
||||
})
|
||||
} catch (err) {
|
||||
logger.error(err)
|
||||
}
|
||||
break
|
||||
}
|
||||
break
|
||||
}
|
||||
case 3 : {
|
||||
message = (await translate(message, '日')).replace('\n', '')
|
||||
try {
|
||||
audio = await VoiceVoxTTS.generateAudio(message, {
|
||||
speaker: defaultVoxTTSRole
|
||||
})
|
||||
} catch (err) {
|
||||
logger.error(err)
|
||||
}
|
||||
break
|
||||
if (useSilk) {
|
||||
await this.e.bot.sendGroupMsg(groupId, await uploadRecord(audio))
|
||||
} else {
|
||||
await this.e.bot.sendGroupMsg(groupId, segment.record(audio))
|
||||
}
|
||||
}
|
||||
if (useSilk) {
|
||||
await this.e.bot.sendGroupMsg(groupId, await uploadRecord(audio))
|
||||
} else {
|
||||
await this.e.bot.sendGroupMsg(groupId, segment.record(audio))
|
||||
await this.e.bot.sendGroupMsg(groupId, message)
|
||||
}
|
||||
} else {
|
||||
await this.e.bot.sendGroupMsg(groupId, message)
|
||||
logger.info(`时机未到，这次就不打招呼给群聊${groupId}了`)
|
||||
}
|
||||
} else {
|
||||
logger.info(`时机未到，这次就不打招呼给群聊${groupId}了`)
|
||||
logger.warn('机器人不在要发送的群组里，忽略群。同时建议检查配置文件修改要打招呼的群号。' + groupId)
|
||||
}
|
||||
} else {
|
||||
logger.warn('机器人不在要发送的群组里，忽略群。同时建议检查配置文件修改要打招呼的群号。' + groupId)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,8 @@
|
|||
import { UserInfo, AddUser } from './user_data.js'
|
||||
import { randomString, getUserData, getMasterQQ, getUin } from '../../utils/common.js'
|
||||
import { getBots } from '../../utils/bot.js';
|
||||
import fs from 'fs'
|
||||
|
||||
function getBots () {
|
||||
if (Bot.uin === 88888) {
|
||||
// 找适配器
|
||||
let adapters = Bot.adapter
|
||||
return adapters?.map(uin => Bot[uin])
|
||||
} else if (Bot.adapter && Bot.adapter.length > 0) {
|
||||
let bots = [Bot]
|
||||
Bot.adapter.forEach(uin => {
|
||||
bots.push(Bot[uin])
|
||||
})
|
||||
return bots
|
||||
}
|
||||
}
|
||||
import path from 'path';
|
||||
|
||||
async function User (fastify, options) {
|
||||
// 登录
|
||||
|
|
|
|||
15
utils/bot.js
Normal file
15
utils/bot.js
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
export function getBots () {
|
||||
if (Bot.uin === 88888) {
|
||||
// 找适配器
|
||||
let adapters = Bot.adapter
|
||||
return adapters?.map(uin => Bot[uin])
|
||||
} else if (Bot.adapter && Bot.adapter.length > 0) {
|
||||
let bots = [Bot]
|
||||
Bot.adapter.forEach(uin => {
|
||||
bots.push(Bot[uin])
|
||||
})
|
||||
return bots
|
||||
} else {
|
||||
return [Bot]
|
||||
}
|
||||
}
|
||||
|
|
@ -136,7 +136,7 @@ export class ClaudeAIClient {
|
|||
attachments,
|
||||
completion: {
|
||||
incremental: true,
|
||||
model: 'claude-2',
|
||||
model: 'claude-2.1',
|
||||
prompt: text,
|
||||
timezone: 'Asia/Hong_Kong'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -848,6 +848,7 @@ export function getMaxModelTokens (model = 'gpt-3.5-turbo') {
|
|||
}
|
||||
|
||||
export function getUin (e) {
|
||||
if (e?.self_id) return e.self_id
|
||||
if (e?.bot?.uin) return e.bot.uin
|
||||
if (Array.isArray(Bot.uin)) {
|
||||
if (Config.trssBotUin && Bot.uin.indexOf(Config.trssBotUin) > -1) { return Config.trssBotUin } else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue