mirrors/pissbot-9000
1
0
Fork 0
mirror of https://gitlab.com/bignutty/labscore.git synced 2025-06-08 14:13:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

update badge display, sync commands with slash commands

Browse source
This commit is contained in:
bignutty 2024-08-28 23:46:06 +02:00
parent 9eeb7f2721
commit de8b946eed
4 changed files with 26 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

18
commands/interaction/slash/info/user.js
View file

@ -56,6 +56,12 @@ module.exports = {
if (u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}` if (u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}`
usernameDisplay = `**@${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}` usernameDisplay = `**@${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}`
// Badge Container
let b = renderBadges(u)
if(b.length >= 1) usernameDisplay += `\n${b.join('')}\n`
if(u.globalName !== null) usernameDisplay += `\n${smallIconPill("user_card", "Display Name")} ${smallPill(u.globalName)}`
if (m && m.nick !== null) usernameDisplay += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}` if (m && m.nick !== null) usernameDisplay += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}`
let userCard = createEmbed("default", context, { let userCard = createEmbed("default", context, {
@ -85,17 +91,7 @@ module.exports = {
inline: true inline: true
}) })
} }
// Badge Container
let b = renderBadges(u)
if (u.avatarUrl.endsWith('.gif') || u.banner) { b.push(BADGE_ICONS.nitro) }
if (b.length >= 1) {
userCard.fields.push({
name: `${icon("nitro")} Badges`,
value: b.join(''),
inline: true
})
}
return editOrReply(context, userCard) return editOrReply(context, userCard)
}catch(e){ }catch(e){
console.log(e) console.log(e)

16
commands/interaction/user/user.js
View file

@ -35,6 +35,12 @@ module.exports = {
if (u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}` if (u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}`
usernameDisplay = `**@${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}` usernameDisplay = `**@${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}`
// Badge Container
let b = renderBadges(u)
if(b.length >= 1) usernameDisplay += `\n${b.join('')}\n`
if(u.globalName !== null) usernameDisplay += `\n${smallIconPill("user_card", "Display Name")} ${smallPill(u.globalName)}`
if (m && m.nick !== null) usernameDisplay += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}` if (m && m.nick !== null) usernameDisplay += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}`
let userCard = createEmbed("default", context, { let userCard = createEmbed("default", context, {
@ -65,16 +71,6 @@ module.exports = {
}) })
} }
// Badge Container
let b = renderBadges(u)
if (u.avatarUrl.endsWith('.gif') || u.banner) { b.push(BADGE_ICONS.nitro) }
if (b.length >= 1) {
userCard.fields.push({
name: `${icon("nitro")} Badges`,
value: b.join(''),
inline: true
})
}
return editOrReply(context, userCard) return editOrReply(context, userCard)
}catch(e){ }catch(e){
console.log(e) console.log(e)

16
commands/message/info/user.js
View file

@ -47,6 +47,10 @@ module.exports = {
usernameDisplay = `**@${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}` usernameDisplay = `**@${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}`
// Badge Container
let b = renderBadges(u)
if(b.length >= 1) usernameDisplay += `\n${b.join('')}\n`
if(u.globalName !== null) usernameDisplay += `\n${smallIconPill("user_card", "Display Name")} ${smallPill(u.globalName)}` if(u.globalName !== null) usernameDisplay += `\n${smallIconPill("user_card", "Display Name")} ${smallPill(u.globalName)}`
if(m && m.nick !== null) usernameDisplay += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}` if(m && m.nick !== null) usernameDisplay += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}`
@ -77,18 +81,6 @@ module.exports = {
inline: true inline: true
}) })
} }
// Badge Container
let b = renderBadges(u)
if(u.avatarUrl.endsWith('.gif') || u.banner){ b.push(BADGE_ICONS.nitro)}
if(b.length >= 1){
userCard.fields.push({
name: `${icon("nitro")} Badges`,
value: b.join(''),
inline: true
})
}
if(!m?.banner && m) u.member = await context.guild.fetchMember(u.id) if(!m?.banner && m) u.member = await context.guild.fetchMember(u.id)

10
labscore/utils/users.js
View file

@ -40,8 +40,14 @@ const { Constants } = require('detritus-client');
const { UserFlags } = Constants const { UserFlags } = Constants
const { BADGE_ICONS } = require('../constants'); const { BADGE_ICONS } = require('../constants');
const { link } = require('./markdown');
const BADGE_TYPES = Object.freeze({ const BADGE_TYPES = Object.freeze({
"nitro": {
description: "Discord Nitro",
link: "https://discord.com/nitro",
icon: BADGE_ICONS.nitro
},
"staff": { "staff": {
description: "Discord Staff", description: "Discord Staff",
link: "https://discord.com/company", link: "https://discord.com/company",
@ -121,7 +127,9 @@ const BADGES = Object.freeze({
function renderBadges(user){ function renderBadges(user){
let badges = []; let badges = [];
for(const flag of Object.keys(BADGES)) if(user.hasFlag(BADGES[flag])) badges.push(BADGE_TYPES[flag].icon) for(const flag of Object.keys(BADGES)) if(user.hasFlag(BADGES[flag])) badges.push(link(BADGE_TYPES[flag].link), BADGE_TYPES[flag].icon, BADGE_TYPES[flag].description)
if(!user.bot && (user.avatarUrl.endsWith('.gif') || user.banner)) { badges.push(link(BADGE_TYPES["nitro"].link, BADGE_TYPES["nitro"].icon, BADGE_TYPES["nitro"].description)) }
return badges; return badges;
} }