greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge pull request #136 from BigBotNetwork/greg-dev

Browse source 
Hotfix
This commit is contained in:
Skidder 2019-12-02 09:15:23 -08:00 • committed by GitHub
commit 534654748a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -25,7 +25,7 @@
<dependency> <dependency>
<groupId>net.dv8tion</groupId> <groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId> <artifactId>JDA</artifactId>
<version>4.0.0_67</version> <version>4.0.0_69</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
@ -65,7 +65,7 @@
<dependency> <dependency>
<groupId>com.sedmelluq</groupId> <groupId>com.sedmelluq</groupId>
<artifactId>lavaplayer</artifactId> <artifactId>lavaplayer</artifactId>
<version>1.3.29</version> <version>1.3.32</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
View file

@ -67,7 +67,7 @@ public class InviteLinkListener extends ListenerAdapter {
@Override @Override
public void onMessageUpdate(@Nonnull MessageUpdateEvent event) { 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 split = event.getMessage().getContentRaw().split("discord.gg/", 10)[1];
String invite = split.split(" ")[0]; String invite = split.split(" ")[0];
OkHttpClient client = new OkHttpClient(); OkHttpClient client = new OkHttpClient();
@ -81,7 +81,7 @@ public class InviteLinkListener extends ListenerAdapter {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); 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 split = event.getMessage().getContentRaw().split("discordapp.com/invite/", 10)[1];
String invite = split.split(" ")[0]; String invite = split.split(" ")[0];
OkHttpClient client = new OkHttpClient(); OkHttpClient client = new OkHttpClient();

4
src/main/java/com/bbn/hadder/listener/LinkListener.java
View file

@ -25,8 +25,8 @@ public class LinkListener extends ListenerAdapter {
public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent event) { public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent event) {
event.getChannel().retrieveMessageById(event.getMessageId()).queue( event.getChannel().retrieveMessageById(event.getMessageId()).queue(
msg -> { 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 requestguild = msg.getEmbeds().get(0).getTitle().replaceAll("\\) wants to link guilds!", "");
String requestguildid = null; String requestguildid = null;
for (int i = requestguild.length() - 1; i >= 0; i--) { for (int i = requestguild.length() - 1; i >= 0; i--) {
@ -55,11 +55,11 @@ public class LinkListener extends ListenerAdapter {
event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue(); event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue();
} }
} }
}
} else { } else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
} }
} }
}
); );
} }