diff --git a/commands/info/userinfo.js b/commands/info/userinfo.js index 09c079f..9984f50 100644 --- a/commands/info/userinfo.js +++ b/commands/info/userinfo.js @@ -1,4 +1,4 @@ -const Discord = require('discord.js'); +const {EmbedBuilder} = require('discord.js'); const getCreationDate = require('../../util/getCreationDate.js'); const getJoinDate = require('../../util/getJoinDate.js'); const getNickname = require('../../util/getNickname.js'); @@ -48,23 +48,32 @@ module.exports = { let discriminator = user.user.discriminator; if(discriminator === "0") discriminator = ""; - let username = `**${user.user.username}#${user.user.discriminator}**${nickname}` - const embed = new Discord.MessageEmbed() + else + discriminator = `#${discriminator}`; + let username = `**${user.user.username}${discriminator}**${nickname}`; + const embed = new EmbedBuilder() .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", username) - .addField("Status", status, false) - if(isPresence) - embed.addField("Presence", user.presence.activities[0].name, false) - if(presenceDetails != 0) - embed.addField("Details", presenceDetails.toString(), false) - embed.addField("Creation date", getCreationDate(user), true) - embed.addField("Join date", getJoinDate(user, message.guild), true) - if(roles != ""){ - embed.addField("Roles", roles) - } + .setAuthor({name: user.user.username, iconURL: user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 })}) + .addFields([ + { name: "Username", value: username, inline: false }, + ]); + if (isPresence) + embed.addFields([{name: "Presence", value: user.presence.activities[0].name, inline: false}]) + if (presenceDetails != 0){ + embed.addFields([{name: "Details", value: presenceDetails.toString(), inline: false}]) + embed.addFields([{name: "Status", value: status, inline: true }]) + } + else + embed.addFields([{ name: "Status", value: status, inline: false }]) + embed.addFields([ + { name: "Creation date", value: getCreationDate(user), inline: true }, + { name: "Join date", value: getJoinDate(user, message.guild), inline: true } + ]) + if (roles != "") { + embed.addFields({name: "Roles", value: roles, inline: false}) + } message.channel.send({embeds :[embed]}); } diff --git a/package.json b/package.json index 51304d0..37d27a2 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "server.js", "dependencies": { "@zuzak/owo": "^1.14.1", - "discord.js": "^13.6.0", + "discord.js": "^14.16.3", "dotenv": "^16.4.5", "express": "^4.21.1", "mysql": "^2.18.1", diff --git a/server.js b/server.js index 43bbb81..eacf2a5 100644 --- a/server.js +++ b/server.js @@ -20,8 +20,8 @@ const createDatabaseTables = require('./server/createDatabaseTables'); const createLastfmTable = require('./server/createLastfmTable'); createLastfmTable(); checkAndConvertJSONToSQL(); -const Discord = require('discord.js'); -const client = new Discord.Client({ intents: [Discord.Intents.FLAGS.GUILDS, Discord.Intents.FLAGS.GUILD_MESSAGES, Discord.Intents.FLAGS.GUILD_PRESENCES] }); +const { Collection, Client, GatewayIntentBits, Partials } = require('discord.js'); +const client = new Client({ intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMessages, GatewayIntentBits.MessageContent, GatewayIntentBits.GuildMembers, GatewayIntentBits.GuildPresences], partials: [Partials.Channel] }); const { globalPrefix, token, @@ -33,10 +33,10 @@ const { presenceText } = require('./data/config.json'); -client.settings = new Discord.Collection(); -client.commands = new Discord.Collection(); -client.serverPrefixes = new Discord.Collection(); -client.netmodules = new Discord.Collection(); +client.settings = new Collection(); +client.commands = new Collection(); +client.serverPrefixes = new Collection(); +client.netmodules = new Collection(); client.settings.set("presenceType", presenceType);