MurasameNoa/chatgpt-plugin
1
0
Fork 0
mirror of https://github.com/ikechan8370/chatgpt-plugin.git synced 2025-12-16 13:27:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 修复TRSS转发错误，chronocat linux应该还没适配

Browse source
This commit is contained in:
ikechan8370 2023-10-14 00:47:39 +08:00
parent 95e730f250
commit 4066f17847
2 changed files with 41 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/chat.js
View file

@ -768,6 +768,7 @@ export class chatgpt extends plugin {
} }
if (e.user_id == getUin(e)) return false if (e.user_id == getUin(e)) return false
prompt = msg.trim() prompt = msg.trim()
try {
if (e.isGroup && typeof this.e.group.getMemberMap === 'function') { if (e.isGroup && typeof this.e.group.getMemberMap === 'function') {
let mm = await this.e.group.getMemberMap() let mm = await this.e.group.getMemberMap()
let me = mm.get(getUin(e)) || {} let me = mm.get(getUin(e)) || {}
@ -797,6 +798,9 @@ export class chatgpt extends plugin {
prompt = prompt.replace(`@${card}`, '').trim() prompt = prompt.replace(`@${card}`, '').trim()
} }
} }
} catch (err) {
logger.warn(err)
}
} else { } else {
let ats = e.message.filter(m => m.type === 'at') let ats = e.message.filter(m => m.type === 'at')
if (!(e.atme || e.atBot) && ats.length > 0) { if (!(e.atme || e.atBot) && ats.length > 0) {

19
utils/common.js
View file

@ -1,18 +1,20 @@
// import { remark } from 'remark' // import { remark } from 'remark'
// import stripMarkdown from 'strip-markdown' // import stripMarkdown from 'strip-markdown'
import {exec} from 'child_process' import { exec } from 'child_process'
import lodash from 'lodash' import lodash from 'lodash'
import fs from 'node:fs' import fs from 'node:fs'
import path from 'node:path' import path from 'node:path'
import buffer from 'buffer' import buffer from 'buffer'
import yaml from 'yaml' import yaml from 'yaml'
import puppeteer from '../../../lib/puppeteer/puppeteer.js' import puppeteer from '../../../lib/puppeteer/puppeteer.js'
import {Config} from './config.js' import common from '../../../lib/common/common.js'
import {convertSpeaker, generateVitsAudio, speakers as vitsRoleList} from './tts.js' import { Config } from './config.js'
import VoiceVoxTTS, {supportConfigurations as voxRoleList} from './tts/voicevox.js' import { convertSpeaker, generateVitsAudio, speakers as vitsRoleList } from './tts.js'
import AzureTTS, {supportConfigurations as azureRoleList} from './tts/microsoft-azure.js' import VoiceVoxTTS, { supportConfigurations as voxRoleList } from './tts/voicevox.js'
import {translate} from './translate.js' import AzureTTS, { supportConfigurations as azureRoleList } from './tts/microsoft-azure.js'
import { translate } from './translate.js'
import uploadRecord from './uploadRecord.js' import uploadRecord from './uploadRecord.js'
import Version from './version.js'
// export function markdownToText (markdown) { // export function markdownToText (markdown) {
// return remark() // return remark()
// .use(stripMarkdown) // .use(stripMarkdown)
@ -81,6 +83,9 @@ export async function tryTimes (promiseFn, maxTries = 10) {
} }
export async function makeForwardMsg (e, msg = [], dec = '') { export async function makeForwardMsg (e, msg = [], dec = '') {
if (Version.isTrss) {
return common.makeForwardMsg(e, msg, dec)
}
let nickname = Bot.nickname let nickname = Bot.nickname
if (e.isGroup) { if (e.isGroup) {
try { try {
@ -919,7 +924,6 @@ export async function generateAzureAudio (pendingText, role = '随机', speaking
let languagePrefix = azureRoleList.find(config => config.code === speaker).languageDetail.charAt(0) let languagePrefix = azureRoleList.find(config => config.code === speaker).languageDetail.charAt(0)
languagePrefix = languagePrefix.startsWith('E') ? '英' : languagePrefix languagePrefix = languagePrefix.startsWith('E') ? '英' : languagePrefix
pendingText = (await translate(pendingText, languagePrefix)).replace('\n', '') pendingText = (await translate(pendingText, languagePrefix)).replace('\n', '')
} else { } else {
let role, languagePrefix let role, languagePrefix
role = azureRoleList[Math.floor(Math.random() * azureRoleList.length)] role = azureRoleList[Math.floor(Math.random() * azureRoleList.length)]
@ -961,4 +965,3 @@ export function getUserSpeaker (userSetting) {
return userSetting.ttsRoleVoiceVox || Config.voicevoxTTSSpeaker return userSetting.ttsRoleVoiceVox || Config.voicevoxTTSSpeaker
} }
} }