Merge pull request #43 from RTByte/dev-1.1.1

noragerdin · web-flow · commit 0beef18b72ca · 2020-01-14T14:17:38.000+01:00
RTByte 1.1.1 release
diff --git a/README.md b/README.md
@@ -2,7 +2,8 @@
 [![Discord](https://img.shields.io/discord/450163430373064704.svg?colorB=7289da&label=discord&logo=Discord&logoColor=fff&style=flat)](https://discord.gg/eRauWP4)
 [![Open Issues](https://img.shields.io/github/issues/RTByte/RTByte.svg)](https://github.com/RTByte/RTByte/issues)
 [![Open PRS](https://img.shields.io/github/issues-pr/RTByte/RTByte.svg)](https://github.com/RTByte/RTByte/pulls)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/2878b3d9eded4d4998cd29dbdf3e98ec)](https://www.codacy.com/app/mcumbers/RTByte?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=ChopBot/RTByte&amp;utm_campaign=Badge_Grade)
+[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/RTByte/RTByte.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/RTByte/RTByte/context:javascript)
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/RTByte/RTByte.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/RTByte/RTByte/alerts/)
 [![David](https://img.shields.io/david/RTByte/RTByte.svg?maxAge=3600)](https://david-dm.org/RTByte/RTByte)
 
 RTByte is a fully modular multipurpose Discord bot built on the incredible [Klasa](https://klasa.js.org/) framework for [discord.js](https://discord.js.org/). It brings a ton of features to help you run and manage your server, and is fully integrated into Discord's audit log system.
diff --git a/config-default.js b/config-default.js
@@ -20,5 +20,12 @@ exports.config = {
 	}
 };
 
+// API tokens you'll need to run the bot
+exports.apis = {
+	genius: '',
+	google: '',
+	darksky: ''
+};
+
 // The token for this bot to login with
 exports.token = '';
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rtbyte",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "A Discord Bot for the Rooster Teeth Community family of Discord Servers",
     "main": "src/index.js",
     "scripts": {
diff --git a/src/arguments/channelname.js b/src/arguments/channelname.js
@@ -41,4 +41,4 @@ module.exports = class extends Argument {
 		}
 	}
 
-};
+};
diff --git a/src/arguments/membername.js b/src/arguments/membername.js
@@ -47,4 +47,4 @@ module.exports = class extends Argument {
 		}
 	}
 
-};
+};
diff --git a/src/arguments/rolename.js b/src/arguments/rolename.js
@@ -39,4 +39,4 @@ module.exports = class extends Argument {
 		}
 	}
 
-};
+};
diff --git a/src/arguments/username.js b/src/arguments/username.js
@@ -47,4 +47,4 @@ module.exports = class extends Argument {
 		}
 	}
 
-};
+};
diff --git a/src/commands/Admin/conf.js b/src/commands/Admin/conf.js
@@ -9,7 +9,7 @@ module.exports = class extends Command {
 			guarded: true,
 			subcommands: true,
 			description: language => language.get('COMMAND_CONF_SERVER_DESCRIPTION'),
-			usage: '<set|show|remove|reset> (key:key) (value:value) [...]',
+			usage: '<set|show:default|remove|reset> (key:key) (value:value) [...]',
 			usageDelim: ' '
 		});
 
