diff --git a/app/social/generators/SchedulesStatus.mjs b/app/social/generators/SchedulesStatus.mjs index bf42771..7c87d1e 100644 --- a/app/social/generators/SchedulesStatus.mjs +++ b/app/social/generators/SchedulesStatus.mjs @@ -50,7 +50,11 @@ export default class SchedulesStatus extends StatusGenerator } if(stages.tricolor?.isTricolorActive && stages.tricolor.tricolorStages) { - lines.push(`– Tricolor: ${stages.tricolor.tricolorStages[0].name}`); + if(stages.tricolor.tricolorStages.length == 1) { + lines.push(`– Tricolor: ${stages.tricolor.tricolorStages[0].name}`); + } else { + lines.push(`– Tricolor: ${stages.tricolor.tricolorStages[0].name} and ${stages.tricolor.tricolorStages[1].name}`); + } } return lines.join('\n'); diff --git a/src/components/TricolorBox.vue b/src/components/TricolorBox.vue index 32c5ef5..b4686ec 100644 --- a/src/components/TricolorBox.vue +++ b/src/components/TricolorBox.vue @@ -43,14 +43,26 @@ -
-
+
+
+ +
+ + +
+
diff --git a/src/components/screenshots/ScreenshotTricolorBox.vue b/src/components/screenshots/ScreenshotTricolorBox.vue index 920adf9..a383be5 100644 --- a/src/components/screenshots/ScreenshotTricolorBox.vue +++ b/src/components/screenshots/ScreenshotTricolorBox.vue @@ -43,8 +43,11 @@
diff --git a/src/stores/splatfests.mjs b/src/stores/splatfests.mjs index 7db7a0b..565004e 100644 --- a/src/stores/splatfests.mjs +++ b/src/stores/splatfests.mjs @@ -77,8 +77,8 @@ function defineSplatfestRegionStore(region) { return { ...fest, - isTricolorActive: fest.tricolorStages ? time.isActive(fest.startTime, fest.endTime) : time.isActive(time.midtermTime, time.endTime), - startTime: fest.tricolorStages ? fest.startTime : fest.midtermTime, + isTricolorActive: time.isActive(fest.midtermTime, fest.endTime), + startTime: fest.midtermTime, endTime: fest.endTime, }; });