fix(leaderboard): make it less ugly

dev-737 · dev-737 · commit 78e47328f3d1 · 2025-02-23T11:47:43.000+05:30
diff --git a/src/commands/Information/about.ts b/src/commands/Information/about.ts
@@ -101,7 +101,7 @@ export default class About extends BaseCommand {
 
     const usernames = await this.getUsernames(interaction.client);
     const creditsDivider = `${getEmoji('blueLine', interaction.client).repeat(9)} **CREDITS** ${getEmoji('blueLine', interaction.client).repeat(9)}`;
-    const dotBlue = getEmoji('dotBlue', interaction.client);
+    const dotBlue = getEmoji('dot', interaction.client);
 
     const creditsEmbed = new InfoEmbed()
       .setDescription(
diff --git a/src/commands/Information/rank.ts b/src/commands/Information/rank.ts
@@ -160,7 +160,7 @@ export default class RankCommand extends BaseCommand {
 
     // Level
     ctx.font = RankCommand.FONTS.LEVEL;
-    ctx.fillStyle = Constants.Colors.interchatBlue;
+    ctx.fillStyle = Constants.Colors.interchat;
     ctx.fillText(`Level ${stats.level}`, textX, avatarY + 80);
 
     // Rank
diff --git a/src/commands/Information/rules.ts b/src/commands/Information/rules.ts
@@ -36,7 +36,7 @@ export default class Rules extends BaseCommand {
     const rulesEmbed = new EmbedBuilder()
       .setDescription(t('rules.rules', locale, { rules_emoji: ctx.getEmoji('rules_icon') }))
       .setImage(Constants.Links.RulesBanner)
-      .setColor(Constants.Colors.interchatBlue);
+      .setColor(Constants.Colors.interchat);
 
     await ctx.reply({ embeds: [rulesEmbed] });
   }
diff --git a/src/commands/Information/stats.ts b/src/commands/Information/stats.ts
@@ -64,7 +64,7 @@ export default class Stats extends BaseCommand {
     const memoryUsed = memoryUsedRaw.reduce((p, n) => p + (n ?? 0), 0);
 
     const embed = new EmbedBuilder()
-      .setColor(Constants.Colors.interchatBlue)
+      .setColor(Constants.Colors.interchat)
       .setDescription(`### ${ctx.getEmoji('fire_icon')} InterChat Statistics`)
       .setFooter({
         text: `InterChat v${ctx.client.version}${Constants.isDevBuild ? '+dev' : ''}`,
diff --git a/src/commands/Main/connection/list.ts b/src/commands/Main/connection/list.ts
@@ -110,7 +110,7 @@ export default class ConnectionListSubcommand extends BaseCommand {
 
   private getEmbed(fields: EmbedField[], description: string) {
     return new EmbedBuilder()
-      .setColor(Constants.Colors.interchatBlue)
+      .setColor(Constants.Colors.interchat)
       .setDescription(description)
       .addFields(fields);
   }
diff --git a/src/commands/Main/hub/edit.ts b/src/commands/Main/hub/edit.ts
@@ -512,11 +512,11 @@ export default class HubEditSubcommand extends BaseCommand {
       where: { hubId: hub.id, status: 'ACTIVE' },
     });
 
-    const dotBlueEmoji = getEmoji('dotBlue', client);
+    const dotBlueEmoji = getEmoji('dot', client);
 
     return new EmbedBuilder()
       .setTitle(hub.name)
-      .setColor(Constants.Colors.interchatBlue)
+      .setColor(Constants.Colors.interchat)
       .setDescription(
         stripIndents`
           ${hub.description}
diff --git a/src/commands/Main/hub/servers.ts b/src/commands/Main/hub/servers.ts
@@ -75,7 +75,7 @@ export default class HubServersSubcommand extends BaseCommand {
       .setTitle(
         `${server?.name ?? 'Unknown Server'} \`(${connection.data.serverId})\``,
       )
-      .setColor(Constants.Colors.interchatBlue)
+      .setColor(Constants.Colors.interchat)
       .setDescription(
         t('hub.servers.connectionInfo', locale, {
           serverId: connection.data.serverId,
@@ -223,7 +223,7 @@ export default class HubServersSubcommand extends BaseCommand {
                 total: `${totalConnections}`,
               }),
             )
-            .setColor(Constants.Colors.interchatBlue)
+            .setColor(Constants.Colors.interchat)
             .setFields(fields),
         ],
       });
diff --git a/src/commands/Main/messageInfo.ts b/src/commands/Main/messageInfo.ts
@@ -113,7 +113,7 @@ export default class MessageInfo extends BaseCommand {
         { name: 'Sent At', value: time(new Date(originalMsg.timestamp), 't'), inline: true },
       ])
       .setThumbnail(author.displayAvatarURL())
-      .setColor(Constants.Colors.interchatBlue);
+      .setColor(Constants.Colors.interchat);
 
     const connection = (await hub.connections.fetch())?.find(
       (c) => c.data.connected && c.data.serverId === originalMsg.guildId,
@@ -259,7 +259,7 @@ export default class MessageInfo extends BaseCommand {
       ])
       .setThumbnail(iconUrl)
       .setImage(bannerUrL)
-      .setColor(Constants.Colors.interchatBlue);
+      .setColor(Constants.Colors.interchat);
 
     // disable the server info button
     greyOutButton(components[0], 1);
diff --git a/src/commands/Support/support/server.ts b/src/commands/Support/support/server.ts
@@ -32,7 +32,7 @@ export default class SupportServer extends BaseCommand {
     const embed = new EmbedBuilder()
       .setTitle('InterChat Central')
       .setDescription(`[Click Here](${Constants.Links.SupportInvite}) to join the support server.`)
-      .setColor(Constants.Colors.interchatBlue)
+      .setColor(Constants.Colors.interchat)
       .setTimestamp();
     await ctx.reply({ embeds: [embed] });
   }
diff --git a/src/events/guildCreate.ts b/src/events/guildCreate.ts
@@ -50,7 +50,7 @@ export default class Ready extends BaseEventListener<'guildCreate'> {
         🌟 If you liked InterChat, consider [donating](${Constants.Links.Donate}) to support the project!
       `,
       )
-      .setColor(Constants.Colors.interchatBlue)
+      .setColor(Constants.Colors.interchat)
       .setFooter({
         text: `Sent for server: ${guild.name}`,
         iconURL: guild.iconURL() ?? undefined,
diff --git a/src/interactions/RulesScreening.ts b/src/interactions/RulesScreening.ts
@@ -131,7 +131,7 @@ export default class RulesScreeningInteraction {
         }),
       )
       .setImage(Constants.Links.RulesBanner)
-      .setColor(Constants.Colors.interchatBlue);
+      .setColor(Constants.Colors.interchat);
 
     const components = new ActionRowBuilder<ButtonBuilder>().addComponents(
       new ButtonBuilder()
diff --git a/src/managers/BlacklistManager.ts b/src/managers/BlacklistManager.ts
@@ -143,7 +143,7 @@ export default class BlacklistManager {
       type = 'User';
     }
 
-    const dotBlueEmoji = getEmoji('dotBlue', client);
+    const dotBlueEmoji = getEmoji('dot', client);
     const embed = new EmbedBuilder()
       .setAuthor({ name: `${type} ${name} blacklisted`, iconURL })
       .setDescription(
@@ -161,7 +161,7 @@ export default class BlacklistManager {
           inline: true,
         },
       )
-      .setColor(Constants.Colors.interchatBlue)
+      .setColor(Constants.Colors.interchat)
       .setFooter({
         text: `Blacklisted by: ${mod.username}`,
         iconURL: mod.displayAvatarURL(),
diff --git a/src/managers/HubSettingsManager.ts b/src/managers/HubSettingsManager.ts
@@ -79,7 +79,7 @@ export default class HubSettingsManager {
   getEmbed(client: Client): EmbedBuilder {
     const embed = new InfoEmbed()
       .setTitle('Hub Settings')
-      .setColor(Constants.Colors.interchatBlue)
+      .setColor(Constants.Colors.interchat)
       .setDescription('Current settings for this hub:');
 
     for (const [key, value] of Object.entries(this.getAll())) {
diff --git a/src/utils/Constants.ts b/src/utils/Constants.ts
@@ -119,7 +119,7 @@ export default {
       'NotQuiteBlack',
       'Random',
     ] as (keyof typeof Colors)[],
-    interchatBlue: '#9172D8' as HexColorString,
+    interchat: '#9172D8' as HexColorString,
     invisible: '#2b2d31' as HexColorString,
     christmas: ['#00B32C', '#D6001C', '#FFFFFF'] as HexColorString[],
   },
diff --git a/src/utils/EmbedUtils.ts b/src/utils/EmbedUtils.ts
@@ -31,7 +31,7 @@ import Constants from '#utils/Constants.js';
 export class InfoEmbed extends EmbedBuilder {
   constructor(data?: EmbedData | APIEmbed) {
     super({
-      color: resolveColor(Constants.Colors.interchatBlue),
+      color: resolveColor(Constants.Colors.interchat),
       ...data,
     });
   }
diff --git a/src/utils/GuildUtils.ts b/src/utils/GuildUtils.ts
@@ -91,7 +91,7 @@ export const logGuildJoin = async (guild: Guild) => {
       context: {
         inviteLogs: Constants.Channels.inviteLogs,
         logsEmbed: buildLogsEmbed(guild, guildOwner.username, totalGuilds, {
-          color: Constants.Colors.interchatBlue,
+          color: Constants.Colors.interchat,
           title: '✨ Invited to New Server',
         }).toJSON(),
       },
@@ -118,7 +118,7 @@ export const logGuildLeave = async (guild: Guild) => {
       context: {
         inviteLogs: Constants.Channels.inviteLogs,
         logsEmbed: buildLogsEmbed(guild, guildOwner.username, totalGuilds, {
-          color: Constants.Colors.interchatBlue,
+          color: Constants.Colors.interchat,
           title: '👢 Kicked from server',
         }).toJSON(),
       },
diff --git a/src/utils/ImageUtils.ts b/src/utils/ImageUtils.ts
@@ -60,7 +60,7 @@ export const drawRankProgressBar = (
   height: number,
   progress: number,
   backgroundColor = '#484b4e',
-  progressColor = Constants.Colors.interchatBlue,
+  progressColor = Constants.Colors.interchat,
 ): void => {
   // Draw background
   ctx.fillStyle = backgroundColor;
diff --git a/src/utils/JSON/emojis.json b/src/utils/JSON/emojis.json
@@ -75,9 +75,9 @@
     "url": "https://cdn.discordapp.com/emojis/1321726664492847104.png",
     "updatedAt": "2024-12-26T06:29:53.309Z"
   },
-  "dotBlue": {
-    "url": "https://cdn.discordapp.com/emojis/1321726667927982141.png",
-    "updatedAt": "2024-12-26T06:29:54.128Z"
+  "dot": {
+    "url": "https://cdn.discordapp.com/emojis/1343102394728185887.png",
+    "updatedAt": "2025-02-23T06:09:24.539Z"
   },
   "forward": {
     "url": "https://cdn.discordapp.com/emojis/1321726671044476980.png",
diff --git a/src/utils/Leaderboard.ts b/src/utils/Leaderboard.ts
@@ -1,4 +1,5 @@
 import db from '#src/utils/Db.js';
+import { getEmoji } from '#src/utils/EmojiUtils.js';
 import getRedis from '#src/utils/Redis.js';
 import { Client } from 'discord.js';
 
@@ -54,7 +55,6 @@ export async function getLeaderboard(type: 'user' | 'server', limit = 10): Promi
   return results;
 }
 
-
 /**
  * Retrieves the leaderboard rank for a given user.
  * Redis' zrevrank returns a 0-indexed rank, so we add 1.
@@ -70,11 +70,12 @@ export async function getUserLeaderboardRank(userId: string): Promise<number | n
  * Returns the display value for a given rank.
  * Adds medal icons for the top three ranks.
  */
-function getRankDisplay(rank: number): string {
+function getRankDisplay(rank: number, dotEmoji: string): string {
   if (rank === 1) return '🥇';
   if (rank === 2) return '🥈';
   if (rank === 3) return '🥉';
-  return rank.toString();
+  // use purple emoji for rest
+  return `${dotEmoji} ${rank}`;
 }
 
 /**
@@ -85,9 +86,7 @@ export async function formatUserLeaderboard(
   client: Client,
 ): Promise<string> {
   // Build header
-  let output = '#  | User               | Messages\n';
-  output += '---|--------------------|---------\n';
-
+  let output = '';
   // Iterate through pairs: [userId, score, ...]
   for (let i = 0; i < leaderboardData.length; i += 2) {
     const rank = i / 2 + 1;
@@ -98,18 +97,14 @@ export async function formatUserLeaderboard(
       username: 'Unknown',
     }));
 
-    // Limit the username length for table formatting.
-    const username =
-      user.username.length > 18 ? `${user.username.slice(0, 15)}...` : user.username;
-
     // Use the helper function to get the rank display value.
-    const rankDisplay = getRankDisplay(rank);
+    const rankDisplay = getRankDisplay(rank, getEmoji('dot', client));
 
     // Pad each column for alignment.
-    output += `${rankDisplay.padEnd(2)} | ${username.padEnd(18)} | ${score.toString().padEnd(7)}\n`;
+    output += `${rankDisplay} ${`\` ${score} msgs \``} ${user.username}\n`;
   }
 
-  return `\`\`\`css\n${output}\`\`\``;
+  return output;
 }
 
 /**
@@ -121,9 +116,7 @@ export async function formatServerLeaderboard(
   client: Client,
 ): Promise<string> {
   // Build header with adjusted column widths
-  let output = '#  | Server               | Msg | Invite\n';
-  output += '---|----------------------|-----|---------------\n';
-
+  let output = '';
   const inviteLinks = await db.serverData.findMany({
     where: { id: { in: leaderboardData.filter((_, i) => i % 2 === 0) } },
     select: { id: true, inviteCode: true },
@@ -138,21 +131,18 @@ export async function formatServerLeaderboard(
     const guild = (await client.fetchGuild(serverId).catch(() => null)) ?? { name: 'Unknown' };
 
     // Limit the server name length for table formatting.
-    const serverName =
-    guild.name.length > 20 ? `${guild.name.slice(0, 17)}...` : guild.name;
-    const serverData = inviteLinks.find(
-      (link) => link.id === serverId && Boolean(link.inviteCode),
-    );
+    const serverName = guild.name.length > 20 ? `${guild.name.slice(0, 17)}...` : guild.name;
+    const serverData = inviteLinks.find((link) => link.id === serverId && Boolean(link.inviteCode));
     const inviteCode =
       serverData?.inviteCode ?? ('vanityURLCode' in guild ? guild.vanityURLCode : null);
-    const invite = inviteCode ? `.gg/${inviteCode}` : 'N/A';
+    const invite = inviteCode ? `([join](https://discord.gg/${inviteCode}))` : '';
 
     // Use the helper function to get the rank display value.
-    const rankDisplay = getRankDisplay(rank);
+    const rankDisplay = getRankDisplay(rank, getEmoji('dot', client));
 
     // Pad each column for alignment.
-    output += `${rankDisplay.padEnd(2)} | ${serverName.padEnd(20)} | ${score.toString().padEnd(3)} | ${invite.padEnd(15)}\n`;
+    output += `${rankDisplay} \` ${score.toString()} \` - ${serverName} ${invite}\n`;
   }
 
-  return `\`\`\`css\n${output}\`\`\``;
+  return output;
 }
diff --git a/src/utils/hub/logger/JoinLeave.ts b/src/utils/hub/logger/JoinLeave.ts
@@ -31,7 +31,7 @@ export const logJoinToHub = async (
   const logManager = await HubLogManager.create(hubId);
   if (!logManager.config.joinLeaves) return;
 
-  const dotBlueEmoji = getEmoji('dotBlue', server.client);
+  const dotBlueEmoji = getEmoji('dot', server.client);
   const owner = await server.fetchOwner();
   const embed = new EmbedBuilder()
     .setTitle('New Server Joined')
@@ -42,7 +42,7 @@ export const logJoinToHub = async (
         ${dotBlueEmoji} **Member Count:** ${server.memberCount}
       `,
     )
-    .setColor(Constants.Colors.interchatBlue)
+    .setColor(Constants.Colors.interchat)
     .setThumbnail(server.iconURL())
     .setFooter({
       text: `We have ${opt?.totalConnections} server(s) connected to ${opt?.hubName} now!`,
diff --git a/src/utils/hub/logger/ModLogs.ts b/src/utils/hub/logger/ModLogs.ts
@@ -41,9 +41,9 @@ const getUnblacklistEmbed = (
     .setAuthor({ name: `${type} ${opts.name} unblacklisted` })
     .setDescription(
       stripIndents`
-      ${getEmoji('dotBlue', client)} **${type}:** ${opts.name} (${opts.id})
-      ${getEmoji('dotBlue', client)} **Moderator:** ${opts.mod.username} (${opts.mod.id})
-      ${getEmoji('dotBlue', client)} **Hub:** ${opts.hubName}
+      ${getEmoji('dot', client)} **${type}:** ${opts.name} (${opts.id})
+      ${getEmoji('dot', client)} **Moderator:** ${opts.mod.username} (${opts.mod.id})
+      ${getEmoji('dot', client)} **Hub:** ${opts.hubName}
     `,
     )
     .addFields(
@@ -58,7 +58,7 @@ const getUnblacklistEmbed = (
         inline: true,
       },
     )
-    .setColor(Constants.Colors.interchatBlue)
+    .setColor(Constants.Colors.interchat)
     .setFooter({
       text: `Unblacklisted by: ${opts.mod.username}`,
       iconURL: opts.mod instanceof User ? opts.mod.displayAvatarURL() : undefined,
diff --git a/src/utils/moderation/blacklistUtils.ts b/src/utils/moderation/blacklistUtils.ts
@@ -69,7 +69,7 @@ export const buildBlacklistNotifEmbed = (
     .setDescription(
       `${targetStr} been blacklisted from talking in hub **${opts.hubName}**.`,
     )
-    .setColor(Constants.Colors.interchatBlue)
+    .setColor(Constants.Colors.interchat)
     .setFields(
       {
         name: 'Reason',

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ export default class Rules extends BaseCommand {`
`36`	`36`	`const rulesEmbed = new EmbedBuilder()`
`37`	`37`	`.setDescription(t('rules.rules', locale, { rules_emoji: ctx.getEmoji('rules_icon') }))`
`38`	`38`	`.setImage(Constants.Links.RulesBanner)`
`39`		`- .setColor(Constants.Colors.interchatBlue);`
	`39`	`+ .setColor(Constants.Colors.interchat);`
`40`	`40`
`41`	`41`	`await ctx.reply({ embeds: [rulesEmbed] });`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ export default class ConnectionListSubcommand extends BaseCommand {`
`110`	`110`
`111`	`111`	`private getEmbed(fields: EmbedField[], description: string) {`
`112`	`112`	`return new EmbedBuilder()`
`113`		`- .setColor(Constants.Colors.interchatBlue)`
	`113`	`+ .setColor(Constants.Colors.interchat)`
`114`	`114`	`.setDescription(description)`
`115`	`115`	`.addFields(fields);`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export default class SupportServer extends BaseCommand {`
`32`	`32`	`const embed = new EmbedBuilder()`
`33`	`33`	`.setTitle('InterChat Central')`
`34`	`34`	.setDescription(`[Click Here](${Constants.Links.SupportInvite}) to join the support server.`)
`35`		`- .setColor(Constants.Colors.interchatBlue)`
	`35`	`+ .setColor(Constants.Colors.interchat)`
`36`	`36`	`.setTimestamp();`
`37`	`37`	`await ctx.reply({ embeds: [embed] });`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ export default class Ready extends BaseEventListener<'guildCreate'> {`
`50`	`50`	`🌟 If you liked InterChat, consider [donating](${Constants.Links.Donate}) to support the project!`
`51`	`51`	`,
`52`	`52`	`)`
`53`		`- .setColor(Constants.Colors.interchatBlue)`
	`53`	`+ .setColor(Constants.Colors.interchat)`
`54`	`54`	`.setFooter({`
`55`	`55`	text: `Sent for server: ${guild.name}`,
`56`	`56`	`iconURL: guild.iconURL() ?? undefined,`