From 027ff17b13dc81b94aa23b08ea9f6b12ca96f401 Mon Sep 17 00:00:00 2001 From: ikechan8370 Date: Sun, 29 Dec 2024 20:24:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbym=E5=8F=91?= =?UTF-8?q?=E7=8E=B0=E7=9A=84bymbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/bym.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/bym.js b/apps/bym.js index 6a73551..208aa18 100644 --- a/apps/bym.js +++ b/apps/bym.js @@ -68,7 +68,7 @@ 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)) { + if (Config.assistantLabel && e.msg?.includes(Config.assistantLabel)) { prop = prop / 100 } if (e.msg?.endsWith('？')) { From 5f2b88851fb8e3fd75a81f395428ff6c8fabd55e Mon Sep 17 00:00:00 2001 From: Ethan <34185079+ethan42nd@users.noreply.github.com> Date: Sun, 29 Dec 2024 20:32:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=9B=BE=E7=89=87=20(#729)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/common.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/common.js b/utils/common.js index f9e2bda..0fea08a 100644 --- a/utils/common.js +++ b/utils/common.js @@ -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}`) From 11fb6f52812eadc7c59c52008a354ce1b534d580 Mon Sep 17 00:00:00 2001 From: ikechan8370 Date: Sun, 29 Dec 2024 20:34:12 +0800 Subject: [PATCH 3/4] fix: try to fix #732 --- server/index.js | 76 ++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/server/index.js b/server/index.js index 443ec1b..23b592f 100644 --- a/server/index.js +++ b/server/index.js @@ -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', { From f6ce6dcec5be103f4c0e63d270d3adc9d39b4200 Mon Sep 17 00:00:00 2001 From: ikechan8370 Date: Sun, 29 Dec 2024 20:40:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20bym=20=E5=8F=88=E5=8F=91=E7=8E=B0?= =?UTF-8?q?=E4=BA=86bym=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/bym.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/bym.js b/apps/bym.js index 208aa18..fc2f39f 100644 --- a/apps/bym.js +++ b/apps/bym.js @@ -69,10 +69,10 @@ export class bym extends plugin { let group = e.group_id let prop = Math.floor(Math.random() * 100) if (Config.assistantLabel && e.msg?.includes(Config.assistantLabel)) { - prop = prop / 100 + prop = -1 } if (e.msg?.endsWith('？')) { - prop = prop / 100 + prop = prop / 10 } let fuck = false