mirror of
https://github.com/arthur-pbty/xiao.git
synced 2026-06-13 15:58:06 +02:00
Lots of small changes
This commit is contained in:
@@ -39,7 +39,7 @@ module.exports = class AxisCultSignUpCommand extends Command {
|
||||
{
|
||||
key: 'gender',
|
||||
type: 'string',
|
||||
oneOf: ['male', 'female']
|
||||
oneOf: ['male', 'female', 'other']
|
||||
},
|
||||
{
|
||||
key: 'age',
|
||||
|
||||
@@ -11,7 +11,7 @@ module.exports = class BoredomCommand extends Command {
|
||||
credit: [
|
||||
{
|
||||
name: 'Bored API',
|
||||
url: 'https://www.boredapi.com/',
|
||||
url: 'https://bored.api.lewagon.com/',
|
||||
reason: 'API'
|
||||
}
|
||||
]
|
||||
@@ -19,7 +19,7 @@ module.exports = class BoredomCommand extends Command {
|
||||
}
|
||||
|
||||
async run(msg) {
|
||||
const { body } = await request.get('https://www.boredapi.com/api/activity/');
|
||||
const { body } = await request.get('https://bored.api.lewagon.com/api/activity/');
|
||||
return msg.say(`${body.activity} (${body.type})`);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -28,7 +28,7 @@ module.exports = class JokeCommand extends Command {
|
||||
if (body.type === 'twopart') {
|
||||
return msg.say(stripIndents`
|
||||
${body.setup}
|
||||
${body.delivery}
|
||||
||${body.delivery}||
|
||||
`);
|
||||
}
|
||||
return msg.say(body.joke);
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
const Command = require('../../framework/Command');
|
||||
const request = require('node-superfetch');
|
||||
const genders = ['male', 'female', 'both'];
|
||||
const genders = {
|
||||
masculine: 'male',
|
||||
feminine: 'female',
|
||||
any: ''
|
||||
};
|
||||
|
||||
module.exports = class NameCommand extends Command {
|
||||
constructor(client) {
|
||||
@@ -21,7 +25,7 @@ module.exports = class NameCommand extends Command {
|
||||
key: 'gender',
|
||||
type: 'string',
|
||||
default: 'both',
|
||||
oneOf: genders,
|
||||
oneOf: Object.keys(genders),
|
||||
parse: gender => gender.toLowerCase()
|
||||
}
|
||||
]
|
||||
@@ -34,7 +38,7 @@ module.exports = class NameCommand extends Command {
|
||||
.query({
|
||||
inc: 'name',
|
||||
noinfo: '',
|
||||
gender: gender === 'both' ? '' : gender,
|
||||
gender: genders[gender],
|
||||
nat: 'AU,US,CA,GB'
|
||||
});
|
||||
const data = body.results[0].name;
|
||||
|
||||
@@ -12,6 +12,8 @@ module.exports = class OffspringCommand extends Command {
|
||||
}
|
||||
|
||||
run(msg) {
|
||||
const chance = Math.floor(Math.random() * 5500);
|
||||
if (!chance) return msg.say('It\'s a... Wait, what is it?');
|
||||
return msg.say(`It's a ${genders[Math.floor(Math.random() * genders.length)]}!`);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -28,7 +28,7 @@ module.exports = class PunCommand extends Command {
|
||||
if (body.type === 'twopart') {
|
||||
return msg.say(stripIndents`
|
||||
${body.setup}
|
||||
${body.delivery}
|
||||
||${body.delivery}||
|
||||
`);
|
||||
}
|
||||
return msg.say(body.joke);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
const Command = require('../../framework/Command');
|
||||
const { oneLine } = require('common-tags');
|
||||
const { MersenneTwister19937, integer } = require('random-js');
|
||||
const genders = ['male', 'female'];
|
||||
const genders = ['man', 'woman'];
|
||||
const { eyeColors, hairColors, hairStyles, extras } = require('../../assets/json/guess-looks');
|
||||
const { LOVER_USER_ID } = process.env;
|
||||
|
||||
@@ -44,7 +44,7 @@ module.exports = class GuessLooksCommand extends Command {
|
||||
const extra = extras[integer(0, extras.length - 1)(random)];
|
||||
return msg.reply(oneLine`
|
||||
I think ${authorUser ? 'you are' : `${user.username} is`} a ${age} year old ${gender} with ${eyeColor} eyes
|
||||
and ${hairStyle} ${hairColor} hair. ${authorUser ? 'You are' : `${gender === 'male' ? 'He' : 'She'} is`}
|
||||
and ${hairStyle} ${hairColor} hair. ${authorUser ? 'You are' : `${gender === 'man' ? 'He' : 'She'} is`}
|
||||
${feet}'${inches}" and weigh${authorUser ? '' : 's'} ${weight} pounds. Don't forget the ${extra}!
|
||||
`);
|
||||
}
|
||||
|
||||
@@ -16,6 +16,14 @@ const batman = {
|
||||
phase: 'Solid',
|
||||
symbol: '🦇'
|
||||
};
|
||||
const jerktonium = {
|
||||
name: 'Jerktonium',
|
||||
atomic_mass: 240,
|
||||
number: 1999,
|
||||
period: 'Bikini Bottom',
|
||||
phase: 'Solid',
|
||||
symbol: 'Jt'
|
||||
};
|
||||
|
||||
module.exports = class PeriodicTableCommand extends Command {
|
||||
constructor(client) {
|
||||
@@ -106,6 +114,7 @@ module.exports = class PeriodicTableCommand extends Command {
|
||||
.get('https://raw.githubusercontent.com/Bowserinator/Periodic-Table-JSON/master/PeriodicTableJSON.json');
|
||||
this.table = JSON.parse(text).elements;
|
||||
this.table.unshift(batman);
|
||||
this.table.unshift(jerktonium);
|
||||
return this.table;
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user