diff --git a/src/modules/utility/guildinfo.js b/src/modules/utility/guildinfo.js index d940a53..6c57b5d 100644 --- a/src/modules/utility/guildinfo.js +++ b/src/modules/utility/guildinfo.js @@ -77,8 +77,9 @@ guildinfo.callback = async function (msg, line, args, {nolocal, debug}) { if (clan) { const images = []; + const game_ids = clan.game_ids ?? clan.game_application_ids ?? []; const games = await Promise.all( - clan.game_ids + game_ids .sort((a, b) => (clan.game_activity[b]?.activity_score ?? 0) - (clan.game_activity[a]?.activity_score ?? 0)) .map(async (id) => { let game = Games.find((x) => x.id == id); @@ -165,6 +166,7 @@ guildinfo.callback = async function (msg, line, args, {nolocal, debug}) { inline: true, }, ].filter((x) => !!x), + thumbnail: !_guild ? {url: CDNEndpoints.GUILD_ICON(clan.id, clan.icon_hash)} : null, footer: !_guild ? {text: "Fetched from clan"} : null, }; @@ -193,7 +195,7 @@ guildinfo.callback = async function (msg, line, args, {nolocal, debug}) { } if (!_guild) { - if (clanEmbed) { + if (clanEmbed != null) { return {embeds: [clanEmbed]}; } else { try { diff --git a/src/util/time.js b/src/util/time.js index 74f4b87..0eefcc1 100644 --- a/src/util/time.js +++ b/src/util/time.js @@ -9,7 +9,7 @@ function formatTime(number) { return ( (days !== 0 ? `${days.toString().padStart(2, "0")}:` : "") + - (hours !== 0 ? `${hours.toString().padStart(2, "0")}:` : "") + + (days !== 0 || hours !== 0 ? `${hours.toString().padStart(2, "0")}:` : "") + `${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}` ); }