Compare commits

..

No commits in common. "19fb233d8a5f5e123cb91d1afa895d7ef613c9b2" and "f1c5b8afdad0c3fe7aafc307fd0777f2b8e7608a" have entirely different histories.

4 changed files with 15 additions and 17 deletions

4
package-lock.json generated
View File

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

View File

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

View File

@ -254,7 +254,7 @@ function getGames(bot) {
}
function handleError(error, socket, domain, data) {
logger.error(`${domain} '${JSON.stringify(data)}' triggered error: ${error.message} ${error.stack}`);
logger.error(`${domain} '${JSON.stringify(data)}' triggered error: ${error.message}`);
if (data?.roomId) {
socket.transmit('message', {

View File

@ -33,16 +33,6 @@ function scoreRound(context, round) {
}).filter(Boolean).join(', ');
}
function getLeaders() {
return Object.entries(game.points).sort(([, scoreA], [, scoreB]) => scoreB - scoreA).map(([username, score], index) => {
if (index === 0) {
return `**@${username}** with **${score}** points`;
}
return `**@${username}** with **${score}** points`;
}).join(', ');
}
async function playRound(context, round = 0) {
const ac = new AbortController(); // eslint-disable-line no-undef
const now = new Date();
@ -84,7 +74,7 @@ async function playRound(context, round = 0) {
}
if (game.stopped) {
context.sendMessage(`The game was stopped by @${game.stopped.username}. The answer to the last question was: **${question.answer}**. Best players: ${getLeaders()}`, context.room.id);
context.sendMessage(`The game was stopped by @${game.stopped.username}. The answer to the last question was: **${question.answer}**`, context.room.id);
game = null;
return;
@ -108,7 +98,7 @@ async function playRound(context, round = 0) {
await timers.setTimeout(5000);
if (game.stopped) {
context.sendMessage(`The game was stopped by @${game.stopped.username}. The answer to the last question was: **${question.answer}**. Best players: ${getLeaders()}`, context.room.id);
context.sendMessage(`The game was stopped by ${game.stopped.username}`, context.room.id);
game = null;
return;
@ -120,7 +110,15 @@ async function playRound(context, round = 0) {
await timers.setTimeout(2000);
context.sendMessage(`That's the end of the game! Best players: ${getLeaders()}`, context.room.id);
const leaders = Object.entries(game.points).sort(([, scoreA], [, scoreB]) => scoreB - scoreA).map(([username, score], index) => {
if (index === 0) {
return `**@${username}** with **${score}** points`;
}
return `**@${username}** with **${score}** points`;
}).join(', ');
context.sendMessage(`That's the end of the game! Best players: ${leaders}`, context.room.id);
game = null;
}