Merge pull request #176 from iminlikewithyou/highlighter-themes

Add highlighter themes
omg · Jul 28, 2024 · dd408db · dd408db
2 parents f8589f3 + 38b0b01
commit dd408db
Show file tree

Hide file tree

Showing 24 changed files with 1,659 additions and 398 deletions.
diff --git a/assets/emoji-maps/highlighters/default/highlighted.ts b/assets/emoji-maps/highlighters/default/highlighted.ts
diff --git a/assets/emoji-maps/highlighters/default/present.ts b/assets/emoji-maps/highlighters/default/present.ts
diff --git a/assets/emoji-maps/highlighters/default/wildcard.ts b/assets/emoji-maps/highlighters/default/wildcard.ts
diff --git a/assets/emoji-maps/highlighters/vivi/highlighted.ts b/assets/emoji-maps/highlighters/vivi/highlighted.ts
diff --git a/assets/emoji-maps/highlighters/vivi/present.ts b/assets/emoji-maps/highlighters/vivi/present.ts
diff --git a/assets/emoji-maps/highlighters/vivi/wildcard.ts b/assets/emoji-maps/highlighters/vivi/wildcard.ts
diff --git a/lame-bot/src/word-bomb-mini.ts b/lame-bot/src/word-bomb-mini.ts
@@ -24,8 +24,8 @@ import {
   solverCache
 } from "../../src/dictionary/dictionary";
 import { getRemarkEmoji, getStreakNumbers } from "../../src/emoji-renderer";
+import { DefaultHighlighter, Highlighter } from "../../src/highlighting/Highlighter";
 import { escapeRegExp, getPromptRegexDisplayText, getPromptRepeatableText } from "../../src/regex";
-import { Highlighters } from "../../src/themes/highlighter";
 import { createEnglishList, escapeDiscordMarkdown, formatNumber, formatPercentage, formatPlacement, getCleanName } from "../../src/utils";
 import { getChannel, getGuild, lameBotClient, sendMessage, sendMessageAsReply } from "./client";
 
@@ -128,7 +128,7 @@ async function startRound() {
     replyMessage,
     (
       getRemarkEmoji("bomb") + " **Quick!** Type a word containing:" +
-      "\n\n" + getPromptRegexDisplayText(prompt, Highlighters.Default) + " ***｡✲ﾟ** (" + formatNumber(solutions) + (solutions === 1 ? " solution)" : " solutions)") +
+      "\n\n" + getPromptRegexDisplayText(prompt, DefaultHighlighter) + " ***｡✲ﾟ** (" + formatNumber(solutions) + (solutions === 1 ? " solution)" : " solutions)") +
       (lengthRequired ? "\n\n• Must be **" + promptWord.length + "** characters!" : "")
     )
   );
@@ -610,6 +610,11 @@ async function endRound() {
     });
   };
 
+  let highlighter: Highlighter;
+  const retrieveHighlighterTheme = async () => {
+    highlighter = await Highlighter.fromServerInteraction(winnerUser);
+  };
+
   let startTime2 = Date.now();
 
   await Promise.all([
@@ -622,6 +627,7 @@ async function endRound() {
     ),
     lateRemarks(),
     roundRemarks(),
+    retrieveHighlighterTheme()
   ]);
 
   console.log("Remarks completed in " + (Date.now() - startTime2) + "ms");
@@ -636,7 +642,7 @@ async function endRound() {
     )} <@${winnerUser}> solved it! ${getRemarkEmoji("solvedIt")}**\n\n` +
       getRemarkEmoji("roundEnded") +
       " **Round ended!**\n" +
-      Highlighters.Default.highlight(winnerSolution, prompt) +
+      highlighter.highlight(winnerSolution, prompt) +
       "\n" +
       getRemarkText()
   );

diff --git a/src/database/db.ts b/src/database/db.ts
@@ -73,6 +73,11 @@ export async function getCash(user) {
   return profile.cash || 0;
 }
 
+export async function getHighlighterTheme(user) {
+  let profile = await getProfile(user);
+  return profile.highlighterTheme || "Default";
+}
+
 export async function spendCash(user, amount) {
   if (amount < 0) return false;
   let profile = await getProfile(user);