package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "schat2-clive",
-  "version": "1.5.13",
+  "version": "1.5.12",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "schat2-clive",
-      "version": "1.5.13",
+      "version": "1.5.12",
       "license": "ISC",
       "dependencies": {
         "bhttp": "^1.2.8",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "schat2-clive",
-  "version": "1.5.13",
+  "version": "1.5.12",
   "description": "Game host for SChat 2-powered chat sites",
   "main": "src/app.js",
   "scripts": {

src/app.js

@@ -72,14 +72,10 @@ async function setPoints(defaultKey, user, value, { mode = 'add', key } = {}) {
 	await fs.writeFile(`./points-${instance}.json`, JSON.stringify(points, null, 4));
 }
 
-function getPoints(game, username, { user, room, command }) {
+function getPoints(game, { user, room, command }) {
-	const gamePoints = points[command] || points[game.key];
+	const userPoints = (points[command] || points[game.key])?.[`${user.id}:${user.username}`];
 
-	const userPoints = username
+	game.sendMessage(`You have scored **${userPoints || 0}** points in ${game.name}, @${user.username}`, room.id);
-		? Object.entries(gamePoints || {}).find(([identifier]) => identifier.split(':')[1] === username)?.[1]
-		: gamePoints?.[`${user?.id}:${user?.username}`];
-
-	game.sendMessage(`${username ? `**${username}** has` : 'You have'} scored **${userPoints || 0}** points in ${game.name}, @${user.username}`, room.id);
 }
 
 function getLeaderboard(game, { user, room, command }) {
@@ -97,7 +93,7 @@ function getLeaderboard(game, { user, room, command }) {
 			const username = userKey.split(':')[1];
 			return `**${username === user.username ? '@' : ''}${username}** at **${score}** points`;
 		})
-		.slice(0, 10)
+		.slice(-10)
 		.join(', ');
 
 	game.sendMessage(`The top ${Math.min(Object.keys(leaderboard).length, 10)} *${game.name}* players are: ${curatedLeaderboard}`, room.id);
@@ -144,20 +140,20 @@ function onMessage(message, bot, games) {
 	const user = bot.users[message.userId] || message.user;
 	const room = bot.rooms[message.roomId];
 
+	if (['leaderboard', 'lead', 'leader', 'leaders', 'scoreboard', 'best'].includes(subcommand) && games[command]) {
+		getLeaderboard(games[command], { user, room, command });
+		return;
+	}
+
+	if (['points', 'score'].includes(subcommand) && games[command]) {
+		getPoints(games[command], { user, room, command });
+		return;
+	}
+
 	if (command) {
 		const args = body.split(/\s+/).slice(1);
 		const game = games[command];
 
-		if (['leaderboard', 'lead', 'leader', 'leaders', 'scoreboard', 'best'].includes(subcommand) && games[command]) {
-			getLeaderboard(games[command], { user, room, command });
-			return;
-		}
-
-		if (['points', 'score'].includes(subcommand) && games[command]) {
-			getPoints(games[command], args[0], { user, room, command });
-			return;
-		}
-
 		if (game && game.onCommand) {
 			if (user) {
 				user.points = points[game.key]?.[`${user.id}:${user.username}`] || 0;