Updated more Thumbnails to reliable sources,, fixed quotes leaderboard

buttons/honor/honors_leaderboard_left.js

@@ -23,7 +23,7 @@ module.exports = {
         })
         const embed = new EmbedBuilder()
             .setTitle('Honors Leaderboard')
-            .setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152940755539722240/pngwing.com.png')
+            .setThumbnail(guild.iconURL({ dynamic: true}))
             .setDescription(fields.toString())
             .setColor('#5865F2')  // Discord's blurple color
             .setFooter({ text: 'Use ◄ ► to navigate' });

buttons/honor/honors_leaderboard_right.js

@@ -21,7 +21,7 @@ module.exports = {
         })
         const embed = new EmbedBuilder()
             .setTitle('Honors Leaderboard')
-            .setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152940755539722240/pngwing.com.png')
+            .setThumbnail(guild.iconURL({ dynamic: true}))
             .setDescription(fields.toString())
             .setColor('#5865F2')  // Discord's blurple color
         .setFooter({ text: 'Use ◄ ► to navigate' });

buttons/honor/honors_leaderboard_self.js

@@ -31,7 +31,7 @@ module.exports = {
         })
         const embed = new EmbedBuilder()
             .setTitle('Honors Leaderboard')
-            .setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152940755539722240/pngwing.com.png')
+            .setThumbnail(guild.iconURL({ dynamic: true}))
             .setDescription(fields.toString())
             .setColor('#5865F2')  // Discord's blurple color
         .setFooter({ text: 'Use ◄ ► to navigate' });

buttons/nuts/nuts_leaderboard_left.js

@@ -23,7 +23,7 @@ module.exports = {
         })
         const embed = new EmbedBuilder()
             .setTitle('Nuts Leaderboard')
-            .setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152940755539722240/pngwing.com.png')
+            .setThumbnail(guild.iconURL({ dynamic: true}))
             .setDescription(fields.toString())
             .setColor('#5865F2')  // Discord's blurple color
         .setFooter({ text: 'Use ◄ ► to navigate' });

buttons/nuts/nuts_leaderboard_right.js

@@ -21,7 +21,7 @@ module.exports = {
         })
         const embed = new EmbedBuilder()
             .setTitle('Nuts Leaderboard')
-            .setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152940755539722240/pngwing.com.png')
+            .setThumbnail(guild.iconURL({ dynamic: true}))
             .setDescription(fields.toString())
             .setColor('#5865F2')  // Discord's blurple color
         .setFooter({ text: 'Use ◄ ► to navigate' });

buttons/nuts/nuts_leaderboard_self.js

@@ -31,7 +31,7 @@ module.exports = {
         })
         const embed = new EmbedBuilder()
             .setTitle('Nuts Leaderboard')
-            .setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152940755539722240/pngwing.com.png')
+            .setThumbnail(guild.iconURL({ dynamic: true}))
             .setDescription(fields.toString())
             .setColor('#5865F2')  // Discord's blurple color
         .setFooter({ text: 'Use ◄ ► to navigate' });

buttons/quotes/quotes_leaderboard_left.js