diff --git a/src/commands/Moderator/ban.js b/src/commands/Moderator/ban.js
@@ -48,8 +48,7 @@ module.exports = class extends Command {
 			await this.client.schedule.create('timedBan', when, {
 				data: {
 					guildID: msg.guild.id,
-					userID: username.id,
-					userTag: username.tag
+					userID: username.id
 				},
 				catchUp: true
 			});
diff --git a/src/commands/Moderator/sendmsg.js b/src/commands/Moderator/sendmsg.js
@@ -21,11 +21,11 @@ module.exports = class extends Command {
 		if (await this.canSend(msg, target)) {
 			try {
 				await msg.delete();
-				if (!target.constructor.name === 'KlasaUser') {
+				if (target.constructor.name !== 'KlasaUser') {
 					return target.send(message);
 				} else if (target.constructor.name === 'KlasaUser') {
 					// eslint-disable-next-line max-len
-					return target.send(message).then(target.send(`This message was sent from the **${msg.guild.name}** Discord and can not be replied to. If you have any questions regarding the contents of it, please contact a moderator.`));
+					return target.send(`${message}\n\n${msg.language.get('COMMAND_SENDMSG_DISCLAIMER', msg.guild)}`);
 				}
 				return target.send(message);
 			} catch (err) {
diff --git a/src/commands/Moderator/userinfo.js b/src/commands/Moderator/userinfo.js
@@ -47,7 +47,8 @@ module.exports = class extends Command {
 			.setFooter(msg.language.get('COMMAND_REQUESTED_BY', msg), msg.author.displayAvatarURL());
 
 		if (membername.user.presence.activity) {
-			await embed.addField(msg.guild.language.get('COMMAND_USERINFO_ACTIVITY', membername), membername.user.presence.activity ? membername.user.presence.activity.name : 'N/A', true);
+			// eslint-disable-next-line max-len
+			await embed.addField(msg.guild.language.get('COMMAND_USERINFO_ACTIVITY', membername), membername.user.presence.activity.type === 'CUSTOM_STATUS' ? `${`${membername.user.presence.activity.emoji} ` || ''}${membername.user.presence.activity.state}` || 'N/A' : membername.user.presence.activity ? !membername.user.presence.activity.details ? membername.user.presence.activity.name : membername.user.presence.activity.type === 'LISTENING' ? `${membername.user.presence.activity.name}\n\`${membername.user.presence.activity.details} by ${membername.user.presence.activity.state}\`` : `${membername.user.presence.activity.name}\n\`${membername.user.presence.activity.details}\`` : 'N/A', true);
 		}
 
 		if (membername.premiumSince) {
diff --git a/src/commands/User/8ball.js b/src/commands/User/8ball.js
@@ -8,6 +8,7 @@ module.exports = class extends Command {
 		super(...args, {
 			aliases: ['mirror', 'magicconch'],
 			description: language => language.get('COMMAND_8BALL_DESCRIPTION'),
+			runIn: ['text', 'dm'],
 			usage: '<question:str>'
 		});
 		this.customizeResponse('question', message =>
@@ -26,7 +27,7 @@ module.exports = class extends Command {
 				});
 			return true;
 		}
-		return msg.reply(`\n🎱 ${msg.guild.language.get('COMMAND_8BALL_ANSWERS')[Math.floor(Math.random() * msg.guild.language.get('COMMAND_8BALL_ANSWERS').length)]}`);
+		return msg.reply(`\n🎱 ${msg.language.get('COMMAND_8BALL_ANSWERS')[Math.floor(Math.random() * msg.language.get('COMMAND_8BALL_ANSWERS').length)]}`);
 	}
 
 };
diff --git a/src/commands/User/choice.js b/src/commands/User/choice.js
@@ -6,6 +6,7 @@ module.exports = class extends Command {
 		super(...args, {
 			aliases: ['choose', 'decide'],
 			description: language => language.get('COMMAND_CHOICE_DESCRIPTION'),
+			runIn: ['text', 'dm'],
 			usage: '<choices:str> [...]',
 			usageDelim: ', '
 		});
diff --git a/src/commands/User/coinflip.js b/src/commands/User/coinflip.js
@@ -6,12 +6,13 @@ module.exports = class extends Command {
 		super(...args, {
 			aliases: ['coin'],
 			description: language => language.get('COMMAND_COINFLIP_DESCRIPTION'),
+			runIn: ['text', 'dm'],
 			usage: ''
 		});
 	}
 
 	async run(msg) {
-		return msg.reply(`\n${Math.random() > 0.5 ? `${msg.guild.language.get('COMMAND_COINFLIP_HEADS')}` : `${msg.guild.language.get('COMMAND_COINFLIP_TAILS')}`}.`);
+		return msg.reply(`\n${Math.random() > 0.5 ? `${msg.language.get('COMMAND_COINFLIP_HEADS')}` : `${msg.language.get('COMMAND_COINFLIP_TAILS')}`}.`);
 	}
 
 };
diff --git a/src/commands/User/discordstatus.js b/src/commands/User/discordstatus.js
@@ -0,0 +1,45 @@
+const { Command } = require('klasa');
+const { MessageEmbed } = require('discord.js');
+const fetch = require('node-fetch');
+const moment = require('moment');
+
+module.exports = class extends Command {
+
+	constructor(...args) {
+		super(...args, {
+			aliases: ['dstatus'],
+			description: language => language.get('COMMAND_DISCORDSTATUS_DESCRIPTION'),
+			runIn: ['text', 'dm']
+		});
+	}
+
+	async run(msg) {
+		fetch('https://status.discordapp.com/api/v2/summary.json')
+			.then(res => res.json())
+			.then(json => {
+				const embed = new MessageEmbed()
+					.setDescription(`[${msg.language.get('COMMAND_DISCORDSTATUS_LINK')}](${json.page.url})`)
+					.setThumbnail('https://i.imgur.com/3Xw9JWs.png')
+					.setTimestamp()
+					.setFooter(msg.language.get('COMMAND_REQUESTED_BY', msg), msg.author.displayAvatarURL());
+
+				if (json.incidents.length === 0) {
+					embed.setTitle(msg.language.get('COMMAND_DISCORDSTATUS_ALLOK'))
+						.setColor(this.client.settings.colors.green)
+						.addField(msg.language.get('COMMAND_DISCORDSTATUS_LASTUPDATE'), moment(json.page.updated_at).format('dddd, MMMM Do YYYY, h:mmA'));
+				}
+
+				const incident = json.incidents[0];
+				if (incident) {
+					embed.setTitle(msg.language.get('COMMAND_DISCORDSTATUS_INCIDENT'))
+						.setDescription(`[${msg.language.get('COMMAND_DISCORDSTATUS_INCIDENT_LINK')}](https://status.discordapp.com/incidents/${incident.incident_id}/)`)
+						.setColor(this.client.settings.colors.yellow)
+						.addField(msg.language.get('COMMAND_DISCORDSTATUS_INCIDENT_TSTAMP'), moment(incident.created_at).format('dddd, MMMM Do YYYY, h:mmA'))
+						.addField(msg.language.get('COMMAND_DISCORDSTATUS_INCIDENT_UPDATES'), incident.incident_updates[0].body);
+				}
+
+				return msg.send(embed);
+			});
+	}
+
+};
diff --git a/src/commands/User/enlarge.js b/src/commands/User/enlarge.js
@@ -6,8 +6,8 @@ module.exports = class extends Command {
 	constructor(...args) {
 		super(...args, {
 			aliases: ['bigemoji'],
-			guarded: true,
 			description: language => language.get('COMMAND_ENLARGE_DESCRIPTION'),
+			runIn: ['text', 'dm'],
 			usage: '[emoji:emoji] [emoji:str]'
 		});
 	}
diff --git a/src/commands/User/info.js b/src/commands/User/info.js
@@ -7,17 +7,18 @@ module.exports = class extends Command {
 		super(...args, {
 			aliases: ['details', 'what'],
 			guarded: true,
-			description: language => language.get('COMMAND_INFO_DESCRIPTION')
+			description: language => language.get('COMMAND_INFO_DESCRIPTION'),
+			runIn: ['text', 'dm']
 		});
 	}
 
 	async run(msg) {
 		const embed = new MessageEmbed()
-			.setAuthor(msg.guild.language.get('COMMAND_INFO_EMBEDTITLE'), this.client.user.displayAvatarURL())
+			.setAuthor(msg.language.get('COMMAND_INFO_EMBEDTITLE'), this.client.user.displayAvatarURL())
 			.setColor(this.client.settings.colors.white)
-			.setDescription(msg.guild.language.get('COMMAND_INFO_EMBEDDESC'))
-			.addField(msg.guild.language.get('COMMAND_INFO_OURTEAM'), msg.guild.language.get('COMMAND_INFO_TEAMLIST'), true)
-			.addField(msg.guild.language.get('COMMAND_INFO_LINKS'), msg.guild.language.get('COMMAND_INFO_LINKLIST'), true)
+			.setDescription(msg.language.get('COMMAND_INFO_EMBEDDESC'))
+			.addField(msg.language.get('COMMAND_INFO_OURTEAM'), msg.language.get('COMMAND_INFO_TEAMLIST'), true)
+			.addField(msg.language.get('COMMAND_INFO_LINKS'), msg.language.get('COMMAND_INFO_LINKLIST'), true)
 			.setThumbnail(this.client.user.displayAvatarURL(), 50, 50)
 			.setTimestamp()
 			.setFooter(msg.language.get('COMMAND_REQUESTED_BY', msg), msg.author.displayAvatarURL());
diff --git a/src/commands/User/invite.js b/src/commands/User/invite.js
@@ -4,9 +4,9 @@ module.exports = class extends Command {
 
 	constructor(...args) {
 		super(...args, {
-			runIn: ['text'],
+			runIn: ['text', 'dm'],
 			guarded: true,
-			description: language => language.get('COMMAND_INVITE_DESCRIPTION')
+			description: language => language.get('COMMAND_INVITE_DESCRIPTION'),
 		});
 	}
 
diff --git a/src/commands/User/lyrics.js b/src/commands/User/lyrics.js
@@ -12,6 +12,7 @@ module.exports = class extends Command {
 			cooldown: 10,
 			aliases: ['songlyrics', 'lyric'],
 			description: language => language.get('COMMAND_LYRICS_DESCRIPTION'),
+			runIn: ['text', 'dm'],
 			usage: '<song:string>'
 		});
 	}
@@ -55,8 +56,8 @@ module.exports = class extends Command {
 			.setAuthor(artist, artistPic)
 			.setColor(this.client.settings.colors.white)
 			.setTitle(songTitle)
-			.setDescription(`[${msg.guild.language.get('COMMAND_LYRICS_LINK')}](${geniusLink})`)
-			.addField(msg.guild.language.get('COMMAND_LYRICS_LYRICS'), lyricsBody)
+			.setDescription(`[${msg.language.get('COMMAND_LYRICS_LINK')}](${geniusLink})`)
+			.addField(msg.language.get('COMMAND_LYRICS_LYRICS'), lyricsBody)
 			.setThumbnail(songPic)
 			.setTimestamp()
 			.setFooter(msg.language.get('COMMAND_REQUESTED_BY', msg), msg.author.displayAvatarURL());
diff --git a/src/commands/User/ping.js b/src/commands/User/ping.js
@@ -5,7 +5,8 @@ module.exports = class extends Command {
 	constructor(...args) {
 		super(...args, {
 			guarded: true,
-			description: language => language.get('COMMAND_PING_DESCRIPTION')
+			description: language => language.get('COMMAND_PING_DESCRIPTION'),
+			runIn: ['text', 'dm']
 		});
 	}
 
diff --git a/src/commands/User/quote.js b/src/commands/User/quote.js
@@ -6,7 +6,7 @@ module.exports = class extends Command {
 	constructor(...args) {
 		super(...args, {
 			aliases: ['q'],
-			runIn: ['text'],
+			runIn: ['text', 'dm'],
 			description: language => language.get('COMMAND_QUOTE_DESCRIPTION'),
 			usage: '<messageID:string> [origin:channelname]',
 			usageDelim: ' '
@@ -18,7 +18,7 @@ module.exports = class extends Command {
 
 	async run(msg, [messageID, origin = msg.channel]) {
 		const qmsg = await origin.messages.fetch(messageID).catch(err => err.message === 'Unknown Message' ? null : msg.reject(err));
-		if (!qmsg) return msg.reject(msg.guild.language.get('COMMAND_QUOTE_NO_MESSAGE_FOUND', messageID, origin));
+		if (!qmsg) return msg.reject(msg.language.get('COMMAND_QUOTE_NO_MESSAGE_FOUND', messageID, origin));
 
 		return await this.sendQuote(msg, qmsg);
 	}
@@ -28,11 +28,11 @@ module.exports = class extends Command {
 		const embed = new MessageEmbed()
 			.setAuthor(qmsg.author.tag, qmsg.author.displayAvatarURL())
 			.setColor(this.client.settings.colors.white)
-			.setDescription(`[${msg.guild.language.get('CLICK_TO_VIEW')}](${qmsg.url})`)
-			.setFooter(`${this.timestamp.displayUTC(qmsg.createdAt)} ${msg.guild.language.get('COMMAND_QUOTE_CHANNEL', qmsg)}`);
+			.setDescription(`[${msg.language.get('CLICK_TO_VIEW')}](${qmsg.url})`)
+			.setFooter(`${this.timestamp.displayUTC(qmsg.createdAt)} ${msg.guild ? msg.language.get('COMMAND_QUOTE_CHANNEL', qmsg) : msg.language.get('COMMAND_QUOTE_DMS')}`);
 
-		if (qmsg.content) await embed.addField(msg.guild.language.get('MESSAGE'), `${qmsg.content}`, true)
-		if (!qmsg.content) await embed.setTitle(msg.guild.language.get('MESSAGE'));
+		if (qmsg.content) await embed.addField(msg.language.get('MESSAGE'), `${qmsg.content}`, true);
+		if (!qmsg.content) await embed.setTitle(msg.language.get('MESSAGE'));
 		if (qmsg.attachments.size > 0) {
 			attachment = qmsg.attachments.map(atch => atch.url).join(' ');
 			attachment = attachment
diff --git a/src/commands/User/reminder.js b/src/commands/User/reminder.js
@@ -6,7 +6,7 @@ module.exports = class extends Command {
 	constructor(...args) {
 		super(...args, {
 			aliases: ['remindme', 'remind', 'setreminder'],
-			runIn: ['text'],
+			runIn: ['text', 'dm'],
 			description: language => language.get('COMMAND_REMINDER_DESCRIPTION'),
 			usage: '<when:time> <message:...string> [-dm]',
 			usageDelim: ' '
@@ -23,8 +23,8 @@ module.exports = class extends Command {
 
 		await this.client.schedule.create('reminder', when, {
 			data: {
-				guildID: msg.guild.id,
-				channelID: msg.channel.id,
+				guildID: msg.guild ? msg.guild.id : null,
+				channelID: msg.guild ? msg.channel.id : msg.author.id,
 				userID: msg.author.id,
 				dmBool: sendInDM,
 				reminderMsg: message,
diff --git a/src/commands/User/roles.js b/src/commands/User/roles.js
@@ -10,7 +10,7 @@ module.exports = class extends Command {
 			aliases: ['roleme', 'team', 'squad', 'role'],
 			description: language => language.get('COMMAND_ROLES_DESCRIPTION'),
 			extendedHelp: language => language.get('COMMAND_ROLES_EXTENDED'),
-			usage: '<list|add|remove|join|leave> [target:member] [roleName:...string]',
+			usage: '<list:default|add|remove|join|leave> [target:member] [roleName:...string]',
 			usageDelim: ' ',
 			subcommands: true
 		});
diff --git a/src/commands/User/userconf.js b/src/commands/User/userconf.js
@@ -4,11 +4,12 @@ module.exports = class extends Command {
 
 	constructor(...args) {
 		super(...args, {
-			enabled: false,
+			enabled: true,
 			guarded: true,
 			subcommands: true,
 			description: language => language.get('COMMAND_CONF_USER_DESCRIPTION'),
-			usage: '<set|show|remove|reset> (key:key) (value:value) [...]',
+			runIn: ['text', 'dm'],
+			usage: '<set|show:default|remove|reset> (key:key) (value:value) [...]',
 			usageDelim: ' '
 		});
 
diff --git a/src/commands/User/weather.js b/src/commands/User/weather.js
diff --git a/src/commands/User/wiki.js b/src/commands/User/wiki.js
diff --git a/src/events/channelUpdate.js b/src/events/channelUpdate.js
diff --git a/src/events/commandUnknown.js b/src/events/commandUnknown.js
diff --git a/src/events/messageReactionAdd.js b/src/events/messageReactionAdd.js
diff --git a/src/events/messageReactionRemove.js b/src/events/messageReactionRemove.js
diff --git a/src/languages/en-US.js b/src/languages/en-US.js
diff --git a/src/lib/structures/schemas/defaultClientSchema.js b/src/lib/structures/schemas/defaultClientSchema.js
diff --git a/src/lib/structures/schemas/defaultGuildSchema.js b/src/lib/structures/schemas/defaultGuildSchema.js
diff --git a/src/tasks/reminder.js b/src/tasks/reminder.js
diff --git a/src/tasks/timedBan.js b/src/tasks/timedBan.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "rtbyte",`
`3`		`- "version": "1.1.0",`
	`3`	`+ "version": "1.1.1",`
`4`	`4`	`"description": "A Discord Bot for the Rooster Teeth Community family of Discord Servers",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,4 @@ module.exports = class extends Argument {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`-};`
	`44`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,4 @@ module.exports = class extends Argument {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`-};`
	`50`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,4 @@ module.exports = class extends Argument {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`-};`
	`42`	`+};`