embee/woomy-v2
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

prefix caching + working database functions!

Browse source
This commit is contained in:
Emily 2020-10-17 23:03:39 +11:00
parent 6d9d453df3
commit c69d2f562d
3 changed files with 49 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
bot/events/message.js
View file

@ -10,15 +10,33 @@ module.exports = class {
async run (message) { async run (message) {
if (message.author.bot) return; if (message.author.bot) return;
let userPrefix;
let guildPrefix;
const prefixes = [];
const data = {}; const data = {};
data.user = await this.client.db.getUser(message.author.id); data.user = await this.client.db.getUser(message.author.id);
const prefixes = [data.user.prefix]; // Prefix cache
if (this.client.prefixCache.has(message.author.id)) {
userPrefix = this.client.prefixCache.get(message.author.id);
prefixes.push(userPrefix);
} else {
userPrefix = data.user.prefix;
prefixes.push(userPrefix);
}
if (message.guild) { if (message.guild) {
data.guild = await this.client.db.getGuild(message.guild.id); data.guild = await this.client.db.getGuild(message.guild.id);
// data.member = await this.client.db.getMember(message.guild.id, message.author.id); // data.member = await this.client.db.getMember(message.guild.id, message.author.id);
prefixes.push(data.guild.prefix); if (this.client.prefixCache.has(message.guild.id)) {
guildPrefix = this.client.prefixCache.get(message.guild.id);
prefixes.push(guildPrefix);
} else {
guildPrefix = data.guild.prefix;
prefixes.push(guildPrefix);
}
} }
prefixes.push(`<@${this.client.user.id}> `, `<@!${this.client.user.id}> `); prefixes.push(`<@${this.client.user.id}> `, `<@!${this.client.user.id}> `);
@ -31,14 +49,22 @@ module.exports = class {
if (message.content.indexOf(prefix) !== 0) return; if (message.content.indexOf(prefix) !== 0) return;
// Prefix cache
if (userPrefix === prefix && !this.client.prefixCache.has(message.author.id)) {
this.client.prefixCache.set(message.author.id, prefix);
}
if (guildPrefix === prefix && !this.client.prefixCache.has(message.guild.id)) {
this.client.prefixCache.set(message.guild.id, prefix);
}
if (prefix === `<@${this.client.user.id}> ` || prefix === `<@!${this.client.user.id}> `) { if (prefix === `<@${this.client.user.id}> ` || prefix === `<@!${this.client.user.id}> `) {
message.prefix = '@Woomy '; message.prefix = '@Woomy ';
} else { } else {
message.prefix = prefix; message.prefix = prefix;
} }
// Naughty users can't run commands! // TO-DO: CREATE BLACKLIST
/* TO-DO: CREATE BLACKLIST */
const args = message.content.slice(prefix.length).trim().split(/ +/g); const args = message.content.slice(prefix.length).trim().split(/ +/g);
const command = args.shift().toLowerCase(); const command = args.shift().toLowerCase();
@ -56,19 +82,7 @@ module.exports = class {
} catch (err) {} //eslint-disable-line no-empty } catch (err) {} //eslint-disable-line no-empty
} }
/* NEED A WAY TO STORE ARRAYS IN A HASH // TO-DO: DISABLED COMMANDS / CATEGORIES
if (data.guild.disabledCommands.includes(cmd.help.name)) {
if (data.guild.systemNotice.enabled === true) {
return message.channel.send('This command has been disabled in this server.');
};
};
if (data.guild.disabledCategories.includes(cmd.help.category)) {
if (data.guild.systemNotice.enabled === true) {
return message.channel.send('The category this command is apart of has been disabled in this server.');
};
};
*/
} }
if (cmd && cmd.conf.enabled === false) { if (cmd && cmd.conf.enabled === false) {
@ -83,31 +97,17 @@ module.exports = class {
return message.channel.send('This command is unavailable via private message. Please run this command in a guild.'); return message.channel.send('This command is unavailable via private message. Please run this command in a guild.');
} }
// Permission handler, for both Woomy and the user // Permission handler
if (message.guild) { if (message.guild) {
// User const missingUserPerms = this.client.functions.checkPermissions(cmd, message, message.member);
let missingUserPerms = new Array(); if (missingUserPerms) return message.channel.send(`
You don't have sufficient permissions to run this command! Missing: ${missingUserPerms}
`);
cmd.conf.userPerms.forEach((p) => { const missingBotPerms = this.client.functions.checkPermissions(cmd, message, message.guild.member(this.client.user));
if (!message.channel.permissionsFor(message.member).has(p)) missingUserPerms.push(p); if (missingBotPerms) return message.channel.send(`
}); I can't run this command because I'm missing these permissions: ${missingBotPerms}
`);
if (missingUserPerms.length > 0) {
missingUserPerms = '`' + (missingUserPerms.join('`, `')) + '`';
return message.channel.send(`You don't have sufficient permissions to run this command! Missing: ${missingUserPerms}`);
}
// Bot
let missingBotPerms = [];
cmd.conf.botPerms.forEach((p) => {
if (!message.channel.permissionsFor(message.guild.member(this.client.user)).has(p)) missingBotPerms.push(p);
});
if (missingBotPerms.length > 0) {
missingBotPerms = '`' + (missingBotPerms.join('`, `')) + '`';
return message.channel.send(`I can't run this command because I'm missing these permissions: ${missingBotPerms}`);
}
} }
// Cooldown // Cooldown
@ -130,9 +130,7 @@ module.exports = class {
message.flags.push(args.shift().slice(1)); message.flags.push(args.shift().slice(1));
} }
cmd.run(message, args); cmd.run(message, args, data);
this.client.logger.cmd(`Command ran: ${message.content}`); this.client.logger.cmd(`Command ran: ${message.content}`);
// TODO: Command caching if it's worth it
} }
}; };

5
bot/index.js
View file

@ -35,6 +35,9 @@ class WoomyClient extends Client {
this.aliases = new Collection(); this.aliases = new Collection();
this.cooldowns = new Collection(); this.cooldowns = new Collection();
// Caches
this.prefixCache = new Collection();
// Handlers, to load commands and events // Handlers, to load commands and events
this.commandHandler = new CommandHandler(this); this.commandHandler = new CommandHandler(this);
this.eventHandler = new EventHandler(this); this.eventHandler = new EventHandler(this);
@ -42,7 +45,7 @@ class WoomyClient extends Client {
} }
async function init () { async function init () {
const client = new WoomyClient(); const client = new WoomyClient({ ws: {}});
client.logger.info(`Initializing Woomy v${client.version}`); client.logger.info(`Initializing Woomy v${client.version}`);

2
bot/util/database.js
View file

@ -27,7 +27,7 @@ class Database {
} }
async getUser (id) { async getUser (id) {
const res = await this.pool.query('SELECT * FROM guilds WHERE user_id = $1;', [id]); const res = await this.pool.query('SELECT * FROM users WHERE user_id = $1;', [id]);
return res.rows[0]; return res.rows[0];
} }