From 8d63f8a1ebb128cf1293e3abfcc5596033cf0d12 Mon Sep 17 00:00:00 2001 From: Atlas <41349879+cloudrex@users.noreply.github.com> Date: Mon, 21 Jan 2019 19:54:59 -0500 Subject: [PATCH 01/50] Better wording and grammatical structure --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 85dd6cf1..8027d821 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # DiscordBot -A chat bot for discord app based off discord.js +A chat bot for Discord app based off discord.js. # Features: - !gif query => returns a gif connected to search query. Example = !gif dogs @@ -15,13 +15,13 @@ A chat bot for discord app based off Date: Mon, 27 May 2019 12:40:25 -0400 Subject: [PATCH 02/50] added package-lock.json to .gitignore (#137) --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 12096618..eac8d033 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ build/Release # Dependency directory # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git node_modules +package-lock.json #config files auth.json @@ -34,4 +35,4 @@ permissions.json messagebox.json config.json memes.json -meme_channels.json \ No newline at end of file +meme_channels.json From cf04f7b38a7d1cd5ecccf62182509156e60647a6 Mon Sep 17 00:00:00 2001 From: Notarin Steele <424c414e4b@gmail.com> Date: Mon, 27 May 2019 11:22:53 -0700 Subject: [PATCH 03/50] added package-lock.json to .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 12096618..eac8d033 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ build/Release # Dependency directory # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git node_modules +package-lock.json #config files auth.json @@ -34,4 +35,4 @@ permissions.json messagebox.json config.json memes.json -meme_channels.json \ No newline at end of file +meme_channels.json From dc8d8238dad9e21c79001ff039b6175f7988555c Mon Sep 17 00:00:00 2001 From: Notarin Steele <424c414e4b@gmail.com> Date: Mon, 27 May 2019 13:17:50 -0700 Subject: [PATCH 04/50] added missing dependencies --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index cc0f2370..3ddeef1f 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,8 @@ "underscore": "1.8.x", "urban": "^0.3.1", "wikijs": "^0.1.4", - "youtube-dl": "^1.11.1" + "youtube-dl": "^1.11.1", + "youtube-node": "^1.3.3" }, "main": "discord_bot.js" } From 84f2a2f4cc54d3219331accec3f569a54353cfcc Mon Sep 17 00:00:00 2001 From: Notarin Steele <424c414e4b@gmail.com> Date: Mon, 27 May 2019 13:25:31 -0700 Subject: [PATCH 05/50] removed error: because its already printed in e --- plugins/RSS/rss.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/RSS/rss.js b/plugins/RSS/rss.js index 3b154639..af06326e 100644 --- a/plugins/RSS/rss.js +++ b/plugins/RSS/rss.js @@ -6,7 +6,7 @@ exports.commands = [ try{ var rssFeeds = require("../../rss.json"); } catch(e) { - console.log("Couldn't load rss.json. See rss.json.example if you want rss feed commands. error: " + e); + console.log("Couldn't load rss.json. See rss.json.example if you want rss feed commands. " + e); } function loadFeeds(){ for(var cmd in rssFeeds){ From eba01569db6ea83b5e7cc7567e9032f884cdd6ca Mon Sep 17 00:00:00 2001 From: Notarin Steele <424c414e4b@gmail.com> Date: Mon, 27 May 2019 14:45:35 -0700 Subject: [PATCH 06/50] fixed the meme command crash --- plugins/Imgflip/imgflip.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/Imgflip/imgflip.js b/plugins/Imgflip/imgflip.js index 887a6874..eef705a9 100644 --- a/plugins/Imgflip/imgflip.js +++ b/plugins/Imgflip/imgflip.js @@ -3,6 +3,7 @@ exports.commands = [ ] var AuthDetails = require("../../auth.json"); +var Config = require("../../config.json"); //https://api.imgflip.com/popular_meme_ids var meme = { @@ -39,7 +40,12 @@ exports.meme = { imgflipper.generateMeme(meme[memetype], tags[1]?tags[1]:"", tags[3]?tags[3]:"", function(err, image){ console.log(arguments); console.log(image); + if(image){ msg.channel.send(image); + } + else { + msg.channel.send(Config.commandPrefix + "meme