murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added command, reverted database service split

Browse source
This commit is contained in:
Essem 2021-08-12 22:28:09 -05:00
parent da709c485f
commit 9f36a79a2b
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
20 changed files with 119 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

3
events/guildCreate.js
View file

@ -4,5 +4,6 @@ const logger = require("../utils/logger.js");
// run when the bot is added to a guild
module.exports = async (client, cluster, worker, ipc, guild) => {
logger.log(`[GUILD JOIN] ${guild.name} (${guild.id}) added the bot.`);
await db(ipc, "addGuild", guild);
const guildDB = await db.getGuild(guild.id);
if (!guildDB) await db.addGuild(guild);
};

29
events/messageCreate.js
View file

@ -15,14 +15,15 @@ module.exports = async (client, cluster, worker, ipc, message) => {
if (message.channel.guild && !message.channel.permissionsOf(client.user.id).has("sendMessages")) return;
let prefixCandidate;
let guildDB;
if (message.channel.guild) {
const cachedPrefix = collections.prefixCache.get(message.channel.guild.id);
if (cachedPrefix) {
prefixCandidate = cachedPrefix;
} else {
let guildDB = await database(ipc, "getGuild", message.channel.guild.id);
guildDB = await database.getGuild(message.channel.guild.id);
if (!guildDB) {
guildDB = await database(ipc, "fixGuild", message.channel.guild);
guildDB = await database.fixGuild(message.channel.guild);
}
prefixCandidate = guildDB.prefix;
collections.prefixCache.set(message.channel.guild.id, guildDB.prefix);
@ -57,21 +58,31 @@ module.exports = async (client, cluster, worker, ipc, message) => {
preArgs.shift();
const command = rawContent.split(/\s+/g).shift().toLowerCase();
const parsed = parseCommand(preArgs);
const aliased = collections.aliases.get(command);
// don't run if message is in a disabled channel
if (message.channel.guild) {
if (collections.disabledCache.has(message.channel.guild.id)) {
const disabled = collections.disabledCache.get(message.channel.guild.id);
const disabled = collections.disabledCache.get(message.channel.guild.id);
if (disabled) {
if (disabled.includes(message.channel.id) && command != "channel") return;
} else if (message.channel.guild) {
const guildDB = await database(ipc, "getGuild", message.channel.guild.id);
} else {
guildDB = await database.getGuild(message.channel.guild.id);
collections.disabledCache.set(message.channel.guild.id, guildDB.disabled);
if (guildDB.disabled.includes(message.channel.id) && command !== "channel") return;
}
const disabledCmds = collections.disabledCmdCache.get(message.channel.guild.id);
if (disabledCmds) {
if (disabledCmds.includes(aliased ? aliased : command)) return;
} else {
guildDB = await database.getGuild(message.channel.guild.id);
collections.disabledCmdCache.set(message.channel.guild.id, guildDB.disabled_commands);
if (guildDB.disabled_commands.includes(aliased ? aliased : command)) return;
}
}
// check if command exists
const cmd = collections.commands.get(command) || collections.commands.get(collections.aliases.get(command));
// check if command exists and if it's enabled
const cmd = aliased ? collections.commands.get(aliased) : collections.commands.get(command);
if (!cmd) return;
// actually run the command
@ -88,7 +99,7 @@ module.exports = async (client, cluster, worker, ipc, message) => {
}
};
try {
await database(ipc, "addCount", collections.aliases.has(command) ? collections.aliases.get(command) : command);
await database.addCount(collections.aliases.has(command) ? collections.aliases.get(command) : command);
const startTime = new Date();
// eslint-disable-next-line no-unused-vars
const commandClass = new cmd(client, cluster, worker, ipc, message, parsed._, message.content.substring(prefix.length).trim().replace(command, "").trim(), (({ _, ...o }) => o)(parsed)); // we also provide the message content as a parameter for cases where we need more accuracy

2
events/voiceChannelSwitch.js
View file

@ -1,5 +1,5 @@
const leaveHandler = require("./voiceChannelLeave.js");
module.exports = async (client, cluster, worker, ipc, member, newChannel, oldChannel) => {
await leaveHandler(client, cluster, ipc, member, oldChannel);
await leaveHandler(client, cluster, worker, ipc, member, oldChannel);
};