Skip to content

Commit 9ba708b

Browse files
authored
#649: pattern cleanup in overallScoreboardEmbed and seasonalScoreboardEmbed (#650)
- seasonal: use formatters instead of markdown - seasonal: rewrite complex ternary as if block - seasonal: use descendingByProperty in sorter - overall: remove unnecessary nullish coalescence
1 parent 26b0edc commit 9ba708b

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

source/frontend/shared/dAPISerializers.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,13 @@ async function seasonalScoreboardEmbed(company, guild, participationMap, ranks,
331331
const rankmojiArray = ranks.map(rank => rank.rankmoji);
332332

333333
const scorelines = [];
334-
for (const [id, participation] of Array.from(participationMap.entries()).sort((a, b) => b[1].xp - a[1].xp)) {
335-
if (participation.xp > 0 && hunterMembers.has(id)) {
336-
scorelines.push(`${!(participation.rankIndex === null || participation.isRankDisqualified) && rankmojiArray[participation.rankIndex] ? `${rankmojiArray[participation.rankIndex]} ` : ""}#${participation.placement} **${hunterMembers.get(id).displayName}** ${participation.xp} season XP`);
334+
for (const participation of Array.from(participationMap.values()).sort(descendingByProperty("xp"))) {
335+
if (participation.xp > 0 && hunterMembers.has(participation.userId)) {
336+
let scoreline = `#${participation.placement} ${bold(hunterMembers.get(participation.userId).displayName)} ${participation.xp} season XP`;
337+
if (rankmojiArray[participation.rankIndex] && !participation.isRankDisqualified && participation.rankIndex !== null) {
338+
scoreline = `${rankmojiArray[participation.rankIndex]} ${scoreline}`;
339+
}
340+
scorelines.push(scoreline);
337341
}
338342
}
339343
const embed = new EmbedBuilder().setColor(Colors.Blurple)
@@ -392,7 +396,7 @@ async function overallScoreboardEmbed(company, guild, hunterMap, goalProgress) {
392396

393397
const scorelines = [];
394398
for (const hunter of Array.from(hunterMap.values()).sort(descendingByProperty("xp"))) {
395-
if (hunter?.xp < 1) {
399+
if (hunter.xp < 1) {
396400
break;
397401
}
398402
const guildMember = hunterMembers.get(hunter.userId);

0 commit comments

Comments
 (0)