misc/chomens-bot-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: only add s to unit when amount > 1 (for *info uptime)

Browse Source
This commit is contained in:
ChomeNS
2025-02-17 15:28:46 +07:00
parent 8b5e706769
commit 859b599af9
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/me/chayapak1/chomens_bot/commands/InfoCommand.java
View File

@@ -6,6 +6,7 @@ import me.chayapak1.chomens_bot.command.CommandContext;
import me.chayapak1.chomens_bot.command.CommandException;
import me.chayapak1.chomens_bot.command.TrustLevel;
import me.chayapak1.chomens_bot.util.ColorUtilities;
import me.chayapak1.chomens_bot.util.StringUtilities;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.event.HoverEvent;
@@ -236,11 +237,15 @@ public class InfoCommand extends Command {
return Component.translatable(
"The bots uptime is: %s",
Component.translatable(
"%s days, %s hours, %s minutes, %s seconds",
"%s %s, %s %s, %s %s, %s %s",
Component.text(days),
Component.text(StringUtilities.addPluralS(days, "day")),
Component.text(hours),
Component.text(StringUtilities.addPluralS(hours, "hour")),
Component.text(minutes),
Component.text(seconds)
Component.text(StringUtilities.addPluralS(minutes, "minute")),
Component.text(seconds),
Component.text(StringUtilities.addPluralS(seconds, "second"))
).color(NamedTextColor.GREEN)
).color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor));
}

4
src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java
View File

@@ -56,6 +56,10 @@ public class StringUtilities {
return false;
}
public static String addPluralS (long amount, String unit) {
return amount > 1 ? unit + "s" : unit;
}
public static boolean isNotNullAndNotBlank (String text) {
return text != null && !text.isBlank();
}