support blacklisting users

This commit is contained in:
Chris Ham
2020-05-01 17:48:03 -07:00
parent 5d2595020a
commit 080d4fa06f
2 changed files with 15 additions and 3 deletions

View File

@@ -31,6 +31,7 @@
}, },
"activities": [ "activities": [
"that gum you like" "that gum you like"
] ],
"blacklistedUsers": []
} }
} }

View File

@@ -236,7 +236,7 @@ function init(config) {
}) })
// Listen for commands for the bot to respond to across all channels // Listen for commands for the bot to respond to across all channels
.on("message", (msg) => { .on("message", (msg) => {
// Ignore messages from unconfigured guilds // Ignore DMs and messages from unconfigured guilds
if (msg.guild) { if (msg.guild) {
if (!config.discord.guilds[msg.guild.id]) { if (!config.discord.guilds[msg.guild.id]) {
return; return;
@@ -245,6 +245,11 @@ function init(config) {
return; 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) // Find the guild config for this msg, use default if no guild (DM)
let guildConfig = config.discord.guilds[msg.guild.id]; let guildConfig = config.discord.guilds[msg.guild.id];
@@ -375,8 +380,14 @@ init(config);
Discord.Client.prototype.setRandomActivity = function () { Discord.Client.prototype.setRandomActivity = function () {
if (!config.discord.master) return; 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}`); console.log(`Setting Discord activity to: ${activity}`);
this.user.setActivity(activity, { this.user.setActivity(activity, {
url: `https://twitch.tv/fgfm`, url: `https://twitch.tv/fgfm`,
type: "STREAMING" type: "STREAMING"