Update icons

gowon-bot · Feb 24, 2024 · 8ae73e5 · 8ae73e5
1 parent 3d4e9a3
commit 8ae73e5
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 30 deletions.
diff --git a/src/lib/emoji/Emoji.ts b/src/lib/emoji/Emoji.ts
@@ -1,5 +1,5 @@
 import { icons } from "./icons";
-import { nativeEmojis } from "./nativeEmojis";
+import { NativeEmoji } from "./nativeEmojis";
 
 const extractionRegex = /<a?:\w+:([0-9]+)>/i;
 const nameExtractionRegex = /<a?(:\w+:)[0-9]+>/i;
@@ -17,8 +17,8 @@ export function extractEmojiName(emoji: string): string {
 }
 
 export const Emoji = {
+  ...NativeEmoji,
   ...icons,
-  ...nativeEmojis,
 
   spotify: "<:spotify:757100448548126720>",
   lastfm: "<:lastfm:879259073143517224>",
@@ -54,17 +54,6 @@ export const Emoji = {
   usesIndexedDataLink: "<:uses_indexed_data2:1056204845683581048>",
   usesIndexedDataTitle: "<:uses_indexed_data3:1056207688696086581>",
 
-  // RYM Stars
-  fullStar: "<:fullStar:843763033858899968>",
-  halfStar: "<:halfStar:843763307994284032>",
-  emptyStar: "<:emptyStar:843763307428315148>",
-
-  // Utlity reactions
-  arrowLeft: "<:arrowleft:825600908594905107>",
-  arrowRight: "<:arrowRight:825626338534490162>",
-  arrowFirst: "<:arrowFirst:825626330648412180>",
-  arrowLast: "<:arrowLast:825626334436917248>",
-
   // Roles
   contentmoderator: "<:contentmoderator:913203995542175794>",
   alphatester: "<:gowonheart:771235114277535764>",

diff --git a/src/lib/emoji/icons.ts b/src/lib/emoji/icons.ts
@@ -1,23 +1,40 @@
 export const icons = {
   // Commmand icons
-  runsInDMs: "<:runs_in_DMs:1116262516520124436>",
-  doesNotRunInDMs: "<:does_not_run_in_DMs:1116262511428259881>",
-  requiresAdmin: "<:requires_admin:1116285314332364930>",
-  doesNotRequireAdmin: "<:does_not_require_admin:1116285311513800786>",
-  slashCommand: "<:slash_command:1116262522085965824>",
-  notASlashCommand: "<:not_a_slash_command:1116262520156590090>",
+  runsInDMs: "<:runs_in_DMs:1197111557918826506>",
+  doesNotRunInDMs: "<:doesnt_run_in_DMs:1197111554550796308>",
+  requiresAdmin: "<:requires_admin:1197111556736032828>",
+  doesNotRequireAdmin: "<:doesnt_require_admin:1197111555632926760>",
+  slashCommand: "<:slash_command:1197111552613031996>",
+  notASlashCommand: "<:not_a_slash_command:1197111560297005066>",
 
   // Fishy icons
-  fishypediaMainTab: "<:main:1130055372367990886>",
-  fishypediaTraitsTab: "<:traits:1130059610607325195>",
+  fishypediaMainTab: "<:main:1197111530332885042>",
+  fishypediaTraitsTab: "<:traits:1197111528743252008>",
 
   // Utility icons
-
   help: "<:help:1206473330740297739>",
   error: "<:error:1206473332418023454>",
   warning: "<:warning:1206473333412208661>",
   info: "<:info:1206473334519365664>",
 
-  checkmark: "<:checkmark:1206487809137967145>",
+  checkmark: "<:checkmark:1211091352943591524>",
   x: "<:x_:1206487810337407036>",
+
+  // RYM Stars
+  fullStar: "<:fullStar:1197111483830632488>",
+  halfStar: "<:halfStar:1197111481637023825>",
+  emptyStar: "<:emptyStar:1197111482689802281>",
+
+  // Utlity reactions
+  arrowFirst: "<:first:1197111484967292928>",
+  arrowLeft: "<:previous:1197111409302065162>",
+  arrowLast: "<:next:1197111479883812895>",
+  arrowRight: "<:last:1197111411055263764>",
+
+  // Native emoji overrides
+  fire: "<:fire:1197111444542595162>",
+  chart: "<:chart:1197111406793850900>",
+  tada: "<:tada:1197111408052158504>",
+  confettiBall: "<:confettiBall:1197111405762052146>",
+  crown: "<:crown:1197111412162580562>",
 } as const satisfies Record<string, string>;
diff --git a/src/lib/emoji/nativeEmojis.ts b/src/lib/emoji/nativeEmojis.ts
@@ -1,9 +1,6 @@
-export const nativeEmojis = {
+export const NativeEmoji = {
   fire: "🔥",
-  chart: "💹",
   sparkles: "✨",
-  tada: "🎉",
-  confettiBall: "🎊",
   crown: "👑",
   eyes: "👀",
   wave: "👋",

diff --git a/src/lib/nowplaying/components/ArtistCrownComponent.ts b/src/lib/nowplaying/components/ArtistCrownComponent.ts
@@ -1,5 +1,6 @@
 import { DiscordService } from "../../../services/Discord/DiscordService";
 import { ServiceRegistry } from "../../../services/ServicesRegistry";
+import { NativeEmoji } from "../../emoji/nativeEmojis";
 import { displayNumber } from "../../ui/displays";
 import { BaseNowPlayingComponent } from "../base/BaseNowPlayingComponent";
 
@@ -25,7 +26,7 @@ export class ArtistCrownComponent extends BaseNowPlayingComponent<
 
       if (userInServer) {
         return {
-          string: `👑 ${displayNumber(crown.crown.plays)} (${
+          string: `${NativeEmoji.crown} ${displayNumber(crown.crown.plays)} (${
             crown.user!.username
           })`,
           size: 1,

diff --git a/src/lib/nowplaying/components/hidden/ComboComponent.ts b/src/lib/nowplaying/components/hidden/ComboComponent.ts
@@ -1,4 +1,4 @@
-import { Emoji } from "../../../emoji/Emoji";
+import { NativeEmoji } from "../../../emoji/nativeEmojis";
 import { displayNumber } from "../../../ui/displays";
 import { BaseNowPlayingComponent } from "../../base/BaseNowPlayingComponent";
 
@@ -16,7 +16,7 @@ export class ComboComponent extends BaseNowPlayingComponent<
     if (this.values.combo) {
       return {
         string: `${displayNumber(this.values.combo.artist.plays)} in a row ${
-          this.values.combo.artist.plays > 100 ? Emoji.fire : ""
+          this.values.combo.artist.plays > 100 ? NativeEmoji.fire : ""
         }`,
         size: 1,
         placeAfter: ["artist-plays"],