minor tweaks

Author: funnbot

events/guildCreate+Delete.js

@@ -1,8 +1,6 @@
 const bot = require('../bot.js')
 const request = require('request');
 const auth = require('../config')
-const Mixpanel = require('mixpanel');
-let mixpanel = Mixpanel.init("a4cd26822d32fdde282a60cb28c31253")
 
 
 bot.on('guildCreate', (g) => {
@@ -13,15 +11,13 @@ bot.on('guildCreate', (g) => {
     dBots()
     carbon()
     discordBots()
-    mixpanel.track("Guild Join", {a: 1})
 })
 
 bot.on('guildDelete', (g) => {
     bot.config.guildLeave(g.id);
     dBots()
     carbon()
     discordBots()
-    mixpanel.track("Guild Leave", {a: -1})
 })
 
 function dBots() {

events/message.js

@@ -8,8 +8,8 @@ const Adblock = require('../functions/adblock')
 const Filter = require('../functions/filter')
 const store = require('../functions/storeMessages')
 const log = require('../functions/log')
-const Mixpanel = require('mixpanel');
-let mixpanel = Mixpanel.init("a4cd26822d32fdde282a60cb28c31253")
+/*const Mixpanel = require('mixpanel');
+let mixpanel = Mixpanel.init("a4cd26822d32fdde282a60cb28c31253")*/
 
 bot.on('message', (message) => {
 
@@ -97,9 +97,9 @@ bot.on('message', (message) => {
   //log
   if (message.channel.type === "dm") log.dm(message)
   else log.g(message)
-  mixpanel.track(message.command, {
+  /*mixpanel.track(message.command, {
     b: 5
-  })
+  })*/
 
   //if (suffix.includes("<") && suffix.includes(">")) message.channel.send("*It looks like you are using the characters < and > in your command. Remember, these are only for refrence on what type of text goes there, not to actually include them.*")
   if (message.channel.type !== "text" && cmds[message.command].conf.dm === false) return message.channel.send('This command does not work in Direct Messages.');

functions/adblock.js

@@ -1,36 +1,32 @@
 const bot = require('../bot')
 const strikes = require('./strikes')
+const inviteRegex = /discord\.gg\/\w+/gim;
 
-module.exports = (message) => {
-
-    if (message.channel.type === "text") {
-        if (message.author.id === bot.user.id) return
-        let ad = message.guild.adblock
-        if (!!ad.on) {
-            if (!ad.ex || !ad.ex.users || !ad.ex.users[message.author.id]) {
-                if (message.content.includes("discord.gg/")) {
-                    let roles = (!!ad.ex && !!ad.ex.roles) ? Object.keys(ad.ex.roles) : [];
-                    let notEx = true;
-                    if (roles.length > 0) {
-                        roles.forEach(r => {
-                            if (message.member && message.member.roles.has(r)) {
-                                notEx = false;
-                            }
-                        })
-                    }
-                    if (notEx) {
-                        if (message.author.id !== message.guild.owner.user.id) {
-                            message.delete();
-                            message.author.send("**AdBlock**: " + message.author + ", Please Do Not Advertise.").catch()
-                            strikes(message.guild.id, message.author.id)
-                            if (!!ad.notify) {
-                                bot.users.get(message.guild.owner.id).send("*The user:* **" + message.author.username + "** *Has Advertised in the channel:* **" + message.channel.name + "** *of the server* **" + message.guild.name + "** *With the message:* \n`" + message.content + "`")
-                            }
-                        }
-                    }
-                }
-            }
+module.exports = message => {
+    if (message.channel.type !== "text") return;
+    if (message.author.id === bot.user.id) return;
+    if (message.author.id === message.guild.owner.user.id) return;
+    let ad = message.guild.adblock;
+    if (!ad.on) return;
+    if (ad.ex && ad.ex.users && ad.ex.users[message.author.id]) return;
+    if (ad.ex && ad.ex.channels && ad.ex.channels[message.channel.id]) return;
+    if (message.content.length < 10) return;
+    if (inviteRegex.test(message.content));
+    const roles = (ad.ex && ad.ex.roles) ? Object.keys(ad.ex.roles) : null;
+    let notEx = true;
+    if (roles) {
+        for (let r of roles) {
+            if (message.member && message.member.roles.has(r))
+                notEx = false;
+        }
+    }
+    if (notEx) {
+        message.delete();
+        message.author.send("**AdBlock**: " + message.author + ", Please Do Not Advertise.").catch(e => e);
+        strikes(message.guild.id, message.author.id)
+        if (!!ad.notify) {
+            let owner = bot.users.get(message.guild.owner.id);
+            owner.send(`*The user* **${message.author.tag}** *Advertised in* **${message.guild.name} #${message.channel.name}** *with the message*\n${message.content}`);
         }
     }
-
 }

functions/strikes.js

@@ -28,8 +28,4 @@ module.exports = (guildid, userid) => {
             return user.send("**You have been banned from `" + guild.name + "`**").then(u => guild.ban(userid).catch())
         }
     }
-
-
-
-
 }

music/lib/GenerateQueue.js

@@ -2,31 +2,18 @@ const paginate = require('Paginate')
 const pretty = require('pretty-ms')
 
 function makeQueue(playlist, num) {
-
     let pager = new paginate(playlist, 20)
-
     let page = pager.page(num)
-
     let list = []
-
     let TotalPages = Math.ceil(playlist.length / 20)
-
     if (num > TotalPages) num = TotalPages
-
     page.forEach((p, i) => {
-
         let duration = pretty(p.duration)
-
         let itemNumber = num != 1 ? ((((num - 1) * 20) + i) + 1) : i + 1
-
         list.push(`${itemNumber}. **${p.title}** - ${p.owner} (${duration})`)
-
     })
-
     list.push(`Page ${num}/${TotalPages}`)
-
     return list
-
 }
 
 module.exports = makeQueue

music/lib/apiKeyCheck.js

@@ -1,19 +1,12 @@
 const resolve = require('soundcloud-resolve')
 
 exports.scKey = (key, callback) => {
-
     resolve(key, "https://soundcloud.com/lubxtpf/whateverhappened", (err, data) => {
-
         if (err) return callback(true)
-
         return callback(false)
-
     })
-
 }
 
 exports.ytKey = (key, callback) => {
-
     return callback(false)
-
 }

shard.js

@@ -8,11 +8,11 @@ Manager.spawn();
 
 setTimeout(() => {
     console.log("restarting")
-    Manager.broadcastEval("process.exit()");
+    procss.exit(1);
 }, 5184e5);
 
 //Guild Api
-const express = require('express')
+/*const express = require('express')
 
 const app = express()
 const router = express.Router()
@@ -43,4 +43,4 @@ app.use("/", router);
 
 app.listen(port, () => {
     console.log("inguild listening on port " + port)
-})
+})*/

struct/Message.js

@@ -1,9 +1,7 @@
 const bot = require('../bot')
 
 function Message(message) {
-
     let id;
-
     if (message.channel.type === "text" && message.guild) id = message.guild.id
     else if (!message.guild) {
         let fakeGuild = {}
@@ -16,49 +14,28 @@ function Message(message) {
     }
 
     message.guild.prefix = bot.config.getPrefix(id)
-
     message.guild.announce = bot.config.getAnc(id)
-
     message.guild.adblock = bot.config.getAd(id)
-
     message.guild.autorole = bot.config.getAuto(id)
-
     message.guild.tags = bot.config.getTags(id)
-
     message.guild.level = bot.config.getLevel(id)
-
     message.guild.custom = bot.config.getCustom(id)
-
     message.guild.modules = bot.config.getMod(id)
-
     message.guild.roleme = bot.config.getRoleMe(id)
-
     message.guild.perms = bot.config.getPerms(id)
-
     message.guild.filter = bot.config.getFilter(id)
-
     message.guild.joindm = bot.config.getJDM(id)
-
     message.guild.strikes = bot.config.getStrike(id)
-
     message.guild.deletem = bot.config.getDeletem(id)
 
     let nopre = message.content.slice(message.guild.prefix.length)
-
     let split = nopre.split(" ")
-
     message.command = split[0]
-
     split = split.slice(1)
-
     message.args = split
-
     message.suffix = split.join(" ")
-
     message.send = message.channel.send.bind(message.channel)
-
     return message;
-
 }
 
 module.exports = Message;