Merge e112050e69
into c751a5aec2
This commit is contained in:
commit
bd32ff8e3d
3 changed files with 31 additions and 22 deletions
|
@ -1,4 +1,4 @@
|
||||||
const Discord = require('discord.js');
|
const {EmbedBuilder} = require('discord.js');
|
||||||
const getCreationDate = require('../../util/getCreationDate.js');
|
const getCreationDate = require('../../util/getCreationDate.js');
|
||||||
const getJoinDate = require('../../util/getJoinDate.js');
|
const getJoinDate = require('../../util/getJoinDate.js');
|
||||||
const getNickname = require('../../util/getNickname.js');
|
const getNickname = require('../../util/getNickname.js');
|
||||||
|
@ -48,23 +48,32 @@ module.exports = {
|
||||||
let discriminator = user.user.discriminator;
|
let discriminator = user.user.discriminator;
|
||||||
if(discriminator === "0")
|
if(discriminator === "0")
|
||||||
discriminator = "";
|
discriminator = "";
|
||||||
let username = `**${user.user.username}#${user.user.discriminator}**${nickname}`
|
else
|
||||||
const embed = new Discord.MessageEmbed()
|
discriminator = `#${discriminator}`;
|
||||||
|
let username = `**${user.user.username}${discriminator}**${nickname}`;
|
||||||
|
const embed = new EmbedBuilder()
|
||||||
.setThumbnail(user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 }))
|
.setThumbnail(user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 }))
|
||||||
.setColor(roleColor)
|
.setColor(roleColor)
|
||||||
.setTimestamp()
|
.setTimestamp()
|
||||||
.setAuthor(user.user.username, user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 }))
|
.setAuthor({name: user.user.username, iconURL: user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 })})
|
||||||
.addField("Username", username)
|
.addFields([
|
||||||
.addField("Status", status, false)
|
{ name: "Username", value: username, inline: false },
|
||||||
if(isPresence)
|
]);
|
||||||
embed.addField("Presence", user.presence.activities[0].name, false)
|
if (isPresence)
|
||||||
if(presenceDetails != 0)
|
embed.addFields([{name: "Presence", value: user.presence.activities[0].name, inline: false}])
|
||||||
embed.addField("Details", presenceDetails.toString(), false)
|
if (presenceDetails != 0){
|
||||||
embed.addField("Creation date", getCreationDate(user), true)
|
embed.addFields([{name: "Details", value: presenceDetails.toString(), inline: false}])
|
||||||
embed.addField("Join date", getJoinDate(user, message.guild), true)
|
embed.addFields([{name: "Status", value: status, inline: true }])
|
||||||
if(roles != ""){
|
}
|
||||||
embed.addField("Roles", roles)
|
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]});
|
message.channel.send({embeds :[embed]});
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
"main": "server.js",
|
"main": "server.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@zuzak/owo": "^1.14.1",
|
"@zuzak/owo": "^1.14.1",
|
||||||
"discord.js": "^13.6.0",
|
"discord.js": "^14.16.3",
|
||||||
"dotenv": "^16.4.5",
|
"dotenv": "^16.4.5",
|
||||||
"express": "^4.21.1",
|
"express": "^4.21.1",
|
||||||
"mysql": "^2.18.1",
|
"mysql": "^2.18.1",
|
||||||
|
|
12
server.js
12
server.js
|
@ -20,8 +20,8 @@ const createDatabaseTables = require('./server/createDatabaseTables');
|
||||||
const createLastfmTable = require('./server/createLastfmTable');
|
const createLastfmTable = require('./server/createLastfmTable');
|
||||||
createLastfmTable();
|
createLastfmTable();
|
||||||
checkAndConvertJSONToSQL();
|
checkAndConvertJSONToSQL();
|
||||||
const Discord = require('discord.js');
|
const { Collection, Client, GatewayIntentBits, Partials } = require('discord.js');
|
||||||
const client = new Discord.Client({ intents: [Discord.Intents.FLAGS.GUILDS, Discord.Intents.FLAGS.GUILD_MESSAGES, Discord.Intents.FLAGS.GUILD_PRESENCES] });
|
const client = new Client({ intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMessages, GatewayIntentBits.MessageContent, GatewayIntentBits.GuildMembers, GatewayIntentBits.GuildPresences], partials: [Partials.Channel] });
|
||||||
const {
|
const {
|
||||||
globalPrefix,
|
globalPrefix,
|
||||||
token,
|
token,
|
||||||
|
@ -33,10 +33,10 @@ const {
|
||||||
presenceText
|
presenceText
|
||||||
} = require('./data/config.json');
|
} = require('./data/config.json');
|
||||||
|
|
||||||
client.settings = new Discord.Collection();
|
client.settings = new Collection();
|
||||||
client.commands = new Discord.Collection();
|
client.commands = new Collection();
|
||||||
client.serverPrefixes = new Discord.Collection();
|
client.serverPrefixes = new Collection();
|
||||||
client.netmodules = new Discord.Collection();
|
client.netmodules = new Collection();
|
||||||
|
|
||||||
|
|
||||||
client.settings.set("presenceType", presenceType);
|
client.settings.set("presenceType", presenceType);
|
||||||
|
|
Loading…
Add table
Reference in a new issue