Lexcubia
/
Miao-Yunzai
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Kokomi 2023-10-26 13:15:04 +08:00
parent 8325c63a62 cdf8ac4a02
commit 6162ac9373
5 changed files with 131 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/plugins/loader.js
View File

@ -181,12 +181,13 @@ class PluginsLoader {
}) })
/** 检查频道消息 */ /** 检查频道消息 */
if (this.checkGuildMsg(e)) return if (this.checkGuildMsg(e)) return
/** 检查黑白名单 */
if (!this.checkBlack(e)) return
/** 冷却 */ /** 冷却 */
if (!this.checkLimit(e)) return if (!this.checkLimit(e)) return
/** 处理消息 */ /** 处理消息 */
this.dealMsg(e) this.dealMsg(e)
/** 检查黑白名单 */
if (!this.checkBlack(e)) return
/** 处理回复 */ /** 处理回复 */
this.reply(e) this.reply(e)
/** 过滤事件 */ /** 过滤事件 */
@ -233,8 +234,16 @@ class PluginsLoader {
// 判断是否是星铁命令，若是星铁命令则标准化处理 // 判断是否是星铁命令，若是星铁命令则标准化处理
// e.isSr = true，且命令标准化为 #星铁 开头 // e.isSr = true，且命令标准化为 #星铁 开头
Object.defineProperty(e, 'isSr', {
get: () => e.game === 'sr',
set: (v) => e.game = v ? 'sr' : 'gs'
})
Object.defineProperty(e, 'isGs', {
get: () => e.game === 'gs',
set: (v) => e.game = v ? 'gs' : 'sr'
})
if (this.srReg.test(e.msg)) { if (this.srReg.test(e.msg)) {
e.isSr = true e.game = 'sr'
e.msg = e.msg.replace(this.srReg, '#星铁') e.msg = e.msg.replace(this.srReg, '#星铁')
} }
@ -717,9 +726,14 @@ class PluginsLoader {
if (e.test) return true if (e.test) return true
/** 黑名单qq */ /** 黑名单qq */
if (other.blackQQ && other.blackQQ.includes(Number(e.user_id) || e.user_id)) { if (other.blackQQ) {
if (other.blackQQ.includes(Number(e.user_id) || e.user_id)) {
return false return false
} }
if (e.at && other.blackQQ.includes(Number(e.at) || e.at)) {
return false
}
}
if (e.group_id) { if (e.group_id) {
/** 白名单群 */ /** 白名单群 */

3
lib/plugins/runtime.js
View File

@ -77,7 +77,6 @@ export default class Runtime {
await MysInfo.initCache() await MysInfo.initCache()
let runtime = new Runtime(e) let runtime = new Runtime(e)
e.runtime = runtime e.runtime = runtime
e.game = e.isSr ? 'sr' : 'gs'
await runtime.initUser() await runtime.initUser()
return runtime return runtime
} }
@ -88,7 +87,7 @@ export default class Runtime {
if (user) { if (user) {
e.user = new Proxy(user, { e.user = new Proxy(user, {
get (self, key, receiver) { get (self, key, receiver) {
let game = e.isSr ? 'sr' : 'gs' let game = e.game
let fnMap = { let fnMap = {
uid: 'getUid', uid: 'getUid',
uidList: 'getUidList', uidList: 'getUidList',

1
lib/tools/log.js
View File

@ -13,7 +13,6 @@ fs.readFile(`${_path}/config/pm2/pm2.json`, `utf8`, (err, data) => {
const config = JSON.parse(data) const config = JSON.parse(data)
if (config.apps && config.apps.length > 0 && config.apps[0].name) { if (config.apps && config.apps.length > 0 && config.apps[0].name) {
const appName = config.apps[0].name const appName = config.apps[0].name
console.log(config.apps[0].name)
runPm2Logs(appName) runPm2Logs(appName)
} else { } else {
console.log('读取失败：无法在pm2.json中找到name数组') console.log('读取失败：无法在pm2.json中找到name数组')

73
plugins/genshin/apps/gcLog.js
View File

@ -8,7 +8,7 @@ import LogCount from '../model/logCount.js'
const _path = process.cwd() + '/plugins/genshin' const _path = process.cwd() + '/plugins/genshin'
export class gcLog extends plugin { export class gcLog extends plugin {
constructor() { constructor () {
super({ super({
name: '抽卡记录', name: '抽卡记录',
dsc: '抽卡记录数据统计', dsc: '抽卡记录数据统计',
@ -20,15 +20,15 @@ export class gcLog extends plugin {
fnc: 'logUrl' fnc: 'logUrl'
}, },
{ {
reg: '^#txt(日志)?(文件)?导入记录$', reg: '^#txt日志文件导入记录$',
fnc: 'logFile' fnc: 'logFile'
}, },
{ {
reg: '^#*(原神|星铁)?(xlsx|excel)(文件)?导入记录$', reg: '^#xlsx文件导入记录$',
fnc: 'logXlsx' fnc: 'logXlsx'
}, },
{ {
reg: '^#*(原神|星铁)?json(文件)?导入记录$', reg: '^#json文件导入记录$',
fnc: 'logJson' fnc: 'logJson'
}, },
{ {
@ -57,8 +57,8 @@ export class gcLog extends plugin {
this.androidUrl = 'https://docs.qq.com/doc/DUWpYaXlvSklmVXlX' this.androidUrl = 'https://docs.qq.com/doc/DUWpYaXlvSklmVXlX'
} }
async init() { async init () {
let file = ['./data/gachaJson', './data/srJson', './temp/html/StarRail'] let file = ['./data/gachaJson', './data/srJson', './temp/html/StarRail', './temp/uigf']
for (let i of file) { for (let i of file) {
if (!fs.existsSync(i)) { if (!fs.existsSync(i)) {
fs.mkdirSync(i) fs.mkdirSync(i)
@ -66,7 +66,7 @@ export class gcLog extends plugin {
} }
} }
accept() { accept () {
if (this.e.file && this.e.isPrivate) { if (this.e.file && this.e.isPrivate) {
let name = this.e.file?.name let name = this.e.file?.name
if (name.includes('txt')) { if (name.includes('txt')) {
@ -89,7 +89,7 @@ export class gcLog extends plugin {
} }
/** 抽卡记录链接 */ /** 抽卡记录链接 */
async logUrl() { async logUrl () {
if (!this.e.isPrivate) { if (!this.e.isPrivate) {
this.e.reply('请私聊发送链接', false, { at: true }) this.e.reply('请私聊发送链接', false, { at: true })
return true return true
@ -103,7 +103,7 @@ export class gcLog extends plugin {
} }
/** 发送output_log.txt日志文件 */ /** 发送output_log.txt日志文件 */
async logFile() { async logFile () {
if (!this.e.isPrivate) { if (!this.e.isPrivate) {
await this.e.reply('请私聊发送日志文件', false, { at: true }) await this.e.reply('请私聊发送日志文件', false, { at: true })
return true return true
@ -126,7 +126,7 @@ export class gcLog extends plugin {
} }
/** #抽卡记录 */ /** #抽卡记录 */
async getLog() { async getLog () {
this.e.isAll = !!(this.e.msg.includes('全部')) this.e.isAll = !!(this.e.msg.includes('全部'))
let data = await new GachaLog(this.e).getLogData() let data = await new GachaLog(this.e).getLogData()
if (!data) return if (!data) return
@ -139,7 +139,7 @@ export class gcLog extends plugin {
} }
/** 导出记录 */ /** 导出记录 */
async exportLog() { async exportLog () {
if (this.e.isGroup) { if (this.e.isGroup) {
await this.reply('请私聊导出', false, { at: true }) await this.reply('请私聊导出', false, { at: true })
return return
@ -150,63 +150,44 @@ export class gcLog extends plugin {
if (this.e.msg.includes('json')) { if (this.e.msg.includes('json')) {
return await exportLog.exportJson() return await exportLog.exportJson()
} else { } else {
await this.e.reply('如需要将此记录导入到其他平台，请导出json格式文件')
return await exportLog.exportXlsx() return await exportLog.exportXlsx()
} }
} }
async logXlsx() { async logXlsx () {
if (!this.e.isPrivate) { if (!this.e.isPrivate) {
await this.e.reply('请私聊发送日志文件', false, { at: true }) await this.e.reply('请私聊发送日志文件', false, { at: true })
return true return true
} }
const gsTips = `注：不支持https://github.com/biuuu/genshin-wish-export项目导出的excel文件,如果是该项目的文件请发送任意消息，取消excel导入后，使用【#json导入记录】`;
const srTips = `注:适配https://github.com/biuuu/star-rail-warp-export项目导出的excel文件`;
await this.e.reply(`请发送xlsx文件，该文件需要以${this.e?.isSr ? '*' : '#'}的uid命名，如：100000000.xlsx\n否则可能无法正确识别，如果误触可发送任意消息取消导入\n${this.e?.isSr ? srTips : gsTips}`);
this.setContext('importLogXlsx');
}
async importLogXlsx() {
if (!this.e.file) { if (!this.e.file) {
await this.e.reply(`未检测到excel文件，操作已取消，请重新发送【${this.e?.isSr ? '*' : '#'}excel导入记录】`); await this.e.reply('请发送xlsx文件')
return true
} }
else { await this.e.reply('如果是星铁记录，请在【原始数据】工作表复制【gacha_type】列，粘贴并把此标题重命名为【srgf_gacha_type】，否则可能无法正确识别')
this.e.isSr = this.getContext()?.importLogXlsx.isSr; await new ExportLog(this.e).logXlsx()
await new ExportLog(this.e).logXlsx();
}
this.finish('importLogXlsx');
} }
async logJson() { async logJson () {
if (!this.e.isPrivate) { if (!this.e.isPrivate) {
await this.e.reply('请私聊发送日志文件', false, { at: true }) await this.e.reply('请私聊发送Json文件', false, { at: true })
return true return true
} }
const gsTips = `注：适配https://github.com/biuuu/genshin-wish-export项目导出的json文件`;
const srTips = `注:适配https://github.com/biuuu/star-rail-warp-export项目导出的json文件`;
await this.e.reply(`请发送json文件，该文件需要以${this.e?.isSr ? '*' : '#'}的uid命名\n如：100000000.json，否则可能无法正确识别，如果误触可发送任意消息取消导入\n${this.e?.isSr ? srTips : gsTips}`);
this.setContext('importLogJson');
}
async importLogJson() {
this.e.isSr = this.getContext()?.importLogJson.isSr;
if (!this.e.file) { if (!this.e.file) {
await this.e.reply(`未检测到json文件，操作已取消，请重新发送【${this.e?.isSr ? '*' : '#'}json导入记录】`); await this.e.reply('请发送Json文件')
} return true
else {
await new ExportLog(this.e).logJson();
}
this.finish('importLogJson');
} }
async help() { await new ExportLog(this.e).logJson()
}
async help () {
await this.e.reply(segment.image(`file://${_path}/resources/logHelp/记录帮助.png`)) await this.e.reply(segment.image(`file://${_path}/resources/logHelp/记录帮助.png`))
} }
async helpPort() { async helpPort () {
let msg = this.e.msg.replace(/#|帮助/g, '') let msg = this.e.msg.replace(/#|帮助/g, '')
if (['电脑', 'pc'].includes(msg)) { if (['电脑', 'pc'].includes(msg)) {
@ -218,7 +199,7 @@ export class gcLog extends plugin {
} }
} }
async logCount() { async logCount () {
let data = await new LogCount(this.e).count() let data = await new LogCount(this.e).count()
if (!data) return if (!data) return
let img = await puppeteer.screenshot(`${data.srtempFile}logCount`, data) let img = await puppeteer.screenshot(`${data.srtempFile}logCount`, data)

111
plugins/genshin/model/exportLog.js
View File

@ -19,35 +19,41 @@ export default class ExportLog extends base {
this.path = this.e.isSr ? `./data/srJson/${this.e.user_id}/` : `./data/gachaJson/${this.e.user_id}/` this.path = this.e.isSr ? `./data/srJson/${this.e.user_id}/` : `./data/gachaJson/${this.e.user_id}/`
const gsPool = [ this.game = this.e.game || this.e.isSr ? 'sr' : 'gs'
this.pool = (game = 'gs') => {
let pool = {
gs: [
{ type: 301, typeName: '角色活动' }, { type: 301, typeName: '角色活动' },
{ type: 302, typeName: '武器活动' }, { type: 302, typeName: '武器活动' },
{ type: 200, typeName: '常驻' } { type: 200, typeName: '常驻' }
]; ],
sr: [
const srPool = [
{ type: 11, typeName: '角色活动' }, { type: 11, typeName: '角色活动' },
{ type: 12, typeName: '武器活动' }, { type: 12, typeName: '武器活动' },
{ type: 2, typeName: '新手活动' }, { type: 2, typeName: '新手活动' },
{ type: 1, typeName: '常驻' } { type: 1, typeName: '常驻' }
]; ]
}
return pool[game]
}
this.pool = this.e.isSr ? srPool : gsPool; this.typeName = (game = 'gs') => {
let type = {
const gsTypeName = { gs: {
301: '角色', 301: '角色',
302: '武器', 302: '武器',
200: '常驻' 200: '常驻'
}; },
sr: {
const srTypeName = {
11: '角色', 11: '角色',
12: '武器', 12: '武器',
2: '新手', 2: '新手',
1: '常驻' 1: '常驻'
}; }
}
this.typeName = this.e.isSr ? srTypeName : gsTypeName; return type[game]
}
} }
async initXlsx() { async initXlsx() {
@ -57,6 +63,9 @@ export default class ExportLog extends base {
} }
async exportJson() { async exportJson() {
if (!this.e.isSr) {
await common.downFile('https://api.uigf.org/dict/genshin/chs.json', './temp/uigf/genshin.json')
}
await this.getUid() await this.getUid()
if (!this.uid) return false if (!this.uid) return false
@ -71,11 +80,17 @@ export default class ExportLog extends base {
export_timestamp: moment().format('X'), export_timestamp: moment().format('X'),
export_app: 'Miao-Yunzai', export_app: 'Miao-Yunzai',
export_app_version: cfg.package.version, export_app_version: cfg.package.version,
uigf_version: 'v2.2'
}, },
list list
} }
if (this.e.isSr) {
data.info.srgf_version = 'v1.0'
data.info.region_time_zone = moment(list[0].time).utcOffset() / 60
} else {
data.info.uigf_version = 'v2.3'
}
let saveFile = `${this.path}${this.uid}/${this.uid}.json` let saveFile = `${this.path}${this.uid}/${this.uid}.json`
fs.writeFileSync(saveFile, JSON.stringify(data, '', '\t')) fs.writeFileSync(saveFile, JSON.stringify(data, '', '\t'))
@ -141,11 +156,12 @@ export default class ExportLog extends base {
} }
getAllList() { getAllList() {
let uigf = JSON.parse(fs.readFileSync('./temp/uigf/genshin.json', 'utf8'))
let res = { let res = {
list: [] list: []
} }
let tmpId = {} let tmpId = {}
for (let v of this.pool) { for (let v of this.pool(this.game)) {
let json = `${this.path}${this.uid}/${v.type}.json` let json = `${this.path}${this.uid}/${v.type}.json`
if (fs.existsSync(json)) { if (fs.existsSync(json)) {
json = JSON.parse(fs.readFileSync(json, 'utf8')) json = JSON.parse(fs.readFileSync(json, 'utf8'))
@ -155,11 +171,17 @@ export default class ExportLog extends base {
} }
res[v.type] = json res[v.type] = json
for (let v of json) { for (let v of json) {
// item_id必要字段
if (!v.item_id) {
v.item_id = String(uigf[v.name])
}
if (!this.e.isSr) {
if (v.gacha_type == 301 || v.gacha_type == 400) { if (v.gacha_type == 301 || v.gacha_type == 400) {
v.uigf_gacha_type = '301' v.uigf_gacha_type = '301'
} else { } else {
v.uigf_gacha_type = v.gacha_type v.uigf_gacha_type = v.gacha_type
} }
}
let id = v.id let id = v.id
if (!id) { if (!id) {
id = moment(v.time).format('x') + '000000' id = moment(v.time).format('x') + '000000'
@ -192,7 +214,7 @@ export default class ExportLog extends base {
xlsxDataPool(data) { xlsxDataPool(data) {
let xlsxData = [] let xlsxData = []
for (let v of this.pool) { for (let v of this.pool(this.game)) {
let poolData = [ let poolData = [
[ [
'时间', '名称', '物品类型', '星级', '祈愿类型' '时间', '名称', '物品类型', '星级', '祈愿类型'
@ -214,15 +236,17 @@ export default class ExportLog extends base {
} }
xlsxDataAll(data) { xlsxDataAll(data) {
let ui = this.e.isSr ? 'sr' : 'ui'
let list = [ let list = [
[ [
'count', 'gacha_type', 'id', 'item_id', 'item_type', 'lang', 'name', 'rank_type', 'time', 'uid', 'uigf_gacha_type' 'count', 'gacha_type', 'id', 'item_id', 'item_type', 'lang', 'name', 'rank_type', 'time', 'uid', `${ui}gf_gacha_type`
] ]
] ]
for (let v of data.list) { for (let v of data.list) {
let tmp = [] let tmp = []
if (this.e.isSr) v.srgf_gacha_type = v.gacha_type
for (let i of list[0]) { for (let i of list[0]) {
if (i == 'id' || i == 'uigf_gacha_type') v[i] = String(v[i]) if (i == 'id' || i == `${ui}gf_gacha_type`) v[i] = String(v[i])
tmp.push(v[i]) tmp.push(v[i])
} }
list.push(tmp) list.push(tmp)
@ -280,6 +304,10 @@ export default class ExportLog extends base {
return false return false
} }
if (rawData.data[0].includes('srgf_gacha_type')) {
this.e.isSr = true
this.game = 'sr'
}
/** 处理xlsx数据 */ /** 处理xlsx数据 */
let data = this.dealXlsx(rawData.data); let data = this.dealXlsx(rawData.data);
if (!data) return false if (!data) return false
@ -287,24 +315,26 @@ export default class ExportLog extends base {
/** 保存json */ /** 保存json */
let msg = [] let msg = []
for (let type in data) { for (let type in data) {
if (!this.typeName[type]) continue let typeName = this.typeName(this.game)
if (!typeName[type]) continue
let gachLog = new GachaLog(this.e) let gachLog = new GachaLog(this.e)
gachLog.uid = uid gachLog.uid = uid
gachLog.type = type gachLog.type = type
gachLog.writeJson(data[type]) gachLog.writeJson(data[type])
msg.push(`${this.typeName[type]}记录：${data[type].length}条`) msg.push(`${typeName[type]}记录：${data[type].length}条`)
} }
/** 删除文件 */ /** 删除文件 */
fs.unlink(textPath, () => { }) fs.unlink(textPath, () => { })
await this.e.reply(`${this.e.file.name}，导入成功\n${msg.join('\n')}`) await this.e.reply(`${this.e.file.name}，${this.e.isSr ? '星铁' : '原神'}记录导入成功\n${msg.join('\n')}`)
} }
dealXlsx(list) { dealXlsx(list) {
let ui = this.e.isSr ? 'sr' : 'ui'
/** 必要字段 */ /** 必要字段 */
let reqField = ['uigf_gacha_type', 'gacha_type', 'item_type', 'name', 'time'] let reqField = ['gacha_type', 'item_type', 'name', 'time', `${ui}gf_gacha_type`]
/** 不是必要字段 */ /** 不是必要字段 */
let noReqField = ['id', 'uid', 'count', 'item_id', 'lang', 'rank_type'] let noReqField = ['id', 'uid', 'count', 'item_id', 'lang', 'rank_type']
@ -313,15 +343,11 @@ export default class ExportLog extends base {
field[list[0][i]] = i field[list[0][i]] = i
} }
// 适配StarRailExport导出的xlsx，该xlsx没有uigf_gacha_type字段.
if (!field['uigf_gacha_type'] && field['gacha_type']) {
field['uigf_gacha_type'] = field['gacha_type']
}
/** 判断字段 */ /** 判断字段 */
for (let v of reqField) { for (let v of reqField) {
if (!field[v]) { if (!field[v]) {
this.e.reply(`xlsx文件内容错误：缺少必要字段${v}`) let tips = v === 'srgf_gacha_type' ? '\n请在【原始数据】工作表复制【gacha_type】列，粘贴并把此标题重命名为【srgf_gacha_type】' : ''
this.e.reply(`xlsx文件内容错误：缺少必要字段${v}${tips}`)
return return
} }
} }
@ -334,7 +360,7 @@ export default class ExportLog extends base {
let data = {} let data = {}
for (let v of list) { for (let v of list) {
if (v[field.name] == 'name') continue if (v[field.name] == 'name') continue
if (!data[v[field.uigf_gacha_type]]) data[v[field.uigf_gacha_type]] = [] if (!data[v[field[`${ui}gf_gacha_type`]]]) data[v[field[`${ui}gf_gacha_type`]]] = []
let tmp = {} let tmp = {}
/** 加入必要字段 */ /** 加入必要字段 */
@ -351,7 +377,7 @@ export default class ExportLog extends base {
} }
} }
data[v[field.uigf_gacha_type]].push(tmp) data[v[field[`${ui}gf_gacha_type`]]].push(tmp)
} }
return data return data
@ -382,25 +408,31 @@ export default class ExportLog extends base {
return false return false
} }
if (json.info.srgf_version) {
this.e.isSr = true
this.game = 'sr'
}
let data = this.dealJson(json.list) let data = this.dealJson(json.list)
if (!data) return false if (!data) return false
/** 保存json */ /** 保存json */
let msg = [] let msg = []
for (let type in data) { for (let type in data) {
if (!this.typeName[type]) continue let typeName = this.typeName(this.game)
if (!typeName[type]) continue
let gachLog = new GachaLog(this.e) let gachLog = new GachaLog(this.e)
gachLog.uid = uid gachLog.uid = uid
gachLog.type = type gachLog.type = type
gachLog.writeJson(data[type]) gachLog.writeJson(data[type])
msg.push(`${this.typeName[type]}记录：${data[type].length}条`) msg.push(`${typeName[type]}记录：${data[type].length}条`)
} }
/** 删除文件 */ /** 删除文件 */
fs.unlink(textPath, () => { }) fs.unlink(textPath, () => { })
await this.e.reply(`${this.e.file.name}，导入成功\n${msg.join('\n')}`) await this.e.reply(`${this.e.file.name}，${this.e.isSr ? '星铁' : '原神'}记录导入成功\n${msg.join('\n')}`)
} }
dealJson(list) { dealJson(list) {
@ -416,22 +448,13 @@ export default class ExportLog extends base {
} }
} }
// 对json进行排序（按照time字段）
list.sort((a, b) => {
return moment(a.time).format('x') - moment(b.time).format('x');
});
/** 倒序 */ /** 倒序 */
if (moment(list[0].time).format('x') < moment(list[list.length - 1].time).format('x')) { if (moment(list[0].time).format('x') < moment(list[list.length - 1].time).format('x')) {
list = list.reverse() list = list.reverse()
} }
for (let v of list) { for (let v of list) {
// 适配StarRailExport导出的json，该json没有uigf_gacha_type字段. if (this.game === 'sr') v.uigf_gacha_type = v.gacha_type
if (!v['uigf_gacha_type'] && v['gacha_type']) {
v['uigf_gacha_type'] = v['gacha_type']
}
if (!data[v.uigf_gacha_type]) data[v.uigf_gacha_type] = [] if (!data[v.uigf_gacha_type]) data[v.uigf_gacha_type] = []
data[v.uigf_gacha_type].push(v) data[v.uigf_gacha_type].push(v)
} }