From 4630cefd47271929fd288914917eb0fd3c3193c9 Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Sat, 19 Jun 2021 12:47:18 +0200 Subject: [PATCH] Split up server.js and message handling --- server.js | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/server.js b/server.js index c4df562..9179514 100644 --- a/server.js +++ b/server.js @@ -16,6 +16,7 @@ client.netmodules = new Discord.Collection(); var reloadCommands = require("./util/reloadCommands.js"); const loadServerPrefixes = require('./util/loadServerPrefixes'); const loadNetModules = require('./util/loadNetModules'); +const onMessage = require('./server/message'); reloadCommands(client) loadNetModules(client) @@ -40,34 +41,7 @@ client.once('disconnect', () => { }); client.on('message', async message => { - - if (client.serverPrefixes.get(message.guild.id)) { - prefix = client.serverPrefixes.get(message.guild.id) - } else - prefix = globalPrefix - - let args = message.content.slice(prefix.length).split(" ") - - const commandName = args.shift().toLowerCase(); - const command = client.commands.get(commandName); - const netModule = client.netmodules.get(commandName); - if (!message.guild || message.author.bot || !message.content.startsWith(prefix)) return; - if (!command){ - if (netModule){ - try { - netModule.execute({message: message, args: args, client: client, prefix: prefix}) - }catch(e){ - console.log(e) - } - } - return; - } - if (command.admin && owners.indexOf(message.author.id.toString()) == -1) return; - try { - command.execute({ message: message, args: args, client: client, prefix: prefix, owners: owners}) - } catch (error) { - console.log(`${error}\n-------`) - } + onMessage(client, owners, message, globalPrefix); });