Merge branch 'ikechan8370:v2' into v2

This commit is contained in:
gaoao-3 2024-12-29 20:41:06 +08:00 committed by GitHub
commit 4933a7e0ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 46 additions and 41 deletions

View file

@ -68,11 +68,11 @@ export class bym extends plugin {
let card = e.sender.card || e.sender.nickname let card = e.sender.card || e.sender.nickname
let group = e.group_id let group = e.group_id
let prop = Math.floor(Math.random() * 100) let prop = Math.floor(Math.random() * 100)
if (e.msg?.includes(Config.assistantLabel)) { if (Config.assistantLabel && e.msg?.includes(Config.assistantLabel)) {
prop = prop / 100 prop = -1
} }
if (e.msg?.endsWith('')) { if (e.msg?.endsWith('')) {
prop = prop / 100 prop = prop / 10
} }
let fuck = false let fuck = false

View file

@ -399,7 +399,7 @@ export async function createServer () {
quotable: { quotable: {
user_id: _Bot.uin, user_id: _Bot.uin,
user_name: _Bot.nickname user_name: _Bot.nickname
}, }
} }
await connection.socket.send(JSON.stringify(messageData)) await connection.socket.send(JSON.stringify(messageData))
} }
@ -412,12 +412,12 @@ export async function createServer () {
user_id: item, user_id: item,
nickname: friend.nickname, nickname: friend.nickname,
group: { group: {
isGroup: false, isGroup: false
}, },
quotable: { quotable: {
user_id: _Bot.uin, user_id: _Bot.uin,
user_name: _Bot.nickname user_name: _Bot.nickname
}, }
} }
await connection.socket.send(JSON.stringify(messageData)) await connection.socket.send(JSON.stringify(messageData))
}) })
@ -443,6 +443,7 @@ export async function createServer () {
return request return request
} }
Bot.on('message', e => { Bot.on('message', e => {
try {
e.message = e.message.map(item => { e.message = e.message.map(item => {
if (item.type === 'at') { if (item.type === 'at') {
let user let user
@ -481,6 +482,9 @@ export async function createServer () {
} }
} }
} }
} catch (error) {
logger.debug(error)
}
}) })
server.get('/ws', { server.get('/ws', {
websocket: true websocket: true

View file

@ -358,8 +358,9 @@ export async function renderUrl (e, url, renderCfg = {}) {
width: 1280, width: 1280,
height: 720 height: 720
}) })
let buff = base64 = await page.screenshot({ fullPage: true }) let buff = await page.screenshot({ fullPage: true });
base64 = segment.image(buff) let buffer = Buffer.from(buff).toString('base64');
base64 = segment.image(`base64://${buffer}`);
await page.close().catch((err) => logger.error(err)) await page.close().catch((err) => logger.error(err))
} catch (error) { } catch (error) {
logger.error(`${url}图片生成失败:${error}`) logger.error(`${url}图片生成失败:${error}`)