Compare commits

..

No commits in common. "e0aab6acf36d69a2199293bc74208415b85e57bc" and "a47b8adf9971668e6204a0a3cba3fe482f98653c" have entirely different histories.

4 changed files with 12 additions and 25 deletions

4
package-lock.json generated
View File

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

View File

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

View File

@ -6,10 +6,8 @@ const crypto = require('crypto');
const style = require('../utils/style');
const dieFaces = ['⚀', '⚁', '⚂', '⚃', '⚄', '⚅'];
const coinFaces = ['🗿', '🏛️'];
function onCommand(args, context) {
const type = ['coin', 'flip'].includes(context.command) ? 'coin' : 'dice';
const pattern = args[0]?.match(/(\d+)?d(\d+)?/i);
if (pattern) {
@ -18,33 +16,30 @@ function onCommand(args, context) {
}
const rolls = Math.max(Number(args[0]) || 1, 1);
const faces = type === 'coin' ? 2 : Math.max(Number(args[1]) || 6, 1);
const faces = Math.max(Number(args[1]) || 6, 1);
if (rolls > config.dice.maxRolls) {
context.sendMessage(`You can only roll ${config.dice.maxRolls} dice at one time`, context.room.id, { label: type });
context.sendMessage(`You can only roll ${config.dice.maxRolls} dice at one time`, context.room.id);
return;
}
if (faces > config.dice.maxFaces) {
context.sendMessage(`Your dice can have at most ${config.dice.maxFaces} faces`, context.room.id, { label: type });
context.sendMessage(`Your dice can have at most ${config.dice.maxFaces} faces`, context.room.id);
return;
}
const results = Array.from({ length: rolls }, () => {
const result = crypto.randomInt(1, faces + 1);
if (type === 'coin') {
return `${style.yellow(`(${coinFaces[result - 1]})`)} ${style.bold(result === 1 ? 'heads' : 'tails')}`; // eslint-disable-line no-irregular-whitespace
}
// using U+2003 Em Space after dice to create double space that doesn't get filtered in SChat
return `${style.grey(dieFaces[result - 1] || '☐')} ${style.bold(result)}`; // eslint-disable-line no-irregular-whitespace
});
context.sendMessage(results.join(style.grey(' | ')), context.room.id, { label: type });
context.sendMessage(results.join(style.grey(' | ')), context.room.id);
}
module.exports = {
onCommand,
commands: ['dice', 'die', 'roll', 'coin', 'coins', 'flip'],
help: 'What\'s your next move? Try ~dice [rolls] [faces], ~die, ~roll, ~coin or ~flip',
commands: ['dice', 'die', 'roll'],
help: 'What\'s your next move? Try ~dice [rolls] [faces], ~die or ~roll',
};

View File

@ -90,10 +90,6 @@ function styleCommands(rawBody) {
}
/* eslint-enable no-irregular-whitespace */
function capitalize(string) {
return `${string.slice(0, 1).toUpperCase()}${string.slice(1)}`;
}
function curateMessageBody(rawBody, game, key, options) {
const body = options?.styleCommands ? styleCommands(rawBody) : rawBody;
@ -101,11 +97,7 @@ function curateMessageBody(rawBody, game, key, options) {
return body;
}
const label = typeof options.label === 'string'
? capitalize(options.label)
: game.name || capitalize(key);
return `${style.grey(`[${label}]`)} ${body}`;
return `${style.grey(`[${game.name || `${key.slice(0, 1).toUpperCase()}${key.slice(1)}`}]`)} ${body}`;
}
async function getGames(bot, identifier) {
@ -132,7 +124,7 @@ async function getGames(bot, identifier) {
}
};
const setGamePoints = (user, score = 1, options) => setPoints(identifier, key, user, score, options);
const setGamePoints = (userId, score = 1, options) => setPoints(identifier, key, userId, score, options);
const curatedGame = {
...game,