SileNce/discord_bot
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: SileNce:e112050e69b96b1eb3610978756ec195f4e34c9c
Branches Tags
SileNce:master
SileNce:experiments
SileNce:devbot
SileNce:remove-parse-ms-dependency
..
compare: SileNce:2005e6141634d58998ae9820702c34e4b3f1c786
Branches Tags
SileNce:master
SileNce:experiments
SileNce:devbot
SileNce:remove-parse-ms-dependency

No commits in common. "e112050e69b96b1eb3610978756ec195f4e34c9c" and "2005e6141634d58998ae9820702c34e4b3f1c786" have entirely different histories.
e112050e69 ... 2005e61416

2 changed files with 5 additions and 43 deletions
Show stats Expand all files Collapse all files

12
commands/info/userinfo.js
View file

@ -48,9 +48,7 @@ module.exports = {
let discriminator = user.user.discriminator; let discriminator = user.user.discriminator;
if(discriminator === "0") if(discriminator === "0")
discriminator = ""; discriminator = "";
else let username = `**${user.user.username}#${user.user.discriminator}**${nickname}`
discriminator = `#${discriminator}`;
let username = `**${user.user.username}${discriminator}**${nickname}`;
const embed = new EmbedBuilder() 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)
@ -58,15 +56,13 @@ module.exports = {
.setAuthor({name: user.user.username, iconURL: user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 })}) .setAuthor({name: user.user.username, iconURL: user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 })})
.addFields([ .addFields([
{ name: "Username", value: username, inline: false }, { name: "Username", value: username, inline: false },
{ name: "Status", value: status, inline: true },
]); ]);
if (isPresence) if (isPresence)
embed.addFields([{name: "Presence", value: user.presence.activities[0].name, inline: false}]) embed.addFields([{name: "Presence", value: user.presence.activities[0].name, inline: false}])
if (presenceDetails != 0){ if (presenceDetails != 0)
embed.addFields([{name: "Details", value: presenceDetails.toString(), inline: false}]) embed.addFields([{name: "Details", value: presenceDetails.toString(), inline: false}])
embed.addFields([{name: "Status", value: status, inline: true }]) embed.addFields([{ name: "Details", value: presenceDetails.toString(), inline: false }])
}
else
embed.addFields([{ name: "Status", value: status, inline: false }])
embed.addFields([ embed.addFields([
{ name: "Creation date", value: getCreationDate(user), inline: true }, { name: "Creation date", value: getCreationDate(user), inline: true },
{ name: "Join date", value: getJoinDate(user, message.guild), inline: true } { name: "Join date", value: getJoinDate(user, message.guild), inline: true }

36
commands/misc/convert.js
View file

@ -2,12 +2,7 @@ module.exports = {
name: 'convert', name: 'convert',
description: 'Convert a value to another value', description: 'Convert a value to another value',
moreHelp: [ moreHelp: [
"Current units supported:", "To convert celsius to fahrenheit:",
"F > C > K",
"inches > cm",
"KG > LB",
"Every unit in a line can be converted to any other unit in the same line",
"Example:",
"<prefix>convert 20 C F" "<prefix>convert 20 C F"
], ],
execute({message, args}) { execute({message, args}) {
@ -111,35 +106,6 @@ module.exports = {
sendText = "Can only convert to kg from lb."; sendText = "Can only convert to kg from lb.";
} }
break; break;
case "INCHES":
case "INCH":
case "IN":
case "\"":
if (args[2].toUpperCase() === "CM") {
let CM = (initial_number * 2.54).toFixed(2);
if(CM[CM.length - 1] === '0' && CM[CM.length - 2] === "0"){
CM = CM.replace(".00","")
}
sendText = `${initial_number}" is ${CM} cm`;
} else {
sendText = "Can only convert to cm from inches.";
}
break;
case "CM":
if (args[2].toUpperCase() === "INCH" || args[2].toUpperCase() === "INCHES") {
let INCH = (initial_number / 2.54).toFixed(2);
if(INCH[INCH.length - 1] === '0' && INCH[INCH.length - 2] === "0"){
INCH = INCH.replace(".00","")
}
sendText = `${initial_number} cm is ${INCH} inches`;
} else {
sendText = "Can only convert to inches from cm.";
}
break;
default: default:
sendText = "No conversion method for that yet" sendText = "No conversion method for that yet"
break; break;