Fixed lingering bugs with outfit wars object defaults

ps2alerts · Jul 31, 2023 · a3db3cc · a3db3cc
1 parent 3fbb29a
commit a3db3cc
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 28 deletions.
diff --git a/components/alert/AlertBattleranks.vue b/components/alert/AlertBattleranks.vue
@@ -156,10 +156,7 @@ export default Vue.extend({
       return (100 / (this.updateRate / 1000)) * this.updateCountdown
     },
     isOutfitWar(): boolean {
-      return (
-        this.outfitwar?.ps2AlertsEventType ===
-        Ps2AlertsEventType.OUTFIT_WARS_AUG_2022
-      )
+      return this.outfitwar.outfitwars !== null
     },
   },
   watch: {

diff --git a/components/alert/AlertCharacterMetrics.vue b/components/alert/AlertCharacterMetrics.vue
@@ -186,10 +186,7 @@ export default Vue.extend({
       return (100 / (this.updateRate / 1000)) * this.updateCountdown
     },
     isOutfitWar(): boolean {
-      return (
-        this.outfitwar?.ps2AlertsEventType ===
-        Ps2AlertsEventType.OUTFIT_WARS_AUG_2022
-      )
+      return this.outfitwar.outfitwars !== null
     },
   },
   watch: {

diff --git a/components/alert/AlertCombatHistory.vue b/components/alert/AlertCombatHistory.vue
@@ -160,10 +160,7 @@ export default Vue.extend({
       return (100 / (this.updateRate / 1000)) * this.updateCountdown
     },
     isOutfitWar(): boolean {
-      return (
-        this.outfitwar?.ps2AlertsEventType ===
-        Ps2AlertsEventType.OUTFIT_WARS_AUG_2022
-      )
+      return this.outfitwar.outfitwars !== null
     },
   },
   watch: {

diff --git a/components/alert/AlertFactionCombatMetrics.vue b/components/alert/AlertFactionCombatMetrics.vue
@@ -298,10 +298,7 @@ export default Vue.extend({
       return this.outfitwar.outfitwars?.teams?.blue?.tag ?? 'Blue'
     },
     isOutfitWar(): boolean {
-      return (
-        this.outfitwar?.ps2AlertsEventType ===
-        Ps2AlertsEventType.OUTFIT_WARS_AUG_2022
-      )
+      return this.outfitwar.outfitwars !== null
     },
   },
   watch: {

diff --git a/components/alert/AlertOutfitMetrics.vue b/components/alert/AlertOutfitMetrics.vue
@@ -217,10 +217,7 @@ export default Vue.extend({
       return (100 / (this.updateRate / 1000)) * this.updateCountdown
     },
     isOutfitWar(): boolean {
-      return (
-        this.outfitwar?.ps2AlertsEventType ===
-        Ps2AlertsEventType.OUTFIT_WARS_AUG_2022
-      )
+      return this.outfitwar.outfitwars !== null
     },
   },
   watch: {

diff --git a/components/alert/AlertPopulations.vue b/components/alert/AlertPopulations.vue
@@ -273,10 +273,7 @@ export default Vue.extend({
       return (100 / (this.updateRate / 1000)) * this.updateCountdown
     },
     isOutfitWar(): boolean {
-      return (
-        this.outfitwar?.ps2AlertsEventType ===
-        Ps2AlertsEventType.OUTFIT_WARS_AUG_2022
-      )
+      return this.outfitwar.outfitwars !== null
     },
   },
   watch: {

diff --git a/components/alert/AlertResult.vue b/components/alert/AlertResult.vue
@@ -124,6 +124,7 @@ export default Vue.extend({
       type: Object as () => InstanceOutfitWarsResponseInterface,
       default: () => ({
         ps2AlertsEventType: Ps2AlertsEventType.OUTFIT_WARS_AUG_2022,
+        outfitwars: null,
       }),
       required: false,
     },
@@ -180,10 +181,7 @@ export default Vue.extend({
       }
     },
     isOutfitWar(): boolean {
-      return (
-        this.outfitwar?.ps2AlertsEventType ===
-        Ps2AlertsEventType.OUTFIT_WARS_AUG_2022
-      )
+      return this.outfitwar.outfitwars !== null
     },
   },
 })