Command logging

.gitignore

@@ -2,3 +2,4 @@
 .idea/
 node_modules/
 npm-debug.log
+sh.exe.stackdump

.travis.yml

@@ -2,7 +2,6 @@ language: node_js
 node_js:
     - '0.10'
 script:
-    - npm run jsHint -- --failTaskOnError
     - echo $BOT >> .env
 before_install:
     - export DISPLAY=:99.0
@@ -13,4 +12,5 @@ deploy:
   provider: modulus
   api_key: $MODULUS_TOKEN
   project_name: miscord
+  on: CommandLogging
   skip_cleanup: true

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch node debugging",
+            "type": "node",
+            "request": "launch",
+            "program": "${workspaceRoot}/main.js",
+            "stopOnEntry": false,
+            "args": [],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": null,
+            "runtimeExecutable": null,
+            "runtimeArgs": ["--nolazy"],
+            "env": {"NODE_ENV": "development"},
+            "externalConsole": false,
+            "sourceMaps": false,
+            "outDir": null
+
+        }
+    ]
+}

db/preference.db

@@ -0,0 +1,8 @@
+{"command":".gg","path":"./audio/random","volume":"1.2","type":"random","_id":"2ta04BGjEAAP87uA"}
+{"command":".reddit","path":null,"volume":null,"type":"reddit","_id":"HTrt2ckQd1B9AXSB"}
+{"command":".bag","path":"https://hydra-media.cursecdn.com/dota2.gamepedia.com/e/ee/Wdoc_inthebag_01.mp3","volume":".125","type":"audio","_id":"MFBVfW21GoidA8PF"}
+{"command":".cheers","path":"https://my.mixtape.moe/dcvdxs.wav","volume":".5","type":"audio","_id":"O6h1K3ex3nGyGV2x"}
+{"command":".gg","path":"./audio/gg.mp3","volume":".25","type":"audio","_id":"bA0ITBRJbRhN9o1P"}
+{"command":".lion","path":"http://hydra-media.cursecdn.com/dota2.gamepedia.com/4/4a/Lion_respawn_01.mp3","volume":".25","type":"audio","_id":"bS3gYZIsgNNGSAnQ"}
+{"command":".random","path":"./audio/gg.mp3","volume":".25","type":"random","_id":"ht33oaUuP5giHFVm"}
+{"command":".trump","path":"./audio/trump","volume":"1.5","type":"random","_id":"ynyIK88s2rwLZ0cZ"}

lib/Models/Commands/audioCommand.js

@@ -0,0 +1,20 @@
+'use strict';
+
+var BaseCommand = require ('./baseCommand');
+var playFile = require('./../../playFile');
+
+
+class AudioCommand extends BaseCommand  {
+
+    constructor(command, path, volume, bot) {
+        super(bot, command);
+        this.path = path;
+        this.volume = volume;
+    }
+
+    doWork(voiceChannel) {
+      playFile(this.bot, voiceChannel, this.volume, this.path);            
+    }     
+}
+
+module.exports = AudioCommand;

lib/Models/Commands/baseCommand.js

@@ -0,0 +1,14 @@
+'use strict';
+
+class BaseCommand {
+    constructor(bot, command) {
+        this.command = command;
+        this.bot = bot;
+    }
+
+    doWork() {
+      //implement in child classes  
+    } 
+}
+
+module.exports = BaseCommand;

lib/Models/Commands/commandCollection.js

@@ -0,0 +1,41 @@
+'use strict';
+
+var command = require('./baseCommand');
+
+class CommandCollection {
+    constructor() {
+        this.Commands = [];
+        this.length = function(){
+            return this.Commands.length;
+        };
+    }
+
+    Add(command) {
+        if(this.Commands.indexOf(command) != -1) {
+            throw new Error("Command already exists in the collection");
+        }
+        this.Commands.push(command);
+    }
+
+
+    Remove(command) {
+        for(let i = 0; i < this.Commands.length; i ++ ) {
+            if(Commands[i] === command) {
+                Commands[i].Remove();
+                return;
+            }           
+            throw new Error("Command not found in collection");
+        }
+    }
+
+    Find(query) {
+        for(let i = 0; i < this.Commands.length; i++) {
+            if(this.Commands[i].command === query) {
+                return this.Commands[i];
+            }
+            throw new Error("Command not found in collection");
+        }
+    }
+}
+
+module.exports = CommandCollection;

lib/Models/Commands/randomAudioCommand.js

@@ -0,0 +1,22 @@
+'use strict';
+var playFile = require('./../../playFile');
+var utils = require('./../../utils');
+
+var BaseCommand = require ('./baseCommand');
+
+class RandomAudioCommand extends BaseCommand  {
+
+    constructor(command, path, volume, bot) {
+        super(bot, command);
+        this.path = path;
+        this.volume = volume;
+        this.fileOptions = utils.dirToArray(this.path);
+    }
+
+    doWork(voiceChannel) {
+      let chosenFile = this.fileOptions[utils.randomRange(this.fileOptions.length)]
+      playFile(this.bot, voiceChannel, this.volume, chosenFile);            
+    }     
+}
+
+module.exports = RandomAudioCommand;

lib/Models/Commands/redditImageCommand.js

