PaiGramTeam/miao-plugin
3
0
Fork 0
mirror of https://github.com/yoimiya-kokomi/miao-plugin.git synced 2024-11-22 06:58:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIx: Match character id with different regex rules

Browse Source
This commit is contained in:
ZM.J 2024-05-16 16:34:44 +08:00
parent 8a1d5eff03
commit 13665f4d2d
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/profile/ProfileRank.js
View File

@ -76,7 +76,7 @@ export async function groupRank (e) {
if (char) { if (char) {
uids = await ProfileRank.getGroupUidList(groupId, char ? char.id : '', mode) uids = await ProfileRank.getGroupUidList(groupId, char ? char.id : '', mode)
} else { } else {
uids = await ProfileRank.getGroupMaxUidList(groupId, mode) uids = await ProfileRank.getGroupMaxUidList(groupId, mode, game)
} }
if (uids.length > 0) { if (uids.length > 0) {
return renderCharRankList({ e, uids, char, mode, groupId }) return renderCharRankList({ e, uids, char, mode, groupId })

20
models/ProfileRank.js
View File

@ -19,6 +19,16 @@ export default class ProfileRank {
return rank return rank
} }
static async getCharacterFromKey(key, game = 'gs') {
if (game === 'gs') {
// 原神的角色id都是8位
return /^miao:rank:\d+:(?:mark|dmg|crit|valid):(\d{8})$/.exec(key)
} else {
// 星铁的角色id都是4位
return /^miao:rank:\d+:(?:mark|dmg|crit|valid):(\d{4})$/.exec(key)
}
}
/** /**
* 获取群排行UID * 获取群排行UID
* @param groupId * @param groupId
@ -31,11 +41,11 @@ export default class ProfileRank {
return uids ? uids[0] : false return uids ? uids[0] : false
} }
static async getGroupMaxUidList (groupId, type = 'mark') { static async getGroupMaxUidList (groupId, type = 'mark', game = 'gs') {
let keys = await redis.keys(`miao:rank:${groupId}:${type}:*`) let keys = await redis.keys(`miao:rank:${groupId}:${type}:*`)
let ret = [] let ret = []
for (let key of keys) { for (let key of keys) {
let keyRet = /^miao:rank:[\w-]+:(?:mark|dmg|crit|valid):(\d{8})$/.exec(key) let keyRet = await ProfileRank.getCharacterFromKey(key, game)
if (keyRet && keyRet[1]) { if (keyRet && keyRet[1]) {
let charId = keyRet[1] let charId = keyRet[1]
let uid = await ProfileRank.getGroupMaxUid(groupId, charId, type) let uid = await ProfileRank.getGroupMaxUid(groupId, charId, type)
@ -78,7 +88,7 @@ export default class ProfileRank {
static async resetRank (groupId, charId = '', game = 'gs') { static async resetRank (groupId, charId = '', game = 'gs') {
let keys = await redis.keys(`miao:rank:${groupId}:*`) let keys = await redis.keys(`miao:rank:${groupId}:*`)
for (let key of keys) { for (let key of keys) {
let charRet = game === 'gs' ? /^miao:rank:\d+:(?:mark|dmg|crit|valid):(\d{8})$/.exec(key) : /^miao:rank:\d+:(?:mark|dmg|crit|valid):(\d{4})$/.exec(key) let charRet = await ProfileRank.getCharacterFromKey(key, game)
if (charRet) { if (charRet) {
if (charId === '' || charId * 1 === charRet[1] * 1) { if (charId === '' || charId * 1 === charRet[1] * 1) {
await redis.del(key) await redis.del(key)
@ -171,14 +181,14 @@ export default class ProfileRank {
await redis.set(`miao:rank:uid-info:${uid}`, JSON.stringify(data), { EX: 3600 * 24 * 365 }) await redis.set(`miao:rank:uid-info:${uid}`, JSON.stringify(data), { EX: 3600 * 24 * 365 })
} }
static async delUidInfo (uid) { static async delUidInfo (uid, game = 'gs') {
let keys = await redis.keys('miao:rank:*') let keys = await redis.keys('miao:rank:*')
uid = uid + '' uid = uid + ''
if (!/\d{9,10}/.test(uid)) { if (!/\d{9,10}/.test(uid)) {
return false return false
} }
for (let key of keys) { for (let key of keys) {
let charRet = /^miao:rank:\d+:(?:mark|dmg|crit|valid):(\d{8})$/.exec(key) let charRet = await ProfileRank.getCharacterFromKey(key, game)
if (charRet) { if (charRet) {
await redis.zRem(key, uid) await redis.zRem(key, uid)
} }