From 101a31f3388436f89fdd0966b4742574045bafbd Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 10 Nov 2019 20:48:18 +0100 Subject: [PATCH 1/6] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cd779c4..4f62557 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # Hadder [![Build Status](https://travis-ci.com/BigBotNetwork/Hadder.svg?branch=master)](https://travis-ci.com/BigBotNetwork/Hadder) + -- 2.45.3 From 5e67ef48db8a51d57b82bc3dbfcde460eff600fd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 13:22:38 +0000 Subject: [PATCH 2/6] Bump JDA from 4.0.0_56 to 4.0.0_59 Bumps JDA from 4.0.0_56 to 4.0.0_59. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23bcffe..688c7c3 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_56 + 4.0.0_59 org.json -- 2.45.3 From 0b67064e34c36db1bb874e2535be806743abeb61 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 13:44:49 +0000 Subject: [PATCH 3/6] Bump JDA from 4.0.0_59 to 4.0.0_60 Bumps JDA from 4.0.0_59 to 4.0.0_60. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 688c7c3..d602e9c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_59 + 4.0.0_60 org.json -- 2.45.3 From 5183cac5cc9761b4153092c7b502a68231344372 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 13:41:50 +0000 Subject: [PATCH 4/6] Bump JDA from 4.0.0_60 to 4.0.0_61 Bumps JDA from 4.0.0_60 to 4.0.0_61. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d602e9c..3211132 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_60 + 4.0.0_61 org.json -- 2.45.3 From 9e09944fff6c2e61334821328b641648f4e85082 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 16:30:13 +0100 Subject: [PATCH 5/6] Version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3211132..7afe0e1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ Hadder Hadder - 0.7-ALPHA + 0.7.1-ALPHA Hadder -- 2.45.3 From 0b644af5ac405d25f7b626a4fe75de821741bb34 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 17:00:35 +0100 Subject: [PATCH 6/6] Better Code --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- src/main/java/com/bbn/hadder/commands/fun/GifCommand.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 8a0e59a..27df501 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -47,7 +47,7 @@ public class Hadder { new ShutdownCommand(), new KickCommand(), new PingCommand(), - new GifCommand(config), + new GifCommand(), new ClearCommand(), new GitHubCommand(), new ScreenshareCommand(), diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java index 14c068e..ae57750 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -19,12 +19,6 @@ import java.util.Random; public class GifCommand implements Command { - private Config config; - - public GifCommand(Config config) { - this.config = config; - } - @Override public void executed(String[] args, CommandEvent event) { if (args.length > 0) { @@ -35,7 +29,7 @@ public class GifCommand implements Command { } OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + config.getGiphyToken()).build(); + Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + event.getConfig().getGiphyToken()).build(); try { Random rand = new Random(); Response response = caller.newCall(request).execute(); -- 2.45.3