From aff436007dc1b7915f8e2fb49abab0063b22b363 Mon Sep 17 00:00:00 2001 From: ikechan8370 Date: Sat, 25 Feb 2023 20:26:11 +0800 Subject: [PATCH] feat: version --- apps/chat.js | 11 ++++++----- apps/help.js | 10 +++++++--- index.js | 7 +++++++ resources/content/Bing/index.html | 2 +- resources/content/ChatGPT/index.html | 2 +- resources/conversation/chatgpt.html | 2 +- resources/help/index.html | 4 ++-- utils/config.js | 3 ++- 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/apps/chat.js b/apps/chat.js index 5f605b5..1785ee4 100644 --- a/apps/chat.js +++ b/apps/chat.js @@ -11,12 +11,12 @@ import { KeyvFile } from 'keyv-file' import { OfficialChatGPTClient } from '../utils/message.js' import fetch from 'node-fetch' import { deleteConversation, getConversations, getLatestMessageIdByConversationId } from '../utils/conversation.js' - +let version = Config.version /** * 每个对话保留的时长。单个对话内ai是保留上下文的。超时后销毁对话，再次对话创建新的对话。 * 单位：秒 * @type {number} - * + * * 这里使用动态数据获取，以便于锅巴动态更新数据 */ // const CONVERSATION_PRESERVE_TIME = Config.conversationPreserveTime @@ -533,7 +533,8 @@ export class chatgpt extends plugin { senderName: e.sender.nickname, quote: quote.length > 0, quotes: quote, - cache: cacheData + cache: cacheData, + version }) } @@ -716,14 +717,14 @@ export class chatgpt extends plugin { logger.mark('all conversations: ', conversations) } // let conversationsFirst10 = conversations.slice(0, 10) - await e.runtime.render('chatgpt-plugin', 'conversation/chatgpt', { conversations }) + await e.runtime.render('chatgpt-plugin', 'conversation/chatgpt', { conversations, version }) let text = '对话列表\n' text += '对话id | 对话发起者 \n' conversations.forEach(c => { text += c.id + '|' + (c.creater || '未知') + '\n' }) text += '您可以通过使用命令#chatgpt切换对话+对话id来切换到指定对话，也可以通过命令#chatgpt加入对话+@某人来加入指定人当前进行的对话中。' - await this.reply(text) + this.reply(await makeForwardMsg(e, [text], '对话列表')) } else { return await this.getConversations(e) } diff --git a/apps/help.js b/apps/help.js index 5f692ff..1a548b3 100644 --- a/apps/help.js +++ b/apps/help.js @@ -1,6 +1,6 @@ import plugin from '../../../lib/plugins/plugin.js' import { Config } from '../utils/config.js' - +let version = Config.version let helpData = [ { group: '聊天', @@ -29,8 +29,12 @@ let helpData = [ icon: 'text', title: '#chatgpt画图+prompt(/张数/图片大小)', desc: '调用OpenAI Dalle API进行绘图，需要有API key并消耗余额。图片大小只能是256x256/512x512/1024x1024中的一个.默认为1张、512x512' + }, + { + icon: 'text', + title: '#chatgpt改图', + desc: '调用OpenAI Dalle API进行改图，需要有API key并消耗余额。可同时发送图片或回复图片' } - ] }, { @@ -127,6 +131,6 @@ export class help extends plugin { } async help (e) { - await e.runtime.render('chatgpt-plugin', 'help/index', { helpData }) + await e.runtime.render('chatgpt-plugin', 'help/index', { helpData, version }) } } diff --git a/index.js b/index.js index a1ff11e..09b09cb 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,5 @@ import fs from 'node:fs' +import {Config} from "./utils/config.js"; const files = fs.readdirSync('./plugins/chatgpt-plugin/apps').filter(file => file.endsWith('.js')) @@ -21,4 +22,10 @@ for (let i in files) { } apps[name] = ret[i].value[Object.keys(ret[i].value)[0]] } +logger.info('**************************************') +logger.info('chatgpt-plugin加载成功') +logger.info(`当前版本${Config.version}`) +logger.info('仓库地址 https://github.com/ikechan8370/chatgpt-plugin') +logger.info('插件群号 559567232') +logger.info('**************************************') export { apps } diff --git a/resources/content/Bing/index.html b/resources/content/Bing/index.html index 7dc7e30..c2b00c5 100644 --- a/resources/content/Bing/index.html +++ b/resources/content/Bing/index.html @@ -87,7 +87,7 @@
-

Response to {{senderName}} Created By Yunzai-Bot and ChatGPT-Plugin

+

Response to {{senderName}} Created By Yunzai-Bot and ChatGPT-Plugin {{version}}

diff --git a/resources/content/ChatGPT/index.html b/resources/content/ChatGPT/index.html index 2aa134f..aaae9a7 100644 --- a/resources/content/ChatGPT/index.html +++ b/resources/content/ChatGPT/index.html @@ -73,7 +73,7 @@
-

Response to {{senderName}} Created By Yunzai-Bot and ChatGPT-Plugin

+

Response to {{senderName}} Created By Yunzai-Bot and ChatGPT-Plugin {{version}}

diff --git a/resources/conversation/chatgpt.html b/resources/conversation/chatgpt.html index d455edb..1908822 100644 --- a/resources/conversation/chatgpt.html +++ b/resources/conversation/chatgpt.html @@ -29,7 +29,7 @@ {{/each}} - + diff --git a/resources/help/index.html b/resources/help/index.html index c30fa5a..4daa400 100644 --- a/resources/help/index.html +++ b/resources/help/index.html @@ -11,7 +11,7 @@
-
ChatGPT-Plugin
+
ChatGPT-Plugin {{version}}

使用说明

@@ -31,7 +31,7 @@
{{/each}} - + diff --git a/utils/config.js b/utils/config.js index 97b280e..810c85e 100644 --- a/utils/config.js +++ b/utils/config.js @@ -31,7 +31,8 @@ const defaultConfig = { proxy: '', debug: true, defaultTimeoutMs: 120000, - chromeTimeoutMS: 120000 + chromeTimeoutMS: 120000, + version: '2.0.0' } const _path = process.cwd() let config = {}