Return sticker url with size 1024

.gitignore

@@ -2,3 +2,4 @@ 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`);
+				stickers.push(`https://media.discordapp.net/stickers/${sticker.id}.png?size=1024`);
 				collector.stop();
 			});
 		});

commands/utility/linkTrack.js

@@ -41,10 +41,6 @@ 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')
@@ -54,6 +50,7 @@ module.exports = {
 		clientSecret: spotify.clientSecret,
 	}),
 	async execute(interaction) {
+		try {
 			let token = await this.spotifyAPI.clientCredentialsGrant().then(
 				function(data) {
 				  return data.body['access_token'];
@@ -97,12 +94,20 @@ 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.setImage(spotifyTrack['body'].album.images[0].url);
+				trackEmbed.setThumbnail(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(', ');
@@ -111,7 +116,7 @@ module.exports = {
 			}
 			
 			if(interaction.options.getAttachment('cover_override')) {
-			trackEmbed.setImage(interaction.options.getAttachment('cover_override').url);
+				trackEmbed.setThumbnail(interaction.options.getAttachment('cover_override').url);
 			}
 			songName = interaction.options.getString('songname', false) ?? songName;
 			artists = interaction.options.getString('artist', false) ?? artists;
@@ -122,12 +127,11 @@ module.exports = {
 			trackEmbed.setTitle(`${title}`);
 			
 			let submitterName = interaction.member.displayName;
-		let footer = interaction.options.getString('footer_override', false) ?? `Submitted by ${submitterName}`;
-		trackEmbed.setFooter({text: footer });
+			let footer = `Submitted by ${submitterName} `;
 			
 			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 },
 				)
 			}
 	
@@ -138,7 +142,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 },
 				)
 			} 
 	
@@ -148,28 +152,23 @@ 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}`;
 				
-			trackEmbed.addFields(
-				{ name: `LFM Global`, value: `Listeners: ${listeners} • Scrobbles: ${globalScrobbles}\n`, inline: false },
-			)
-
-			let tagHeader = 'Tags';
+				let tagContent = '';
 				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) {
-				tags = this.joinLineBreak(tags, ', ', 4);
+				if(tags.length > 1) {
+					tags = this.joinLineBreak(tags, ', ', 3);
 					trackEmbed.addFields(
-					{ name: `${tagHeader}`, value: `${tags.substr(0,60)}${tags.length > 60 ? '...' : ''}`, inline: true },
+						{ name: `Tags`, 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 });
@@ -177,11 +176,20 @@ module.exports = {
 			}
 	
 			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 ) {

timers/memberAnniversaries.js

@@ -1,78 +0,0 @@
-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);
-                }
-            });
-        }
-    },
-};