fix: fix sticker url not being used properly (#228)

Author: dev-737

.github/workflows/release.yml

@@ -1,9 +1,5 @@
 name: Release
 on:
-  push:
-    tags:
-      - 'v*'
-
   workflow_dispatch:
     inputs:
       logLevel:

bun.lockb

@@ -25,7 +25,7 @@
   "dependencies": {
     "@prisma/client": "^6.1.0",
     "@sentry/bun": "^8.47.0",
-    "canvas": "^3.0.1",
+    "canvas": "^3.0.0-rc3",
     "common-tags": "^1.8.2",
     "discord-hybrid-sharding": "^2.2.3",
     "discord.js": "^14.17.2",

package.json

@@ -67,7 +67,10 @@ export default class RankCommand extends BaseCommand {
 
     try {
       const targetUser = interaction.options.getUser('user') ?? interaction.user;
-      const stats = await interaction.client.userLevels.getStats(targetUser.id);
+      const stats = await interaction.client.userLevels.getStats(
+        targetUser.id,
+        targetUser.username,
+      );
       const rankCard = await this.createRankCard(targetUser, stats);
 
       await interaction.editReply({ files: [rankCard] });

src/commands/slash/Main/rank.ts

@@ -60,11 +60,11 @@ export default class InterChatClient extends Client {
         ApplicationCommandManager: 0,
         BaseGuildEmojiManager: 0,
         StageInstanceManager: 0,
-        GuildStickerManager: 0,
         ThreadMemberManager: 0,
         GuildInviteManager: 0,
         GuildEmojiManager: 0,
         GuildBanManager: 0,
+        DMMessageManager: 0,
       }),
       sweepers: {
         messages: {

src/core/BaseClient.ts

@@ -53,8 +53,8 @@ export class BroadcastService {
     hub: HubManager,
     hubConnections: ConnectionManager[],
     connection: ConnectionManager,
+    attachmentURL: string | undefined,
   ) {
-    const attachmentURL = await this.resolveAttachmentURL(message);
     const username = this.getUsername(hub.settings, message);
     const censoredContent = censor(message.content);
     const referredMessage = await this.fetchReferredMessage(message);

src/services/BroadcastService.ts

@@ -43,13 +43,13 @@ export class LevelingService {
     this.updateUserCooldown(userId);
   }
 
-  public async getStats(userId: string): Promise<
+  public async getStats(userId: string, username: string): Promise<
     UserData & {
       stats: UserStats;
       requiredXP: number;
     }
   > {
-    const user = await this.getOrCreateUser(userId);
+    const user = await this.getOrCreateUser(userId, username);
     const stats = await this.calculateUserStats(user);
 
     return {
@@ -78,7 +78,7 @@ export class LevelingService {
   }
 
   private async processMessageXP(message: Message<true>): Promise<void> {
-    const user = await this.getOrCreateUser(message.author.id);
+    const user = await this.getOrCreateUser(message.author.id, message.author.username);
     const earnedXP = this.generateXP();
     const { newLevel, totalXP } = this.calculateXPAndLevel(user, earnedXP);
 
@@ -140,10 +140,10 @@ export class LevelingService {
     // });
   }
 
-  private async getOrCreateUser(userId: string): Promise<UserData> {
+  private async getOrCreateUser(userId: string, username: string): Promise<UserData> {
     const user = await this.userService.getUser(userId);
 
-    return user ?? (await this.userService.createUser({ id: userId }));
+    return user ?? (await this.userService.createUser({ id: userId, username }));
   }
 
   private async calculateUserStats(user: UserData): Promise<UserStats> {

src/services/LevelingService.ts

@@ -50,6 +50,12 @@ export class MessageProcessor {
     const { passed } = await checkBlockedWords(message, await hub.fetchBlockWords());
     if (!passed) return;
 
-    await this.broadcastService.broadcastMessage(message, hub, hubConnections, connection);
+    await this.broadcastService.broadcastMessage(
+      message,
+      hub,
+      hubConnections,
+      connection,
+      attachmentURL,
+    );
   }
 }

src/services/MessageProcessor.ts

@@ -15,7 +15,6 @@ export class CompactMessageFormatter implements MessageFormatterStrategy {
       referred: opts.referredContent,
       censored: opts.censoredContent,
     };
-
     const { referredAuthor } = opts.referredMsgData;
 
     // check if the person being replied to explicitly allowed mentionOnReply setting for themself
@@ -41,7 +40,11 @@ export class CompactMessageFormatter implements MessageFormatterStrategy {
     // compact mode doesn't need new attachment url for tenor and direct image links
     // we can just slap them right in the content without any problems
     // [] has an empty char in between its not magic kthxbye
-    const attachmentURL = message.attachments.size > 0 ? `\n[⁥](${opts.attachmentURL})` : '';
+    const attachmentURL =
+      message.attachments.size > 0 || message.stickers.size > 0
+        ? `\n[⁥](${opts.attachmentURL})`
+        : '';
+
     const messageContent = `${connection.profFilter ? contents.censored : contents.normal} ${attachmentURL}`;
 
     return {

src/services/formatters/CompactMsgFormatter.ts

@@ -1,2 +1 @@
-export const calculateRequiredXP = (level: number): number =>
-  Math.floor(100 * Math.pow(level, 2));
+export const calculateRequiredXP = (level: number): number => 50 * Math.pow(level, 2) + 25 * level; // arcane formula