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

Invite Detector and code improvements #131

Merged
greg6775 merged 7 commits from greg-dev into master 2019-12-02 13:59:24 +01:00
Conversation 0 Commits 7 Files changed 17 +18 -14
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d53068dd50 - Show all commits

6
src/main/java/com/bbn/hadder/commands/misc/EqualsCommand.java → src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java
View file

@ -1,10 +1,14 @@
package com.bbn.hadder.commands.misc; package com.bbn.hadder.commands.general;
import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.EventWaiter; import com.bbn.hadder.utils.EventWaiter;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
/*
* @author Skidder / GregTCLTK
*/
public class EqualsCommand implements Command { public class EqualsCommand implements Command {
@Override @Override

2
src/main/java/com/bbn/hadder/commands/general/HelpCommand.java
View file

@ -47,7 +47,7 @@ public class HelpCommand implements Command {
} else { } else {
for (Command cmd : event.getCommandHandler().getCommandList()) { for (Command cmd : event.getCommandHandler().getCommandList()) {
for (String label : cmd.labels()) { for (String label : cmd.labels()) {
if (label.toLowerCase().equals(args[0])) { if (label.equalsIgnoreCase(args[0])) {
sendHelp(cmd, event.getRethink(), event.getAuthor(), event.getTextChannel()); sendHelp(cmd, event.getRethink(), event.getAuthor(), event.getTextChannel());
} }
} }

6
src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java → src/main/java/com/bbn/hadder/commands/general/InviteCommand.java
View file

@ -1,4 +1,4 @@
package com.bbn.hadder.commands.misc; package com.bbn.hadder.commands.general;
/* /*
* @author Skidder / GregTCLTK * @author Skidder / GregTCLTK
@ -9,6 +9,10 @@ import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
/*
* @author Skidder / GregTCLTK
*/
public class InviteCommand implements Command { public class InviteCommand implements Command {
@Override @Override

18
src/main/java/com/bbn/hadder/listener/RulesListener.java
View file

@ -19,24 +19,20 @@ public class RulesListener extends ListenerAdapter {
@Override @Override
public void onMessageReactionAdd(MessageReactionAddEvent event) { public void onMessageReactionAdd(MessageReactionAddEvent event) {
if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId()))) { if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) {
if (!event.getMember().getUser().isBot()) { if (event.getReactionEmote().getEmoji().equals("✅")) {
if (event.getReactionEmote().getEmoji().equals("✅")) { event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); } else if (event.getReactionEmote().getEmoji().equals("❌") && event.getGuild().getSelfMember().canInteract(event.getMember())) {
} else if (event.getReactionEmote().getEmoji().equals("❌") && event.getGuild().getSelfMember().canInteract(event.getMember())) { event.getReaction().removeReaction().queue();
event.getReaction().removeReaction().queue(); event.getMember().kick().reason("Declined the rules");
event.getMember().kick().reason("Declined the rules");
}
} }
} }
} }
@Override @Override
public void onMessageReactionRemove(MessageReactionRemoveEvent event) { public void onMessageReactionRemove(MessageReactionRemoveEvent event) {
if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId()))) { if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot() && event.getReactionEmote().getEmoji().equals("✅")) {
if (!event.getMember().getUser().isBot() && event.getReactionEmote().getEmoji().equals("✅")) {
event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue(); event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue();
}
} }
} }
} }