Merge branch 'ikechan8370:v2' into v2

utils/common.js

@@ -1030,6 +1030,25 @@ export function getUserSpeaker (userSetting) {
   }
 }
 
+/**
+ * 获取或者下载文件，如果文件存在则直接返回不会重新下载
+ * @param destPath 相对路径，如received/abc.pdf
+ * @param url
+ * @param ignoreCertificateError 忽略证书错误
+ * @return {Promise<string>} 最终下载文件的存储位置
+ */
+export async function getOrDownloadFile (destPath, url, ignoreCertificateError = true) {
+  const _path = process.cwd()
+  let dest = path.join(_path, 'data', 'chatgpt', destPath)
+  const p = path.dirname(dest)
+  mkdirs(p)
+  if (fs.existsSync(dest)) {
+    return dest
+  } else {
+    return await downloadFile(url, destPath, false, ignoreCertificateError)
+  }
+}
+
 /**
  *
  * @param url 要下载的文件链接

utils/config.js

@@ -163,6 +163,11 @@ const defaultConfig = {
   qwenSeed: 0,
   qwenTemperature: 1,
   qwenEnableSearch: true,
+  geminiKey: '',
+  geminiModel: 'gemini-pro',
+  geminiPrompt: 'You are Gemini. Your answer shouldn\'t be too verbose. Prefer to answer in Chinese.',
+  // origin: https://generativelanguage.googleapis.com
+  geminiBaseUrl: 'https://gemini.ikechan8370.com',
   version: 'v2.7.8'
 }
 const _path = process.cwd()

utils/dalle.js

@@ -80,7 +80,7 @@ export async function imageVariation (imageUrl, n = 1, size = '512x512') {
   return response.data.data?.map(pic => pic.b64_json)
 }
 
-async function resizeAndCropImage (inputFilePath, outputFilePath, size = 512) {
+export async function resizeAndCropImage (inputFilePath, outputFilePath, size = 512) {
   // Determine the maximum dimension of the input image
   let sharp
   try {

utils/proxy.js

@@ -1,5 +1,7 @@
 // workaround for ver 7.x and ver 5.x
 import HttpsProxyAgent from 'https-proxy-agent'
+import { Config } from './config.js'
+import fetch from 'node-fetch'
 
 let proxy = HttpsProxyAgent
 if (typeof proxy !== 'function') {
@@ -15,3 +17,17 @@ if (typeof proxy !== 'function') {
 export function getProxy () {
   return proxy
 }
+
+export const newFetch = (url, options = {}) => {
+  const defaultOptions = Config.proxy
+    ? {
+        agent: proxy(Config.proxy)
+      }
+    : {}
+  const mergedOptions = {
+    ...defaultOptions,
+    ...options
+  }
+
+  return fetch(url, mergedOptions)
+}

utils/randomMessage.js

@@ -1,5 +1,5 @@
 import { Config } from './config.js'
-import { ChatGPTAPI } from 'chatgpt'
+import { ChatGPTAPI } from './openai/chatgpt-api.js'
 import fetch from 'node-fetch'
 import { getProxy } from './proxy.js'
 let proxy = getProxy()

utils/tools/SendPictureTool.js

@@ -19,6 +19,9 @@ export class SendPictureTool extends AbstractTool {
 
   func = async function (opt, e) {
     let { urlOfPicture, targetGroupIdOrQQNumber } = opt
+    if (typeof urlOfPicture === 'object') {
+      urlOfPicture = urlOfPicture.join(' ')
+    }
     const defaultTarget = e.isGroup ? e.group_id : e.sender.user_id
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget

utils/tools/SerpIkechan8370Tool.js

@@ -19,7 +19,7 @@ export class SerpIkechan8370Tool extends AbstractTool {
 
   func = async function (opts) {
     let { q, source } = opts
-    if (!source) {
+    if (!source || !['google', 'bing', 'baidu'].includes(source)) {
       source = 'bing'
     }
     let serpRes = await fetch(`https://serp.ikechan8370.com/${source}?q=${encodeURIComponent(q)}&lang=zh-CN&limit=5`, {

utils/tools/SetTitleTool.js

@@ -34,7 +34,7 @@ export class SetTitleTool extends AbstractTool {
       return `failed, the user ${qq} is not in group ${groupId}`
     }
     if (mm.get(e.bot.uin).role !== 'owner') {
-      return 'on group owner can give title'
+      return 'failed, only group owner can give title'
     }
     logger.info('edit card: ', groupId, qq)
     let result = await group.setTitle(qq, title)