From f4f3a1580f6a4b40a0ce93b220e290f1e819800b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8C=8C?= Date: Wed, 31 May 2023 09:55:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=20Miao-Yunzai=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/adapter/WebSocket/go-cqhttp.js | 4 ++-- lib/plugins/loader.js | 2 +- lib/plugins/runtime.js | 10 ++++++++++ package.json | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/adapter/WebSocket/go-cqhttp.js b/lib/adapter/WebSocket/go-cqhttp.js index e8b7d37..58f0cc9 100644 --- a/lib/adapter/WebSocket/go-cqhttp.js +++ b/lib/adapter/WebSocket/go-cqhttp.js @@ -558,11 +558,11 @@ export default class gocqhttpAdapter { break case "channel_updated": data.notice_type = "guild_channel_updated" - logger.info(`${logger.blue(`[${data.self_id}]`)} 子频道更新:[${data.guild_id}-${data.channel_id}, ${data.user_id}] ${data.old_info}=>${data.new_info}`) + logger.info(`${logger.blue(`[${data.self_id}]`)} 子频道更新:[${data.guild_id}-${data.channel_id}, ${data.user_id}] ${JSON.stringify(data.old_info)}=>${JSON.stringify(data.new_info)}`) break case "channel_created": data.notice_type = "guild_channel_created" - logger.info(`${logger.blue(`[${data.self_id}]`)} 子频道创建:[${data.guild_id}-${data.channel_id}, ${data.user_id}] ${data.channel_info}`) + logger.info(`${logger.blue(`[${data.self_id}]`)} 子频道创建:[${data.guild_id}-${data.channel_id}, ${data.user_id}] ${JSON.stringify(data.channel_info)}`) Bot[data.self_id].gl = await this.getGroupMap(data) break default: diff --git a/lib/plugins/loader.js b/lib/plugins/loader.js index d316ff3..ec58f6a 100644 --- a/lib/plugins/loader.js +++ b/lib/plugins/loader.js @@ -391,7 +391,7 @@ class PluginsLoader { for (let val of e.message) { switch (val.type) { case "text": - e.msg = (e.msg || "") + (val.text || "").replace(/^\s*[#井#]+\s*/, "#").replace(/^\s*[\\*※]+\s*/, "*").trim() + e.msg = (e.msg || "") + (val.text || "").replace(/^\s*[##井]+\s*/, "#").replace(/^\s*[\\**※]+\s*/, "*").trim() break case "image": if (!e.img) { diff --git a/lib/plugins/runtime.js b/lib/plugins/runtime.js index 740f362..1dbf7b8 100644 --- a/lib/plugins/runtime.js +++ b/lib/plugins/runtime.js @@ -13,6 +13,8 @@ import MysApi from '../../plugins/genshin/model/mys/mysApi.js' import MysInfo from '../../plugins/genshin/model/mys/mysInfo.js' import puppeteer from '../puppeteer/puppeteer.js' import { Version } from '#miao' +import NoteUser from '../../plugins/genshin/model/mys/NoteUser.js' +import MysUser from '../../plugins/genshin/model/mys/MysUser.js' /** * 常用的处理方法 @@ -56,6 +58,14 @@ export default class Runtime { return MysInfo } + get NoteUser () { + return NoteUser + } + + get MysUser () { + return MysUser + } + static async init (e) { e.runtime = new Runtime(e) e.user = await MysInfo.getNoteUser(e) diff --git a/package.json b/package.json index d468ef8..50a3eb4 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "eslint": "^8.41.0", - "eslint-config-standard": "^17.0.0", + "eslint-config-standard": "^17.1.0", "eslint-plugin-import": "^2.27.5", "eslint-plugin-n": "^16.0.0", "eslint-plugin-promise": "^6.1.1"