Fix sending links if they didn't get changed

And do not set a color in misc/fm.js when there already is one set.

.github/workflows/CI.yml

@@ -16,6 +16,6 @@ jobs:
       with:
         node-version: 'latest'
     - name: install dependencies
-      run: npm install
+      run: npm ci
     - name: run tests
       run: npm test 

commands/admin/update.js

@@ -1,4 +1,5 @@
 const calculateReloaded = require("../../util/calculateReloaded");
+const executeCommand = require("../../util/executeCommand");
 const reloadCommands = require("../../util/reloadCommands");
 
 module.exports = {
@@ -27,10 +28,12 @@ module.exports = {
 					let commitCount = stdout.split(/\r\n|\r|\n/).length - 1
 					sendText = `${sendText}\n\nLatest commits (${commitCount}):\n${stdout}`
 					if(sendText.length >= 2000){
-						sendText.slice(1955)
+						sendText = sendText.slice(1955)
 						sendText = `${sendText}\n... Message is too long to show everything`
 					}
 					message.channel.send(sendText)
+					const githash = executeCommand(`git`, ["rev-parse", "--short", "HEAD"]);
+					client.githash = githash.error ? "N/A" : githash.output;
 					if (err) console.log(stderr)
 				})
 			}

commands/info/botinfo.js

