Merge branch 'v2' of github.com:ikechan8370/chatgpt-plugin into v2

This commit is contained in:
ikechan8370 2023-04-16 13:05:31 +08:00
commit b66592d2fb
2 changed files with 8 additions and 3 deletions

View file

@ -559,8 +559,12 @@ export class chatgpt extends plugin {
let me = mm.get(Bot.uin)
let card = me.card
let nickname = me.nickname
prompt = prompt.replace(`@${card}`, '').trim()
prompt = prompt.replace(`@${nickname}`, '').trim()
if (card) {
prompt = prompt.replace(`@${card}`, '').trim()
}
if (nickname) {
prompt = prompt.replace(`@${nickname}`, '').trim()
}
}
} else {
let ats = e.message.filter(m => m.type === 'at')
@ -718,7 +722,7 @@ export class chatgpt extends plugin {
num: 0
}
}
} else if (use !== 'poe' && use === 'claude') {
} else if (use !== 'poe' && use !== 'claude') {
switch (use) {
case 'api': {
key = `CHATGPT:CONVERSATIONS:${e.sender.user_id}`