@@ -1,70 +1,19 @@
-const { EmbedBuilder, ButtonBuilder, ButtonStyle, ActionRowBuilder } = require('discord.js');
+const { quotesLeaderboard } = require("../../commands/slash/applications/quotes");
-const { mClient } = require('../..'); // Adjust the path as needed
-function delay(ms) { return new Promise(resolve => setTimeout(resolve, ms)); }
 
 module.exports = {
-    name: 'quotes_leaderboard_right',
+    name: 'quotes_leaderboard_left',
-    description: 'Navigate right through the quotes leaderboard',
+    description: 'Navigate left through the quotes leaderboard',
     async execute(interaction) {
-        await interaction.deferReply()
+        await interaction.deferReply();
-        const db = mClient.db(process.env.M_DB)
-        const quotesColl = db.collection('items_quotes')
-        const maxValue = await quotesColl.countDocuments({ $and: [{ guildID: interaction.guild.id }, { count: { $gt: 0 } }] })
 
-        let skip = interaction.message.embeds[0].data.fields[0].value.split('.')
+        // Parse current page from footer
-        skip = Number(skip[0]) - 6 
+        let page = 1;
-        if (skip >= (maxValue - (maxValue % 5))) {
+        const footerText = interaction.message.embeds[0]?.footer?.text || '';
-            skip = maxValue - (maxValue % 5)
+        const match = footerText.match(/Page (\d+) of (\d+)/);
-        }
+        if (match) page = Number(match[1]);
 
-        const quotesData = await quotesColl.find({ count: { $gt: 0 } }).sort({ count: -1, messageID: -1 }).skip(skip).limit(5).toArray()
+        page--; // move to previous page
-        const fields = []
 
-        const guild = await interaction.client.guilds.fetch(interaction.guild.id)
+        await quotesLeaderboard(interaction, page);
-        quotesData.forEach(async (data, index) => {
-
-            let channel = await guild.channels.fetch(data.channelID)
-            let message = await channel.messages.fetch(data.messageID)
-            await delay(500)
-            fields.push({
-                name: `\u200b`,
-                value: `${skip + index + 1}. [#${data.messageID}](https://discord.com/channels/${data.guildID}/${data.channelID}/${data.messageID})\r\n**by** <@${data.by}>  • ⭐ ${data.count}\r\n${message.content}`
-            })
-        })
-        
-        await delay(5000)
-        console.log(fields)
-        const embed = new EmbedBuilder()
-            .setTitle('- Quotes Leaderboard -')
-            .setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152940755539722240/pngwing.com.png')
-            .setFields(fields)
-            .setColor('#5865F2')  // Discord's blurple color
-            .setFooter({ text: 'Use ◄ ► to navigate' });
-
-        const row = new ActionRowBuilder()
-            .addComponents(
-                new ButtonBuilder()
-                    .setLabel('◄')
-                    .setStyle(ButtonStyle.Primary)
-                    .setCustomId('quotes_leaderboard_left')
-                    .setDisabled(skip - 6 < 0)
-            )
-            .addComponents(
-                new ButtonBuilder()
-                    .setLabel('X')
-                    .setStyle(ButtonStyle.Danger)
-                    .setCustomId('abort')
-            )
-            .addComponents(
-                new ButtonBuilder()
-                    .setLabel('►')
-                    .setStyle(ButtonStyle.Primary)
-                    .setCustomId('quotes_leaderboard_right')
-                    .setDisabled(skip + 4 > maxValue)
-            )
-        await interaction.editReply({
-            embeds: [embed],
-            components: [row]
-        })
     }
 };

buttons/quotes/quotes_leaderboard_right.js

