Merge pull request #36 from colorfulFlames/feature/stringutils

Added score format function
colorfulFlames · Oct 14, 2021 · b388fb6 · b388fb6
2 parents 7a71a85 + 67cfee5
commit b388fb6
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 15 deletions.
diff --git a/src/main/java/com/severalcircles/flames/buttonaction/data/FunFactsButtonAction.java b/src/main/java/com/severalcircles/flames/buttonaction/data/FunFactsButtonAction.java
@@ -5,7 +5,7 @@
 import com.severalcircles.flames.data.base.FlamesDataManager;
 import com.severalcircles.flames.data.user.FlamesUser;
 import com.severalcircles.flames.data.user.UserFunFacts;
-import com.severalcircles.flames.features.FlamesPrettyDate;
+import com.severalcircles.flames.features.StringUtils;
 import com.severalcircles.flames.features.rank.Ranking;
 import com.severalcircles.flames.system.Flames;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -80,8 +80,8 @@ public void execute(ButtonClickEvent event, FlamesUser user) throws IOException
                 .setAuthor("User Data: Fun Facts")
                 .setTitle(event.getUser().getName())
                 .setDescription("French Toast Score: " + funFacts.getFrenchToastMentioned() + "")
-                .addField("Best Day Ever", FlamesPrettyDate.prettifyDate(funFacts.getHappyDay()),true)
-                .addField("Worst Day Ever", (FlamesPrettyDate.prettifyDate(funFacts.getSadDay())), true)
+                .addField("Best Day Ever", StringUtils.prettifyDate(funFacts.getHappyDay()),true)
+                .addField("Worst Day Ever", (StringUtils.prettifyDate(funFacts.getSadDay())), true)
                 .addField("Highest Ever Flames Score", funFacts.getHighestFlamesScore() + " (" + rank + ")", true)
                 .addField("Lowest Ever Flames Score", funFacts.getLowestFlamesScore() + "", true)
                 .setTimestamp(Instant.now())

diff --git a/src/main/java/com/severalcircles/flames/command/DebugCommand.java b/src/main/java/com/severalcircles/flames/command/DebugCommand.java
@@ -3,7 +3,7 @@
 import com.severalcircles.flames.data.global.GlobalData;
 import com.severalcircles.flames.data.user.FlamesUser;
 import com.severalcircles.flames.events.ButtonEvent;
-import com.severalcircles.flames.features.FlamesPrettyDate;
+import com.severalcircles.flames.features.StringUtils;
 import com.severalcircles.flames.system.Flames;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
