From b27bf38265740cc9ab2c93b26f94e1d4c72ccedb Mon Sep 17 00:00:00 2001 From: Loic Bersier Date: Sat, 1 Dec 2018 02:47:44 +0100 Subject: [PATCH] forgot to update sayd my bad --- commands/fun/sayd.js | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/commands/fun/sayd.js b/commands/fun/sayd.js index ab4a988f..ce1bbc1b 100644 --- a/commands/fun/sayd.js +++ b/commands/fun/sayd.js @@ -1,14 +1,14 @@ const { Command } = require('discord.js-commando'); const SelfReloadJSON = require('self-reload-json'); const blacklist = require('../../blacklist'); -module.exports = class saydCommand extends Command { +module.exports = class sayCommand extends Command { constructor(client) { super(client, { - name: 'sayd', - aliases: ['repeatd'], + name: 'say', + aliases: ['repeat'], group: 'fun', - memberName: 'sayd', - description: `Repeat the text you send and delete it( can also use [verb] [noun] [adverb] [adjective] [member] and [number] to get random thing )`, + memberName: 'say', + description: `Repeat the text you send ( can also use [verb] [noun] [adverb] [adjective] [member] and [number] to get random thing )`, args: [ { key: 'text', @@ -27,9 +27,24 @@ module.exports = class saydCommand extends Command { // Load all the different files const verb = require('../../dictionary/verbs.json') - const noun = require('../../dictionary/nouns.json') + const noun = require('../../dictionary/noun.json') const adverb = require('../../dictionary/adjectives.json') const adjective = require('../../dictionary/adverbs.json') + const activities = require('../../dictionary/activities.json') + const celebreties = require('../../dictionary/celebreties.json') + const countries = require('../../dictionary/countries.json') + const diseases = require('../../dictionary/diseases.json') + const elements = require('../../dictionary/elements.json') + const hobbies = require('../../dictionary/hobbies.json') + const music = require('../../dictionary/music.json') + const prefixes = require('../../dictionary/prefixes.json') + const pronouns = require('../../dictionary/pronouns.json') + const states = require('../../dictionary/states.json') + const titles = require('../../dictionary/titles.json') + const units = require('../../dictionary/units.json') + + + // Generate a random number function randNumber(file) { let Rand = Math.floor((Math.random() * file.length) + 1); @@ -41,9 +56,22 @@ module.exports = class saydCommand extends Command { text = text.replace(/\[adverb\]/, adverb[randNumber(adverb)]) text = text.replace(/\[noun\]/, noun[randNumber(noun)]) text = text.replace(/\[adjective\]/, adjective[randNumber(adjective)]) + text = text.replace(/\[activitie\]/, activities[randNumber(activities)]) + text = text.replace(/\[celebreties\]/, celebreties[randNumber(celebreties)]) + text = text.replace(/\[countrie\]/, countries[randNumber(countries)]) + text = text.replace(/\[diseases\]/, diseases[randNumber(diseases)]) + text = text.replace(/\[elements\]/, elements[randNumber(elements)]) + text = text.replace(/\[hobbie\]/, hobbies[randNumber(hobbies)]) + text = text.replace(/\[music\]/, music[randNumber(music)]) + text = text.replace(/\[prefixe\]/, prefixes[randNumber(prefixes)]) + text = text.replace(/\[pronoun\]/, pronouns[randNumber(pronouns)]) + text = text.replace(/\[state\]/, states[randNumber(states)]) + text = text.replace(/\[title\]/, titles[randNumber(titles)]) + text = text.replace(/\[unit\]/, units[randNumber(units)]) text = text.replace(/\[member\]/, message.guild.members.random().user.username) text = text.replace(/\[number\]/, Math.floor((Math.random() * 9) + 1)) - } while( text.includes('[verb]') || text.includes('[adverb]') || text.includes('[noun]') || text.includes('[adjective]') || text.includes('[member]') || text.includes('[number]') ) +// Verify if it replaced everything + } while( text.includes('[verb]') || text.includes('[adverb]') || text.includes('[noun]') || text.includes('[adjective]') || text.includes('[member]') || text.includes('[number]') || text.includes('[activitie]') || text.includes('[celebreties]') || text.includes('[countrie]') || text.includes('[diseases]') || text.includes('[elements]') || text.includes('[hobbie]') || text.includes('[music]') || text.includes('[prefixe]') || text.includes('[pronoun]') || text.includes('[state]') || text.includes('[title]') || text.includes('[unit]')) // Send the final text message.delete();