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

fix: merge (maybe broken?)

Browse source
This commit is contained in:
ikechan8370 2024-11-19 10:35:38 +08:00
commit df715e22a2
10 changed files with 120 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

14
model/core.js
View file

@ -873,13 +873,13 @@ class Core {
// 如果配了proxy(或者不在国内)，而且有反代，但是没开启强制反代,将baseurl删掉
delete opts.apiBaseUrl
}
const client = new OpenAI({
apiKey: Config.apiKey,
baseURL: opts.apiBaseUrl,
fetch: newFetch
})
// const client = new OpenAI({
// apiKey: Config.apiKey,
// baseURL: opts.apiBaseUrl,
// fetch: newFetch
// })
// this.chatGPTApi = new ChatGPTAPI(opts)
this.chatGPTApi = new ChatGPTAPI(opts)
let option = {
timeoutMs: 600000,
completionParams,
@ -1065,7 +1065,7 @@ async function collectTools (e) {
}
let systemAddition = ''
if (e.isGroup) {
let botInfo = await e.bot.getGroupMemberInfo(e.group_id, getUin(e), true)
let botInfo = await e.bot?.pickMember?.(e.group_id, getUin(e), true) || await e.bot?.getGroupMemberInfo?.(e.group_id, getUin(e), true)
if (botInfo.role !== 'member') {
// 管理员才给这些工具
tools.push(...[new EditCardTool(), new JinyanTool(), new KickOutTool(), new HandleMessageMsgTool(), new SetTitleTool()])