From fd06f8c21a21edf68cf0da1ddacf44df0809a2a2 Mon Sep 17 00:00:00 2001 From: ikechan8370 Date: Mon, 17 Apr 2023 21:07:42 +0800 Subject: [PATCH] chore: format code --- apps/chat.js | 33 +++++++++++++++++---------------- apps/management.js | 40 ++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/apps/chat.js b/apps/chat.js index f215374..6cf4561 100644 --- a/apps/chat.js +++ b/apps/chat.js @@ -26,8 +26,9 @@ import { convertSpeaker, generateAudio, speakers } from '../utils/tts.js' import ChatGLMClient from '../utils/chatglm.js' import { convertFaces } from '../utils/face.js' import uploadRecord from '../utils/uploadRecord.js' -import { SlackClaudeClient } from "../utils/slack/slackClient.js" +import { SlackClaudeClient } from '../utils/slack/slackClient.js' import { ChatgptManagement } from './management.js' +import {getPromptByName} from "../utils/prompts.js"; try { await import('keyv') } catch (err) { @@ -60,10 +61,10 @@ try { const defaultPropmtPrefix = ', a large language model trained by OpenAI. You answer as concisely as possible for each response (e.g. don’t be verbose). It is very important that you answer as concisely as possible, so please remember this. If you are generating a list, do not have too many items. Keep the number of items short.' const newFetch = (url, options = {}) => { const defaultOptions = Config.proxy - ? { + ? { agent: proxy(Config.proxy) } - : {} + : {} const mergedOptions = { ...defaultOptions, ...options @@ -1615,19 +1616,19 @@ export class chatgpt extends plugin { Authorization: 'Bearer ' + Config.apiKey } }) - .then(response => response.json()) - .then(data => { - if (data.error) { - this.reply('获取失败：' + data.error.code) - return false - } else { - let total_granted = data.total_granted.toFixed(2) - let total_used = data.total_used.toFixed(2) - let total_available = data.total_available.toFixed(2) - let expires_at = new Date(data.grants.data[0].expires_at * 1000).toLocaleDateString().replace(/\//g, '-') - this.reply('总额度：$' + total_granted + '\n已经使用额度：$' + total_used + '\n当前剩余额度：$' + total_available + '\n到期日期(UTC)：' + expires_at) - } - }) + .then(response => response.json()) + .then(data => { + if (data.error) { + this.reply('获取失败：' + data.error.code) + return false + } else { + let total_granted = data.total_granted.toFixed(2) + let total_used = data.total_used.toFixed(2) + let total_available = data.total_available.toFixed(2) + let expires_at = new Date(data.grants.data[0].expires_at * 1000).toLocaleDateString().replace(/\//g, '-') + this.reply('总额度：$' + total_granted + '\n已经使用额度：$' + total_used + '\n当前剩余额度：$' + total_available + '\n到期日期(UTC)：' + expires_at) + } + }) } /** diff --git a/apps/management.js b/apps/management.js index a4ff57b..f178a0a 100644 --- a/apps/management.js +++ b/apps/management.js @@ -207,7 +207,7 @@ export class ChatgptManagement extends plugin { }, { reg: '^#chatgpt(对话|管理|娱乐|绘图|人物设定|聊天记录)?指令表(帮助)?', - fnc: 'commandHelp', + fnc: 'commandHelp' } ] }) @@ -276,11 +276,11 @@ export class ChatgptManagement extends plugin { */ async processList (whitelist, blacklist) { let groupWhitelist = Array.isArray(whitelist) - ? whitelist - : String(whitelist).split(/[,，]/) + ? whitelist + : String(whitelist).split(/[,，]/) let groupBlacklist = !Array.isArray(blacklist) - ? blacklist - : String(blacklist).split(/[,，]/) + ? blacklist + : String(blacklist).split(/[,，]/) groupWhitelist = Array.from(new Set(groupWhitelist)).filter(value => /^[1-9]\d{8,9}$/.test(value)) groupBlacklist = Array.from(new Set(groupBlacklist)).filter(value => /^[1-9]\d{8,9}$/.test(value)) return [groupWhitelist, groupBlacklist] @@ -322,12 +322,12 @@ export class ChatgptManagement extends plugin { } else { if (listType === '白名单') { Config.groupWhitelist = groupWhitelist - .filter(group => group !== '') - .concat(whitelist) + .filter(group => group !== '') + .concat(whitelist) } else { Config.groupBlacklist = groupBlacklist - .filter(group => group !== '') - .concat(blacklist) + .filter(group => group !== '') + .concat(blacklist) } } let replyMsg = `群聊${listType}已更新，可通过\n'#chatgpt查看群聊${listType}'查看最新名单\n'#chatgpt移除群聊${listType}'管理名单` @@ -537,11 +537,11 @@ export class ChatgptManagement extends plugin { if (token) { token = token.split('|') token = token.map((item, index) => ( - { - Token: item, - State: '正常', - Usage: 0 - } + { + Token: item, + State: '正常', + Usage: 0 + } )) } else { token = [] @@ -561,10 +561,10 @@ export class ChatgptManagement extends plugin { if (tokens) tokens = JSON.parse(tokens) else tokens = [] tokens = tokens.length > 0 - ? tokens.map((item, index) => ( + ? tokens.map((item, index) => ( `【${index}】 Token：${item.Token.substring(0, 5 / 2) + '...' + item.Token.substring(item.Token.length - 5 / 2, item.Token.length)}` - )).join('\n') - : '无必应Token记录' + )).join('\n') + : '无必应Token记录' await this.reply(`${tokens}`, true) return false } @@ -575,10 +575,10 @@ export class ChatgptManagement extends plugin { if (tokens) tokens = JSON.parse(tokens) else tokens = [] tokens = tokens.length > 0 - ? tokens.map((item, index) => ( + ? tokens.map((item, index) => ( `【${index}】 Token：${item.Token.substring(0, 5 / 2) + '...' + item.Token.substring(item.Token.length - 5 / 2, item.Token.length)}` - )).join('\n') - : '无必应Token记录' + )).join('\n') + : '无必应Token记录' await this.reply(`请发送要删除的token编号\n${tokens}`, true) if (tokens.length == 0) this.finish('saveBingToken') return false