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

Merge pull request #179 from BigBotNetwork/hax-dev

Browse source 
Hax dev
This commit is contained in:
Skidder 2019-12-08 21:36:37 +01:00 • committed by GitHub
commit a4fee6f27a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
View file

@ -74,8 +74,10 @@ public class RulesCommand implements Command {
Role role = event.getMessage().getMentionedRoles().get(0); Role role = event.getMessage().getMentionedRoles().get(0);
setRole(event, channel, message, event3, role); setRole(event, channel, message, event3, role);
} else { } else {
Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0); if (event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).size()>0) {
setRole(event, channel, message, event3, role); Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0);
setRole(event, channel, message, event3, role);
} // TODO
} }
}, event.getJDA(), event.getAuthor()); }, event.getJDA(), event.getAuthor());
}, event.getJDA(), event.getAuthor()); }, event.getJDA(), event.getAuthor());

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

@ -29,8 +29,15 @@ public class RulesListener extends ListenerAdapter {
event.getMember().kick().reason("Declined the rules"); event.getMember().kick().reason("Declined the rules");
} }
} }
} else { } else if (event.getReactionEmote().isEmoji()) {
if (event.getReactionEmote().getEmoji().equals(rethink.getRulesAEmote(event.getGuild().getId()))) {
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(rethink.getRulesDEmote(event.getGuild().getId()))) {
event.getReaction().removeReaction(event.getUser()).queue();
if (event.getGuild().getSelfMember().canInteract(event.getMember())) {
event.getMember().kick().reason("Declined the rules");
}
}
} }
} }
} }