diff --git a/config.json.example b/config.json.example index 123ff8a..bc460f4 100755 --- a/config.json.example +++ b/config.json.example @@ -31,6 +31,7 @@ }, "activities": [ "that gum you like" - ] + ], + "blacklistedUsers": [] } } \ No newline at end of file diff --git a/discord.js b/discord.js index 6688e22..ece600b 100755 --- a/discord.js +++ b/discord.js @@ -236,7 +236,7 @@ function init(config) { }) // Listen for commands for the bot to respond to across all channels .on("message", (msg) => { - // Ignore messages from unconfigured guilds + // Ignore DMs and messages from unconfigured guilds if (msg.guild) { if (!config.discord.guilds[msg.guild.id]) { return; @@ -245,6 +245,11 @@ function init(config) { return; } + // Ignore anything from blacklisted users + if (config.discord.blacklistedUsers.includes(msg.author.id)) { + return; + } + // Find the guild config for this msg, use default if no guild (DM) let guildConfig = config.discord.guilds[msg.guild.id]; @@ -375,8 +380,14 @@ init(config); Discord.Client.prototype.setRandomActivity = function () { if (!config.discord.master) return; - let activity = randElement(config.discord.activities); + + let activity = + config.discord.activities.length > 0 + ? randElement(config.discord.activities) + : "DESTROY ALL HUMANS"; + console.log(`Setting Discord activity to: ${activity}`); + this.user.setActivity(activity, { url: `https://twitch.tv/fgfm`, type: "STREAMING"