@@ -29,7 +29,7 @@ public void execute(SlashCommandEvent event, FlamesUser sender) {
                 .addField("Number of Participants", String.valueOf(GlobalData.participants), true)
                 .addField("Guilds", String.valueOf(Flames.api.getGuilds().size()), true)
                 .addField("Status", Flames.api.getStatus().name(), true)
-                .addField("Created", FlamesPrettyDate.prettifyDate(Flames.api.getSelfUser().getTimeCreated().toInstant()), true)
+                .addField("Created", StringUtils.prettifyDate(Flames.api.getSelfUser().getTimeCreated().toInstant()), true)
                 .setTimestamp(Instant.now())
                 .setFooter("Flames", Flames.api.getSelfUser().getAvatarUrl()).build();
         event.replyEmbeds(builder).complete();

diff --git a/src/main/java/com/severalcircles/flames/command/data/GlobalDataCommand.java b/src/main/java/com/severalcircles/flames/command/data/GlobalDataCommand.java
@@ -3,6 +3,7 @@
 import com.severalcircles.flames.command.FlamesCommand;
 import com.severalcircles.flames.data.global.GlobalData;
 import com.severalcircles.flames.data.user.FlamesUser;
+import com.severalcircles.flames.features.StringUtils;
 import com.severalcircles.flames.features.external.severalcircles.FlamesAssets;
 import com.severalcircles.flames.system.Flames;
 //import discord4j.core.event.domain.message.MessageCreateEvent;
@@ -30,8 +31,8 @@ public void execute(SlashCommandEvent event, FlamesUser sender) {
                 .setAuthor(resources.getString("author"), null, user.getAvatarUrl())
                 .setTitle(Flames.api.getSelfUser().getName())
 //                .setUrl("https://en.wikipedia.org/wiki/" + trending.replace(" ", "_"))
-                .addField(resources.getString("totalScore"), GlobalData.globalScore + "", true)
-                .addField(resources.getString("averageScore"), GlobalData.averageScore + "", true)
+                .addField(resources.getString("totalScore"), StringUtils.formatScore(GlobalData.globalScore) + " FP", true)
+                .addField(resources.getString("averageScore"), StringUtils.formatScore(GlobalData.averageScore) + " FP", true)
 //                .addField(resources.getString("trendingTopic"), trending, true)
                 .setTimestamp(Instant.now())
                 .setThumbnail(FlamesAssets.globalDataUrl)

diff --git a/src/main/java/com/severalcircles/flames/command/data/HiCommand.java b/src/main/java/com/severalcircles/flames/command/data/HiCommand.java
@@ -4,6 +4,7 @@
 import com.severalcircles.flames.data.base.FlamesDataManager;
 import com.severalcircles.flames.data.global.GlobalData;
 import com.severalcircles.flames.data.user.FlamesUser;
+import com.severalcircles.flames.features.StringUtils;
 import com.severalcircles.flames.features.external.severalcircles.FlamesAssets;
 import com.severalcircles.flames.system.Flames;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -55,7 +56,7 @@ public void execute(SlashCommandEvent event, FlamesUser flamesUser) {
                     .setImage(FlamesAssets.welcomeBackUrl)
                     .addField("Daily Bonus", "" + dailyBonus, true)
                     .setColor(Color.ORANGE)
-                    .addField("Your Flames Score", "" + flamesUser.getScore() + " FP", true)
+                    .addField("Your Flames Score", "" + StringUtils.formatScore(flamesUser.getScore()) + " FP", true)
                     .setTimestamp(Instant.now()).build();
             event.replyEmbeds(embed).queue();
             flamesUser.setLastSeen(Instant.now());

diff --git a/src/main/java/com/severalcircles/flames/command/data/MyDataCommand.java b/src/main/java/com/severalcircles/flames/command/data/MyDataCommand.java
@@ -3,6 +3,7 @@
 import com.severalcircles.flames.api.FlamesAPI;
 import com.severalcircles.flames.command.FlamesCommand;
 import com.severalcircles.flames.data.user.FlamesUser;
+import com.severalcircles.flames.features.StringUtils;
 import com.severalcircles.flames.features.external.severalcircles.FlamesAssets;
 import com.severalcircles.flames.features.rank.Ranking;
 import com.severalcircles.flames.system.Flames;
@@ -84,7 +85,7 @@ public void execute(SlashCommandEvent event, FlamesUser sender) {
                 .setAuthor(resources.getString("author"), null, user.getAvatarUrl())
                 .setTitle(String.format(resources.getString("title"), user.getName()), FlamesAPI.getUserDataLink(user))
                 .setDescription(String.format(resources.getString("description"), sender.getStats().getLevel()))
-                .addField(resources.getString("flamesScore"), sender.getScore() + "", true)
+                .addField(resources.getString("flamesScore"), StringUtils.formatScore(sender.getScore()) + " FP", true)
                 .addField(resources.getString("rank"), rank, true)
                 .addField(resources.getString("toNext"), Ranking.toNext(sender.getScore()) + "", true)
                 .addField(resources.getString("emotion"), emotionString, true)

diff --git a/src/main/java/com/severalcircles/flames/command/data/TodayCommand.java b/src/main/java/com/severalcircles/flames/command/data/TodayCommand.java
@@ -7,7 +7,7 @@
 import com.severalcircles.flames.command.FlamesCommand;
 import com.severalcircles.flames.data.user.FlamesUser;
 import com.severalcircles.flames.features.Analysis;
-import com.severalcircles.flames.features.FlamesPrettyDate;
+import com.severalcircles.flames.features.StringUtils;
 import com.severalcircles.flames.features.today.Today;
 import com.severalcircles.flames.system.Flames;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -43,14 +43,14 @@ public void execute(SlashCommandEvent event, FlamesUser sender) {
         else if (emotion > -50) emotionString = "A little sad";
         else emotionString = "Pretty upset";
         MessageEmbed today = new EmbedBuilder()
-                .setAuthor("Today for " + day + ", " + FlamesPrettyDate.prettifyDate(now),null,  event.getUser().getAvatarUrl())
+                .setAuthor("Today for " + day + ", " + StringUtils.prettifyDate(now),null,  event.getUser().getAvatarUrl())
                 .setTitle("Today...")
                 .addField("We're talking about", trendingEntity, true)
                 .addBlankField(true)
                 .addField("We're feeling", emotionString + " (" + emotion + ")", true)
                 .addField("The highest scoring user is", Today.highUser + " (" + Today.highScore + ")", true)
                 .addBlankField(false)
-                .addField("\"" + Today.quote[0] + "\"", " - " + Today.quote[1] + ", " + FlamesPrettyDate.prettifyDate(now), false)
+                .addField("\"" + Today.quote[0] + "\"", " - " + Today.quote[1] + ", " + StringUtils.prettifyDate(now), false)
                 .addBlankField(false)
                 .addField("...and that's what today is all about.", "What will tomorrow bring?", true)
                 .setColor(Color.GREEN.darker())

diff --git a/src/main/java/com/severalcircles/flames/events/MessageEvent.java b/src/main/java/com/severalcircles/flames/events/MessageEvent.java
@@ -12,7 +12,7 @@
 import com.severalcircles.flames.data.user.UserFunFacts;
 import com.severalcircles.flames.features.Analysis;
 import com.severalcircles.flames.features.BadWordFilter;
-import com.severalcircles.flames.features.FlamesPrettyDate;
+import com.severalcircles.flames.features.StringUtils;
 import com.severalcircles.flames.features.today.Today;
 import com.severalcircles.flames.system.Flames;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -80,7 +80,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
             MessageEmbed congrats = new EmbedBuilder()
                     .setAuthor("Flames", null, event.getAuthor().getAvatarUrl())
                     .setTitle(event.getAuthor().getName() + ", congratulations on being selected for the quote of the day!")
-                    .addField("\"" + content + "\"", "- " + event.getAuthor().getName() + ", " + FlamesPrettyDate.prettifyDate(Instant.now()), true)
+                    .addField("\"" + content + "\"", "- " + event.getAuthor().getName() + ", " + StringUtils.prettifyDate(Instant.now()), true)
                     .setFooter("/today to see it for yourself!", Flames.api.getSelfUser().getAvatarUrl())
                     .setColor(Color.CYAN.darker())
                     .build();

diff --git a/...les/flames/features/FlamesPrettyDate.java → ...lcircles/flames/features/StringUtils.java b/...les/flames/features/FlamesPrettyDate.java → ...lcircles/flames/features/StringUtils.java
@@ -1,10 +1,11 @@
 package com.severalcircles.flames.features;
 
+import java.text.DecimalFormat;
 import java.time.Instant;
 import java.util.Date;
 
 @SuppressWarnings("deprecation")
-public class FlamesPrettyDate {
+public class StringUtils {
     /**
      * @return String with Instant formatted as a nice, human-readable date string.
      */
@@ -50,4 +51,8 @@ public static String prettifyDate(Instant instant) {
         prettyDate += Date.from(instant).getDate() + ", " + (Date.from(instant).getYear()+1900);
         return prettyDate;
     }
+    public static String formatScore(int score) {
+        DecimalFormat df = new DecimalFormat("### ### ###");
+        return df.format(score);
+    }
 }