mirror of
https://github.com/ikechan8370/chatgpt-plugin.git
synced 2025-12-17 13:57:10 +00:00
Merge branch 'ikechan8370:v2' into v2
This commit is contained in:
commit
4933a7e0ec
3 changed files with 46 additions and 41 deletions
|
|
@ -68,11 +68,11 @@ export class bym extends plugin {
|
|||
let card = e.sender.card || e.sender.nickname
|
||||
let group = e.group_id
|
||||
let prop = Math.floor(Math.random() * 100)
|
||||
if (e.msg?.includes(Config.assistantLabel)) {
|
||||
prop = prop / 100
|
||||
if (Config.assistantLabel && e.msg?.includes(Config.assistantLabel)) {
|
||||
prop = -1
|
||||
}
|
||||
if (e.msg?.endsWith('?')) {
|
||||
prop = prop / 100
|
||||
prop = prop / 10
|
||||
}
|
||||
|
||||
let fuck = false
|
||||
|
|
|
|||
|
|
@ -399,7 +399,7 @@ export async function createServer () {
|
|||
quotable: {
|
||||
user_id: _Bot.uin,
|
||||
user_name: _Bot.nickname
|
||||
},
|
||||
}
|
||||
}
|
||||
await connection.socket.send(JSON.stringify(messageData))
|
||||
}
|
||||
|
|
@ -412,12 +412,12 @@ export async function createServer () {
|
|||
user_id: item,
|
||||
nickname: friend.nickname,
|
||||
group: {
|
||||
isGroup: false,
|
||||
isGroup: false
|
||||
},
|
||||
quotable: {
|
||||
user_id: _Bot.uin,
|
||||
user_name: _Bot.nickname
|
||||
},
|
||||
}
|
||||
}
|
||||
await connection.socket.send(JSON.stringify(messageData))
|
||||
})
|
||||
|
|
@ -443,43 +443,47 @@ export async function createServer () {
|
|||
return request
|
||||
}
|
||||
Bot.on('message', e => {
|
||||
e.message = e.message.map(item => {
|
||||
if (item.type === 'at') {
|
||||
let user
|
||||
try {
|
||||
user = e.group.pickMember(parseInt(item.qq)).card || e.group.pickMember(parseInt(item.qq)).nickname
|
||||
} catch (error) {
|
||||
user = item.qq
|
||||
try {
|
||||
e.message = e.message.map(item => {
|
||||
if (item.type === 'at') {
|
||||
let user
|
||||
try {
|
||||
user = e.group.pickMember(parseInt(item.qq)).card || e.group.pickMember(parseInt(item.qq)).nickname
|
||||
} catch (error) {
|
||||
user = item.qq
|
||||
}
|
||||
return { ...item, text: user }
|
||||
}
|
||||
return { ...item, text: user }
|
||||
}
|
||||
return item
|
||||
})
|
||||
const messageData = {
|
||||
notice: 'clientMessage',
|
||||
message: e.message,
|
||||
sender: e.sender,
|
||||
group: {
|
||||
isGroup: e.isGroup || e.group_id != undefined,
|
||||
group_id: e.group_id,
|
||||
group_name: e.group_name || e.bot.gl?.get(e.group_id)?.group_name || e.group_id
|
||||
},
|
||||
quotable: {
|
||||
user_id: e.user_id,
|
||||
time: e.time,
|
||||
seq: e.seq,
|
||||
rand: e.rand,
|
||||
return item
|
||||
})
|
||||
const messageData = {
|
||||
notice: 'clientMessage',
|
||||
message: e.message,
|
||||
user_name: e.sender.card || e.sender.nickname
|
||||
}
|
||||
}
|
||||
if (clients) {
|
||||
for (const index in clients) {
|
||||
const user = GetUser(index)
|
||||
if (user.autho == 'admin' || user.user == e.user_id) {
|
||||
clients[index].send(JSON.stringify(messageData))
|
||||
sender: e.sender,
|
||||
group: {
|
||||
isGroup: e.isGroup || e.group_id != undefined,
|
||||
group_id: e.group_id,
|
||||
group_name: e.group_name || e.bot.gl?.get(e.group_id)?.group_name || e.group_id
|
||||
},
|
||||
quotable: {
|
||||
user_id: e.user_id,
|
||||
time: e.time,
|
||||
seq: e.seq,
|
||||
rand: e.rand,
|
||||
message: e.message,
|
||||
user_name: e.sender.card || e.sender.nickname
|
||||
}
|
||||
}
|
||||
if (clients) {
|
||||
for (const index in clients) {
|
||||
const user = GetUser(index)
|
||||
if (user.autho == 'admin' || user.user == e.user_id) {
|
||||
clients[index].send(JSON.stringify(messageData))
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
logger.debug(error)
|
||||
}
|
||||
})
|
||||
server.get('/ws', {
|
||||
|
|
|
|||
|
|
@ -358,8 +358,9 @@ export async function renderUrl (e, url, renderCfg = {}) {
|
|||
width: 1280,
|
||||
height: 720
|
||||
})
|
||||
let buff = base64 = await page.screenshot({ fullPage: true })
|
||||
base64 = segment.image(buff)
|
||||
let buff = await page.screenshot({ fullPage: true });
|
||||
let buffer = Buffer.from(buff).toString('base64');
|
||||
base64 = segment.image(`base64://${buffer}`);
|
||||
await page.close().catch((err) => logger.error(err))
|
||||
} catch (error) {
|
||||
logger.error(`${url}图片生成失败:${error}`)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue