Brought back the funny in today

colorfulFlames · Feb 5, 2023 · 056ca3d · 056ca3d
1 parent dc60ce8
commit 056ca3d
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 0 deletions.
diff --git a/.gradle/7.2/executionHistory/executionHistory.bin b/.gradle/7.2/executionHistory/executionHistory.bin
diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock
diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin
diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock
diff --git a/.gradle/7.2/fileHashes/resourceHashesCache.bin b/.gradle/7.2/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/src/main/java/com/severalcircles/flames/conversations/Conversation.java b/src/main/java/com/severalcircles/flames/conversations/Conversation.java
@@ -11,6 +11,7 @@
 import com.severalcircles.flames.data.user.FlamesUser;
 import com.severalcircles.flames.data.user.consent.ConsentException;
 import com.severalcircles.flames.external.analysis.FinishedAnalysis;
+import com.severalcircles.flames.frontend.today.Today;
 import net.dv8tion.jda.api.entities.Message;
 //import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 //import net.dv8tion.jda.api.entitiesGuildMessageChannel;
@@ -122,6 +123,9 @@ public void processMessage(Message message, FinishedAnalysis finishedAnalysis) t
                 if (user.getScore() > user.getFunFacts().getHighestFlamesScore()) user.getFunFacts().setHighestFlamesScore(user.getScore());
                 GlobalData.globalScore += score;
                 GlobalData.averageScore = GlobalData.globalScore / GlobalData.participants;
+                if (user.getScore() > Today.highScore) {
+                    Today.highUser = message.getAuthor().getName() + " (" + user.getScore() + ")";
+                }
             }
             conversationCache.put(element.getId(), user);
         });

diff --git a/src/main/java/com/severalcircles/flames/frontend/today/ResetTodayRunnable.java b/src/main/java/com/severalcircles/flames/frontend/today/ResetTodayRunnable.java
@@ -26,6 +26,7 @@ public void run() {
         Today.quoteChanges = 0;
         Today.quoteLocked = false;
         Today.thanks = new LinkedList<>();
+        Today.highUser = "Nobody yet!";
         Date now = new Date();
         thanksgiving.set(2021, Calendar.NOVEMBER, 25);
         System.out.println(Calendar.getInstance().toInstant().truncatedTo(ChronoUnit.DAYS).compareTo(thanksgiving.toInstant().truncatedTo(ChronoUnit.DAYS)));

diff --git a/src/main/java/com/severalcircles/flames/frontend/today/TodayEmbed.java b/src/main/java/com/severalcircles/flames/frontend/today/TodayEmbed.java
@@ -48,6 +48,7 @@ public MessageEmbed get() {
                 .setTitle(title)
                 .addField(resources.getString("talkingAbout"), trendingEntity, true)
                 .addField(resources.getString("feeling"), Emotion.getEmotionString(Today.emotion, flamesUser.getConfig().getLocale()), true)
+                .addField(resources.getString("highUser"), Today.highUser, true)
                 .addBlankField(false)
                 .addField("\"" + Today.quote[0] + "\"", "- " + Today.quote[1] + ", " + StringUtil.prettifyDate(Instant.now()), false)
                 .addBlankField(false)

diff --git a/src/main/resources/features/TodayEmbed.properties b/src/main/resources/features/TodayEmbed.properties
@@ -4,6 +4,7 @@
 allAbout=...and that's what today is all about.
 author=Today, %s
 feeling=We're feeling
+highUser=The highest scoring user is
 talkingAbout=We're talking about
 title=Today,
 title.thanksgiving=Today, it's Thanksgiving, and

diff --git a/src/main/resources/features/TodayEmbed_en.properties b/src/main/resources/features/TodayEmbed_en.properties
@@ -4,6 +4,7 @@
 allAbout=...and that's what today is all about.
 author=Today, %s
 feeling=We're feeling
+highUser=The highest scoring user is
 talkingAbout=We're talking about
 title=Today,
 title.thanksgiving=Today, it's Thanksgiving, and

diff --git a/src/main/resources/features/TodayEmbed_es.properties b/src/main/resources/features/TodayEmbed_es.properties
@@ -4,6 +4,7 @@
 allAbout=...y de eso se trata hoy.
 author=Today, %s
 feeling=Estamos sentimiento
+highUser=El/la usuario/a con la puntaje mas alta es
 talkingAbout=Estamos hablando de
 title=Hoy mismo,
 title.thanksgiving=Hoy mismo, es la Día de acción de gracias, e

diff --git a/src/main/resources/features/TodayEmbed_tra.properties b/src/main/resources/features/TodayEmbed_tra.properties
@@ -5,6 +5,7 @@
 allAbout=... And THAT'S Egactly how everything is now -
 author=TODAY , HUNDREDS OF %S
 feeling=What awaits in
+highUser=Caa-caa-caa-caa -
 talkingAbout=We talk
 title=now
 title.thanksgiving=T?d?~`??? , bn? ? s?n? ? th?n?#?cs?g6? ?`???, &