Merge branch 'ikechan8370:v2' into v2

apps/bym.js

@@ -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

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,6 +443,7 @@ export async function createServer () {
     return request
   }
   Bot.on('message', e => {
+    try {
       e.message = e.message.map(item => {
         if (item.type === 'at') {
           let user
@@ -481,6 +482,9 @@ export async function createServer () {
           }
         }
       }
+    } catch (error) {
+      logger.debug(error)
+    }
   })
   server.get('/ws', {
     websocket: true

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}`)