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

Merge pull request #92 from BigBotNetwork/greg-dev

Browse source 
Greg dev
This commit is contained in:
Skidder 2019-11-22 22:24:04 +01:00 • committed by GitHub
commit 3dc1306106
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
View file

@ -6,7 +6,6 @@ package com.bbn.hadder.commands.fun;
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.core.Config;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;

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

@ -42,7 +42,28 @@ public class RoleCommand implements Command {
break; break;
case "remove": 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; break;
} }
} else { } else {
@ -70,6 +91,6 @@ public class RoleCommand implements Command {
@Override @Override
public String usage() { public String usage() {
return "<@role> <@user>"; return "add/remove <@role> <@user>";
} }
} }

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

@ -20,7 +20,11 @@ public class RulesListener extends ListenerAdapter {
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()))) {
if (!event.getMember().getUser().isBot()) { if (!event.getMember().getUser().isBot()) {
if (event.getReactionEmote().equals("✅")) {
event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).queue(); event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).queue();
} else if (event.getReactionEmote().equals("❌")) {
event.getMember().kick().reason("Declined the rules").queue();
}
} }
} }
} }

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

@ -143,7 +143,7 @@ public class BotList {
try { try {
new OkHttpClient().newCall(discordextremelist).execute().close(); 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) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }