From e9f73ab462f2314d268a9d39fc9d353ebd9bb7c0 Mon Sep 17 00:00:00 2001 From: loicbersier Date: Fri, 28 Jun 2019 17:05:01 +0200 Subject: [PATCH] Chech if these files exists --- event/listeners/guildMemberAdd.js | 55 +++---- event/listeners/guildMemberRemove.js | 42 ++--- event/listeners/message.js | 231 ++++++++++++++------------- 3 files changed, 166 insertions(+), 162 deletions(-) diff --git a/event/listeners/guildMemberAdd.js b/event/listeners/guildMemberAdd.js index 4c079974..a2783875 100644 --- a/event/listeners/guildMemberAdd.js +++ b/event/listeners/guildMemberAdd.js @@ -1,5 +1,5 @@ const { Listener } = require('discord-akairo'); -const reload = require('auto-reload'); +const fs = require('fs'); const rand = require('../../rand.js'); class guildMemberAddListener extends Listener { @@ -11,34 +11,35 @@ class guildMemberAddListener extends Listener { } async exec(guild) { - let welcome = reload(`../../welcome/${guild.guild.id}.json`); - - const channel = this.client.channels.get(welcome['channel']); - - let welcomeMessage = welcome['message']; - - welcomeMessage = welcomeMessage.replace(/\[member\]/, guild.user.username); - welcomeMessage = welcomeMessage.replace(/\[server\]/, guild.guild.name); - - let attach; - if (welcomeMessage.includes('[attach:')) { - attach = welcomeMessage.split(/(\[attach:.*?])/); - for (let i = 0, l = attach.length; i < l; i++) { - if (attach[i].includes('[attach:')) { - attach = attach[i].replace('[attach:', '').slice(0, -1); - i = attach.length; + if (fs.existsSync(`./welcome/${guild.guild.id}.json`)) { + let welcome = require(`../../welcome/${guild.guild.id}.json`); + const channel = this.client.channels.get(welcome['channel']); + + let welcomeMessage = welcome['message']; + + welcomeMessage = welcomeMessage.replace(/\[member\]/, guild.user.username); + welcomeMessage = welcomeMessage.replace(/\[server\]/, guild.guild.name); + + let attach; + if (welcomeMessage.includes('[attach:')) { + attach = welcomeMessage.split(/(\[attach:.*?])/); + for (let i = 0, l = attach.length; i < l; i++) { + if (attach[i].includes('[attach:')) { + attach = attach[i].replace('[attach:', '').slice(0, -1); + i = attach.length; + } } + welcomeMessage = welcomeMessage.replace(/(\[attach:.*?])/, ''); + } + + welcomeMessage = rand.random(welcomeMessage); + + + if (attach) { + return channel.send(welcomeMessage, {files: [attach]}); + } else { + return channel.send(welcomeMessage); } - welcomeMessage = welcomeMessage.replace(/(\[attach:.*?])/, ''); - } - - welcomeMessage = rand.random(welcomeMessage); - - - if (attach) { - return channel.send(welcomeMessage, {files: [attach]}); - } else { - return channel.send(welcomeMessage); } } } diff --git a/event/listeners/guildMemberRemove.js b/event/listeners/guildMemberRemove.js index 631c9c78..1a6c8e5f 100644 --- a/event/listeners/guildMemberRemove.js +++ b/event/listeners/guildMemberRemove.js @@ -1,5 +1,5 @@ const { Listener } = require('discord-akairo'); -const reload = require('auto-reload'); +const fs = require('fs'); const rand = require('../../rand.js'); class guildMemberRemoveListener extends Listener { @@ -11,34 +11,36 @@ class guildMemberRemoveListener extends Listener { } async exec(guild) { - let bye = reload(`../../bye/${guild.guild.id}.json`); + if (fs.existsSync(`./bye/${guild.guild.id}.json`)) { + let bye = require(`../../bye/${guild.guild.id}.json`); - const channel = this.client.channels.get(bye['channel']); + const channel = this.client.channels.get(bye['channel']); - let byeMessage = bye['message']; + let byeMessage = bye['message']; - byeMessage = byeMessage.replace(/\[member\]/, guild.user.username); - byeMessage = byeMessage.replace(/\[server\]/, guild.guild.name); + byeMessage = byeMessage.replace(/\[member\]/, guild.user.username); + byeMessage = byeMessage.replace(/\[server\]/, guild.guild.name); - let attach; - if (byeMessage.includes('[attach:')) { - attach = byeMessage.split(/(\[attach:.*?])/); - for (let i = 0, l = attach.length; i < l; i++) { - if (attach[i].includes('[attach:')) { - attach = attach[i].replace('[attach:', '').slice(0, -1); - i = attach.length; + let attach; + if (byeMessage.includes('[attach:')) { + attach = byeMessage.split(/(\[attach:.*?])/); + for (let i = 0, l = attach.length; i < l; i++) { + if (attach[i].includes('[attach:')) { + attach = attach[i].replace('[attach:', '').slice(0, -1); + i = attach.length; + } } + byeMessage = byeMessage.replace(/(\[attach:.*?])/, ''); } - byeMessage = byeMessage.replace(/(\[attach:.*?])/, ''); - } - byeMessage = rand.random(byeMessage); + byeMessage = rand.random(byeMessage); - if (attach) { - return channel.send(byeMessage, {files: [attach]}); - } else { - return channel.send(byeMessage); + if (attach) { + return channel.send(byeMessage, {files: [attach]}); + } else { + return channel.send(byeMessage); + } } } } diff --git a/event/listeners/message.js b/event/listeners/message.js index 5ab0f0b1..616d25fc 100644 --- a/event/listeners/message.js +++ b/event/listeners/message.js @@ -5,6 +5,7 @@ const reactObject = require('../../json/react.json'); const imgResponseObject = require('../../json/imgreply.json'); const rand = require('../../rand.js'); const reload = require('auto-reload'); +const fs = require('fs'); class messageListener extends Listener { constructor() { @@ -41,145 +42,145 @@ class messageListener extends Listener { } } // User autoresponse - let customresponse; - try { - customresponse = reload(`../../tag/${message.guild.id}.json`); - } catch (err) { - null; - } - - try { - if(customresponse[message_content]) { - let text = customresponse[message_content]; - if (text.includes('[ban]')) { - message.member.ban('Tag ban :^)'); - } else if (text.includes('[kick]')) { - message.member.kick('Tag kick :^)'); - } else if (text.includes('[delete]')) { - message.delete('Tag delete :^)'); - } - - text = rand.random(text, message); - let attach = ''; + if (fs.existsSync(`./tag/${message.guild.id}.json`)) { + let customresponse = require(`../../tag/${message.guild.id}.json`); - if (text.includes('[attach:')) { - attach = text.split(/(\[attach:.*?])/); - for (let i = 0, l = attach.length; i < l; i++) { - if (attach[i].includes('[attach:')) { - attach = attach[i].replace('[attach:', '').slice(0, -1); - i = attach.length; - } + try { + if(customresponse[message_content]) { + let text = customresponse[message_content]; + if (text.includes('[ban]')) { + message.member.ban('Tag ban :^)'); + } else if (text.includes('[kick]')) { + message.member.kick('Tag kick :^)'); + } else if (text.includes('[delete]')) { + message.delete('Tag delete :^)'); } - text = text.replace(/(\[attach:.*?])/, ''); - } - - // THIS SECTION IS VERY VERY BAD MUST CHANGE - if (text.includes('[embed]')) { - text = text.replace(/\[embed\]/, ' '); - - let title = ''; - let desc = ''; - let image; - let thumbnail; - let footer = ''; - let color; + + text = rand.random(text, message); - if (text.includes('[embedImage:')) { - image = text.split(/(\[embedImage:.*?])/); + let attach = ''; - for (let i = 0, l = image.length; i < l; i++) { - if (image[i].includes('[embedImage:')) { - image = image[i].replace('[embedImage:', '').slice(0, -1); - text = text.replace(/(\[embedimage:.*?])/g, ''); - i = image.length; + if (text.includes('[attach:')) { + attach = text.split(/(\[attach:.*?])/); + for (let i = 0, l = attach.length; i < l; i++) { + if (attach[i].includes('[attach:')) { + attach = attach[i].replace('[attach:', '').slice(0, -1); + i = attach.length; } } + text = text.replace(/(\[attach:.*?])/, ''); } - - if (text.includes('[embedThumbnail:')) { - thumbnail = text.split(/(\[embedThumbnail:.*?])/); - for (let i = 0, l = thumbnail.length; i < l; i++) { - if (thumbnail[i].includes('[embedThumbnail:')) { - thumbnail = thumbnail[i].replace('[embedThumbnail:', '').slice(0, -1); - text = text.replace(/(\[embedThumbnail:.*?])/g, ''); - i = thumbnail.length; + // THIS SECTION IS VERY VERY BAD MUST CHANGE + if (text.includes('[embed]')) { + text = text.replace(/\[embed\]/, ' '); + + let title = ''; + let desc = ''; + let image; + let thumbnail; + let footer = ''; + let color; + + if (text.includes('[embedImage:')) { + image = text.split(/(\[embedImage:.*?])/); + + for (let i = 0, l = image.length; i < l; i++) { + if (image[i].includes('[embedImage:')) { + image = image[i].replace('[embedImage:', '').slice(0, -1); + text = text.replace(/(\[embedimage:.*?])/g, ''); + i = image.length; + } } } - } - - if (text.includes('[embedColor:')) { - color = text.split(/(\[embedColor:.*?])/); - for (let i = 0, l = color.length; i < l; i++) { - if (color[i].includes('[embedColor:')) { - color = color[i].replace('[embedColor:', '').slice(0, -1); - text = text.replace(/(\[embedColor:.*?])/g, ''); - i = color.length; + + if (text.includes('[embedThumbnail:')) { + thumbnail = text.split(/(\[embedThumbnail:.*?])/); + + for (let i = 0, l = thumbnail.length; i < l; i++) { + if (thumbnail[i].includes('[embedThumbnail:')) { + thumbnail = thumbnail[i].replace('[embedThumbnail:', '').slice(0, -1); + text = text.replace(/(\[embedThumbnail:.*?])/g, ''); + i = thumbnail.length; + } } } - } - - - if (text.includes('[embedTitle:')) { - title = text.split(/(\[embedTitle:.*?])/); - for (let i = 0, l = title.length; i < l; i++) { - if (title[i].includes('[embedTitle:')) { - title = title[i].replace('[embedTitle:', '').slice(0, -1); - text = text.replace(/(\[embedTitle:.*?])/g, ''); - i = title.length; + + if (text.includes('[embedColor:')) { + color = text.split(/(\[embedColor:.*?])/); + for (let i = 0, l = color.length; i < l; i++) { + if (color[i].includes('[embedColor:')) { + color = color[i].replace('[embedColor:', '').slice(0, -1); + text = text.replace(/(\[embedColor:.*?])/g, ''); + i = color.length; + } } } - } - - if (text.includes('[embedFooter:')) { - footer = text.split(/(\[embedFooter:.*?])/); - for (let i = 0, l = footer.length; i < l; i++) { - if (footer[i].includes('[embedFooter:')) { - footer = footer[i].replace('[embedFooter:', '').slice(0, -1); - text = text.replace(/(\[embedFooter:.*?])/g, ''); - i = footer.length; + + + if (text.includes('[embedTitle:')) { + title = text.split(/(\[embedTitle:.*?])/); + for (let i = 0, l = title.length; i < l; i++) { + if (title[i].includes('[embedTitle:')) { + title = title[i].replace('[embedTitle:', '').slice(0, -1); + text = text.replace(/(\[embedTitle:.*?])/g, ''); + i = title.length; + } } } - } - - if (text.includes('[embedDesc:')) { - desc = text.split(/(\[embedDesc:.*?])/); - for (let i = 0, l = desc.length; i < l; i++) { - if (desc[i].includes('[embedDesc:')) { - desc = desc[i].replace('[embedDesc:', '').slice(0, -1); - i = desc.length; + + if (text.includes('[embedFooter:')) { + footer = text.split(/(\[embedFooter:.*?])/); + for (let i = 0, l = footer.length; i < l; i++) { + if (footer[i].includes('[embedFooter:')) { + footer = footer[i].replace('[embedFooter:', '').slice(0, -1); + text = text.replace(/(\[embedFooter:.*?])/g, ''); + i = footer.length; + } + } + } + + if (text.includes('[embedDesc:')) { + desc = text.split(/(\[embedDesc:.*?])/); + for (let i = 0, l = desc.length; i < l; i++) { + if (desc[i].includes('[embedDesc:')) { + desc = desc[i].replace('[embedDesc:', '').slice(0, -1); + i = desc.length; + } } } + + const embed = new MessageEmbed() + .setColor(color) + .setTitle(title) + .setImage(image) + .setThumbnail(thumbnail) + .setDescription(desc) + .setFooter(footer) + .setTimestamp(); + + + if (attach) { + return message.channel.send(embed, {files: [attach]}); + } else { + return message.channel.send(embed); + } } - - const embed = new MessageEmbed() - .setColor(color) - .setTitle(title) - .setImage(image) - .setThumbnail(thumbnail) - .setDescription(desc) - .setFooter(footer) - .setTimestamp(); - - + if (attach) { - return message.channel.send(embed, {files: [attach]}); + return message.channel.send(text, {files: [attach]}); } else { - return message.channel.send(embed); + return message.channel.send(text); } - } - - if (attach) { - return message.channel.send(text, {files: [attach]}); - } else { - return message.channel.send(text); - } - } - - } catch (err) { - null; + } + + } catch (err) { + null; + } } + + } }