细节优化

This commit is contained in:
yeyang
2024-05-24 17:08:18 +08:00
parent 4f6cfc395c
commit 1476171bc0
3 changed files with 4 additions and 4 deletions

View File

@@ -11,7 +11,7 @@ const numReg = "[一壹二两三四五六七八九十百千万亿\\d]+"
// 正则
const pidReg = /^#?pid搜图\s?(\d+)$/i
const rankingrReg = new RegExp(`^#?看看((\\d{4}-\\d{1,2}-\\d{1,2})的)?(${Object.keys(Pixiv.ranktype).join("|")})(r18)?榜\\s?(第(${numReg})页)?$`, "i")
const rankingrReg = new RegExp(`^#?看看((\\d{4}-\\d{1,2}-\\d{1,2})的)?(${Object.keys(Pixiv.ranktype).join("|")})(r18|全年龄)?榜\\s?(第(${numReg})页)?$`, "i")
const tagReg = new RegExp(`^#?tag(pro)?搜图(.*?)(第(${numReg})页)?$`, "i")
const uidReg = new RegExp(`^#?uid搜图(.*?)(第(${numReg})页)?$`, "i")
const searchUser = new RegExp(`^#?user搜索(.*?)(第(${numReg})页)?$`, "i")

View File

@@ -59,7 +59,7 @@ let Data = {
* @param root
* @param space
*/
writeJSON(file, data, root = "", space = "\t") {
writeJSON(file, data, root = "", space = 2) {
// 检查并创建目录
Data.createDir(file, root, true)
root = getRoot(root)

View File

@@ -22,7 +22,7 @@ export default new class extends sendMsgMod {
* @returns {boolean|string} - 是否具有权限
*/
getPermission(e, permission = "all", role = "all", {
groupObj = e.group || e.bot.pickGroup(e.group_id)
groupObj = e.group || e.bot?.pickGroup?.(e.group_id)
} = {}) {
if (!groupObj && permission != "master" && role != "all") throw new Error("未获取到群对象")
if (role == "owner" && !groupObj.is_owner) {
@@ -32,7 +32,7 @@ export default new class extends sendMsgMod {
}
// 判断权限
if (e.isMaster || a.includes(md5(String(e.user_id)))) return true
const memberObj = groupObj.pickMember(e.user_id)
const memberObj = groupObj && groupObj.pickMember(e.user_id)
if (permission == "master") {
return "❎ 该命令仅限主人可用"
} else if (permission == "owner" && !memberObj.is_owner) {