f3d0r4/woomy
1
0
Fork 0
forked from embee/woomy
Code Issues Pull requests Projects Releases Wiki Activity

FUCKING WORK MY GIOD

Browse source
This commit is contained in:
Emily 2020-01-25 21:45:12 +11:00
parent 7811edab64
commit 1cc6725fdd
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config.js
View file

@ -3,11 +3,11 @@ const config = {
"owners": ["433790467830972417", "324937993972350976"], "owners": ["433790467830972417", "324937993972350976"],
// Tokens // Tokens
"token": "", "token": "NDM1OTYxNzA0MTQ1NDg1ODM1.XW762g.4uLWDkiz0tUkiAHZRrIW39ZJh6A",
"devtoken": "", "devtoken": "NDM5NTk0Njc1MjMwMjEyMDk2.XW77ww.izMA1miEMwRcM1-B6CM58qZq9d8",
"ytkey": "", "ytkey": "AIzaSyCCf9Q04Zy6tNOre3pTkiXRShI55kjGhmg",
"owmkey": "", "owmkey": "c49ea77cf0d3216a1cbc6b683f8d9117",
"dblkey": "", "dblkey": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjQzNTk2MTcwNDE0NTQ4NTgzNSIsImJvdCI6dHJ1ZSwiaWF0IjoxNTI5NDg5MzgzfQ.Wrjwn2ETwBfRZM7F3PiFf8Gy2MgBZ6Ry7vKv8WTxK_Y",
// Default per-server settings // Default per-server settings
"defaultSettings" : { "defaultSettings" : {

6
src/events/message.js
View file

@ -16,6 +16,8 @@ module.exports = async (client, message) => {
prefix = settings.devprefix; prefix = settings.devprefix;
} }
let blacklisted = false;
if(message.guild) { if(message.guild) {
perms = message.channel.permissionsFor(client.user); perms = message.channel.permissionsFor(client.user);
@ -24,7 +26,7 @@ module.exports = async (client, message) => {
var adminRole = message.guild.roles.get(settings.adminRole); var adminRole = message.guild.roles.get(settings.adminRole);
var autorole = message.guild.roles.get(settings.autorole); var autorole = message.guild.roles.get(settings.autorole);
var mutedRole = message.guild.roles.get(settings.mutedRole); var mutedRole = message.guild.roles.get(settings.mutedRole);
var welcomeChannel = message.guild.channels.get(settings.welcomeChannel) var welcomeChannel = message.guild.channels.get(settings.welcomeChannel);
if(!welcomeChannel && settings.welcomeChannel != "off" || !adminRole && settings.adminRole != "None set" || !modRole && settings.modRole != "None set" || !mutedRole && settings.mutedRole != "None set" || !autorole && settings.autorole != "off") { if(!welcomeChannel && settings.welcomeChannel != "off" || !adminRole && settings.adminRole != "None set" || !modRole && settings.modRole != "None set" || !mutedRole && settings.mutedRole != "None set" || !autorole && settings.autorole != "off") {
@ -121,8 +123,6 @@ module.exports = async (client, message) => {
}; };
if(message.settings.blacklisted != "ARRAY" && settings.blacklisted.length > 0) { if(message.settings.blacklisted != "ARRAY" && settings.blacklisted.length > 0) {
let blacklisted = false;
settings.blacklisted.forEach(function(ID) { settings.blacklisted.forEach(function(ID) {
if(ID == message.author.id) { if(ID == message.author.id) {
blacklisted = true; blacklisted = true;