From 7760f0c11d1a4495d1e46b6148c444ed5f8fda80 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 13:18:06 +0000 Subject: [PATCH 1/3] Bump rethinkdb-driver from 2.4.2 to 2.4.3 Bumps [rethinkdb-driver](https://github.com/rethinkdb/rethinkdb-java) from 2.4.2 to 2.4.3. - [Release notes](https://github.com/rethinkdb/rethinkdb-java/releases) - [Commits](https://github.com/rethinkdb/rethinkdb-java/compare/v2.4.2...2.4.3) 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 a5294f3..aeaaf9f 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.2 + 2.4.3 org.slf4j From 9497aeaf0bda1c88c88fe7ea148f5b566418ef5b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 13:18:33 +0000 Subject: [PATCH 2/3] Bump JDA from 4.1.1_153 to 4.1.1_154 Bumps JDA from 4.1.1_153 to 4.1.1_154. 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 a5294f3..26072d7 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_153 + 4.1.1_154 org.json From 75e9745233f685a658a67acfe8ef76584fae9838 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 21 May 2020 20:45:23 +0200 Subject: [PATCH 3/3] Fix emote stuff --- .../java/com/bbn/hadder/listener/OwnerMessageListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java b/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java index be14cae..010c531 100644 --- a/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java @@ -23,14 +23,14 @@ public class OwnerMessageListener extends ListenerAdapter { @Override public void onMessageReceived(@Nonnull MessageReceivedEvent event) { - if (config.getOwners().contains(event.getAuthor().getIdLong())) { + if (config.getOwners().contains(event.getAuthor().getIdLong()) && event.getMessage().getContentRaw().startsWith(":") && event.getMessage().getContentRaw().endsWith(":")) { String emotename = event.getMessage().getContentRaw().split(":")[1]; if (!emotename.contains(" ")) { Emote[] emotes = event.getJDA().getEmotesByName(emotename, true).toArray(new Emote[0]); StringBuilder sb = new StringBuilder(); if (emotes.length!=0) { for (Emote emote : emotes) { - sb.append(emote.getAsMention() + " "); + sb.append(emote.getAsMention()).append(" "); } event.getChannel().sendMessage(sb.toString()).queue(); }