更新了 .editorconfig

This commit is contained in:
Ayakura Yuki 2023-09-06 11:37:42 +08:00
parent 52cf19d0db
commit 730b58ed08
6 changed files with 33 additions and 25 deletions

View File

@ -1,7 +1,6 @@
root = true root = true
[*] [*]
# EditorConfig 标准配置项
charset = utf-8 charset = utf-8
indent_size = 2 indent_size = 2
indent_style = space indent_style = space
@ -10,18 +9,26 @@ insert_final_newline = true
end_of_line = lf end_of_line = lf
trim_trailing_whitespace = true trim_trailing_whitespace = true
max_line_length = off max_line_length = off
# IntelliJ 系列配置项
ij_any_space_before_colon = true ij_any_space_before_colon = true
ij_any_space_after_colon = true ij_any_space_after_colon = true
ij_any_keep_indents_on_empty_lines = false ij_any_keep_indents_on_empty_lines = false
[{*.cjs,*.js}]
ij_javascript_align_imports = false
ij_javascript_use_semicolon_after_statement = false ij_javascript_use_semicolon_after_statement = false
ij_javascript_use_double_quotes = false ij_javascript_use_double_quotes = false
ij_javascript_enforce_trailing_comma = keep ij_javascript_enforce_trailing_comma = keep
ij_typescript_use_semicolon_after_statement = false ij_javascript_space_before_method_parentheses = true
ij_typescript_use_double_quotes = false ij_javascript_spaces_within_object_literal_braces = true
ij_typescript_enforce_trailing_comma = keep ij_javascript_indent_chained_calls = true
[*.json] [{*.json,*.json5}]
ij_any_space_before_colon = false
ij_json_keep_trailing_comma = false ij_json_keep_trailing_comma = false
ij_json_keep_blank_lines_in_code = 0
ij_json_keep_indents_on_empty_lines = false
ij_json_space_after_colon = true
ij_json_space_after_comma = true
ij_json_space_before_colon = false
ij_json_space_before_comma = false
ij_json_spaces_within_braces = false
ij_json_spaces_within_brackets = false

View File

@ -1,6 +1,6 @@
const os = require('os') const os = require('os')
const {existsSync, realpathSync} = require('fs') const { existsSync, realpathSync } = require('fs')
const {execSync} = require('child_process') const { execSync } = require('child_process')
const arch = os.arch() const arch = os.arch()
let skipDownload = false let skipDownload = false
@ -59,4 +59,4 @@ if (executablePath || arch === 'arm64' || arch === 'aarch64') {
skipDownload = true skipDownload = true
} }
module.exports = {skipDownload, executablePath} module.exports = { skipDownload, executablePath }

View File

@ -6,10 +6,10 @@ import path from 'node:path'
/** /**
* 发送私聊消息仅给好友发送 * 发送私聊消息仅给好友发送
* @param user_id qq号 * @param userId qq号
* @param msg 消息 * @param msg 消息
*/ */
async function relpyPrivate(userId, msg) { async function relpyPrivate (userId, msg) {
userId = Number(userId) userId = Number(userId)
let friend = Bot.fl.get(userId) let friend = Bot.fl.get(userId)
@ -25,7 +25,7 @@ async function relpyPrivate(userId, msg) {
* 休眠函数 * 休眠函数
* @param ms 毫秒 * @param ms 毫秒
*/ */
function sleep(ms) { function sleep (ms) {
return new Promise((resolve) => setTimeout(resolve, ms)) return new Promise((resolve) => setTimeout(resolve, ms))
} }
@ -33,8 +33,9 @@ function sleep(ms) {
* 下载保存文件 * 下载保存文件
* @param fileUrl 下载地址 * @param fileUrl 下载地址
* @param savePath 保存路径 * @param savePath 保存路径
* @param param
*/ */
async function downFile(fileUrl, savePath, param = {}) { async function downFile (fileUrl, savePath, param = {}) {
try { try {
mkdirs(path.dirname(savePath)) mkdirs(path.dirname(savePath))
logger.debug(`[下载文件] ${fileUrl}`) logger.debug(`[下载文件] ${fileUrl}`)
@ -48,7 +49,7 @@ async function downFile(fileUrl, savePath, param = {}) {
} }
} }
function mkdirs(dirname) { function mkdirs (dirname) {
if (fs.existsSync(dirname)) { if (fs.existsSync(dirname)) {
return true return true
} else { } else {
@ -66,9 +67,11 @@ function mkdirs(dirname) {
* @param dec 转发描述 * @param dec 转发描述
* @param msgsscr 转发信息是否伪装 * @param msgsscr 转发信息是否伪装
*/ */
async function makeForwardMsg(e, msg = [], dec = '', msgsscr = false) { async function makeForwardMsg (e, msg = [], dec = '', msgsscr = false) {
if (!Array.isArray(msg)) msg = [msg] if (!Array.isArray(msg)) {
msg = [msg]
}
let name = msgsscr ? e.sender.card || e.user_id : Bot.nickname let name = msgsscr ? e.sender.card || e.user_id : Bot.nickname
let id = msgsscr ? e.user_id : Bot.uin let id = msgsscr ? e.user_id : Bot.uin
@ -84,14 +87,15 @@ async function makeForwardMsg(e, msg = [], dec = '', msgsscr = false) {
} }
let forwardMsg = [] let forwardMsg = []
for (const message of msg){ for (const message of msg) {
if(!message) continue if (!message) {
continue
}
forwardMsg.push({ forwardMsg.push({
...userInfo, ...userInfo,
message: message message: message
}) })
} }
/** 制作转发内容 */ /** 制作转发内容 */
if (e?.group?.makeForwardMsg) { if (e?.group?.makeForwardMsg) {

View File

@ -25,4 +25,3 @@ export default {
return ret.length > 0 ? ret : false return ret.length > 0 ? ret : false
} }
} }

View File

@ -37,4 +37,3 @@ export default {
return rendererBackends[cfg.renderer?.name || 'puppeteer'] return rendererBackends[cfg.renderer?.name || 'puppeteer']
} }
} }

View File

@ -1,4 +1,3 @@
import '../config/init.js' import '../config/init.js'
import log4js from 'log4js' import log4js from 'log4js'
import PluginsLoader from '../plugins/loader.js' import PluginsLoader from '../plugins/loader.js'
@ -49,7 +48,7 @@ class Command {
group_id: data.group_id || 826198224, group_id: data.group_id || 826198224,
group_name: data.group_name || '测试群', group_name: data.group_name || '测试群',
user_id: data.user_id, user_id: data.user_id,
user_avatar:`https://q1.qlogo.cn/g?b=qq&s=0&nk=${data.user_id}`, user_avatar: `https://q1.qlogo.cn/g?b=qq&s=0&nk=${data.user_id}`,
anonymous: null, anonymous: null,
message: [{ type: 'text', text }], message: [{ type: 'text', text }],
raw_message: text, raw_message: text,