Refactor: Notices scrapper and enhance myStats.js. Connected #4

agntperfect · agntperfect · commit 88be09662526 · 2025-07-26T14:52:54.000Z
diff --git a/src/bot.js b/src/bot.js
@@ -1,4 +1,4 @@
-import { Client, Collection, IntentsBitField, EmbedBuilder, PermissionsBitField, ChannelType, Partials, ActionRowBuilder, ButtonBuilder, ButtonStyle, AttachmentBuilder, Events, MessageFlags } from 'discord.js';
+import { Client, Collection, IntentsBitField, EmbedBuilder, PermissionsBitField, ChannelType, Partials, ActionRowBuilder, ButtonBuilder, ButtonStyle, AttachmentBuilder, Events, MessageFlags, Widget } from 'discord.js';
 import { REST } from '@discordjs/rest';
 import { Routes } from 'discord-api-types/v9';
 import dotenv from 'dotenv';
diff --git a/src/commands/slash/myStats.js b/src/commands/slash/myStats.js
@@ -1,4 +1,5 @@
 import { SlashCommandBuilder, EmbedBuilder, PermissionsBitField } from 'discord.js';
+import { promisify } from 'node:util';
 
 const VERIFIED_ROLE_ID = process.env.VERIFIED_ROLE_ID || 'YOUR_VERIFIED_ROLE_ID_HERE';
 
@@ -12,60 +13,42 @@ export async function execute(interaction) {
         return interaction.reply({ content: 'This command can only be used in a server.', ephemeral: true });
     }
 
+    if (interaction.replied || interaction.deferred) {
+        console.warn(`[myStats] Interaction ${interaction.id} already acknowledged. Skipping.`);
+        return;
+    }
+
+    await interaction.deferReply();
+
     const userId = interaction.user.id;
     const guildId = interaction.guild.id;
     const db = interaction.client.db;
-    const isModerator = interaction.member.permissions.has(PermissionsBitField.Flags.KickMembers || PermissionsBitField.Flags.BanMembers);
-    const hasVerifiedRole = interaction.member.roles.cache.has(VERIFIED_ROLE_ID);
-
-    await interaction.deferReply();
 
