pendulum
/
schat2-clive
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Using room map instead of list, fixing user join registration.

This commit is contained in:
ThePendulum 2021-11-10 00:06:28 +01:00
parent f4df512031
commit 448f0ce3bd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app.js
View File

@ -105,7 +105,7 @@ function onRooms({ rooms, users }, bot) {
logger.info(`Joined ${rooms.map((room) => room.name).join(', ')}`); logger.info(`Joined ${rooms.map((room) => room.name).join(', ')}`);
/* eslint-disable no-param-reassign */ /* eslint-disable no-param-reassign */
bot.rooms = rooms; bot.rooms = rooms.reduce((acc, room) => ({ ...acc, [room.id]: room }), {});
bot.users = { ...bot.users, ...users }; bot.users = { ...bot.users, ...users };
/* eslint-enable no-param-reassign */ /* eslint-enable no-param-reassign */
@ -120,22 +120,22 @@ function onRooms({ rooms, users }, bot) {
/* eslint-disable no-param-reassign */ /* eslint-disable no-param-reassign */
function onJoin(data, bot) { function onJoin(data, bot) {
if (bot.rooms[data.roomId] && !bot.rooms[data.roomId]?.includes(data.user.id)) { if (bot.rooms[data.roomId] && !bot.rooms[data.roomId].userIds?.includes(data.user.id)) {
bot.users[data.user.id] = data.user; bot.users[data.user.id] = data.user;
bot.rooms[data.roomId].push(data.user.id); bot.rooms[data.roomId].userIds.push(data.user.id);
} }
} }
function onLeave(data, bot) { function onLeave(data, bot) {
if (bot.rooms[data.roomId]) { if (bot.rooms[data.roomId]) {
bot.rooms[data.roomId].users = bot.rooms[data.roomId].users.filter((userId) => userId !== data.userId); bot.rooms[data.roomId].userIds = bot.rooms[data.roomId].userIds.filter((userId) => userId !== data.userId);
} }
} }
function onMessage(message, bot, games) { function onMessage(message, bot, games) {
const [, command, subcommand] = message.body?.match(new RegExp(`^${config.prefix}(\\w+)(?:\\:(\\w+))?`)) || []; const [, command, subcommand] = message.body?.match(new RegExp(`^${config.prefix}(\\w+)(?:\\:(\\w+))?`)) || [];
const user = bot.users[message.userId]; const user = bot.users[message.userId];
const room = bot.rooms.find((roomX) => roomX.id === message.roomId); const room = bot.rooms[message.roomId];
if (['leaderboard', 'lead', 'leader', 'leaders', 'scoreboard', 'best'].includes(subcommand) && games[command]) { if (['leaderboard', 'lead', 'leader', 'leaders', 'scoreboard', 'best'].includes(subcommand) && games[command]) {
getLeaderboard(games[command], { user, room }); getLeaderboard(games[command], { user, room });