@@ -12,10 +12,11 @@ module.exports = {
 		let descriptionArr =  [`Name: ${client.user.username}`,
 						   `Prefix: ${prefix}`,
 						   `Total Servers: ${guildInfo.guildCount}`,
-						   `Total Members: ${guildInfo.totalMembers}`,
+						   `Total Members: ${guildInfo.totalMembers} (${guildInfo.uniqueMemberCount} unique)`,
 						   `Total Commands: ${client.commands.size}`,
 						   `Creation Date: ${getCreationDate(client)}`,
-						   `Source: [Click Here](https://github.com/SileNce5k/discord_bot)`
+						   `Source: [Click Here](https://github.com/SileNce5k/discord_bot)`,
+						   `Current Version: ${client.githash}`
 		]
 
 		let description = "";

commands/info/mc.js

@@ -0,0 +1,103 @@
+// Code is taken from https://github.com/stphnduvall/mcstatus/blob/master/src/index.ts
+// and converted to pure js.
+    
+const net = require('net')
+const { EmbedBuilder } = require('discord.js');
+
+module.exports = {
+    name: 'mc',
+    description: 'get minecraft server information',
+    hidden: true,
+    needsWhitelist: true,
+    async execute({ message, args }) {
+        let host = "";
+        let port = 25565;
+        if (args[0]) host = args[0];
+
+        if (host.includes(":")) {
+            port = host.replace(/.+(?:\:)/g, "");
+            host = host.match(/.+(?:\:)/g, "")[0].replace(":", "");
+        }
+        if(host === "") return message.channel.send("No host provided")
+        let info = await getMinecraftServerInfo(host, port);
+        if (info) {
+            const embed = new EmbedBuilder()
+            embed.setColor("#ee7939")
+            embed.setTimestamp()
+            embed.addFields(
+                { name: "ping", value: info.ping.toString(), inline: false },
+                { name: "Player Count", value: info.playercount.toString(), inline: false },
+                { name: "Max Players", value: info.maxPlayers.toString(), inline: false },
+                { name: "MOTD", value: info.motd, inline: false },
+            )
+
+            message.channel.send({ embeds: [embed] });
+        } else {
+            message.channel.send("Something went wrong\nThe minecraft server is likely not reachable from the discord bot")
+        }
+
+    }
+};
+
+
+
+async function getMinecraftServerInfo(host, port = 25565) {
+    let serverInfo = {
+        ping: undefined,
+        maxPlayers: undefined,
+        version: undefined,
+        playercount: undefined,
+        motd: undefined
+    }
+
+    let startTime = new Date();
+    let data;
+    let ping;
+    serverInfo = await new Promise((resolve) => {
+        const client = net.connect({ host, port }, () => {
+            ping = Math.round(new Date().getMilliseconds() - startTime.getMilliseconds());
+
+            let buff = Buffer.from([0xFE, 0x01]);
+            client.write(buff);
+
+        })
+        let error = false;
+        client.on('data', (d) => {
+            data = d.toString()
+            client.destroy();
+
+        })
+        client.once('error', (error) => {
+            console.error(error)
+            error = true;
+        })
+        client.once('connectionAttemptFailed', (ip) => {
+            console.error("in attempt failed")
+            error = true;
+        })
+
+        client.once('connectionAttemptTimeout', (ip) => {
+            console.error("in attempt timeout")
+            error = true;
+        })
+        client.on('close', () => {
+            if (!error) {
+                let _serverInfo = data?.split('\x00\x00\x00');
+
+                if (!_serverInfo) {
+                    console.log("Something went wrong.")
+                    resolve(serverInfo)
+                }
+                serverInfo.version = _serverInfo[2].replace(/\u0000/g, '')
+                serverInfo.motd = _serverInfo[3].replace(/\u0000/g, '')
+                serverInfo.playercount = Number(_serverInfo[4].replace(/\u0000/g, ''))
+                serverInfo.maxPlayers = Number(_serverInfo[5].replace(/\u0000/g, ''))
+                serverInfo.ping = Number(ping)
+                resolve(serverInfo)
+            } else {
+                resolve(0)
+            }
+        })
+    })
+    return serverInfo
+}

commands/info/pfp.js

@@ -16,9 +16,9 @@ module.exports = {
 		let user = message.guild.members.cache.get(info);
 		let guildPfp = user.avatarURL({format: 'png', dynamic: true, size: 4096});
 		let globalPfp = user.user.avatarURL({format: 'png', dynamic: true, size: 4096});
-		let sendText = `Global pfp:\n${globalPfp}`;
+		let sendText = `${globalPfp}`;
 		if(guildPfp != null){
-			sendText = `${sendText}\nGuild pfp:\n${guildPfp}`;
+			sendText = `Global pfp${sendText}\nGuild pfp:\n${guildPfp}`;
 		}
 
 		message.channel.send(sendText)

commands/info/serverinfo.js

@@ -15,6 +15,7 @@ module.exports = {
 				{name: "Server Name", value: message.guild.name, inline: false},
 				{name: "Created", value: convertDateToISOString(message.guild.createdAt), inline: false},
 				{name: "Members", value: message.guild.memberCount.toString(), inline: false},
+				{name: "Channels", value: message.guild.channels.channelCountWithoutThreads.toString(), inline: false},
 				
 			
 			])

commands/misc/dl.js

@@ -0,0 +1,71 @@
+const path = require('path');
+const fs = require('fs')
+
+const executeCommand = require('../../util/executeCommand');
+module.exports = {
+    name: 'dl',
+    description: 'Download a video',
+    moreHelp: [
+        "Usage: <prefix>dl <url>"
+    ],
+    async execute({message, args}) {
+        const downloadsDir = path.resolve(process.cwd(), 'data', 'downloads', Date.now().toString());
+        const cookieFilepath = path.resolve(process.cwd(), 'data', 'cookies.txt')
+        if(!fs.existsSync(cookieFilepath)) {
+            message.channel.send("Some dependencies are needed for the command to work properly. Please let the bot's owner know.")
+            return;
+        }
+        fs.mkdirSync(downloadsDir, {recursive: true});
+        
+        let url;
+        
+        if(args.length > 0){
+            if(args[0].charAt(0) === '<' && args[0].charAt(args[0].length - 1) === '>'){
+                args[0] = args[0].slice(1, args[0].length - 1)
+            }
+            try {
+                url = new URL(args[0]);
+                url = url.href;
+            } catch (error) {
+                this.cleanUp(downloadsDir);
+                message.channel.send("Could not parse the provided argument as a URL.");
+                return;
+            }
+        } else {
+            this.cleanUp(downloadsDir);
+            return message.channel.send("You have to provide a URL in an argument.")
+        }
+        
+        const originalMessage = await message.channel.send("Downloading video...")
+        
+        if(executeCommand("yt-dlp", [url, "-P", downloadsDir, "--cookies", cookieFilepath]).error){
+            originalMessage.edit("An error occurred when downloading the video.");
+            this.cleanUp(downloadsDir);
+            return;
+        }
+        
+
+        let files = fs.readdirSync(downloadsDir);
+        if(files.length < 1) {
+            this.cleanUp(downloadsDir);
+            originalMessage.edit("Something went wrong when downloading the video.")
+            return;
+        }
+        const filename = files[0];
+
+        await originalMessage.edit({
+            content: null,
+            files: [{
+            attachment: path.resolve(downloadsDir, filename)
+        }]})
+
+        this.cleanUp(downloadsDir);
+
+        
+    },
+
+    cleanUp(downloadsDir){
+        fs.rmSync(downloadsDir, {force: true, recursive: true});
+    },
+    
+}

commands/misc/fm.js

@@ -87,11 +87,13 @@ module.exports = {
         if(sendText.embed != null){
             let parse = parseMention(message.author.id, message.guild)
             let user = message.guild.members.cache.get(parse);
-            let roleColor = 15788778;
-            if (user.roles.color) {
-                roleColor = user.roles.color.color;
+            if(!sendText.embed.data.color){
+                let roleColor = 15788778;
+                if (user.roles.color) {
+                    roleColor = user.roles.color.color;
+                }
+                sendText.embed.setColor(roleColor);
             }
-            sendText.embed.setColor(roleColor);
 		    message.channel.send({embeds :[sendText.embed]})
         }else{
             message.channel.send(sendText.text.replaceAll("<prefix>", prefix));

commands/misc/ig.js

@@ -0,0 +1,28 @@
+
+module.exports = {
+    name: 'ig',
+    description: 'Replaces Instagram links with kkinstagram and deletes the original message',
+    execute({message, args}) {
+        const noUrlErr = "You need to provide an Instagram link to use this command."
+        if(args.length < 1) {
+            message.channel.send(noUrlErr);
+            return;
+        }
+        let replacedLink = "";
+        const regex = /(?<=\/)(instagram)\.com/g
+        if(args[0].startsWith("https://") || args[0].startsWith("http://")){
+            replacedLink = args[0].replace(regex, "kkinstagram.com");
+        }
+        if(replacedLink.length === 0 || args[0] === replacedLink){
+            message.channel.send(noUrlErr);
+            return;
+        }
+        message.channel.send(replacedLink);
+        try{
+            message.delete()
+        }catch(err){
+            console.error(`${this.name}: An error occurred while trying to delete the original message.`)
+            console.error(err);
+        }
+    }
+};

commands/misc/say.js

@@ -1,6 +1,7 @@
 module.exports = {
 	name: 'say',
 	description: 'Repeats arguments',
+	admin: true,
 	execute({message, args}) {
 
 		if(args.length == 0)

commands/misc/tdoss.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const path = require('path');
 const { writeFile } = require('node:fs/promises')
 const { Readable } = require('node:stream')
-
+const executeCommand = require('../../util/executeCommand');
 
 module.exports = {
     name: 'tdoss',
@@ -60,8 +60,8 @@ module.exports = {
         }
 
 
-        const command = `magick ${tdossTemplate} \\( ${directory}/input.png -resize 800x800^ -gravity center -extent 1000x1000 \\) -compose dst-over -composite ${directory}/tdoss_result.png`;
-        if (this.executeCommand(command).error === true) {
+        const commandArgs = [tdossTemplate, "(", `${directory}/input.png`, "-resize", "800x800^", "-gravity", "center", "-extent", "1000x1000", ")", "-compose", "dst-over", "-composite", `${directory}/tdoss_result.png`]
+        if (executeCommand("magick", commandArgs).error === true) {
             message.channel.send("Something went wrong during image manipulation.\nTry again and if it keeps happening, contact the owner of the bot.")
             fs.rmSync(`${directory}`, {recursive: true})
             return
@@ -75,20 +75,6 @@ module.exports = {
         await message.channel.send({files: [final_image]})
         fs.rmSync(`${directory}`, {recursive: true})
     },
-
-
-    executeCommand(command) {
-        console.log("Executing:", command)
-        try {
-            const output = execSync(command, { encoding: 'utf-8' })
-            if (output.length != 0)
-                console.log(output)
-        } catch (error) {
-            console.error(`Error executing ${command.split(" ")[0]} command:`, error);
-            return { error: true };
-        }
-        return { error: false };
-    },
     // https://stackoverflow.com/a/77210219
     async downloadImage(url, path) { 
         let res;

commands/misc/x.js

@@ -0,0 +1,28 @@
+
+module.exports = {
+    name: 'x',
+    description: 'Replaces X/Twitter links with fxtwitter and deletes the original message',
+    execute({message, args}) {
+        const noUrlErr = "You need to provide an X or twitter link to use this command."
+        if(args.length < 1) {
+            message.channel.send(noUrlErr);
+            return;
+        }
+        let replacedLink = "";
+        const regex = /(?<=\/)(x|twitter)\.com/g
+        if(args[0].startsWith("https://") || args[0].startsWith("http://")){
+            replacedLink = args[0].replace(regex, "fxtwitter.com");
+        }
+        if(replacedLink.length === 0 || args[0] === replacedLink){
+            message.channel.send(noUrlErr);
+            return;
+        }
+        message.channel.send(replacedLink);
+        try{
+            message.delete()
+        }catch(err){
+            console.error(`${this.name}: An error occurred while trying to delete the original message.`)
+            console.error(err);
+        }
+    }
+};

package.json

@@ -5,8 +5,8 @@
   "main": "server.js",
   "dependencies": {
     "@zuzak/owo": "^1.14.1",
-    "discord.js": "^14.20.0",
-    "dotenv": "^16.5.0",
+    "discord.js": "^14.21.0",
+    "dotenv": "^17.2.1",
     "seedrandom": "^3.0.5",
     "sqlite3": "^5.1.6"
   },
@@ -21,6 +21,6 @@
   "license": "UNLICENSE",
   "devDependencies": {
     "@types/jest": "^30.0.0",
-    "jest": "^30.0.0"
+    "jest": "^30.0.5"
   }
 }

server.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const createInitialConfig = require("./util/createInitialConfig")
 const convertJSONToSQL = require('./util/timer/convertJSONToSQL');
+const executeCommand = require('./util/executeCommand.js');
 const sqlite3 = require('sqlite3').verbose();
 if(!fs.existsSync("./data/config.json")) {
 	createInitialConfig();
@@ -56,6 +57,9 @@ client.settings.set("presenceType", presenceType);
 client.settings.set("presenceText", presenceText);
 client.settings.set("globalPrefix", globalPrefix);
 
+const githash = executeCommand(`git`, ["rev-parse", "--short", "HEAD"]);
+client.githash = githash.error ? "N/A" : githash.output;
+
 const reloadCommands = require("./util/reloadCommands.js");
 const onMessage = require('./server/message');
 const onReady = require('./server/ready');

tests/getGuildCount.test.js

@@ -1,17 +0,0 @@
-const getGuildInfo = require('../util/getGuildInfo');
-
-
-
-test("Testing getGuildCount", () => {
-    for(let i = 1; i < 200000; i = i+i*30 ){
-        let client = {guilds: {cache: new Map()}}
-        client.guilds.cache.each = client.guilds.cache.forEach;
-
-        for(let j = 0; j < i; j++){
-            client.guilds.cache.set(`num: ${j}`, j);
-        }
-        
-        expect(getGuildInfo(client).guildCount).toBe(i);
-        
-    }
-})

util/executeCommand.js

@@ -0,0 +1,15 @@
+const { execFileSync } = require('child_process');
+module.exports = function(command, commandArgs, verbose=false) {
+    if (typeof command !== 'string' || !Array.isArray(commandArgs)) return { error: true };
+    console.log("Executing:", command, commandArgs.join(" "));
+    let output;
+    try {
+        output = execFileSync(command, commandArgs, {encoding: 'utf8'})
+        if (output.length !== 0 && verbose)
+            console.log(output)
+    } catch (error) {
+        console.error(`Error executing ${command} command:`, error);
+        return { error: true };
+    }
+    return { error: false, output};
+}

util/getGuildInfo.js

@@ -1,9 +1,16 @@
 module.exports = function(client){
 	let guildCount = 0;
 	let totalMembers = 0;
+	const uniqueMembers = new Map();
 		client.guilds.cache.each(guild => {
 			guildCount++
 			totalMembers += guild.memberCount;
+			guild.members.cache.each(member => {
+				if(!uniqueMembers.has(member.id)){
+					uniqueMembers.set(member.id, true);
+				}
+			})
 		});
-	return {guildCount: guildCount, totalMembers: totalMembers};
+	const uniqueMemberCount = uniqueMembers.size;
+	return {guildCount, totalMembers, uniqueMemberCount};
 }

util/lastfm/getCurrentScrobble.js

@@ -2,6 +2,11 @@ const getNickname = require("../getNickname");
 const parseMention = require("../parseMention");
 const getFmUsername = require("./getFmUsername");
 const {EmbedBuilder} = require('discord.js');
+const path = require('path');
+const fs = require('fs');
+const { writeFile } = require('node:fs/promises')
+const executeCommand = require('../executeCommand');
+const { Readable } = require('node:stream')
 
 require("dotenv").config();
 module.exports = async function (userID, guild) {
@@ -58,21 +63,56 @@ module.exports = async function (userID, guild) {
             sendText.text = tracks.errorMsg;
             return sendText;
         }
+        let coverDir = path.resolve(process.cwd(), 'data', 'covers');
+        let color = "#C27D0E"
+        const directory = path.resolve(coverDir, Math.floor(new Date).toString())
+        fs.mkdirSync(directory, {recursive: true})
+        const coverFile = path.resolve(directory, "cover")
+        let downloadResult = await downloadImage(tracks[0].cover, coverFile);
+        if(downloadResult.value === ERROR_CODES.SUCCESS){
+            const commandArgs = [`${coverFile}.${downloadResult.ext}`, "-resize", "1x1", "txt:-"]         
+            let res = executeCommand("magick", commandArgs);
+            if(!res.error) color = res.output.split("\n")[1].split(" ")[3].slice(0,7);
+            
+        }
         const embed = new EmbedBuilder()
-            .setAuthor({name: `Now playing - ${nickname}`, iconURL: user.user.avatarURL({ dynamic: true, size: 4096 })})
-            .setThumbnail(tracks[0].cover)
-            .setColor(15780145)
-            .addFields({
-                name: `${isCurrentScrobble}:`, value: `${tracks[0].song}\n **${tracks[0].artist} • ** ${tracks[0].album}`
-            },)
+        .setAuthor({name: `Now playing - ${nickname}`, iconURL: user.user.avatarURL({ dynamic: true, size: 4096 })})
+        .setThumbnail(tracks[0].cover)
+        .setColor(color)
+        .addFields({
+            name: `${isCurrentScrobble}:`, value: `${tracks[0].song}\n **${tracks[0].artist} • ** ${tracks[0].album}`
+        },)
         if (isCurrentScrobble === "Current") {
             embed.addFields({
                 name: "Previous:", value: `${tracks[1].song}\n **${tracks[1].artist} • ** ${tracks[1].album}`
             },)
         }
         sendText.embed = embed;
+        fs.rmSync(`${directory}`, {recursive: true})
     } else {
         sendText.text = "You haven't set your last.fm username yet. Use `<prefix>fm set <lastfm_username>` to set it.";
     }
     return sendText;
 }
+const ERROR_CODES = {
+    SUCCESS: 0,
+    HTTP_ERROR: 1,
+    NOT_IMAGE: 2,
+    FETCH_ERROR: 3
+}
+async function downloadImage(url, downloadPath) { 
+    let res;
+    try {
+        res = await fetch(url);
+    } catch (error) {
+        return {value: ERROR_CODES.FETCH_ERROR, errorMessage: error.cause?.message || error.message};
+    }
+    if(!res.ok) return {value: ERROR_CODES.HTTP_ERROR, errorMessage: res.status.toString()};
+    const contentType = res.headers.get('content-type');
+    
+    if(!contentType || !contentType.startsWith("image")) return {value: ERROR_CODES.NOT_IMAGE, errorMessage: contentType || "No content-type header"};
+    const fileExt = contentType.split("/")[1]
+    const stream = Readable.fromWeb(res.body)
+    await writeFile(`${downloadPath}.${fileExt}`, stream);
+    return {value: ERROR_CODES.SUCCESS, errorMessage: "", ext: fileExt};
+}

util/lastfm/getTopAlbums.js

@@ -77,7 +77,8 @@ module.exports = async function (userID, option, guild, compatibility=false) {
         fetch(`https://ws.audioscrobbler.com/2.0/?method=user.gettopalbums&user=${lastfmUsername}&period=${option[0]}&api_key=${process.env.LAST_FM_API_KEY}&format=json`)
         .then(response => response.json())
         .then(data => {
-            for(let i = 0; i < 10; i++){
+            const maxIterations = data.topalbums.album.length >= 10 ? 10 : data.topalbums.album.length;
+            for(let i = 0; i < maxIterations; i++){
                 let album = {}
                 let currentAlbum = data.topalbums.album[i];
                 album.artist = currentAlbum.artist.name;

util/lastfm/getTopArtists.js

@@ -77,7 +77,8 @@ module.exports = async function (userID, option, guild, compatibility=false) {
         fetch(`https://ws.audioscrobbler.com/2.0/?method=user.gettopartists&user=${lastfmUsername}&period=${option[0]}&api_key=${process.env.LAST_FM_API_KEY}&format=json`)
         .then(response => response.json())
         .then(data => {
-            for(let i = 0; i < 10; i++){
+            const maxIterations = data.topartists.artist.length >= 10 ? 10 : data.topartists.artist.length;
+            for(let i = 0; i < maxIterations; i++){
                 let artist = {}
                 let currentArtist = data.topartists.artist[i];
                 artist.name = currentArtist.name;

util/lastfm/getTopTracks.js

@@ -78,7 +78,8 @@ module.exports = async function (userID, option, guild, compatibility=false) {
         fetch(`https://ws.audioscrobbler.com/2.0/?method=user.gettoptracks&user=${lastfmUsername}&period=${option[0]}&api_key=${apiKey}&format=json`)
         .then(response => response.json())
         .then(data => {
-            for(let i = 0; i < 10; i++){
+            const maxIterations = data.toptracks.track.length >= 10 ? 10 : data.toptracks.track.length;
+            for(let i = 0; i < maxIterations; i++){
                 let track = {}
                 let currentTrack = data.toptracks.track[i];
                 track.artist = currentTrack.artist.name;

util/setPresence.js

@@ -22,7 +22,8 @@ module.exports = function ({presenceText, presenceType, client}) {
 		guilds: guildInfo.guildCount,
 		prefix: globalPrefix,
 		uptime: uptimeFormat,
-		members: guildInfo.totalMembers
+		members: guildInfo.totalMembers,
+		uniqueMembers: guildInfo.uniqueMemberCount
 	}
 
 	const regex = /(?<=\${)(.*?)(?=})/g;