@@ -1,70 +1,19 @@
-const { EmbedBuilder, ButtonBuilder, ButtonStyle, ActionRowBuilder } = require('discord.js');
+const { quotesLeaderboard } = require("../../commands/slash/applications/quotes");
-const { mClient } = require('../..'); // Adjust the path as needed
-function delay(ms) { return new Promise(resolve => setTimeout(resolve, ms)); }
 
 module.exports = {
     name: 'quotes_leaderboard_right',
     description: 'Navigate right through the quotes leaderboard',
     async execute(interaction) {
-        await interaction.deferReply()
+        await interaction.deferReply();
-        const db = mClient.db(process.env.M_DB)
-        const quotesColl = db.collection('items_quotes')
-        const maxValue = await quotesColl.countDocuments({ $and: [{ guildID: interaction.guild.id }, { count: { $gt: 0 } }] })
 
-        let skip = interaction.message.embeds[0].data.fields[0].value.split('.')
+        // Parse current page from footer
-        skip = Number(skip[0]) +4
+        let page = 1;
-        if (skip >= (maxValue - (maxValue % 5))) {
+        const footerText = interaction.message.embeds[0]?.footer?.text || '';
-            skip = maxValue - (maxValue % 5)
+        const match = footerText.match(/Page (\d+) of (\d+)/);
-        }
+        if (match) page = Number(match[1]);
 
-        const quotesData = await quotesColl.find({ count: { $gt: 0 } }).sort({ count: -1, messageID: -1 }).skip(skip).limit(5).toArray()
+        page++; // move to next page
-        const fields = []
 
-        const guild = await interaction.client.guilds.fetch(interaction.guild.id)
+        await quotesLeaderboard(interaction, page);
-        quotesData.forEach(async (data, index) => {
-
-            let channel = await guild.channels.fetch(data.channelID)
-            let message = await channel.messages.fetch(data.messageID)
-            await delay(500)
-            fields.push({
-                name: `\u200b`,
-                value: `${skip + index + 1}. [#${data.messageID}](https://discord.com/channels/${data.guildID}/${data.channelID}/${data.messageID})\r\n**by** <@${data.by}>  • ⭐ ${data.count}\r\n${message.content}`
-            })
-        })
-        
-        await delay(5000)
-        console.log(fields)
-        const embed = new EmbedBuilder()
-            .setTitle('- Quotes Leaderboard -')
-            .setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152940755539722240/pngwing.com.png')
-            .setFields(fields)
-            .setColor('#5865F2')  // Discord's blurple color
-            .setFooter({ text: 'Use ◄ ► to navigate' });
-
-        const row = new ActionRowBuilder()
-            .addComponents(
-                new ButtonBuilder()
-                    .setLabel('◄')
-                    .setStyle(ButtonStyle.Primary)
-                    .setCustomId('quotes_leaderboard_left')
-                    .setDisabled(skip - 6 < 0)
-            )
-            .addComponents(
-                new ButtonBuilder()
-                    .setLabel('X')
-                    .setStyle(ButtonStyle.Danger)
-                    .setCustomId('abort')
-            )
-            .addComponents(
-                new ButtonBuilder()
-                    .setLabel('►')
-                    .setStyle(ButtonStyle.Primary)
-                    .setCustomId('quotes_leaderboard_right')
-                    .setDisabled(skip + 4 > maxValue)
-            )
-        await interaction.editReply({
-            embeds: [embed],
-            components: [row]
-        })
     }
 };

commands/legacy/nuts/nutsLeaderboard.js

@@ -37,7 +37,7 @@ module.exports = {
         })
         const embed = new EmbedBuilder()
             .setTitle('Nuts Leaderboard')
-            .setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152940755539722240/pngwing.com.png')
+            .setThumbnail(guild.iconURL({ dynamic: true}))
             .setDescription(fields.toString())
             .setColor('#5865F2')  // Discord's blurple color
             .setFooter({ text: 'Use ◄ ► to navigate' });

commands/slash/applications/honors.js

@@ -103,7 +103,7 @@ async function honorLeaderboard(interaction) {
     })
     const embed = new EmbedBuilder()
         .setTitle('- Honors Leaderboard -')
-        .setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152940755539722240/pngwing.com.png')
+        .setThumbnail(guild.iconURL({ dynamic: true}))
         .setDescription(fields.toString())
         .setColor('#5865F2')  // Discord's blurple color
         .setFooter({ text: 'Use ◄ ► to navigate' });

commands/slash/applications/quotes.js

@@ -267,71 +267,87 @@ async function quotesList(interaction) {
     })
 
 }
