fix: 一些极端的措施

This commit is contained in:
ikechan8370 2023-06-24 23:38:36 +08:00
parent 06371b1668
commit 2bf92e2bbf

View file

@ -58,9 +58,9 @@ import { WebsiteTool } from '../utils/tools/WebsiteTool.js'
import { WeatherTool } from '../utils/tools/WeatherTool.js' import { WeatherTool } from '../utils/tools/WeatherTool.js'
import { SerpTool } from '../utils/tools/SerpTool.js' import { SerpTool } from '../utils/tools/SerpTool.js'
import { SerpIkechan8370Tool } from '../utils/tools/SerpIkechan8370Tool.js' import { SerpIkechan8370Tool } from '../utils/tools/SerpIkechan8370Tool.js'
import {SendPictureTool} from "../utils/tools/SendPictureTool.js"; import { SendPictureTool } from '../utils/tools/SendPictureTool.js'
import {SerpImageTool} from "../utils/tools/SearchImageTool.js"; import { SerpImageTool } from '../utils/tools/SearchImageTool.js'
import {ImageCaptionTool} from "../utils/tools/ImageCaptionTool.js"; import { ImageCaptionTool } from '../utils/tools/ImageCaptionTool.js'
try { try {
await import('emoji-strip') await import('emoji-strip')
} catch (err) { } catch (err) {
@ -1954,10 +1954,7 @@ export class chatgpt extends plugin {
} }
let tools = [ let tools = [
new SearchVideoTool(),
new SendVideoTool(),
new SearchMusicTool(),
new SendMusicTool(),
// new SendAvatarTool(), // new SendAvatarTool(),
// new SendDiceTool(), // new SendDiceTool(),
new EditCardTool(), new EditCardTool(),
@ -1967,7 +1964,7 @@ export class chatgpt extends plugin {
new KickOutTool(), new KickOutTool(),
new WeatherTool(), new WeatherTool(),
new SendPictureTool(), new SendPictureTool(),
new SerpImageTool(),
new ImageCaptionTool(), new ImageCaptionTool(),
serpTool serpTool
] ]
@ -1994,6 +1991,12 @@ export class chatgpt extends plugin {
} }
if (img.length > 0) { if (img.length > 0) {
prompt += `\nthe url of the picture(s) above: ${img.join(', ')}` prompt += `\nthe url of the picture(s) above: ${img.join(', ')}`
} else {
tools.push(new SerpImageTool())
tools.push(...[new SearchVideoTool(),
new SendVideoTool(),
new SearchMusicTool(),
new SendMusicTool()])
} }
// if (e.sender.role === 'admin' || e.sender.role === 'owner') { // if (e.sender.role === 'admin' || e.sender.role === 'owner') {
// tools.push(...[new JinyanTool(), new KickOutTool()]) // tools.push(...[new JinyanTool(), new KickOutTool()])