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

fix: shamrock的小问题

Browse source
This commit is contained in:
ikechan8370 2023-11-28 14:30:09 +08:00
parent c99019cd91
commit cef2f7378d
2 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

56
utils/chat.js
View file

@ -1,34 +1,34 @@
export async function getChatHistoryGroup (e, num) { export async function getChatHistoryGroup (e, num) {
//if (e.adapter === 'shamrock') { // if (e.adapter === 'shamrock') {
// return await e.group.getChatHistory(0, num, false) // return await e.group.getChatHistory(0, num, false)
//} else { // } else {
let latestChats = await e.group.getChatHistory(0, 1) let latestChats = await e.group.getChatHistory(0, 1)
if (latestChats.length > 0) { if (latestChats.length > 0) {
let latestChat = latestChats[0] let latestChat = latestChats[0]
if (latestChat) { if (latestChat) {
let seq = latestChat.seq || latestChat.message_id let seq = latestChat.seq || latestChat.message_id
let chats = [] let chats = []
while (chats.length < num) { while (chats.length < num) {
let chatHistory = await e.group.getChatHistory(seq, 20) let chatHistory = await e.group.getChatHistory(seq, 20)
chats.push(...chatHistory) chats.push(...chatHistory)
seq = chatHistory[0].seq || chatHistory[0].message_id seq = chatHistory[0].seq || chatHistory[0].message_id
}
chats = chats.slice(0, num)
try {
let mm = await e.group.getMemberMap()
chats.forEach(chat => {
let sender = mm.get(chat.sender.user_id)
if (sender) {
chat.sender = sender
}
})
} catch (err) {
logger.warn(err)
}
// console.log(chats)
return chats
} }
chats = chats.slice(0, num)
try {
let mm = await e.group.getMemberMap()
chats.forEach(chat => {
let sender = mm.get(chat.sender.user_id)
if (sender) {
chat.sender = sender
}
})
} catch (err) {
logger.warn(err)
}
// console.log(chats)
return chats
} }
// } }
// }
return [] return []
} }

1
utils/common.js
View file

@ -848,6 +848,7 @@ export function getMaxModelTokens (model = 'gpt-3.5-turbo') {
export function getUin (e) { export function getUin (e) {
if (e?.bot?.uin) return e.bot.uin if (e?.bot?.uin) return e.bot.uin
if (e?.bot?.self_id) return e.bot.self_id
if (Array.isArray(Bot.uin)) { if (Array.isArray(Bot.uin)) {
if (Config.trssBotUin && Bot.uin.indexOf(Config.trssBotUin) > -1) { return Config.trssBotUin } else { if (Config.trssBotUin && Bot.uin.indexOf(Config.trssBotUin) > -1) { return Config.trssBotUin } else {
Bot.uin.forEach((u) => { Bot.uin.forEach((u) => {