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

fix shutdown db saving (fr this time) and fixed embed color parsing
All checks were successful
Deploy to Dokku / docker (ubuntu-latest) (push) Successful in 40s
Details

Browse Source
This commit is contained in:
Lee
2024-07-04 02:47:36 +01:00
parent 96486bb3a1
commit 040846ef0a
4 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cc/fascinated/bat/features/welcomer/WelcomerEmbed.java
View File

@ -1,5 +1,6 @@
package cc.fascinated.bat.features.welcomer;
import cc.fascinated.bat.common.HexColorUtils;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NonNull;
@ -44,7 +45,7 @@ public class WelcomerEmbed {
embedBuilder.setTitle(WelcomerPlaceholders.replaceAllPlaceholders(title, replacements));
}
embedBuilder.setDescription(WelcomerPlaceholders.replaceAllPlaceholders(description, replacements));
embedBuilder.setColor(Integer.parseInt(color, 16));
embedBuilder.setColor(HexColorUtils.hexToColor(color));
return embedBuilder;
}
}

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

@ -5,6 +5,7 @@ import cc.fascinated.bat.command.BatSubCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.EmbedDescriptionBuilder;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.HexColorUtils;
import cc.fascinated.bat.features.welcomer.WelcomerProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
@ -46,13 +47,13 @@ public class EmbedSubCommand extends BatSubCommand {
String color = colorOption.getAsString();
boolean pingBeforeSend = pingBeforeSendOption.getAsBoolean();
// Remove # if the user added it
color = color.replace("#", "");
// Add the # if it's not there
color = !color.startsWith("#") ? "#" + color : color;
// Validate the input
if (color.length() != 6 || Color.decode("#" + color).getRGB() == -1){
if (!HexColorUtils.isHexColor(color)){
event.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("The color must be a valid hex color code\n" +
.setDescription("The color must be a valid hex color code Example: `#3498DB`\n" +
"You can use this website to get a hex color code: https://htmlcolorcodes.com")
.build()).queue();
return;
@ -84,7 +85,7 @@ public class EmbedSubCommand extends BatSubCommand {
successDescription.appendLine("Title: `%s`".formatted(title), true);
}
successDescription.appendLine("Description: `%s`".formatted(description), true);
successDescription.appendLine("Color: `#%s`".formatted(color), true);
successDescription.appendLine("Color: `%s`".formatted(color), true);
successDescription.appendLine("Ping Before Send: %s".formatted(pingBeforeSend ? Emojis.CHECK_MARK_EMOJI.getFormatted() + " *(Preview won't ping you)*" : Emojis.CROSS_MARK_EMOJI), true);
successDescription.emptyLine();
successDescription.appendLine("**Preview Below:**", false);