thmsdy/Biscuit
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

bug fixes, Reaction Toggle Role, Booster Exclusive roles

Browse Source
This commit is contained in:
Ghoti
2020-06-22 01:40:07 -05:00
parent f05582baaf
commit fa5c9371f1
17 changed files with 317 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/fpghoti/biscuit/commands/client/NotSpammerCommand.java
View File

@@ -29,7 +29,7 @@ public class NotSpammerCommand extends ClientCommand{
for(Member m : event.getMessage().getMentionedMembers()){
User u = m.getUser();
String s = u.getAsMention();
if(event.getChannel().getName().equals("public-spam-test") || (PermUtil.isMod(event.getMember()) || PermUtil.canMute(event.getMember()))) {
if(event.getChannel().getName().equals("public-spam-test") || (PermUtil.isMod(event.getMember()))) {
SpamRecords.spammers.remove(u);
event.getTextChannel().sendMessage(s+ " is no longer flagged as spam.").queue();
}

2
src/main/java/com/fpghoti/biscuit/commands/client/SoftMuteCommand.java
View File

@@ -29,7 +29,7 @@ public class SoftMuteCommand extends ClientCommand{
for(Member m : event.getMessage().getMentionedMembers()){
User u = m.getUser();
String s = u.getAsMention();
if(event.getChannel().getName().equals("public-softmute-test") || (PermUtil.isMod(event.getMember()) || PermUtil.canMute(event.getMember()))) {
if(event.getChannel().getName().equals("public-softmute-test") || (PermUtil.isMod(event.getMember()))) {
SpamRecords.softmute.add(u);
u.openPrivateChannel().queue();
event.getTextChannel().sendMessage(s+ " is now soft-muted. They will now be only able to send one message every two minutes.").queue();

42
src/main/java/com/fpghoti/biscuit/commands/client/ToggleRoleCommand.java
View File

@@ -12,35 +12,35 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
public class ToggleRoleCommand extends ClientCommand{
public ToggleRoleCommand() {
name = "ToggleRole";
description = "Toggles specified role on/off";
usage = PropertiesRetrieval.getCommandSignifier() + "togglerole <role>";
minArgs = 1;
maxArgs = 1;
identifiers.add("togglerole");
identifiers.add("tr");
}
public ToggleRoleCommand() {
name = "ToggleRole";
description = "Toggles specified role on/off";
usage = PropertiesRetrieval.getCommandSignifier() + "togglerole <role>";
minArgs = 1;
maxArgs = 1;
identifiers.add("togglerole");
identifiers.add("tr");
}
@Override
public void execute(String[] args, MessageReceivedEvent event) {
Biscuit b = Main.getBiscuit();
if(!event.getAuthor().isBot()) {
b.log(event.getAuthor().getName() + " issued a command: -togglerole " + args[0]);
String rolename = "";
for(String s : PropertiesRetrieval.getToggleRoles()) {
if(s.equalsIgnoreCase(args[0])) {
rolename = s;
}
}
if(rolename.equals("")) {
event.getTextChannel().sendMessage("Sorry! This role either cannot be toggled or does not exist!").queue();
return;
}
Role role = null;
for(Role r : event.getGuild().getRoles()) {
if(r.getName().toLowerCase().equalsIgnoreCase(rolename)) {
@@ -51,7 +51,7 @@ public class ToggleRoleCommand extends ClientCommand{
b.error("Cannot find role!");
return;
}
Emote done = null;
for(Emote e : event.getGuild().getEmotes()) {
if(e.getName().contains(PropertiesRetrieval.getDoneEmote())) {
@@ -65,7 +65,17 @@ public class ToggleRoleCommand extends ClientCommand{
if(PermUtil.hasRole(event.getMember(), role)){
event.getGuild().removeRoleFromMember(event.getMember(),role).queue();
}else {
event.getGuild().addRoleToMember(event.getMember(), role).queue();
boolean canAdd = false;
if(PermUtil.isBoosterExclusive(role)) {
if(PermUtil.isBooster(event.getMember())) {
canAdd = true;
}
}else {
canAdd = true;
}
if(canAdd) {
event.getGuild().addRoleToMember(event.getMember(), role).queue();
}
}
event.getMessage().addReaction(done).queue();
}

22
src/main/java/com/fpghoti/biscuit/commands/client/UIDCommand.java
View File

@@ -12,14 +12,14 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
public class UIDCommand extends ClientCommand{
public UIDCommand() {
name = "User ID";
description = "Retrieves a user's ID.";
usage = PropertiesRetrieval.getCommandSignifier() + "uid @<mention-user>";
minArgs = 1;
maxArgs = 1;
identifiers.add("uid");
}
public UIDCommand() {
name = "User ID";
description = "Retrieves a user's ID.";
usage = PropertiesRetrieval.getCommandSignifier() + "uid @<mention-user>";
minArgs = 1;
maxArgs = 1;
identifiers.add("uid");
}
@Override
public void execute(String[] args, MessageReceivedEvent event) {
@@ -27,9 +27,9 @@ public class UIDCommand extends ClientCommand{
b.log(event.getAuthor().getName() + " issued a command: -uid " + args[0]);
for(Member m : event.getMessage().getMentionedMembers()){
User u = m.getUser();
String s = u.getAsMention();
if(PermUtil.isMod(event.getMember()) || PermUtil.canMute(event.getMember()))
event.getTextChannel().sendMessage("DEBUG: " + s+ " retrieved.").queue();
if(PermUtil.isMod(event.getMember())) {
event.getTextChannel().sendMessage(u.getId()).queue();
}
}
}

2
src/main/java/com/fpghoti/biscuit/commands/client/UnSoftMuteCommand.java
View File

@@ -29,7 +29,7 @@ public class UnSoftMuteCommand extends ClientCommand{
for(Member m : event.getMessage().getMentionedMembers()){
User u = m.getUser();
String s = u.getAsMention();
if(event.getChannel().getName().equals("public-softmute-test") || (PermUtil.isMod(event.getMember()) || PermUtil.canMute(event.getMember()))) {
if(event.getChannel().getName().equals("public-softmute-test") || (PermUtil.isMod(event.getMember()))) {
SpamRecords.softmute.remove(u);
event.getTextChannel().sendMessage(s+ " is no longer soft-muted.").queue();
}