Merge pull request #31 from Zwater/event-cleanup

Event cleanup
nixnest · Jul 7, 2018 · 7116b7a · 7116b7a
2 parents 85e9759 + 06e67cd
commit 7116b7a
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 175 deletions.
diff --git a/app.js b/app.js
@@ -8,13 +8,12 @@ const config = require('./config.json')
 const gotkicked = require('./gotkicked.json')
 const joinmessages = require('./joinmessages.json')
 
+// Since the events are moved to seperate files, need to smuggle these in through the config argument
 config.colors = {
     red: 0x781706,
     orange: 0xBA430D,
     green: 0x037800
 }
-
-// Since the events are moved to seperate files, need to smuggle these in through the config argument
 config.gotkicked = gotkicked
 config.joinmessages = joinmessages
 

diff --git a/events/message.js b/events/message.js
@@ -1,5 +1,7 @@
 // message.js
 
+const extra = require('./../modules/extraneous')
+
 var checkusers = {}
 var messages = []
 
@@ -92,7 +94,7 @@ module.exports = async (config, client, influx, message) => {
                 .then(connection => {
                     connection.playFile('./Roblox_Death_Sound_Effect.mp3')
                 })
-            await sleep(3000)
+            await extra.sleep(3000)
             console.log('Disconnecting from voice channel')
             message.member.voiceChannel.leave()
         }
@@ -134,7 +136,7 @@ module.exports = async (config, client, influx, message) => {
                     database: 'nixnest'
                 })
                 message.channel.send('Setting messages for user')
-                await sleep(2000)
+                await extra.sleep(2000)
                 influx.writePoints([
                     {
                         measurement: 'message',
@@ -280,14 +282,14 @@ module.exports = async (config, client, influx, message) => {
     default: {
         if (config.plugins.hasOwnProperty(command)) {
             if (config.plugins[command].nsfw && !message.channel.nsfw) {
-                message.channel.send('Tisk tisk, '.join(message.author.username, '. Don\'t be naughty here.'))
+                message.channel.send('Tisk tisk, '.join(message.author.username), '. Don\'t be naughty here.')
                 break
             }
-            arg.shift()
-            arg.shift()
-            arg.unshift(message.author.id)
+            var argb = message.content.split(' ')
+            argb.shift()
+            argb.unshift(message.author.id)
             const { execFile } = require('child_process')
-            execFile(config.plugins[command].path, arg, (error, stdout, stderr) => {
+            execFile(config.plugins[command].path, argb, (error, stdout, stderr) => {
                 if (error) {
                     throw error
                 }
@@ -301,76 +303,22 @@ module.exports = async (config, client, influx, message) => {
         }
     }
     };
-    if (message.guild.id.toString().includes(config.logserver)) {
-        var embedFields = fieldGenerator(message.cleanContent, 'Command')
-        console.log(embedFields)
-        client.channels.get(config.logchannel).send({embed: {
-            color: config.colors.green,
-            author: {
-                name: message.author.username,
-                icon_url: message.author.displayAvatarURL
-            },
-            url: urlGenerator(message),
-            title: 'Command ran in #' + message.channel.name,
-            fields: embedFields,
-            timestamp: new Date(),
-            footer: {
-                icon_url: client.user.displayAvatarURL,
-                text: 'User ID: ' + message.author.id
-            }
-        }})
-    }
-}
 
-const embedLength = 1020
-
-function lengthSplit (message, length) {
-    var splitCount = Math.floor(message.length / length) + 1
-    var splits = []
-
-    for (var n = 0; n < splitCount; n++) {
-        splits.push(message.substr(0 + (n * length), length))
-    }
-
-    if (!splits[splits.length - 1]) {
-        splits.pop()
-    }
-    console.log(splits)
-    return splits
-};
-
-function fieldGenerator (message, msgTitle) {
-    console.log(msgTitle)
-    console.log(message)
-    var splits = lengthSplit(message, embedLength)
-    var fields = []
-
-    if (splits.length === 1) {
-        fields = [{
-            name: msgTitle,
-            value: '` ' + splits[0] + ' `'
-        }]
-    } else {
-        for (var n = 0; n < splits.length; n++) {
-            fields.push({
-                name: msgTitle + ' (' + n + ')',
-                value: '` ' + splits[n] + ' `'
-            })
+    var embedFields = extra.fieldGenerator(message.cleanContent, 'Command')
+    console.log(embedFields)
+    client.channels.get(config.logchannel).send({embed: {
+        color: config.colors.green,
+        author: {
+            name: message.author.username,
+            icon_url: message.author.displayAvatarURL
+        },
+        url: extra.urlGenerator(message),
+        title: 'Command ran in #' + message.channel.name,
+        fields: embedFields,
+        timestamp: new Date(),
+        footer: {
+            icon_url: client.user.displayAvatarURL,
+            text: 'User ID: ' + message.author.id
         }
-    }
-    console.log(fields)
-    return fields
-};
-
-function urlGenerator (msgObj) {
-    var url = `https://discordapp.com/channels/${msgObj.guild.id}/${msgObj.channel.id}/${msgObj.id}`
-    return url
-}
-
-async function sleep (ms = 0) {
-    return new Promise((resolve, reject) => {
-        setTimeout(() => {
-            resolve()
-        }, ms)
-    })
+    }})
 }
diff --git a/events/messageDelete.js b/events/messageDelete.js
@@ -1,15 +1,17 @@
 // messageDelete.js
 
+const extra = require('./../modules/extraneous')
+
 module.exports = async (config, client, influx, message) => {
-    var embedFields = fieldGenerator(message.cleanContent, 'Message')
+    var embedFields = extra.fieldGenerator(message.cleanContent, 'Message')
     console.log(embedFields)
     client.channels.get(config.logchannel).send({embed: {
         color: config.colors.red,
         author: {
             name: message.author.username,
             icon_url: message.author.displayAvatarURL
         },
-        url: urlGenerator(message),
+        url: extra.urlGenerator(message),
         title: 'Message ID#' + message.id + ' deleted in #' + message.channel.name,
         description: 'The following message was deleted:',
         fields: embedFields,
@@ -21,48 +23,3 @@ module.exports = async (config, client, influx, message) => {
 
     }})
 }
-
-const embedLength = 1020
-
-function lengthSplit (message, length) {
-    var splitCount = Math.floor(message.length / length) + 1
-    var splits = []
-
-    for (var n = 0; n < splitCount; n++) {
-        splits.push(message.substr(0 + (n * length), length))
-    }
-
-    if (!splits[splits.length - 1]) {
-        splits.pop()
-    }
-    console.log(splits)
-    return splits
-};
-
-function fieldGenerator (message, msgTitle) {
-    console.log(msgTitle)
-    console.log(message)
-    var splits = lengthSplit(message, embedLength)
-    var fields = []
-
-    if (splits.length === 1) {
-        fields = [{
-            name: msgTitle,
-            value: '` ' + splits[0] + ' `'
-        }]
-    } else {
-        for (var n = 0; n < splits.length; n++) {
-            fields.push({
-                name: msgTitle + ' (' + n + ')',
-                value: '` ' + splits[n] + ' `'
-            })
-        }
-    }
-    console.log(fields)
-    return fields
-};
-
-function urlGenerator (msgObj) {
-    var url = `https://discordapp.com/channels/${msgObj.guild.id}/${msgObj.channel.id}/${msgObj.id}`
-    return url
-}
diff --git a/events/messageUpdate.js b/events/messageUpdate.js
@@ -1,9 +1,11 @@
 // messageUpdate.js
 
+const extra = require('./../modules/extraneous')
+
 module.exports = async (config, client, influx, oldmsg, newmsg) => {
     if (oldmsg.cleanContent !== newmsg.cleanContent) {
-        var oldFields = fieldGenerator(oldmsg.cleanContent, 'Old message')
-        var newFields = fieldGenerator(newmsg.cleanContent, 'New message')
+        var oldFields = extra.fieldGenerator(oldmsg.cleanContent, 'Old message')
+        var newFields = extra.fieldGenerator(newmsg.cleanContent, 'New message')
         var embedFields = oldFields.concat(newFields)
         console.log(embedFields)
         client.channels.get(config.logchannel).send({embed: {
@@ -12,7 +14,7 @@ module.exports = async (config, client, influx, oldmsg, newmsg) => {
                 name: newmsg.author.username,
                 icon_url: newmsg.author.displayAvatarURL
             },
-            url: urlGenerator(newmsg),
+            url: extra.urlGenerator(newmsg),
             title: 'Message ID#' + newmsg.id + ' modified in #' + newmsg.channel.name,
             description: 'The following message was modified:',
             fields: embedFields,
@@ -24,48 +26,3 @@ module.exports = async (config, client, influx, oldmsg, newmsg) => {
         }})
     }
 }
-
-const embedLength = 1020
-
-function lengthSplit (message, length) {
-    var splitCount = Math.floor(message.length / length) + 1
-    var splits = []
-
-    for (var n = 0; n < splitCount; n++) {
-        splits.push(message.substr(0 + (n * length), length))
-    }
-
-    if (!splits[splits.length - 1]) {
-        splits.pop()
-    }
-    console.log(splits)
-    return splits
-};
-
-function fieldGenerator (message, msgTitle) {
-    console.log(msgTitle)
-    console.log(message)
-    var splits = lengthSplit(message, embedLength)
-    var fields = []
-
-    if (splits.length === 1) {
-        fields = [{
-            name: msgTitle,
-            value: '` ' + splits[0] + ' `'
-        }]
-    } else {
-        for (var n = 0; n < splits.length; n++) {
-            fields.push({
-                name: msgTitle + ' (' + n + ')',
-                value: '` ' + splits[n] + ' `'
-            })
-        }
-    }
-    console.log(fields)
-    return fields
-};
-
-function urlGenerator (msgObj) {
-    var url = `https://discordapp.com/channels/${msgObj.guild.id}/${msgObj.channel.id}/${msgObj.id}`
-    return url
-}
diff --git a/modules/extraneous.js b/modules/extraneous.js
@@ -41,5 +41,10 @@ module.exports = {
     urlGenerator: (msgObj) => {
         var url = `https://discordapp.com/channels/${msgObj.guild.id}/${msgObj.channel.id}/${msgObj.id}`
         return url
+    },
+    sleep (ms = 0) {
+        return new Promise((resolve, reject) => {
+            setTimeout(resolve, ms)
+        })
     }
 }
diff --git a/plugins/remember.py b/plugins/remember.py
@@ -3,7 +3,8 @@
 import sys
 
 if len(sys.argv) < 3:
-    reply = "Missing parameters"
+    arg = sys.argv[1]
+    reply = "*<@{}> will remember that*".format(arg)
 else:
     args = sys.argv
     args.pop(0)