-    try {
-        const statsRow = await new Promise((resolve, reject) => {
-            db.get(`SELECT messages_sent, voice_time_minutes FROM user_stats WHERE user_id = ? AND guild_id = ?`,
-                [userId, guildId], (err, row) => {
-                    if (err) reject(err);
-                    else resolve(row);
-                });
-        });
+    const dbGet = promisify(db.get).bind(db);
+    const dbAll = promisify(db.all).bind(db);
 
-        const warnRows = await new Promise((resolve, reject) => {
-            db.all(`SELECT reason, timestamp FROM warnings WHERE userId = ? AND guildId = ? ORDER BY timestamp DESC LIMIT 3`,
-                [userId, guildId], (err, rows) => { // Fetch last 3 warn reasons
-                    if (err) reject(err);
-                    else resolve(rows);
-                });
-        });
-        const warnCount = warnRows.length;
+    const isModerator = interaction.member.permissions.has(
+        PermissionsBitField.Flags.KickMembers || PermissionsBitField.Flags.BanMembers
+    );
 
-        const reputationRow = await new Promise((resolve, reject) => {
-            db.get(`SELECT reputation_points FROM reputation WHERE user_id = ? AND guild_id = ?`,
-                [userId, guildId], (err, row) => {
-                    if (err) reject(err);
-                    else resolve(row);
-                });
-        });
+    const hasVerifiedRole = interaction.member.roles.cache.has(VERIFIED_ROLE_ID);
 
-        let verifiedUserRow = null;
-        let birthdayRow = null;
-        if (hasVerifiedRole) {
-            verifiedUserRow = await new Promise((resolve, reject) => {
-                db.get(`SELECT real_name, email FROM verified_users WHERE user_id = ? AND guild_id = ?`,
-                    [userId, guildId], (err, row) => {
-                        if (err) reject(err);
-                        else resolve(row);
-                    });
-            });
-
-            birthdayRow = await new Promise((resolve, reject) => {
-                db.get(`SELECT month, day, year FROM birthdays WHERE user_id = ? AND guild_id = ?`,
-                    [userId, guildId], (err, row) => {
-                        if (err) reject(err);
-                        else resolve(row);
-                    });
-            });
-        }
+    try {
+        const statsRow = await dbGet(
+            `SELECT messages_sent, voice_time_minutes FROM user_stats WHERE user_id = ? AND guild_id = ?`,
+            [userId, guildId]
+        );
+
+        const warnRows = await dbAll(
+            `SELECT reason, timestamp FROM warnings WHERE userId = ? AND guildId = ? ORDER BY timestamp DESC LIMIT 3`,
+            [userId, guildId]
+        );
+        const warnCount = warnRows.length;
 
+        const reputationRow = await dbGet(
+            `SELECT reputation_points FROM reputation WHERE user_id = ? AND guild_id = ?`,
+            [userId, guildId]
+        );
 
         const messagesSent = statsRow ? statsRow.messages_sent : 0;
         const voiceTimeMinutes = statsRow ? statsRow.voice_time_minutes : 0;
@@ -85,64 +68,73 @@ export async function execute(interaction) {
             statusColor = '#FF0000';
         }
 
-        const embed = new EmbedBuilder()
+        const publicEmbed = new EmbedBuilder()
             .setColor(statusColor)
-            .setTitle(`📊 ${interaction.user.tag}'s Stats`)
-            .setDescription('Your activity and standing in this server:')
+            .setTitle(`📊 ${interaction.user.tag}'s Server Stats`)
+            .setDescription('Here are some general statistics about your activity and standing in this server:')
             .setThumbnail(interaction.user.displayAvatarURL({ dynamic: true }))
             .setTimestamp()
             .addFields(
                 { name: 'Messages Sent', value: messagesSent.toLocaleString(), inline: true },
                 { name: 'Voice Time', value: `${voiceTimeMinutes} minutes`, inline: true },
                 { name: 'Reputation', value: reputationPoints.toLocaleString(), inline: true },
-                { name: 'Warn Status', value: `${warnStatus} (${warnCount} warns)`, inline: true }
+                { name: 'Warn Status', value: `${warnCount} warns (${warnStatus})`, inline: true }
             );
 
         if (warnCount > 0) {
             const warnReasons = warnRows.map((warn, index) =>
                 `${index + 1}. ${warn.reason} (<t:${Math.floor(warn.timestamp / 1000)}:d>)`
             ).join('\n');
-            embed.addFields(
+            publicEmbed.addFields(
                 { name: 'Recent Warn Reasons', value: warnReasons }
             );
         }
 
-        if (hasVerifiedRole && verifiedUserRow) {
-            embed.addFields(
-                { name: '\u200b', value: '**Verified Information:**', inline: false }, // Spacer
-                { name: 'Full Name', value: verifiedUserRow.real_name, inline: true },
-                { name: 'Email', value: verifiedUserRow.email, inline: true }
+        await interaction.editReply({ embeds: [publicEmbed] });
+
+        const privateEmbed = new EmbedBuilder()
+            .setColor('#0099FF')
+            .setTitle(`🔒 ${interaction.user.tag}'s Private Stats`)
+            .setDescription('This message contains sensitive or personal information.')
+            .setTimestamp();
+        console.log(VERIFIED_ROLE_ID);
+        console.log(hasVerifiedRole);
+        if (hasVerifiedRole) {
+            const verifiedUserRow = await dbGet(
+                `SELECT real_name, email FROM verified_users WHERE user_id = ? AND guild_id = ?`,
+                [userId, guildId]
+            );
+            const birthdayRow = await dbGet(
+                `SELECT month, day, year FROM birthdays WHERE user_id = ? AND guild_id = ?`,
+                [userId, guildId]
             );
 
-            if (birthdayRow) {
-                let dob = `${birthdayRow.month}/${birthdayRow.day}`;
-                if (birthdayRow.year) {
-                    dob += `/${birthdayRow.year}`;
-                }
-                embed.addFields(
-                    { name: 'Date of Birth', value: dob, inline: true }
+            if (verifiedUserRow) {
+                privateEmbed.addFields(
+                    { name: '\u200b', value: '**Verified Information:**', inline: false },
+                    { name: 'Full Name', value: verifiedUserRow.real_name, inline: true },
+                    { name: 'Email', value: verifiedUserRow.email, inline: true }
                 );
+
+                if (birthdayRow) {
+                    let dob = `${birthdayRow.month}/${birthdayRow.day}`;
+                    if (birthdayRow.year) {
+                        dob += `/${birthdayRow.year}`;
+                    }
+                    privateEmbed.addFields(
+                        { name: 'Date of Birth', value: dob, inline: true }
+                    );
+                }
             }
         }
 
-
         if (isModerator) {
-            const modActions = await new Promise((resolve, reject) => {
-                db.all(`SELECT action_type, COUNT(*) as count FROM moderation_actions WHERE moderator_id = ? AND guild_id = ? GROUP BY action_type`,
-                    [userId, guildId], (err, rows) => {
-                        if (err) reject(err);
-                        else resolve(rows);
-                    });
-            });
-
-            const modStats = {
-                kicks: 0,
-                bans: 0,
-                timeouts: 0,
-                mutes: 0,
-                deafens: 0,
-            };
+            const modActions = await dbAll(
+                `SELECT action_type, COUNT(*) as count FROM moderation_actions WHERE moderator_id = ? AND guild_id = ? GROUP BY action_type`,
+                [userId, guildId]
+            );
 
+            const modStats = { kicks: 0, bans: 0, timeouts: 0, mutes: 0, deafens: 0 };
             for (const action of modActions) {
                 switch (action.action_type) {
                     case 'kick': modStats.kicks = action.count; break;
@@ -153,8 +145,8 @@ export async function execute(interaction) {
                 }
             }
 
-            embed.addFields(
-                { name: '\u200b', value: '**Moderation Actions Issued:**', inline: false }, // Spacer
+            privateEmbed.addFields(
+                { name: '\u200b', value: '**Moderation Actions Issued:**', inline: false },
                 { name: 'Kicks', value: modStats.kicks.toLocaleString(), inline: true },
                 { name: 'Bans', value: modStats.bans.toLocaleString(), inline: true },
                 { name: 'Timeouts', value: modStats.timeouts.toLocaleString(), inline: true },
@@ -163,10 +155,24 @@ export async function execute(interaction) {
             );
         }
 
-        await interaction.editReply({ embeds: [embed] });
+        if (privateEmbed.data.fields && privateEmbed.data.fields.length > 0) {
+            try {
+                await interaction.user.send({ embeds: [privateEmbed] });
+            } catch (dmError) {
+                console.error(`Error sending DM to ${interaction.user.tag}:`, dmError);
+                await interaction.followUp({
+                    content: 'I could not send your private stats to your DMs. Please check your privacy settings to allow DMs from server members.',
+                    ephemeral: true
+                });
+            }
+        }
 
     } catch (err) {
         console.error('Error fetching stats:', err.message);
-        await interaction.editReply({ embeds: [new EmbedBuilder().setColor('#FF0000').setDescription(`❌ An error occurred while fetching your stats: ${err.message}`)], ephemeral: true });
+        const replyMethod = interaction.deferred || interaction.replied ? 'followUp' : 'editReply';
+        await interaction[replyMethod]({
+            embeds: [new EmbedBuilder().setColor('#FF0000').setDescription(`❌ An error occurred while fetching your stats: ${err.message}`)],
+            ephemeral: true
+        });
     }
-}
+}
diff --git a/src/services/scraper.js b/src/services/scraper.js
@@ -164,47 +164,52 @@ export async function scrapeIoeExamNotice() {
 }
 
 /**
- * Scrapes the latest notice from the Pulchowk Campus website.
- * @returns {Promise<object|null>} - A single notice object or null on failure.
+ * Scrapes all recent notices from the Pulchowk Campus website's homepage widget.
+ * @returns {Promise<Array<object>>} - A list of notice objects.
  */
 export async function scrapePcampusNotice() {
-    const listUrl = "https://pcampus.edu.np/category/general-notices/";
+    const listUrl = "https://pcampus.edu.np/";
     try {
         const listData = await fetchWithRetry(listUrl);
         const $list = cheerio.load(listData);
-        const latestArticle = $list("article").first();
-        const title = latestArticle.find("h2.entry-title a").text().trim();
-        const pageLink = latestArticle.find("h2.entry-title a").attr("href");
-        const date = latestArticle.find("time.entry-date").attr("datetime");
-        const postId = latestArticle.attr("id");
-
-        if (!pageLink) {
-        console.warn("[scrapePcampusNotice] No page link found in latest article.");
-        return null;
-        }
-
-        const pageData = await fetchWithRetry(pageLink);
-        const $page = cheerio.load(pageData);
-        const attachments = [];
-
-        $page(".entry-content a").each((_, el) => {
-        const href = $page(el).attr("href");
-        if (href?.includes("/wp-content/uploads/")) {
-            attachments.push(new URL(href, pageLink).href);
+        const noticeItems = $list("#recent-posts-2 ul li"); 
+        if (noticeItems.length === 0) {
+            console.warn("[scrapePcampusNotice] Could not find any notices in the widget.");
+            return []; 
         }
+        const noticeDetailPromises = [];
+        noticeItems.each((_, el) => {
+            const item = $list(el);
+            const titleElement = item.find("a");
+            const pageLink = titleElement.attr("href");
+            const title = titleElement.text().trim();
+            const date = item.find(".post-date").text().trim(); 
+            if (pageLink) {
+                const detailPromise = (async () => {
+                    try {
+                        const pageData = await fetchWithRetry(pageLink);
+                        const $page = cheerio.load(pageData);
+                        const attachments = [];
+                        $page(".entry-content a").each((_, a) => {
+                            const href = $page(a).attr("href");
+                            if (href?.includes("/wp-content/uploads/")) {
+                                attachments.push(new URL(href, pageLink).href);
+                            }
+                        });
+                        return { title, link: pageLink, attachments: [...new Set(attachments)], date, source: "Pulchowk Campus" };
+                    } catch (err) {
+                        console.error(`[scrapePcampusNotice] Failed to fetch details for ${pageLink}. Error: ${err.message}`);
+                        return null; 
+                    }
+                })();
+                noticeDetailPromises.push(detailPromise);
+            }
         });
-
-        return {
-        id: postId,
-        title,
-        link: pageLink,
-        attachments: [...new Set(attachments)],
-        date,
-        source: "Pulchowk Campus",
-        };
+        const results = await Promise.all(noticeDetailPromises);
+        return results.filter(notice => notice !== null);
     } catch (err) {
         console.error("[scrapePcampusNotice] Error during scraping or parsing:", err.message);
-        return null;
+        return []; 
     }
 }
 
@@ -228,7 +233,7 @@ export async function scrapeLatestNotice() {
     }
 
     if (pcampus.status === 'fulfilled' && pcampus.value) {
-        combinedNotices = [...combinedNotices, pcampus.value];
+        combinedNotices = [...combinedNotices, ...pcampus.value];
     } else {
         console.error("[scrapeLatestNotice] Pulchowk Campus Notice scraping failed:", pcampus.reason);
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Client, Collection, IntentsBitField, EmbedBuilder, PermissionsBitField, ChannelType, Partials, ActionRowBuilder, ButtonBuilder, ButtonStyle, AttachmentBuilder, Events, MessageFlags } from 'discord.js';`
	`1`	`+import { Client, Collection, IntentsBitField, EmbedBuilder, PermissionsBitField, ChannelType, Partials, ActionRowBuilder, ButtonBuilder, ButtonStyle, AttachmentBuilder, Events, MessageFlags, Widget } from 'discord.js';`
`2`	`2`	`import { REST } from '@discordjs/rest';`
`3`	`3`	`import { Routes } from 'discord-api-types/v9';`
`4`	`4`	`import dotenv from 'dotenv';`