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

Greg dev #92

Merged
greg6775 merged 2 commits from greg-dev into master 2019-11-22 22:24:05 +01:00
Conversation 0 Commits 2 Files changed 4 +24 -3
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 68303f1d9e - Show all commits

25
src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
View file

@ -42,7 +42,28 @@ public class RoleCommand implements Command {
break;
case "remove":
event.getTextChannel().sendMessage("SOON").queue();
if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() > 0) {
for (Member member : event.getMessage().getMentionedMembers()) {
for (Role role : event.getMessage().getMentionedRoles()) {
if (event.getGuild().getSelfMember().canInteract(member)) {
if (event.getGuild().getSelfMember().canInteract(role)) {
event.getGuild().removeRoleFromMember(member, role).reason("Role removed by " + event.getAuthor().getAsTag()).queue();
} else {
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue();
}
} else {
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue();
}
}
}
EmbedBuilder builder = new EmbedBuilder();
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder)
.setTitle("✅ Successfully removed role(s) ✅")
.setDescription("I successfully removed " + event.getMessage().getMentionedRoles().size() + " roles from " + event.getMessage().getMentionedMembers().size() + " members.")
.build()).queue();
}
break;
}
} else {
@ -70,6 +91,6 @@ public class RoleCommand implements Command {
@Override
public String usage() {
return "<@role> <@user>";
return "add/remove <@role> <@user>";
}
}

2
src/main/java/com/bbn/hadder/utils/BotList.java
View file

@ -143,7 +143,7 @@ public class BotList {
try {
new OkHttpClient().newCall(discordextremelist).execute().close();
System.out.println("Successfully posted count to the Discord Extreme List!");
System.out.println("Successfully posted count for the Discord Extreme List!");
} catch (IOException e) {
e.printStackTrace();
}