notsoyuzu
/
Command-fix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server: clean up

This commit is contained in:
liushuyu 2020-05-02 14:40:16 -06:00
parent 5b00eb9cdd
commit 0b3d67a90c
No known key found for this signature in database
GPG Key ID: 23D1CE4534419437
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/models/interfaces.ts
View File

@ -16,6 +16,6 @@ export interface ICompatList {
export interface IResponses { export interface IResponses {
pmReply: string, pmReply: string,
quotes: { quotes: {
[key: string]: string [key: string]: { reply: string }
} }
} }

32
src/server.ts
View File

@ -150,47 +150,33 @@ client.on('message', message => {
// Check by the name of the command. // Check by the name of the command.
let cachedModule = cachedModules[`${cmd}.js`]; let cachedModule = cachedModules[`${cmd}.js`];
let cachedModuleType = 'Command'; let quoteResponse = null;
// Check by the quotes in the configuration. // Check by the quotes in the configuration.
if (cachedModule == null) { cachedModule = state.responses.quotes[cmd]; cachedModuleType = 'Quote'; } if (!cachedModule) quoteResponse = state.responses.quotes[cmd];
if (!cachedModule && !quoteResponse) return; // Not a valid command.
if (!cachedModule) return; // Not a valid command.
// Check access permissions. // Check access permissions.
if (cachedModule.roles && findArray(message.member.roles.cache.map(x => x.name), cachedModule.roles) === false) { if (cachedModule && cachedModule.roles && !findArray(message.member.roles.cache.map(x => x.name), cachedModule.roles)) {
state.logChannel.send(`${message.author.toString()} attempted to use admin command: ${message.content}`); state.logChannel.send(`${message.author.toString()} attempted to use admin command: ${message.content}`);
logger.info(`${message.author.username} ${message.author} attempted to use admin command: ${message.content}`); logger.info(`${message.author.username} ${message.author} attempted to use admin command: ${message.content}`);
return false; return;
} }
logger.info(`${message.author.username} ${message.author} [Channel: ${message.channel}] executed command: ${message.content}`); logger.info(`${message.author.username} ${message.author} [Channel: ${message.channel}] executed command: ${message.content}`);
message.delete(); message.delete();
try { try {
if (cachedModuleType === 'Command') { if (!!cachedModule) {
cachedModule.command(message); cachedModule.command(message);
} else if (cachedModuleType === 'Quote') { } else if (cachedModules['quote.js']) {
cachedModules['quote.js'].command(message, cachedModule.reply); cachedModules['quote.js'].command(message, quoteResponse.reply);
}
} catch (err) { logger.error(err); }
// Warn after running command?
try {
// Check if the command requires a warning.
if (cmd !== 'warn' && cachedModule.warn === true) {
// Access check to see if the user has privileges to warn.
const warnCommand = cachedModules['warn.js'];
if (findArray(message.member.roles.cache.map(x => x.name), warnCommand.roles)) {
// They are allowed to warn because they are in warn's roles.
warnCommand.command(message);
}
} }
} catch (err) { logger.error(err); } } catch (err) { logger.error(err); }
} else if (message.author.bot === false) { } else if (message.author.bot === false) {
// This is a normal channel message. // This is a normal channel message.
cachedTriggers.forEach(function (trigger) { cachedTriggers.forEach(function (trigger) {
if (trigger.roles === undefined || findArray(message.member.roles.cache.map(x => x.name), trigger.roles)) { if (!trigger.roles || findArray(message.member.roles.cache.map(x => x.name), trigger.roles)) {
if (trigger.trigger(message) === true) { if (trigger.trigger(message) === true) {
logger.debug(`${message.author.username} ${message.author} [Channel: ${message.channel}] triggered: ${message.content}`); logger.debug(`${message.author.username} ${message.author} [Channel: ${message.channel}] triggered: ${message.content}`);
try { try {