MurasameNoa/chatgpt-plugin
1
0
Fork 0
mirror of https://github.com/ikechan8370/chatgpt-plugin.git synced 2025-12-17 13:57:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pr-774' into v2

Browse source 
兼容napcat
This commit is contained in:
Chenyuxin221 2025-04-01 22:34:18 +08:00
commit abf6fa6ac2
3 changed files with 52 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
utils/chat.js
View file

@ -2,9 +2,9 @@ import { Config } from './config.js'
import { newFetch } from './proxy.js' import { newFetch } from './proxy.js'
export async function getChatHistoryGroup (e, num) { export async function getChatHistoryGroup (e, num) {
// if (e.adapter === 'shamrock') { if (e.adapter_name && e.adapter_name === 'OneBotv11') {
// return await e.group.getChatHistory(0, num, false) return await e.group.getChatHistory(0, num, false)
// } else { } else {
let latestChats = await e.group.getChatHistory(e.seq || e.message_id, 1) let latestChats = await e.group.getChatHistory(e.seq || e.message_id, 1)
if (latestChats.length > 0) { if (latestChats.length > 0) {
let latestChat = latestChats[0] let latestChat = latestChats[0]
@ -49,7 +49,7 @@ export async function getChatHistoryGroup (e, num) {
return chats return chats
} }
} }
// } }
return [] return []
} }

9
utils/common.js
View file

@ -734,6 +734,15 @@ export async function getImg (e) {
e.img = i e.img = i
} }
} }
if (e.reply_id) {
let reply = (await e.getReply(e.reply_id)).message;
for (const val of reply) {
if (val.type === "image") {
e.img = [val.url];
break;
}
}
}
return e.img return e.img
} }

3
utils/tools/SendPictureTool.js
View file

@ -45,7 +45,8 @@ export class SendPictureTool extends AbstractTool {
} }
let errs = [] let errs = []
try { try {
if (groupList.get(target)) { if ((typeof groupList.get === 'function' && groupList.get(target)) ||
(Array.isArray(groupList) && groupList.includes(target))) {
let group = await e.bot.pickGroup(target) let group = await e.bot.pickGroup(target)
for (let pic of pictures) { for (let pic of pictures) {
try { try {