From 38dd66b2072b2970a1c90759d5adbd4727ebe1da Mon Sep 17 00:00:00 2001 From: Matt Isenhower Date: Thu, 23 Nov 2023 08:31:11 -0800 Subject: [PATCH] Fix
in challenge posts --- app/common/util.mjs | 4 ++++ app/social/generators/ChallengeStatus.mjs | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/common/util.mjs b/app/common/util.mjs index 1cb30f6..330a397 100644 --- a/app/common/util.mjs +++ b/app/common/util.mjs @@ -27,6 +27,10 @@ export function getDateParts(date = null) { }; } +export function br2nl(str, replace = '\n') { + return str.replace(//gi, replace); +} + export function getGearIcon(gear) { switch (gear.gear.__typename) { case 'HeadGear': return '๐Ÿงข'; diff --git a/app/social/generators/ChallengeStatus.mjs b/app/social/generators/ChallengeStatus.mjs index f046056..f1a6de4 100644 --- a/app/social/generators/ChallengeStatus.mjs +++ b/app/social/generators/ChallengeStatus.mjs @@ -1,6 +1,7 @@ import StatusGenerator from "./StatusGenerator.mjs"; import Media from "../Media.mjs"; import { useEventSchedulesStore } from "../../../src/stores/schedules.mjs"; +import { br2nl } from "../../common/util.mjs"; export default class ChallengeStatus extends StatusGenerator { key = 'challenge'; @@ -25,8 +26,11 @@ export default class ChallengeStatus extends StatusGenerator async _getStatus() { let schedule = await this.getActiveSchedule(); + let name = br2nl(schedule.settings.leagueMatchEvent.name, ' '); + let desc = br2nl(schedule.settings.leagueMatchEvent.desc, ' '); + return [ - `A challenge event is now open! ${schedule.settings.leagueMatchEvent.name} โ€“ ${schedule.settings.leagueMatchEvent.desc}`, + `A challenge event is now open! ${name} โ€“ ${desc}`, '', `Play ${schedule.settings.vsRule.name} on ${schedule.settings.vsStages[0].name} and ${schedule.settings.vsStages[1].name}! #splatoon3`, ].join('\n');