Fascinated/Bat
1
1
Fork 2
Code Issues 1 Pull Requests Actions Activity

Compare commits

base: Fascinated:642185f8c5db94d4a315c0dcd1d62da5f71975a7
Branches Tags
Fascinated:master Fascinated:new-commands
..
compare: Fascinated:2b4980fb10f35c0bbe13cebd3fe0a92350ec8a6b
Branches Tags
Fascinated:master Fascinated:new-commands

2 Commits
642185f8c5 ... 2b4980fb10

Author SHA1 Message Date
Liam
2b4980fb10 change auto role log to include the guild
All checks were successful
Deploy to Dokku / docker (ubuntu-latest) (push) Successful in 39s
Details
2024-07-03 22:18:51 +01:00
Liam
655662c6f8 fix embed color 2024-07-03 22:18:35 +01:00
2 changed files with 9 additions and 3 deletions
Show Stats Expand all files Collapse all files

8
src/main/java/cc/fascinated/bat/features/autorole/AutoRoleListener.java
View File

@ -49,7 +49,11 @@ public class AutoRoleListener implements EventListener {
event.getGuild().addRoleToMember(event.getMember(), role).queue(); event.getGuild().addRoleToMember(event.getMember(), role).queue();
} }
toRemove.forEach(profile::removeRole); toRemove.forEach(profile::removeRole);
log.info("Gave user \"{}\" {} auto roles{}", user.getId(), profile.getRoles().size(), toRemove.isEmpty() ? "" log.info("Gave user \"{}\" {} auto roles in guild \"{}\"{}",
: " and removed %s invalid roles".formatted(toRemove.size())); user.getId(),
profile.getRoles().size(),
guild.getName(),
toRemove.isEmpty() ? "" : " and removed %s invalid roles from the profile".formatted(toRemove.size())
);
} }
} }

4
src/main/java/cc/fascinated/bat/features/welcomer/command/EmbedSubCommand.java
View File

@ -46,6 +46,9 @@ public class EmbedSubCommand extends BatSubCommand {
String color = colorOption.getAsString(); String color = colorOption.getAsString();
boolean pingBeforeSend = pingBeforeSendOption.getAsBoolean(); boolean pingBeforeSend = pingBeforeSendOption.getAsBoolean();
// Remove # if the user added it
color = color.replace("#", "");
// Validate the input // Validate the input
if (color.length() != 6 || Color.decode("#" + color).getRGB() == -1){ if (color.length() != 6 || Color.decode("#" + color).getRGB() == -1){
event.replyEmbeds(EmbedUtils.errorEmbed() event.replyEmbeds(EmbedUtils.errorEmbed()
@ -67,7 +70,6 @@ public class EmbedSubCommand extends BatSubCommand {
return; return;
} }
color = color.replace("#", ""); // Remove # if the user added it
boolean isMessageEnabled = profile.isMessage(); boolean isMessageEnabled = profile.isMessage();
profile.setEmbed(title, description, color, pingBeforeSend); profile.setEmbed(title, description, color, pingBeforeSend);
EmbedDescriptionBuilder successDescription = new EmbedDescriptionBuilder("Welcomer Embed") EmbedDescriptionBuilder successDescription = new EmbedDescriptionBuilder("Welcomer Embed")