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

fix: 修复对原生bing造成的影响

Browse source
This commit is contained in:
ikechan8370 2023-04-02 13:10:00 +08:00
parent 95a4d7a69c
commit 10bbbf4f64
1 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

80
apps/chat.js
View file

@ -1049,50 +1049,52 @@ export class chatgpt extends plugin {
let errorMessage = '' let errorMessage = ''
do { do {
let abtrs = await getAvailableBingToken(conversation, throttledTokens)
bingToken = abtrs.bingToken
allThrottled = abtrs.allThrottled
if (bingToken?.indexOf('=') > -1) {
cookies = bingToken
}
bingAIClient.opts.userToken = bingToken
bingAIClient.opts.cookies = cookies
try { try {
let opt = _.cloneDeep(conversation) || {} let opt = _.cloneDeep(conversation) || {}
opt.toneStyle = Config.toneStyle opt.toneStyle = Config.toneStyle
opt.context = Config.sydneyContext opt.context = Config.sydneyContext
opt.messageType = allThrottled ? 'Chat' : 'SearchQuery' if (Config.toneStyle === 'Sydney' || Config.toneStyle === 'Custom') {
if (Config.enableGroupContext && e.isGroup) { let abtrs = await getAvailableBingToken(conversation, throttledTokens)
try { bingToken = abtrs.bingToken
opt.groupId = e.group_id allThrottled = abtrs.allThrottled
opt.qq = e.sender.user_id if (bingToken?.indexOf('=') > -1) {
opt.nickname = e.sender.card cookies = bingToken
opt.groupName = e.group.name }
opt.botName = e.isGroup ? (e.group.pickMember(Bot.uin).card || e.group.pickMember(Bot.uin).nickname) : Bot.nickname bingAIClient.opts.userToken = bingToken
let master = (await getMasterQQ())[0] bingAIClient.opts.cookies = cookies
if (master && e.group) { opt.messageType = allThrottled ? 'Chat' : 'SearchQuery'
opt.masterName = e.group.pickMember(master).card || e.group.pickMember(master).nickname if (Config.enableGroupContext && e.isGroup) {
try {
opt.groupId = e.group_id
opt.qq = e.sender.user_id
opt.nickname = e.sender.card
opt.groupName = e.group.name
opt.botName = e.isGroup ? (e.group.pickMember(Bot.uin).card || e.group.pickMember(Bot.uin).nickname) : Bot.nickname
let master = (await getMasterQQ())[0]
if (master && e.group) {
opt.masterName = e.group.pickMember(master).card || e.group.pickMember(master).nickname
}
if (master && !e.group) {
opt.masterName = Bot.getFriendList().get(master)?.nickname
}
let latestChat = await e.group.getChatHistory(0, 1)
let seq = latestChat[0].seq
let chats = []
while (chats.length < Config.groupContextLength) {
let chatHistory = await e.group.getChatHistory(seq, 20)
chats.push(...chatHistory)
}
chats = chats.slice(0, Config.groupContextLength)
let mm = await e.group.getMemberMap()
chats.forEach(chat => {
let sender = mm.get(chat.sender.user_id)
chat.sender = sender
})
// console.log(chats)
opt.chats = chats
} catch (err) {
logger.warn('获取群聊聊天记录失败，本次对话不携带聊天记录', err)
} }
if (master && !e.group) {
opt.masterName = Bot.getFriendList().get(master)?.nickname
}
let latestChat = await e.group.getChatHistory(0, 1)
let seq = latestChat[0].seq
let chats = []
while (chats.length < Config.groupContextLength) {
let chatHistory = await e.group.getChatHistory(seq, 20)
chats.push(...chatHistory)
}
chats = chats.slice(0, Config.groupContextLength)
let mm = await e.group.getMemberMap()
chats.forEach(chat => {
let sender = mm.get(chat.sender.user_id)
chat.sender = sender
})
// console.log(chats)
opt.chats = chats
} catch (err) {
logger.warn('获取群聊聊天记录失败，本次对话不携带聊天记录', err)
} }
} }
response = await bingAIClient.sendMessage(prompt, opt, (token) => { response = await bingAIClient.sendMessage(prompt, opt, (token) => {