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

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

Browse source
This commit is contained in:
ikechan8370 2023-05-25 22:33:40 +08:00
commit 3de9ca9c49
13 changed files with 59 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/help.js
View file

@ -331,7 +331,11 @@ export class help extends plugin {
}
async help (e) {
if (!Config.oldview) { await renderUrl(e, `http://127.0.0.1:${Config.serverPort || 3321}/help/`, { Viewport: { width: 800, height: 600 } }) } else { await render(e, 'chatgpt-plugin', 'help/index', { helpData, version }) }
if (Config.newhelp && !Config.oldview) {
await renderUrl(e, `http://127.0.0.1:${Config.serverPort || 3321}/help/`, { Viewport: { width: 800, height: 600 } })
} else {
await render(e, 'chatgpt-plugin', 'help/index', { helpData, version })
}
}
async newHelp (e) {

6
server/index.js
View file

@ -299,6 +299,9 @@ export async function createServer() {
if (await redis.exists('CHATGPT:CONFIRM') != 0) {
redisConfig.turnConfirm = await redis.get('CHATGPT:CONFIRM') === 'on'
}
if (await redis.exists('CHATGPT:USE') != 0) {
redisConfig.useMode = await redis.get('CHATGPT:USE')
}
reply.send({
chatConfig: Config,
redisConfig
@ -363,6 +366,9 @@ export async function createServer() {
if (redisConfig.turnConfirm != null) {
await redis.set('CHATGPT:CONFIRM', redisConfig.turnConfirm ? 'on' : 'off')
}
if (redisConfig.useMode != null) {
await redis.set('CHATGPT:USE', redisConfig.useMode)
}
} else {
if (body.userSetting) {
await redis.set(`CHATGPT:USER:${user.user}`, JSON.stringify(body.userSetting))

2
server/static/index.html
View file

@ -17,4 +17,4 @@
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-->
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><link rel="shortcut icon" href="/favicon.ico"/><link rel="apple-touch-icon" sizes="76x76" href="/apple-icon.png"/><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.css"/><script src="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/8.6.3/mermaid.min.js"></script><script src="/live2d/live2dcubismcore.min.js"></script><title>ChatGPT-Plugin</title><script defer="defer" type="module" src="/js/chunk-vendors.f436bd7e.js"></script><script defer="defer" type="module" src="/js/app.06ce534d.js"></script><link href="/css/chunk-vendors.0ede84b4.css" rel="stylesheet"><link href="/css/app.4dc5e420.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors-legacy.70bbbaed.js" nomodule></script><script defer="defer" src="/js/app-legacy.de234224.js" nomodule></script></head><body class="text-blueGray-700 antialiased"><noscript><strong>We're sorry but vue-notus doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><link rel="shortcut icon" href="/favicon.ico"/><link rel="apple-touch-icon" sizes="76x76" href="/apple-icon.png"/><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.css"/><script src="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/8.6.3/mermaid.min.js"></script><script src="/live2d/live2dcubismcore.min.js"></script><title>ChatGPT-Plugin</title><script defer="defer" type="module" src="/js/chunk-vendors.f436bd7e.js"></script><script defer="defer" type="module" src="/js/app.84a0dda5.js"></script><link href="/css/chunk-vendors.0ede84b4.css" rel="stylesheet"><link href="/css/app.4dc5e420.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors-legacy.70bbbaed.js" nomodule></script><script defer="defer" src="/js/app-legacy.b9741f05.js" nomodule></script></head><body class="text-blueGray-700 antialiased"><noscript><strong>We're sorry but vue-notus doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

21
server/static/js/app-legacy.b9741f05.js Normal file
View file

File diff suppressed because one or more lines are too long

1
server/static/js/app-legacy.b9741f05.js.map Normal file
View file

File diff suppressed because one or more lines are too long

21
server/static/js/app-legacy.de234224.js
View file

File diff suppressed because one or more lines are too long

1
server/static/js/app-legacy.de234224.js.map
View file

File diff suppressed because one or more lines are too long

21
server/static/js/app.06ce534d.js
View file

File diff suppressed because one or more lines are too long

1
server/static/js/app.06ce534d.js.map
View file

File diff suppressed because one or more lines are too long

21
server/static/js/app.84a0dda5.js Normal file
View file

File diff suppressed because one or more lines are too long

1
server/static/js/app.84a0dda5.js.map Normal file
View file

File diff suppressed because one or more lines are too long

3
utils/SydneyAIClient.js
View file

@ -309,7 +309,8 @@ export default class SydneyAIClient {
const text = (pureSydney ? pureSydneyInstruction : (useCast?.bing || Config.sydney)).replaceAll(namePlaceholder, botName || defaultBotName) +
((Config.enableGroupContext && groupId) ? groupContextTip : '') +
((Config.enforceMaster && master) ? masterTip : '') +
(Config.sydneyMood ? moodTip : '')
(Config.sydneyMood ? moodTip : '') +
(Config.sydneySystemCode ? '' : '')
// logger.info(text)
if (pureSydney) {
previousMessages = invocationId === 0

1
utils/config.js
View file

@ -85,6 +85,7 @@ const defaultConfig = {
sydneyApologyIgnored: true,
enforceMaster: false,
oldview: false,
newhelp: false,
serverPort: 3321,
serverHost: '',
viewHost: '',