diff --git a/commands/message/info/invite.js b/commands/message/info/invite.js index f8b1943..5a88715 100644 --- a/commands/message/info/invite.js +++ b/commands/message/info/invite.js @@ -5,7 +5,7 @@ const { createEmbed, formatPaginationEmbeds, page } = require("#utils/embed"); const { guildFeaturesField } = require("#utils/fields"); const { getGuildIcon } = require('#utils/guilds'); const { acknowledge } = require('#utils/interactions'); -const { icon, highlight, timestamp, iconPill, iconLinkPill, link } = require("#utils/markdown"); +const { icon, timestamp, iconPill, iconLinkPill, link, smallIconPill, smallPill} = require("#utils/markdown"); const { editOrReply } = require("#utils/message"); const { STATIC_ASSETS } = require("#utils/statics"); @@ -48,21 +48,22 @@ module.exports = { let gDesc = "" if(g.description) gDesc = g.description + "\n\n" let inviteCard = createEmbed("default", context, { - description: `${icon("link")} **https://discord.gg/${inviteCode[1]}**\n\n​${icon("home")} **${g.name}** ${highlight(`(${g.id})`)}\n${iconPill("user_multiple", invite.approximateMemberCount.toLocaleString())} ​ ​ ​ ​ ​ ${iconPill("status_online", invite.approximatePresenceCount.toLocaleString())}​ ​ ​ ${iconPill("status_offline", (invite.approximateMemberCount - invite.approximatePresenceCount).toLocaleString())}\n\n${gDesc}${icon("calendar")} **Created at: **${timestamp(g.createdAt, "f")}\n`, + author: { + name: g.name, + iconUrl: getGuildIcon(g), + url: `https://discord.gg/${inviteCode[1]}` + }, + description: `-# discord.gg/${inviteCode[1]}\n${iconPill("user_multiple", invite.approximateMemberCount.toLocaleString())} ​ ​ • ​ ​ ${smallIconPill("status_online", invite.approximatePresenceCount.toLocaleString())}​ ​ ​ ${smallIconPill("status_offline", (invite.approximateMemberCount - invite.approximatePresenceCount).toLocaleString())}\n\n${gDesc}${smallIconPill("id", "Server ID")} ${smallPill(g.id)}\n${smallIconPill("calendar", "Server Created")} ${timestamp(g.createdAt, "f")}`, fields: [], - thumbnail: { - url: getGuildIcon(g) - } }) - if(g.splash){ + if((g.banner || g.splash || g.discoverySplash) !== undefined){ inviteCard.image = { - url: g.splashUrl + "?size=4096" - } - } else if(g.banner){ // if no splash exists, check the banner - inviteCard.image = { - url: g.bannerUrl + "?size=4096" + url: (g.bannerUrl || g.splashUrl || g.discoverySplashUrl) + "?size=4096" } + + // TODO: report + if(g.discoverySplashUrl) inviteCard.image.url = inviteCard.image.url.replace("/splashes/","/discovery-splashes/"); } // Guild Features @@ -73,7 +74,7 @@ module.exports = { let i = 0; let ic = Math.ceil(featureCards.length / 2); - if(ic == 1) featureCards[0].name = `${icon("list")} Server Features` + if(ic === 1) featureCards[0].name = `${icon("list")} Server Features` while(featureCards.length >= 1){ i++; const sub = featureCards.splice(0, 2)