diff --git a/src/bots/room-manager/room-manager.bot.ts b/src/bots/room-manager/room-manager.bot.ts index 39f7703..2cb019f 100644 --- a/src/bots/room-manager/room-manager.bot.ts +++ b/src/bots/room-manager/room-manager.bot.ts @@ -59,23 +59,34 @@ export class RoomManagerBot implements RoomBot { return; } - const users = ev.users; - - for (const [userId, power] of Object.entries(users)) { + const { users, prevUsers, defaultPower } = ev; + const changedUsers = new Set(); + + // 收集所有在新列表或旧列表中出现过的用户 + for (const userId of Object.keys(users)) changedUsers.add(userId); + for (const userId of Object.keys(prevUsers)) changedUsers.add(userId); + + for (const userId of changedUsers) { try { + const oldPower = prevUsers[userId] ?? defaultPower; + const newPower = users[userId] ?? defaultPower; + + // 如果该用户的分数根本没变,跳过 + if (oldPower === newPower) continue; + let targetState = ''; const actions: Array<{ action: 'kick' | 'invite'; roomName: string; roomId: string; reason?: string }> = []; - if (power >= levelA) { - targetState = 'A级(高级)'; + if (newPower >= levelA) { + targetState = `A级(高级) [${newPower}分]`; actions.push({ action: 'invite', roomName: '工作房1', roomId: workRoom1 }); actions.push({ action: 'invite', roomName: '工作房2', roomId: workRoom2 }); - } else if (power === levelB) { - targetState = 'B级(普通)'; + } else if (newPower === levelB) { + targetState = `B级(普通) [${newPower}分]`; actions.push({ action: 'kick', roomName: '工作房1', roomId: workRoom1, reason: '权限不足' }); actions.push({ action: 'invite', roomName: '工作房2', roomId: workRoom2 }); - } else if (power <= levelC) { - targetState = 'C级(失联)'; + } else if (newPower <= levelC) { + targetState = `C级(失联) [${newPower}分]`; actions.push({ action: 'kick', roomName: '工作房1', roomId: workRoom1, reason: '打入冷宫' }); actions.push({ action: 'kick', roomName: '工作房2', roomId: workRoom2, reason: '打入冷宫' }); actions.push({ action: 'invite', roomName: '失联房', roomId: lostRoom }); diff --git a/src/core/command/types.ts b/src/core/command/types.ts index 9c8776e..04267e7 100644 --- a/src/core/command/types.ts +++ b/src/core/command/types.ts @@ -21,6 +21,8 @@ export interface PowerLevelEvent { account: string; roomId: string; users: Record; + prevUsers: Record; + defaultPower: number; } /** 解析后的命令。 */ diff --git a/src/core/matrix/matrix-session.ts b/src/core/matrix/matrix-session.ts index f0c39f7..925e12d 100644 --- a/src/core/matrix/matrix-session.ts +++ b/src/core/matrix/matrix-session.ts @@ -428,10 +428,16 @@ export class MatrixSession implements MatrixTransport { void this.sink.onMember(ev); } else if (type === 'm.room.power_levels') { const users = (content['users'] ?? {}) as Record; + const prevContent = (event['unsigned']?.['prev_content'] ?? event['prev_content'] ?? {}) as Record; + const prevUsers = (prevContent['users'] ?? {}) as Record; + const defaultPower = (content['users_default'] as number) ?? 0; + void this.sink.onPowerLevel({ account: this.account, roomId, users, + prevUsers, + defaultPower, }); } });