Pre Merge pull request !60 from touchscale/master

.puppeteerrc.cjs

@@ -0,0 +1,33 @@
+const os = require("os");
+const { existsSync } = require("fs");
+const arch = os.arch();
+let skipDownload = false;
+let executablePath;
+//win32 存在 Edge 优先选择
+if (process.platform == "win32") {
+  if (
+    existsSync("C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe")
+  ) {
+    skipDownload = true;
+    executablePath =
+      "C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe";
+  }
+} else if (process.platform == "linux") {
+  //如果arm64架构跳过下载
+  if (arch == "arm64" || arch == "aarch64") {
+    skipDownload = true;
+  }
+  //不管什么架构,如果存在配置则跳过下载,且配置路径
+  if (existsSync("/usr/bin/chromium")) {
+    skipDownload = true;
+    executablePath = "/usr/bin/chromium";
+  }
+}
+
+/**
+ * @type {import("puppeteer").Configuration}
+ */
+module.exports = {
+  skipDownload,
+  executablePath,
+};

lib/plugins/loader.js

@@ -698,6 +698,7 @@ class PluginsLoader {
   /** 判断黑白名单 */
   checkBlack (e) {
     let other = cfg.getOther()
+    let notice = cfg.getNotice()
 
     if (e.test) return true
 

lib/tools/command.js

@@ -49,6 +49,7 @@ class Command {
       group_id: data.group_id || 826198224,
       group_name: data.group_name || '测试群',
       user_id: data.user_id,
+      user_avatar:`https://q1.qlogo.cn/g?b=qq&s=0&nk=${data.user_id}`,
       anonymous: null,
       message: [{ type: 'text', text }],
       raw_message: text,