Anniversary stash

.gitignore

@@ -2,4 +2,3 @@ node_modules/
 config.json
 old/
 bot.log
-data/

commands/utility/grab.js

@@ -63,7 +63,7 @@ module.exports = {
 
 		collector.on('collect', m => {
 			m.stickers.forEach(sticker => {
-				stickers.push(`https://media.discordapp.net/stickers/${sticker.id}.png?size=1024`);
+				stickers.push(`https://media.discordapp.net/stickers/${sticker.id}.png`);
 				collector.stop();
 			});
 		});

commands/utility/linkTrack.js

@@ -41,6 +41,10 @@ module.exports = {
 			option.setName('songname')
 				.setDescription('Override song name, otherwise uses name from Spotify')
 				.setRequired(false))
+		.addStringOption(option =>
+			option.setName('footer_override')
+				.setDescription('Custom footer')
+				.setRequired(false))
 		.addAttachmentOption(option =>
 			option.setName('cover_override')
 			.setDescription('Uses this image instead of Spotofy metadata')
@@ -50,7 +54,6 @@ module.exports = {
 		clientSecret: spotify.clientSecret,
 	}),
 	async execute(interaction) {
-		try {
 		let token = await this.spotifyAPI.clientCredentialsGrant().then(
 			function(data) {
 			  return data.body['access_token'];
@@ -94,20 +97,12 @@ module.exports = {
 				links.push(`[<:ytbm:1224704771248750622>  Youtube ](${url})`);
 				continue;
 			}
-				if (url.startsWith('https://jelly.')) {
-					links.push(`[<:jelly:1225931843279519905>  Jellyfin (${url.split('.')[1]}) ](${url})`);
-					continue;
-				}
-				if (url.startsWith('https://soundcloud.com/') || url.startsWith('https://m.soundcloud.com/')) {
-					links.push(`[<:soundcld:1225702702135119902> Soundcloud ](${url})`);
-					continue;
-				}
 		}
 		
 		
 		if(spotifyID) {
 			let spotifyTrack = await this.spotifyAPI.getTrack(spotifyID);
-				trackEmbed.setThumbnail(spotifyTrack['body'].album.images[0].url);
+			trackEmbed.setImage(spotifyTrack['body'].album.images[0].url);
 			songName = spotifyTrack['body'].name;
 			mainArtist = spotifyTrack['body'].artists[0].name;
 			artists = spotifyTrack['body'].artists.map(a => a.name).join(', ');
@@ -116,7 +111,7 @@ module.exports = {
 		}
 		
 		if(interaction.options.getAttachment('cover_override')) {
-				trackEmbed.setThumbnail(interaction.options.getAttachment('cover_override').url);
+			trackEmbed.setImage(interaction.options.getAttachment('cover_override').url);
 		}
 		songName = interaction.options.getString('songname', false) ?? songName;
 		artists = interaction.options.getString('artist', false) ?? artists;
@@ -127,11 +122,12 @@ module.exports = {
 		trackEmbed.setTitle(`${title}`);
 
 		let submitterName = interaction.member.displayName;
-			let footer = `Submitted by ${submitterName} `;
+		let footer = interaction.options.getString('footer_override', false) ?? `Submitted by ${submitterName}`;
+		trackEmbed.setFooter({text: footer });
 		
 		if(interaction.options.getString('rating', false)) {
 			trackEmbed.addFields(
-					{ name: `${submitterName} rated this`, value: `${interaction.options.getString('rating', false)} out of **10**`, inline: true },
+				{ name: `${submitterName} rated this`, value: `${interaction.options.getString('rating', false)} out of 10`, inline: true },
 			)
 		}
 
@@ -142,7 +138,7 @@ module.exports = {
 
 		if(interaction.options.getInteger('scrobbles', false) || lfmData.data['track']?.['userplaycount'] > 0) {
 			trackEmbed.addFields(
-					{ name: `${submitterName} scrobbled this`, value: `**${interaction.options.getInteger('scrobbles', false) ?? lfmData.data['track']['userplaycount']}** times so far`, inline: true },
+				{ name: `${submitterName} scrobbled this`, value: `${interaction.options.getInteger('scrobbles', false) ?? lfmData.data['track']['userplaycount']} times so far`, inline: true },
 			)
 		} 
 
@@ -152,44 +148,40 @@ module.exports = {
 			console.log(tags);
 			let listeners = this.numToHumanReadable(lfmData.data['track']['listeners']);
 			let globalScrobbles = this.numToHumanReadable(lfmData.data['track']['playcount']);
-				footer += `∘ Listeners: ${listeners} • Scrobbles: ${globalScrobbles}`;
 
-				let tagContent = '';
+			trackEmbed.addFields(
+				{ name: `LFM Global`, value: `Listeners: ${listeners} • Scrobbles: ${globalScrobbles}\n`, inline: false },
+			)
+
+			let tagHeader = 'Tags';
 			if(tags.length === 0) {
 				//artist tag fallback
 				let lfmArtistTags = await axios.get(`https://ws.audioscrobbler.com/2.0/?method=artist.getTopTags&api_key=${lfmKey}&artist=${mainArtist}&format=json`);
 				console.log(lfmArtistTags);
 				tags = lfmArtistTags.data['toptags']['tag'].map(a => a.name);
+				tagHeader = `Artist ${tagHeader}`;
 			}
-				if(tags.length > 1) {
+			if(tags) {
-					tags = this.joinLineBreak(tags, ', ', 3);
+				tags = this.joinLineBreak(tags, ', ', 4);
 				trackEmbed.addFields(
-						{ name: `Tags`, value: `${tags.substr(0,60)}${tags.length > 60 ? '...' : ''}`, inline: true },
+					{ name: `${tagHeader}`, value: `${tags.substr(0,60)}${tags.length > 60 ? '...' : ''}`, inline: true },
 				)
 			}
-	
 		}
 
+		description = `${description}\n${this.joinLineBreak(links, ' ∘ ', 3)}`
+
 		if(!description) {
 			await interaction.reply({content: 'Sorry, no valid link has bee supplied.', ephemeral: true });
 			return;
 		}
 
 		trackEmbed.setDescription(description);
-			trackEmbed.addFields(
-				{ name: 'Links', value: `${this.joinLineBreak(links, ' ∘ ', 4)}` }
-			);
-	
-			trackEmbed.setFooter({text: footer });
 		
         interaction.channel.send({ embeds: [trackEmbed] });
 
 		let response = await interaction.reply({content: 'done', ephemeral: true});
 		await response.delete();
-		} catch (error) {
-			await interaction.reply(`# FUCK \n ${JSON.stringify(error)}`.substring(0,200));
-		}
-		
 	},
 	numToHumanReadable: function(num) {
 		if (num > 1000000 ) {

commands/utility/receiptCommands.js

@@ -1,52 +0,0 @@
-const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
-
-module.exports = {
-    category: 'utility',
-    global: true,
-    data: new SlashCommandBuilder()
-        .setName('budget')
-        .setDescription('The thing')
-        .addSubcommand(subcommand =>
-            subcommand
-                .setName('set')
-                .setDescription('Set weekly budget')
-                .addIntegerOption(option =>
-                    option.setName('amount')
-                        .setRequired(true)
-                        .setDescription('Amount as int'))
-        )
-        .addSubcommand(subcommand =>
-            subcommand
-                .setName('show')
-                .setDescription('not implemented')
-        ),
-    async execute(interaction) {
-        console.log('budget command entrypoint');
-        let db = await interaction.client.localDB;
-        let discordId = interaction.member.id;
-        console.log(db, discordId);
-        let allowed = ['372115788498468864', '222457277708369928'].includes(discordId);
-        console.log(allowed);
-        if (!allowed) {
-            console.log('budget command denied');
-            await interaction.reply('This command may only be invoked by Miffy!');
-            return;
-		}
-        console.log(`Switcching on sub ${interaction.options.getSubcommand()}`);
-        switch (interaction.options.getSubcommand()) {
-            case 'set':
-                console.log('budget command set');
-                let budget = interaction.options.get('amount').value
-                db.prepare(`INSERT OR REPLACE INTO bot_config (id, weekly_budget) VALUES (1, ?)`).run(budget);
-                await interaction.reply(`Budget set to ${budget}`);
-                break;
-                case 'show':
-                console.log('budget command show');
-                await interaction.reply('Not implemented');
-                break
-            default:
-                await interaction.reply(`Sub mismatch. Switching on ${interaction.options.getSubcommand()}`);
-                break;
-        }
-    },
-};

core/db.js

@@ -1,21 +1,20 @@
 const fs = require("fs");
-const Database = require("better-sqlite3");
+const sqlite3 = require("sqlite3").verbose();
-const path = require("path");
 const { open } = require('sqlite');
 const filepath = "./data/minzbot.db";
 
 async function createDbConnection() {
-    const dir = path.dirname(filepath);
+    if (fs.existsSync(filepath)) {
-    if (!fs.existsSync(dir)) {
+        //new sqlite3.Database(filepath);
-        fs.mkdirSync(dir, { recursive: true });
+        const db = await open({filename: filepath, driver: sqlite3.Database});
-    }
+        await initDB(db);
-
-    const db = new Database(filepath, { verbose: console.log });
-
-    initDB(db);
-
-    console.log("[DATABASE] Connection with better-sqlite3 established");
         return db;
+    } else {
+        const db = await open({filename: filepath, driver: sqlite3.Database});
+        await initDB(db);
+        console.log("[DATABASE] Connection with SQLite has been established");
+        return db;
+    }
 }
 
 async function initDB(db) {
@@ -34,29 +33,7 @@ async function initDB(db) {
             lastfm_name TEXT
         );
     `);
-    await db.exec(`
-        CREATE TABLE IF NOT EXISTS bot_config (
-            id INTEGER PRIMARY KEY CHECK (id = 1),
-            weekly_budget REAL DEFAULT 0,
-            exchange_rate_eur_kr REAL DEFAULT 0,
-            last_budget_notification_date TEXT
-        );
-    `);
-    await db.exec(`
-        CREATE TABLE IF NOT EXISTS grocery_budgets (
-            ID INTEGER PRIMARY KEY AUTOINCREMENT,
-            discord_id   VARCHAR(50) NOT NULL,
-            budget_spent REAL,
-            total_spent REAL
-        );
-    `);
-
-    // Optional: Initialize the row if it doesn't exist yet
-    await db.exec(`
-        INSERT OR IGNORE INTO bot_config (id, weekly_budget, last_budget_notification_date) 
-        VALUES (1, 0, NULL);
-    `);
     console.log('[DATABASE] Created new DB table');
 }
 
-module.exports = createDbConnection;
+module.exports = createDbConnection();

deploy-commands.js

@@ -36,14 +36,14 @@ const rest = new REST().setToken(token);
 // and deploy your commands!
 (async () => {
 	try {
-		console.log(`[GUILD] Started refreshing ${guildCommands.length} Guild (/) commands.`);
+		console.log(`[GUILD] Started refreshing ${guildCommands.length} application (/) commands.`);
 
 		let data = await rest.put(
 			Routes.applicationGuildCommands(clientId, guildId),
 			{ body: guildCommands },
 		);
 
-		console.log(`[GUILD] Successfully reloaded ${data.length} Guild (/) commands.`);
+		console.log(`[GUILD] Successfully reloaded ${data.length} application (/) commands.`);
 
 		console.log(`[GLOBAL] Started refreshing ${globalCommands.length} application (/) commands.`);
 

events/receiptsMessageCreate.js

@@ -1,46 +0,0 @@
-const { Events, channelLink, discordSort } = require('discord.js');
-
-module.exports = {
-	name: Events.MessageCreate,
-	async execute(message) {
-        if (message.author.bot) return;
-
-        if(message.channel.id === '1462060674766344370') {
-
-            let reply = "";
-            let db = await message.client.localDB;
-            const receiptsChannel = message.channel; 
-            const authorId = message.author.id;
-            
-            let budgets = await db.prepare(`SELECT * FROM grocery_budgets WHERE discord_id = ?`).get(authorId);
-            let weeklyBudget = await (await db.prepare(`SELECT weekly_budget FROM bot_config`).get()).weekly_budget;
-            
-            console.log(weeklyBudget, budgets);
-            if (budgets === undefined) {
-                console.log(`No budget row in db for ${authorId}`);
-                db.prepare(`INSERT OR REPLACE INTO grocery_budgets (discord_id, budget_spent, total_spent) VALUES (?,0,0)`).run(authorId);
-            }
-
-            let matches = [];
-            let lines = message.content.split("\n");
-            let additionalSpent = 0.0;
-            lines.forEach(line => {0
-                if (line.startsWith('-')) {
-                    console.log(`Matching on line ${line}`);
-                    const regex = /-(?=[0-9])([0-9]*,?[0-9]*)/m;
-                    let match = regex.exec(line)
-                    console.log(match);
-                    additionalSpent = additionalSpent + parseFloat(match[1]);
-                }
-            });
-            
-            if (additionalSpent > 0) {
-                db.prepare(`UPDATE grocery_budgets SET budget_spent = ?, total_spent = ? WHERE discord_id = ?`).run(budgets.budget_spent + additionalSpent, budgets.total_spent + additionalSpent, authorId);
-                let remainingBudget = weeklyBudget - (budgets.budget_spent + additionalSpent);
-
-                reply = `${message.author.globalName} spent ${additionalSpent} of their budget.\nThey have ${remainingBudget} remaining.`;
-                await receiptsChannel.send(reply);
-            }
-        }
-	},
-};

main.js

@@ -2,11 +2,8 @@ const fs = require('node:fs');
 const path = require('node:path');
 const { Client, Collection, Events, GatewayIntentBits, Options, Partials } = require('discord.js');
 const { token } = require('./config.json');
-const createDbConnection = require('./core/db.js');
 
-
+const localDB = require('./core/db');
-async function entrypoint() {
-	const localDB = await createDbConnection();
 
 const client = new Client({ 
 	intents: [GatewayIntentBits.Guilds, GatewayIntentBits.MessageContent, GatewayIntentBits.GuildMessages, GatewayIntentBits.GuildMembers, GatewayIntentBits.GuildPresences, GatewayIntentBits.GuildMessageReactions],
@@ -67,6 +64,3 @@ async function entrypoint() {
 });
 
 client.login(token);
-};
-
-entrypoint();

package.json

@@ -1,11 +1,11 @@
 {
   "dependencies": {
     "axios": "^1.6.8",
-    "better-sqlite3": "^12.6.2",
     "discord.js": "^14.13.0",
     "dotenv": "^16.3.1",
     "spotify-web-api-node": "^5.0.2",
-    "sqlite": "^5.1.1"
+    "sqlite": "^5.1.1",
+    "sqlite3": "^5.1.7"
   },
   "name": "minzbot",
   "description": "Successor of the Discord.py implementation",

timers/cleanupMessages.js

@@ -22,9 +22,7 @@ module.exports = {
             return false;
         }
 
-
         for (let i = 0; i < channelConfigs.length; i++) {
-            try {
             const config = channelConfigs[i];
             const channel = await client.channels.fetch(config.channelId);
     
@@ -52,9 +50,6 @@ module.exports = {
                     message.delete();
                 });
             });
-            } catch (error) {
-                console.log(`[CLEANUP] Failed for ${channelConfigs[i].channelId}`);
-            }
         }
 	},
 };

timers/memberAnniversaries.js

@@ -0,0 +1,78 @@
+const db = require("../core/db");
+
+
+async function fetchAnniversary(id) {
+    console.log(await db);
+    let query = await db.prepare(`SELECT * FROM anniversaries WHERE discord_id = ?`)
+    return await query.get(id);
+}
+
+function insertNewMember(member) {
+    db.run(
+        `INSERT INTO anniversaries (name, guild_id, discord_id, last_anniversary_notification) VALUES (?, ?, ?, ?)`,
+        [member.user.username, member.guild.id, member.id, Date.now()],
+        function (error) {
+            if (error) {
+                console.error(error.message);
+            }
+            console.log(`Inserted a row with the ID: ${this.lastID}`);
+        }
+    );
+}
+
+function isAnniversary(date) {
+    const now = new Date("Thu Nov 11 2024");// new Date();
+    console.log(`${date.getDate()} - ${now.getDate()}`);
+    return date.getDate() === now.getDate() && date.getMonth() === now.getMonth();
+}
+
+function getTimeSince(date) {
+    const now = new Date();
+    const diff = now - date; // `date` is already a Date object
+
+    const seconds = Math.floor(diff / 1000);
+    const minutes = Math.floor(seconds / 60);
+    const hours = Math.floor(minutes / 60);
+    const days = Math.floor(hours / 24);
+    const weeks = Math.floor(days / 7);
+    const months = Math.floor(days / 30);
+    const years = Math.floor(days / 365);
+
+    if (years > 0) return `${years} years ago`;
+    if (months > 0) return `${months} months ago`;
+    if (weeks > 0) return `${weeks} weeks ago`;
+    if (days > 0) return `${days} days ago`;
+    if (hours > 0) return `${hours} hours ago`;
+    if (minutes > 0) return `${minutes} minutes ago`;
+    return `${seconds} seconds ago`;
+}
+
+module.exports = {
+    timeout: 60000,
+    immediate: true,
+    name: 'Daily member anniversary check',
+
+    async tick(client, timer) {
+        return;
+        console.log(`[TIMER] Anniversary Check`);
+        let debugChannel = await client.channels.fetch('1214134516247957504');
+
+        let subscribedChannels = [
+            { guild: '442059309581336578', channel: '1214134516247957504' } //toho-test
+        ]
+
+        for (let channelIndex = 0; channelIndex < subscribedChannels.length; channelIndex++) {
+            const guild = await client.guilds.fetch(subscribedChannels[channelIndex].guild);
+            const channel = await client.channels.fetch(subscribedChannels[channelIndex].channel);
+            let guildMembers = await guild.members.fetch();
+            guildMembers.forEach(member => {
+                if(isAnniversary(member.joinedAt)) {
+                    //debugChannel.send(`Upcoming anniversary ${member.displayName} ${member.joinedAt} ${getTimeSince(member.joinedAt)}`);
+                    console.log(`User anniversary ${member.displayName} ${member.joinedAt} ${getTimeSince(member.joinedAt)}`);
+                    let dbEntry = fetchAnniversary(member.id);
+                    console.log(dbEntry);
+                }
+            });
+        }
+    },
+};

timers/receiptTimer.js

@@ -1,64 +0,0 @@
-module.exports = {
-    timeout: 1000,
-    immediate: false,
-    name: 'Receipt Day Announcements',
-    data: {
-        channelId: '1462060674766344370',
-        targetHour: 0,
-        targetMinute: 1
-    },
-    async tick(client, timer) {
-        try {
-            // 1. Send the message
-            const currentDate = new Date().toLocaleDateString('en-GB', {
-                weekday: 'long',
-                day: '2-digit',
-                month: '2-digit',
-                year: 'numeric'
-            });
-            const channel = await client.channels.fetch(timer.data.channelId);
-            await channel.send(`${currentDate}`);
-            if (currentDate.startsWith('Sunday')) {
-                const response = await fetch(`https://api.frankfurter.dev/v1/latest?amount=1&from=EUR&to=SEK`);
-
-                if (!response.ok) await channel.send(`Failed to fetch exchange rate:\n${response.statusText}`);
-                let db = await client.localDB;
-                const data = await response.json();
-                db.prepare(`UPDATE bot_config SET exchange_rate_eur_kr = ? WHERE id = 1`).run(data.rates.SEK);
-                let weeklyBudget = await (await db.prepare(`SELECT weekly_budget FROM bot_config`).get()).weekly_budget;
-                await channel.send(`Fetched new exchange rate:\n${JSON.stringify(data)}`);
-                db.prepare(`UPDATE grocery_budgets SET budget_spent = 0`).run();
-                await channel.send(`Reset weekly budget to ${weeklyBudget}EUR / ${weeklyBudget*data.rates.SEK}SEK`);
-            }
-
-        } catch (error) {
-            console.error('[TIMER] Error:', error);
-        } finally {
-            // 2. Schedule the NEXT tick manually
-            await this.scheduleNext(client, timer);
-        }
-    },
-
-    async scheduleNext(client, timer) {
-        const now = new Date();
-        const next = new Date();
-
-        next.setHours(timer.data.targetHour, timer.data.targetMinute, 0, 0);
-
-        if (next <= now) {
-            next.setDate(next.getDate() + 1);
-        }
-
-        const delay = next.getTime() - now.getTime();
-
-        if (timer.instance) clearTimeout(timer.instance);
-
-        timer.instance = setTimeout(() => {
-            this.tick(client, timer);
-        }, delay);
-
-        const channel = await client.channels.fetch(timer.data.channelId);
-        if (channel) await channel.send(`Next message scheduled for: ${next.toLocaleString()} with ms delta of ${delay} / ${delay/3600000}`);
-        console.log(`[TIMER] Next message scheduled for: ${next.toLocaleString()}`);
-    }
-};