Merge pull request #12 from TimboKZ/dev

NPM version badge, better linting
TimboKZ · Apr 2, 2017 · a7e6cbf · a7e6cbf
2 parents ea36846 + 5cf5076
commit a7e6cbf
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 5 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -8,6 +8,7 @@
         "sourceType": "module"
     },
     "rules": {
+        "eol-last": 1,
         "indent": [
             "error",
             4

diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # Discord Spoiler Bot
 
+[![npm](https://img.shields.io/npm/v/discord-spoiler-bot.svg)](https://www.npmjs.com/package/discord-spoiler-bot)
 [![npm](https://img.shields.io/npm/dt/discord-spoiler-bot.svg)](https://www.npmjs.com/package/discord-spoiler-bot)
 ![npm dependencies](https://david-dm.org/TimboKZ/discord-spoiler-bot.svg)
 

diff --git a/src/DiscordClient.js b/src/DiscordClient.js
@@ -6,7 +6,6 @@
  */
 
 const DiscordJS = require('discord.js');
-const DiscordIO = require('discord.io');
 
 const DISCORD_JS = 'discord.js';
 const DISCORD_IO = 'discord.io';

diff --git a/src/GifGenerator.js b/src/GifGenerator.js
@@ -195,4 +195,4 @@ class GifGenerator {
 
 }
 
-module.exports = GifGenerator;
+module.exports = GifGenerator;
diff --git a/src/SpoilerBot.js b/src/SpoilerBot.js
@@ -8,8 +8,6 @@
 'use strict';
 
 const fs = require('fs');
-const DiscordJS = require('discord.js');
-const DiscordIO = require('discord.io');
 const DiscordClient = require('./DiscordClient');
 const GifGenerator = require('./GifGenerator');
 

diff --git a/test/integration/config.example.js b/test/integration/config.example.js
@@ -4,6 +4,8 @@
  * @license MIT
  */
 
+const SpoilerBot = require('../../src/SpoilerBot');
+
 module.exports = {
     token: 'your_bot_token_here',
     markUserIds: [

diff --git a/test/mocha/GifGeneratorTest.js b/test/mocha/GifGeneratorTest.js
@@ -56,4 +56,4 @@ describe('GifGenerator', () => {
             done();
         });
     });
-});
+});
Original file line number	Diff line number	Diff line change
Expand Up		@@ -195,4 +195,4 @@ class GifGenerator {

		}

		module.exports = GifGenerator;
		module.exports = GifGenerator;
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,4 +56,4 @@ describe('GifGenerator', () => { @@
                 done();
             });
         });
-    });
+    });