From d9bb7a60a865dd3b36e8e0e74944a6b7c4e49d0d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 2 Dec 2019 14:04:50 +0100 Subject: [PATCH 1/4] MessageUpdateListener Fix --- src/main/java/com/bbn/hadder/listener/InviteLinkListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index b6564a8..b77f536 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -67,7 +67,7 @@ public class InviteLinkListener extends ListenerAdapter { @Override public void onMessageUpdate(@Nonnull MessageUpdateEvent event) { - if (event.isFromType(ChannelType.TEXT) && event.getMessage().getContentRaw().contains("discord.gg/") && event.getMember().hasPermission(Permission.MANAGE_SERVER) && rethink.getInviteDetection(event.getGuild().getId())) { + if (event.isFromType(ChannelType.TEXT) && event.getMessage().getContentRaw().contains("discord.gg/") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId())) { String split = event.getMessage().getContentRaw().split("discord.gg/", 10)[1]; String invite = split.split(" ")[0]; OkHttpClient client = new OkHttpClient(); @@ -81,7 +81,7 @@ public class InviteLinkListener extends ListenerAdapter { } catch (Exception e) { e.printStackTrace(); } - } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && event.getMember().hasPermission(Permission.MANAGE_SERVER) && rethink.getInviteDetection(event.getGuild().getId())) { + } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId())) { String split = event.getMessage().getContentRaw().split("discordapp.com/invite/", 10)[1]; String invite = split.split(" ")[0]; OkHttpClient client = new OkHttpClient(); From 281598f5656af0dda71a749db9aa11a37ee1fd7c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 13:21:31 +0000 Subject: [PATCH 2/4] Bump lavaplayer from 1.3.29 to 1.3.32 Bumps lavaplayer from 1.3.29 to 1.3.32. 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 ea1142c..0c95b79 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ com.sedmelluq lavaplayer - 1.3.29 + 1.3.32 From f63162ffc36060975e52c919626498ea1e4f20df Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 13:21:57 +0000 Subject: [PATCH 3/4] Bump JDA from 4.0.0_67 to 4.0.0_69 Bumps JDA from 4.0.0_67 to 4.0.0_69. 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 ea1142c..8c046ee 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_67 + 4.0.0_69 org.json From 9d028e629c686c9bc778603a2015ed4852449377 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 2 Dec 2019 18:14:35 +0100 Subject: [PATCH 4/4] Fix --- src/main/java/com/bbn/hadder/listener/LinkListener.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/LinkListener.java b/src/main/java/com/bbn/hadder/listener/LinkListener.java index 968c173..d678b8d 100644 --- a/src/main/java/com/bbn/hadder/listener/LinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/LinkListener.java @@ -25,8 +25,8 @@ public class LinkListener extends ListenerAdapter { public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent event) { event.getChannel().retrieveMessageById(event.getMessageId()).queue( msg -> { - if (event.getMember().hasPermission(Permission.MANAGE_CHANNEL)) { - if (!event.getMember().getUser().equals(event.getJDA().getSelfUser()) && msg.getAuthor().equals(event.getJDA().getSelfUser()) && msg.getEmbeds().size() == 1 && msg.getEmbeds().get(0).getFooter() == null && msg.getEmbeds().get(0).getTitle().endsWith(") wants to link guilds!")) { + if (!event.getMember().getUser().equals(event.getJDA().getSelfUser()) && msg.getAuthor().equals(event.getJDA().getSelfUser()) && msg.getEmbeds().size() == 1 && msg.getEmbeds().get(0).getFooter() == null && msg.getEmbeds().get(0).getTitle().endsWith(") wants to link guilds!")) { + if (event.getMember().hasPermission(Permission.MANAGE_CHANNEL)) { String requestguild = msg.getEmbeds().get(0).getTitle().replaceAll("\\) wants to link guilds!", ""); String requestguildid = null; for (int i = requestguild.length() - 1; i >= 0; i--) { @@ -55,9 +55,9 @@ public class LinkListener extends ListenerAdapter { event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue(); } } + } else { + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } - } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } );