Fixed leaderboard message error (#31). Fixed XPDrops XP adding to user. Fixed small voiceXP issue. Minor Bug fixes. bump version.

xyzjesper · xyzjesper · commit 370f01f35eb7 · 2026-02-08T14:56:30.000+01:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "disbot",
   "main": "./.build/startup.js",
-  "version": "v.1.6.5",
+  "version": "v.1.6.5.1",
   "scripts": {
     "disbot": "npx prisma migrate deploy && node ./.build/src/main/startup.js",
     "disbotdev": "bun run build && node ./.build/src/main/startup.js",
diff --git a/src/helper/ticketHelper.ts b/src/helper/ticketHelper.ts
@@ -295,7 +295,7 @@ export async function ticketHelper(
         })
 
         if (!messageData) {
-            const ticketTemplateMessage = await fetch("https://cdn.xyzhub.link/raw/VqvWD9.json?download=true")
+            const ticketTemplateMessage = await fetch("https://cdn.xyzify.ing/raw/VqvWD9.json?download=true")
             const ticketTemplateMessageData = await ticketTemplateMessage.json()
 
             messageData = {
diff --git a/src/main/placeholder.ts b/src/main/placeholder.ts
@@ -11,15 +11,15 @@ export const IMAGE_PLACEHOLDER = {
     "{twitch.vod}": "https://twitch.tv/vod.png",
     "{youtube.thumbnail}": "https://youtube.com/thumbnail.png",
     "{member.avatar}": "https://i.imgur.com/kjEQRRI.png",
-    "{user.avatar}": "https://cdn.xyzhub.link/u/TbZSAH.png",
-    "{spotify.episode.image}": "https://cdn.xyzhub.link/u/nM7pNI.png",
-    "{spotify.author.image}": "https://cdn.xyzhub.link/u/HsqWSk.png",
+    "{user.avatar}": "https://cdn.xyzify.ing/u/TbZSAH.png",
+    "{spotify.episode.image}": "https://cdn.xyzify.ing/u/nM7pNI.png",
+    "{spotify.author.image}": "https://cdn.xyzify.ing/u/HsqWSk.png",
     "{polls.image}": "https://i.imgur.com/FHBicGA.png",
-    "{welcome.image}": "https://cdn.xyzhub.link/u/e3IChB.png",
-    "{level.rankCard}": "https://cdn.xyzhub.link/u/uFmQ8z.png",
-    "{level.leaderboard.leaderboardImageHorizontal}": "https://cdn.xyzhub.link/u/dtKeTY.png",
-    "{level.leaderboard.leaderboardImageDefault}": "https://cdn.xyzhub.link/u/aLvYLD.png",
-    "{inviter.avatar}": "https://cdn.xyzhub.link/u/7cU4sY.png",
+    "{welcome.image}": "https://cdn.xyzify.ing/u/e3IChB.png",
+    "{level.rankCard}": "https://cdn.xyzify.ing/u/uFmQ8z.png",
+    "{level.leaderboard.leaderboardImageHorizontal}": "https://cdn.xyzify.ing/u/dtKeTY.png",
+    "{level.leaderboard.leaderboardImageDefault}": "https://cdn.xyzify.ing/u/aLvYLD.png",
+    "{inviter.avatar}": "https://cdn.xyzify.ing/u/7cU4sY.png",
 };
 
 export const TIMESTAMP_PLACEHOLDER = {
@@ -36,7 +36,7 @@ const STATIC_PLACEHOLDERS: Record<string, string> = {
 // TODO: This will be used for new Modules!
 export function replacePlaceholders(template: string, data: Record<string, any>): string {
 
-    let fullPlaceholder = template;
+    let fullPlaceholder = template.replace(/cdn\.xyzhub\.link/i, "cdn.xyzify.ing");
 
     for (const [key, value] of Object.entries(STATIC_PLACEHOLDERS)) {
         if (fullPlaceholder.includes(value)) {
diff --git a/src/modules/leave/events/guildMemberLeave.ts b/src/modules/leave/events/guildMemberLeave.ts
@@ -88,7 +88,7 @@ export default {
                     outlineColor: data.ImageData?.Gradient?.split(",")[0] ?? "#fff"
                 },
                 card: {
-                    background: data.ImageData?.Background ?? "https://cdn.xyzhub.link/u/czdZgx.png",
+                    background: data.ImageData?.Background ?? "https://cdn.xyzify.ing/u/czdZgx.png",
                     blur: 1,
                     border: true,
                     rounded: true
@@ -99,7 +99,7 @@ export default {
         const withImagePlaceholder = {
             ...replacements,
             leave: {
-                image: cdnUrl ?? "https://cdn.xyzhub.link/u/ixBzIX.png",
+                image: cdnUrl ?? "https://cdn.xyzify.ing/u/ixBzIX.png",
             },
         }
 
diff --git a/src/modules/level/buttons/level-drop-claim.ts b/src/modules/level/buttons/level-drop-claim.ts
@@ -112,7 +112,7 @@ export default {
                 ClaimedXPDrops: {
                     push: data.UUID
                 },
-                XP: userData.XP + xpRange
+                XP: (parseInt(userData.XP) + xpRange).toString()
             }
         })
         return await sendDefaultMessage(`-# Claimed XP Drop successfully!`, interaction, true, "reply")
diff --git a/src/modules/level/buttons/level-leaderboard-pagination.ts b/src/modules/level/buttons/level-leaderboard-pagination.ts
@@ -44,7 +44,7 @@ export default {
             return
         }
         const list = data.Levels.sort((a, b) => {
-            return b.Level - a.Level;
+            return (b.Level - a.Level)
         }).slice(currentIndex, currentIndex + (data.LeaderboardDisplayAmount == null || data.LeaderboardDisplayAmount == 0 ? 10 : data.LeaderboardDisplayAmount));
 
         const leaderboardImageDefault = await generateLevelLeaderboard(interaction.guild, "default", list)
@@ -54,12 +54,15 @@ export default {
                 id: interaction.user.id,
                 name: interaction.user.username,
                 displayName: interaction.user.displayName,
-                avatar: interaction.user.displayAvatarURL()
+                avatar: interaction.user.displayAvatarURL({
+                    extension: "png",
+                    forceStatic: true
+                }) ?? "https://cdn.discordapp.com/embed/avatars/0.png"
             },
             level: {
                 leaderboard: {
-                    leaderboardImageDefault: leaderboardImageDefault,
-                    leaderboardImageHorizontal: leaderboardImageHorizontal,
+                    leaderboardImageDefault: leaderboardImageDefault.replace("cdn.xyzhub.link", "cdn.xyzify.ing"),
+                    leaderboardImageHorizontal: leaderboardImageHorizontal.replace("cdn.xyzhub.link", "cdn.xyzify.ing"),
                     message: data?.Levels.length < 0 ? list.map((l, index) => {
                         const user = interaction.guild.members.cache.get(l.UserId);
                         const rank = index + 1;
diff --git a/src/modules/level/commands/subCommand/level.leaderboard.ts b/src/modules/level/commands/subCommand/level.leaderboard.ts
@@ -57,7 +57,7 @@ export default {
             }
 
             const list = data.Levels.sort((a, b) => {
-                return b.Level - a.Level;
+                return (b.Level - a.Level)
             }).slice(currentIndex, currentIndex + (data.LeaderboardDisplayAmount == null || data.LeaderboardDisplayAmount == 0 ? 10 : data.LeaderboardDisplayAmount));
 
             const leaderboardImageDefault = await generateLevelLeaderboard(interaction.guild, "default", list)
@@ -67,7 +67,7 @@ export default {
                     id: interaction.user.id,
                     name: interaction.user.username,
                     displayName: interaction.user.displayName,
-                    avatar: interaction.user.displayAvatarURL()
+                    avatar: interaction.user.displayAvatarURL() ?? "https://cdn.discordapp.com/embed/avatars/0.png"
                 },
                 level: {
                     leaderboard: {
diff --git a/src/modules/level/commands/subCommand/level.stats.ts b/src/modules/level/commands/subCommand/level.stats.ts
@@ -84,7 +84,7 @@ export default {
 
             let message = await database.messageTemplates.findFirst({
                 where: {
-                    Name: data.LevelSettings.LevelUserInfoMessageTemplate
+                    Name: data.LevelSettings?.LevelUserInfoMessageTemplate ?? ""
                 }
             })
 
@@ -102,8 +102,8 @@ export default {
                 },
                 level: {
                     rankCard: rankImage,
-                    xp: data.XP,
-                    requiredXp: data.RequiredXp,
+                    xp: Math.round(parseInt(data.XP)),
+                    requiredXp: Math.round(parseInt(data.RequiredXp)),
                     level: data.Level,
                     streakDay: data.CurrentStreakDay
                 }
diff --git a/src/modules/level/events/level-VoiceConnection.ts b/src/modules/level/events/level-VoiceConnection.ts
@@ -25,10 +25,19 @@ export default {
      */
     async execute(oldState: VoiceState, newState: VoiceState, client: ExtendedClient) {
 
+
         const guild = newState.guild;
-        const member = newState.member;
+        const member = newState?.member ?? oldState.member;
         const channel = newState.channel as VoiceChannel;
 
+
+        if (!newState.channelId) return
+        if (client.cache.has(`${guild.id}-level-voice-${member.id}`)) {
+            (client.cache.get(`${guild.id}-level-voice-${member.id}`).timer as NodeJS.Timeout).close()
+            client.cache.delete(`${guild.id}-level-voice-${member.id}`)
+            return
+        }
+
         const data = await database.levelSettings.findFirst({
             include: {
                 Levels: true,
@@ -42,17 +51,16 @@ export default {
         })
         if (!data) return
         if (!data.IsVoiceXPEnabled) return
-        const user = await client.users.fetch(newState.member.id)
+        const user = await client.users.fetch(newState?.member?.id ?? oldState.member.id)
         if (user.bot) return
         if (!data.VoiceXPCooldown) return
 
-        if (client.cooldowns.has(`${guild.id}-level-voice`)) {
-            const timer = client.cooldowns.get(`${guild.id}-level-voice`) as NodeJS.Timeout
-            timer.close()
-        }
-
         const interval = setInterval(async () => {
 
+            const levelCache = client.cache.get(`${guild.id}-level-voice-${member.id}`)
+            if (!levelCache) return
+            if (member.id != levelCache.userId) return
+
             let userData = await database.levels.findFirst({
                 where: {
                     UserId: member.id,
@@ -157,7 +165,10 @@ export default {
             )
         }, ms(data.VoiceXPCooldown as StringValue))
 
-        client.cooldowns.set(`${guild.id}-level-voice`, interval)
+        client.cache.set(`${guild.id}-level-voice-${member.id}`, {
+            timer: interval,
+            userId: member.id
+        })
     }
 }
 
diff --git a/src/modules/level/modals/levels-settings-streaks-message-type-modal.ts b/src/modules/level/modals/levels-settings-streaks-message-type-modal.ts
@@ -26,8 +26,6 @@ export default {
             const input = interaction.fields.getSelectedChannels("channel", true, [ChannelType.GuildText])
             for (const channel of input.values()) {
 
-                console.log(channel.id)
-
                 await database.levelSettings.update({
                     where: {
                         GuildId: interaction.guild.id
diff --git a/src/modules/welcome/events/guildMemberAdd.ts b/src/modules/welcome/events/guildMemberAdd.ts
@@ -89,7 +89,7 @@ export default {
                     outlineColor: data.ImageData?.Gradient?.split(",")[0] ?? "#fff"
                 },
                 card: {
-                    background: data.ImageData?.Background ?? "https://cdn.xyzhub.link/u/czdZgx.png",
+                    background: data.ImageData?.Background ?? "https://cdn.xyzify.ing/u/czdZgx.png",
                     blur: 1,
                     border: true,
                     rounded: true
@@ -101,7 +101,7 @@ export default {
         const withImagePlaceholder = {
             ...replacements,
             welcome: {
-                image: cdnUrl ?? "https://cdn.xyzhub.link/u/ixBzIX.png",
+                image: cdnUrl ?? "https://cdn.xyzify.ing/u/ixBzIX.png",
             },
         }
 
diff --git a/src/systems/level/levelImages.ts b/src/systems/level/levelImages.ts
@@ -1,5 +1,5 @@
 import {Font, LeaderboardBuilder, RankCardBuilder} from "canvacord";
-import {Guild, GuildMember} from "discord.js";
+import {FetchMemberOptions, FetchMembersOptions, Guild, GuildMember, UserResolvable} from "discord.js";
 import {database} from "../../main/database.js";
 import {uploadToCDN} from "../../helper/utilityHelper.js";
 
@@ -18,7 +18,10 @@ export async function generateLevelCardImage(user: GuildMember, guildId: string)
         .setUsername(user.user.username)
         .setLevel(levelData.Level)
         .setRequiredXP(Number(levelData.RequiredXp))
-        .setAvatar(user.displayAvatarURL({extension: "png", forceStatic: true}) ?? "https://cdn.discordapp.com/emojis/1259432940383768647.webp?size=96/mes")
+        .setAvatar(user.displayAvatarURL({
+            extension: "png",
+            forceStatic: true
+        }) ?? "https://cdn.discordapp.com/embed/avatars/0.png")
         .setCurrentXP(Number(levelData.XP))
 
 
@@ -46,22 +49,40 @@ export async function generateLevelLeaderboard(guild: Guild, type: "default" | "
 
     const players = await Promise.all(
         playerData
-            .map(async (user, rank) => {
+            .map(async (user: {
+                UserId: UserResolvable | FetchMemberOptions | (FetchMembersOptions & { user: UserResolvable; });
+                Level: any;
+                XP: any;
+            }, rank: number) => {
                 try {
-                    const position = data.filter((f) => f.UserId == user.UserId).map((i, c) => {
-                        return c
-                    })[0]
+                    /*
+                const position = data.filter((f) => f.UserId == user.UserId).map((i, c) => {
+                    return c
+                })[0]
+                 */
                     const guildMember = await guild.members.fetch(user.UserId);
+                    if (guildMember) {
+                        return {
+                            level: user.Level ?? 0,
+                            username: guildMember?.user?.username ?? "N/A",
+                            displayName: guildMember?.displayName ?? "N/A",
+                            avatar: guildMember.displayAvatarURL({
+                                extension: "png",
+                                forceStatic: true
+                            }) ?? "https://cdn.discordapp.com/embed/avatars/0.png",
+                            xp: Number(user.XP) ?? 0,
+                            rank: (rank + 1)
+                        };
+                    }
+                } catch (e) {
                     return {
                         level: user.Level ?? 0,
-                        username: guildMember?.user?.username ?? "N/A",
-                        displayName: guildMember?.displayName ?? "N/A",
-                        avatar: guildMember?.displayAvatarURL({extension: "png", forceStatic: true}) ?? "https://cdn.discordapp.com/emojis/1259432940383768647.webp?size=96",
+                        username: user?.UserId ?? "N/A",
+                        displayName: user?.UserId ?? "N/A",
+                        avatar: "https://cdn.discordapp.com/embed/avatars/0.png",
                         xp: Number(user.XP) ?? 0,
-                        rank:  (rank + 1)
+                        rank: (rank + 1)
                     };
-                } catch (error) {
-                    return
                 }
             })
     )
@@ -70,14 +91,16 @@ export async function generateLevelLeaderboard(guild: Guild, type: "default" | "
     const leaderboard = new LeaderboardBuilder()
         .setHeader({
             title: `Level Leaderboard`,
-            image: guild.iconURL({extension: "png", forceStatic: true}),
+            image: guild.iconURL({
+                extension: "png",
+                forceStatic: true
+            }) ?? "https://cdn.discordapp.com/embed/avatars/0.png",
             subtitle: `Total Members: ${data.length}/${guild.memberCount} - Global XP ${allXP}`,
         })
         .setPlayers(players)
         .setVariant(type)
 
-
-    const image = await leaderboard.build({format: "png"})
+    const image = await leaderboard.build()
     if (Buffer.isBuffer(image)) {
         return await uploadToCDN(image)
     }
diff --git a/src/systems/level/levelMath.ts b/src/systems/level/levelMath.ts
@@ -12,10 +12,7 @@ import {replacePlaceholders} from "../../main/placeholder.js";
 import {MessageBuilder} from "../../helper/messageHelper.js";
 import {ExtendedClient} from "../../types/ExtendedClient.js";
 import ms, {StringValue} from "ms";
-import Interceptors from "undici/types/interceptors.js";
 import * as mathjs from "mathjs";
-import logging from "../../modules/logging/commands/logging.js";
-import {randomUUID} from "crypto";
 
 export function calcXP(minXP: number, maxXP: number) {
     return Math.random() * (maxXP - minXP) + minXP
@@ -399,7 +396,7 @@ export async function scheduleLevelXPDrops(client: ExtendedClient) {
                     const template = await database.messageTemplates.findFirst(
                         {
                             where: {
-                                Name: settings.XPDropsMessageTemplate
+                                Name: settings.XPDropsMessageTemplate ?? ""
                             }
                         }
                     )
diff --git a/src/types/ExtendedClient.ts b/src/types/ExtendedClient.ts
@@ -27,7 +27,7 @@ export class ExtendedClient extends Client {
     public inviteTrackerInvitesCacheUpdates: Collection<Snowflake, number> = new Collection();
 
     // Cache Data
-    public cache: Collection<string, {}> = new Collection();
+    public cache: Collection<string, any> = new Collection();
 
     public ExtendedClient() {
         return this;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "disbot",`
`3`	`3`	`"main": "./.build/startup.js",`
`4`		`- "version": "v.1.6.5",`
	`4`	`+ "version": "v.1.6.5.1",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"disbot": "npx prisma migrate deploy && node ./.build/src/main/startup.js",`
`7`	`7`	`"disbotdev": "bun run build && node ./.build/src/main/startup.js",`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ export default {`
`112`	`112`	`ClaimedXPDrops: {`
`113`	`113`	`push: data.UUID`
`114`	`114`	`},`
`115`		`- XP: userData.XP + xpRange`
	`115`	`+ XP: (parseInt(userData.XP) + xpRange).toString()`
`116`	`116`	`}`
`117`	`117`	`})`
`118`	`118`	return await sendDefaultMessage(`-# Claimed XP Drop successfully!`, interaction, true, "reply")