@@ -0,0 +1,40 @@
+'use strict';
+
+var parent = require ('./baseCommand');
+var reddit = require('redwrap');
+var LINQ = require('node-linq').LINQ;
+
+class RedditImageCommand extends BaseCommand {
+    constructor(command) {
+        super(command);
+    }
+
+    doWork(channel, subreddit, msg) {
+        bot.reply(msg, 'gimme a sec...', function (error, message) {
+            if (error) {
+                throw error;
+            }
+            console.log(message);
+        });
+        var urlArray = [];
+        reddit.r(subreddit).limit(100, function (err, data) {
+            var parsedData = new LINQ(data.data.children)
+                .Where(function (file) {
+                    if (file.data.url.includes('i.sli.mg') || file.data.url.includes('imgur.com')) {
+                        return true;
+                    }
+                    return false;
+                })
+                .ToArray().forEach(function (item) {
+                    urlArray.push([item.data.url, item.data.title]);
+                })
+            var image = urlArray[utils.randomRange(urlArray.length)];
+            bot.sendFile(channel, image[0], null, image[1], function (error, message) {
+                if (error) {
+                    throw error;
+                }
+                console.log(message);
+            });
+        });
+    }
+}

lib/Models/Database/dbContext.js

@@ -0,0 +1,35 @@
+'use strict';
+
+var Datastore = require ('nedb');
+
+class DbContext {
+    constructor(dbName) {
+        this.db = {};
+        this.dbPath = './db/' + dbName;
+        this.db = new Datastore(this.dbPath);
+        this.db.loadDatabase();
+    }
+
+    addEntry(document) {
+        this.db.insert(document, function(err) {
+            if(err) {
+                throw err;
+            }
+        });
+    }
+
+    getEntry(query) {
+        return new Promise(function (fulfill, reject) {
+            this.db.find(query, function (err, docs) {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    console.log('first' + docs);
+                    fulfill(docs);
+            }
+        });
+    });
+  }
+}
+module.exports = DbContext;

lib/Models/Services/commandService.js

@@ -0,0 +1,24 @@
+'use strict';
+
+var dbContext = require('../Database/dbContext');
+var commandCollection = require('../Commands/commandCollection');
+class CommandService {
+    constructor(db, collection) {
+        this.db = db;
+        this.collection = collection;
+    }
+
+    populateCollection() {
+       return new Promise(function(resolve) {
+           resolve({
+               value: this.db.getEntry({type: 'audio'})
+           });
+       })
+    }
+
+    populateDatabase() {
+
+    }
+}
+
+module.exports = CommandService;

lib/eventLogging.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var dateFormat = require('dateformat');
+var historyChannel;
 
 /**
  * Records the activities of users joining and leaving voice channels based on the given parameters.
@@ -11,13 +12,13 @@ var dateFormat = require('dateformat');
  * @param {Object} user the given user
  */
 function history(event, bot, channel, user) {
-  if (event === 'leave') {
-    bot.sendMessage(channel.server.channels.get('name', 'history'), '**' + user.username + '**' + ' left **' + channel.name + '** at **' + dateFormat(new Date(), 'mmmm dS, yyyy, h:MM:ss TT Z') + '**');
+  if (event === 'leave' && user.bot === false) {
+    bot.sendMessage(channel.server.channels.get('name', 'history'), '**' + user.username + '**' + ' left **' + channel.name + '** at **' + dateFormat(new Date(), 'mmmm dS, yyyy, h:MM:ss TT Z') + '**\n');
   }
 
-  if (event === 'join') {
-    bot.sendMessage(channel.server.channels.get('name', 'history'), '**' + user.username + '**' + ' joined **' + channel.name + '** at **' + dateFormat(new Date(), 'mmmm dS, yyyy, h:MM:ss TT Z') + '**');
-  }
+  if (event === 'join' && user.bot === false) {
+    bot.sendMessage(channel.server.channels.get('name', 'history'), '**' + user.username + '**' + ' joined **' + channel.name + '** at **' + dateFormat(new Date(), 'mmmm dS, yyyy, h:MM:ss TT Z') + '**\n');
+}
 }
 
 /**
@@ -39,13 +40,13 @@ function presenceUpdated(oldUser, newUser, bot) {
           } else {
             statusVerb = 'come';
           }
-          bot.sendMessage(historyChannel, '**' + newUser.username + '**' + ' has ' + statusVerb + ' **' + newUser.status + '** at **' + dateFormat(new Date(), 'mmmm dS, yyyy, h:MM:ss TT Z') + '**');
+          bot.sendMessage(historyChannel, '**' + newUser.username + '**' + ' has ' + statusVerb + ' **' + newUser.status + '** at **' + dateFormat(new Date(), 'mmmm dS, yyyy, h:MM:ss TT Z') + '**\n');
         }
         if (oldUser.game !== newUser.game) {
           if (!newUser.game) {
-            bot.sendMessage(historyChannel, '**' + newUser.username + '**' + ' stopped playing **' + oldUser.game.name + '** at **' + dateFormat(new Date(), 'mmmm dS, yyyy, h:MM:ss TT Z') + '**');
+            bot.sendMessage(historyChannel, '**' + newUser.username + '**' + ' stopped playing **' + oldUser.game.name + '** at **' + dateFormat(new Date(), 'mmmm dS, yyyy, h:MM:ss TT Z') + '**\n');
           } else {
-            bot.sendMessage(historyChannel, '**' + newUser.username + '**' + ' started playing **' + newUser.game.name + '** at **' + dateFormat(new Date(), 'mmmm dS, yyyy, h:MM:ss TT Z') + '**');
+            bot.sendMessage(historyChannel, '**' + newUser.username + '**' + ' started playing **' + newUser.game.name + '** at **' + dateFormat(new Date(), 'mmmm dS, yyyy, h:MM:ss TT Z') + '**\n');
           }
         }
       }
@@ -54,6 +55,7 @@ function presenceUpdated(oldUser, newUser, bot) {
 }
 
 module.exports = {
-  history : history,
-  presenceUpdated : presenceUpdated
+  history: history,
+  presenceUpdated: presenceUpdated,
+  historyChannel: historyChannel
 };