From cdc96ee087854ee795eb8ac7718925ebe29842a3 Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Mon, 28 Jun 2021 13:45:31 +0200 Subject: [PATCH 1/4] Align Joined and Creation dates in userinfo --- commands/userinfo.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/commands/userinfo.js b/commands/userinfo.js index cd3ea3d..0e27674 100644 --- a/commands/userinfo.js +++ b/commands/userinfo.js @@ -33,9 +33,8 @@ module.exports = { .setAuthor(user.user.username, user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 })) .addField("Username", `**${user.user.username}#${user.user.discriminator}**${nickname}`) .addField("Presence", user.user.presence.activities[0].name) - .addField("Joined", getJoinDate(user, message.guild)) + .addField("Joined", getJoinDate(user, message.guild), true) .addField("Creation date", getCreationDate(user), true) - .addField("Join date", user.joinDate, true) message.channel.send(embed); } From 8a47c78b449f5219827b0f230a54be44d3b0d2f3 Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Mon, 28 Jun 2021 17:09:17 +0200 Subject: [PATCH 2/4] Update gitignore Add whole data dir and netload dir --- .gitignore | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 542f9db..e24e91f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -/data/config.json -/data/netmoduleWhitelist.json -/data/serverPrefixes.json +data/ node_modules/ -/commands/debug.js \ No newline at end of file +/commands/debug.js +netload/ \ No newline at end of file From a1986c12a2e24463a205fbecadaeabc1d6314bfc Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Mon, 28 Jun 2021 17:54:22 +0200 Subject: [PATCH 3/4] Add convertDateToISOString.js Also make getCreationDate.js and getJoinDate.js use this function --- util/convertDateToISOString.js | 3 +++ util/getCreationDate.js | 3 ++- util/getJoinDate.js | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 util/convertDateToISOString.js diff --git a/util/convertDateToISOString.js b/util/convertDateToISOString.js new file mode 100644 index 0000000..764c279 --- /dev/null +++ b/util/convertDateToISOString.js @@ -0,0 +1,3 @@ +module.exports = function (date){ + return date.getUTCFullYear() + '-' + ('0' + (date.getUTCMonth()+1)).slice(-2) + '-' + ('0' + date.getUTCDate()).slice(-2)+" "+date.getUTCHours()+":"+date.getUTCMinutes()+":"+date.getUTCSeconds(); +} \ No newline at end of file diff --git a/util/getCreationDate.js b/util/getCreationDate.js index 2bb9472..fa15199 100644 --- a/util/getCreationDate.js +++ b/util/getCreationDate.js @@ -1,4 +1,5 @@ +const convertDateToISOString = require("./convertDateToISOString"); module.exports = function(user){ let date = user.user.createdAt; - return date.getUTCFullYear() + '-' + ('0' + (date.getUTCMonth()+1)).slice(-2) + '-' + ('0' + date.getUTCDate()).slice(-2)+" "+date.getUTCHours()+":"+date.getUTCMinutes()+":"+date.getUTCSeconds(); + return convertDateToISOString(date); } \ No newline at end of file diff --git a/util/getJoinDate.js b/util/getJoinDate.js index e61a3ea..20cfc32 100644 --- a/util/getJoinDate.js +++ b/util/getJoinDate.js @@ -1,5 +1,6 @@ +const convertDateToISOString = require("./convertDateToISOString"); module.exports = function(user, guild){ const member = guild.member(user) let date = member.joinedAt; - return date.getUTCFullYear() + '-' + ('0' + (date.getUTCMonth()+1)).slice(-2) + '-' + ('0' + date.getUTCDate()).slice(-2)+" "+date.getUTCHours()+":"+date.getUTCMinutes()+":"+date.getUTCSeconds(); + return convertDateToISOString(date) } \ No newline at end of file From e9a93c9279024172053f3d0ac1191229a65d232c Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Mon, 28 Jun 2021 17:57:13 +0200 Subject: [PATCH 4/4] Add morePresence, and make userinfo.js use it To get more details about stuff. Only foobar2000, apple music and spotify for now --- commands/userinfo.js | 11 +++++++---- util/morePresence.js | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 util/morePresence.js diff --git a/commands/userinfo.js b/commands/userinfo.js index 0e27674..1231a0d 100644 --- a/commands/userinfo.js +++ b/commands/userinfo.js @@ -1,6 +1,7 @@ const Discord = require('discord.js'); const getCreationDate = require('../util/getCreationDate.js'); const getJoinDate = require('../util/getJoinDate.js'); +const morePresence = require('../util/morePresence.js'); const parseMention = require("../util/parseMention.js") module.exports = { @@ -25,16 +26,18 @@ module.exports = { roleColor = user.roles.color.color; } - + let presenceDetails = morePresence(user); const embed = new Discord.MessageEmbed() .setThumbnail(user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 })) .setColor(roleColor) .setTimestamp() .setAuthor(user.user.username, user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 })) .addField("Username", `**${user.user.username}#${user.user.discriminator}**${nickname}`) - .addField("Presence", user.user.presence.activities[0].name) - .addField("Joined", getJoinDate(user, message.guild), true) - .addField("Creation date", getCreationDate(user), true) + .addField("Presence", user.user.presence.activities[0].name, true) + if(presenceDetails != 0) + embed.addField("Details", presenceDetails, true) + embed.addField("Joined", getJoinDate(user, message.guild), false) + embed.addField("Creation date", getCreationDate(user), true) message.channel.send(embed); } diff --git a/util/morePresence.js b/util/morePresence.js new file mode 100644 index 0000000..b881258 --- /dev/null +++ b/util/morePresence.js @@ -0,0 +1,19 @@ +module.exports = function (user) { + let details; + switch (user.user.presence.activities[0].name) { + case "foobar2000": + details = `Artist/Album: ${user.user.presence.activities[0].state}\nSong: ${user.user.presence.activities[0].details}\n` + break; + case "Apple Music": + details = `Artist/Song: ${user.user.presence.activities[0].state}\nAlbum: ${user.user.presence.activities[0].details}\n` + break; + case "Spotify": + details = `Artist: ${user.user.presence.activities[0].state}\nAlbum: ${user.user.presence.activities[0].details}\nSong: ${user.user.presence.activities[0].assets.largeText}` + break; + default: + details = 0; + break; + } + + return details +} \ No newline at end of file