Commit because i can

Author: funnbot

events/message.js

@@ -6,11 +6,15 @@ const help = require('../commands/help.js')
 const CustomCmds = require('../commands/ccmd')
 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")*/
 
+function handleError(e) {
+    let a = 0;
+    return a;
+}
+
 bot.on('message', (message) => {
 
   //Extend Message
@@ -24,9 +28,6 @@ bot.on('message', (message) => {
 
   if (message.author.bot) return;
 
-  //Stored Messages
-  //store.add(message, bot.user.id)
-
   let blocked = bot.system.getBlocked()
   if (blocked[message.author.id]) return
   if (message.channel.type === 'text' && blocked[message.guild.id]) return
@@ -49,7 +50,7 @@ bot.on('message', (message) => {
 
   if (!message.content.startsWith(message.guild.prefix)) return;
 
-  if (message.channel.type === "text" && !message.channel.permissionsFor(message.guild.member(bot.user)).has("SEND_MESSAGES")) return message.author.send("**I lack the permission to send messages in this channel.**")
+  if (message.channel.type === "text" && !message.channel.permissionsFor(message.guild.member(bot.user)).has("SEND_MESSAGES")) return message.author.send("**I lack the permission to send messages in this channel.**").catch(e => handleError(e))
 
   //Custom Commands
   if (message.channel.type === "text") {

functions/checkPerm.js

@@ -15,9 +15,9 @@ exports.Mcheck = (perms, message) => {
       if (message.author.id !== "163735744995655680") {
         can.has = false;
         can.miss.push(p);
-      } 
+      }
     } else {
-      let perm = message.channel.permissionsFor(message.member).has(p);
+      let perm = message.channel.permissionsFor(message.author);
       if (!perm && message.author.id !== message.guild.owner.user.id && message.author.id !== "163735744995655680") {
         can.has = false;
         can.miss.push(p);
@@ -44,4 +44,4 @@ exports.Bcheck = (perms, message) => {
     }
   })
   return can;
-}
+}

functions/filter.js

@@ -16,7 +16,7 @@ module.exports = (message) => {
         let w
         keys.forEach(k => low.includes(k.toLowerCase()) ? w = k : 0)
         strike(message.guild.id, message.author.id)
-        message.author.send(filters.msg ? filters.msg : "**Your message was deleted because it contained a restricted keyword: **"+w)
+        message.author.send(filters.msg ? filters.msg : "**Your message was deleted because it contained a restricted keyword: **"+w).catch(e => e + "")
     }
 
 }

music/commands/meval.js

@@ -1,3 +1,8 @@
+const auth = require("../../config.js");
+const r = require("rethinkdbdash")({
+    db: "Nitro",
+    password: auth.rethink
+})
 const util = require('util')
 
 exports.run = (message, bot, send) => {

struct/Bot.js

@@ -16,9 +16,9 @@ const Bot = () => {
 
             let bot = new Discord.Client({
                 disabledEvents: ['TYPING_START'],
-                messageCacheMaxSize: 50,
-                messageCacheLifetime: 300,
-                messageSweepInterval: 300
+                messageCacheMaxSize: 25,
+                messageCacheLifetime: 120,
+                messageSweepInterval: 120
             })
 
             bot.config = new GuildConfig(data)

struct/Message.js

@@ -34,7 +34,7 @@ function Message(message) {
     split = split.slice(1)
     message.args = split
     message.suffix = split.join(" ")
-    message.send = message.channel.send.bind(message.channel)
+    message.send = (...args) => message.channel.send(...args);
     return message;
 }
 

struct/ProfileConfig.js

@@ -1,34 +1,15 @@
-const r = require('rethinkdb')
+const r = require('rethinkdbdash')
 const Discord = require('discord.js')
 
 class ProfileConfig {
 
     constructor(data) {
 
         this.profiles = {}
-
         data.profile.forEach(d => {
             this.profiles[d.id] = d.data;
         })
-
         this.conn = data.connection
-
-        r.table('profile').changes().run(this.conn, (err, change) => {
-
-            if (err) return console.log(err)
-
-            change.each((err, row) => {
-
-                if (err) return console.log(err)
-
-                if (!row.new_val) return
-
-                this.profiles[row.new_val.id] = row.new_val.data
-
-            })
-
-        })
-
     }
 
     update(id) {