-async function quotesLeaderboard(interaction) {
+async function quotesLeaderboard(interaction, page = 1, limit = 5) {
-    const db = mClient.db(process.env.M_DB)
+    const db = mClient.db(process.env.M_DB);
-    const quotesColl = db.collection('items_quotes')
+    const quotesColl = db.collection('items_quotes');
-    let skip = 0
-    const minValue = 0
-    const maxValue = await quotesColl.countDocuments({ $and: [{ guildID: interaction.guild.id }, { count: { $gt: 0 } }] })
 
-    const quotesData = await quotesColl.find({}).sort({ count: -1, messageID: -1 }).skip(skip).limit(5).toArray()
+    // Total quotes in the guild
-    const fields = []
+    const totalQuotes = await quotesColl.countDocuments({ guildID: interaction.guild.id, count: { $gte: 0 } });
+    const totalPages = Math.ceil(totalQuotes / limit);
 
-    const guild = await interaction.client.guilds.fetch(interaction.guild.id)
+    // Clamp page
-    quotesData.forEach(async (data, index) => {
+    if (page < 1) page = 1;
+    if (page > totalPages) page = totalPages;
 
-        let channel = await guild.channels.fetch(data.channelID)
+    const skip = (page - 1) * limit;
-        let message = await channel.messages.fetch(data.messageID)
 
-        await delay(500)
+    // Fetch quotes for this page
-        let timestamp = new Date(message.createdTimestamp)
+    const quotesData = await quotesColl
-        fields.push({
+        .find({ guildID: interaction.guild.id, count: { $gte: 0 } })
-            name: `${index + 1}.`,//`\u200b` ,
+        .sort({ count: -1, messageID: -1 })
-            value: `[#${data.messageID}](https://discord.com/channels/${data.guildID}/${data.channelID}/${data.messageID})\r\n**by** <@${data.by}>  • ⭐ ${data.count}\r\n_Posted on **${timestamp}**_\r\n${message.content}`
+        .skip(skip)
+        .limit(limit)
+        .toArray();
+
+    // Fallback if no quotes exist
+    if (!quotesData.length) {
+        return interaction.editReply({ content: 'No quotes found for this server yet!', components: [] });
+    }
+
+    const guild = await interaction.client.guilds.fetch(interaction.guild.id);
+
+    // Fetch all messages concurrently
+    const fields = await Promise.all(
+        quotesData.map(async (data, index) => {
+            try {
+                const channel = await guild.channels.fetch(data.channelID);
+                const message = await channel.messages.fetch(data.messageID);
+                const timestamp = new Date(message.createdTimestamp).toLocaleString('en-US', {
+                    dateStyle: 'medium',
+                    timeStyle: 'short'
+                });
+
+                return {
+                    name: `${skip + index + 1}.`,
+                    value: `[#${data.messageID}](https://discord.com/channels/${data.guildID}/${data.channelID}/${data.messageID})\n**by** <@${data.by}> • ⭐ ${data.count}\n_Posted on **${timestamp}**_\n${message.content}`
+                };
+            } catch {
+                return {
+                    name: `${skip + index + 1}.`,
+                    value: 'Message unavailable.'
+                };
+            }
         })
+    );
 
-    })
+    // Build embed
-
-
-    await delay(5000)
-    console.log(fields)
-    quotesData.sort((a, b) => {
-        const numA = parseInt(a.name);
-        const numB = parseInt(b.name);
-        return numA - numB;
-    })
-    console.log(fields)
-
     const embed = new EmbedBuilder()
         .setTitle('- Quotes Leaderboard -')
-        .setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152940755539722240/pngwing.com.png')
+        .setThumbnail(guild.iconURL({ dynamic: true }))
         .setFields(fields)
-        .setColor('#5865F2')  // Discord's blurple color
+        .setColor('#5865F2')
-        .setFooter({ text: `Use ◄ ► to navigate\r\n${skip}` });
+        .setFooter({ text: `Use ◄ ► to navigate • Page ${page} of ${totalPages}` });
 
+    // Build buttons
     const row = new ActionRowBuilder()
         .addComponents(
             new ButtonBuilder()
                 .setLabel('◄')
                 .setStyle(ButtonStyle.Primary)
                 .setCustomId('quotes_leaderboard_left')
-        )
+                .setDisabled(page === 1),
-        .addComponents(
             new ButtonBuilder()
                 .setLabel('X')
                 .setStyle(ButtonStyle.Danger)
-                .setCustomId('abort')
+                .setCustomId('abort'),
-        )
-        .addComponents(
             new ButtonBuilder()
                 .setLabel('►')
                 .setStyle(ButtonStyle.Primary)
                 .setCustomId('quotes_leaderboard_right')
-        )
+                .setDisabled(page === totalPages)
-    await interaction.editReply({
+        );
-        embeds: [embed],
+
-        components: [row]
+    await interaction.editReply({ embeds: [embed], components: [row] });
-    })
 }
 
 module.exports = {
@@ -392,4 +408,6 @@ module.exports = {
                 break;
         }
     }
-}
+},
+
+module.exports.quotesLeaderboard = quotesLeaderboard