From 5b3d4f139543d7ed1c39b405d77bf5bca0ad52de Mon Sep 17 00:00:00 2001
From: zoton2 <zoton2@gmail.com>
Date: Sat, 17 Feb 2024 22:02:08 +0100
Subject: [PATCH] Only show/play donation alerts if total update was received
 over MQ

---
 src/extension/tracker/index.ts            |  4 ++++
 src/graphics/omnibar/components/Total.vue | 27 +++++++++++++----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/extension/tracker/index.ts b/src/extension/tracker/index.ts
index 207c9916..2b9b2f29 100644
--- a/src/extension/tracker/index.ts
+++ b/src/extension/tracker/index.ts
@@ -75,6 +75,8 @@ async function updateDonationTotalFromAPITiltify(init = false): Promise<void> {
       total += eventTotal;
     }
     if (init || donationTotal.value < total) {
+      const diff = total - donationTotal.value;
+      nodecg().sendMessage('donationTotalUpdated', { total, diff, showAlert: false });
       nodecg().log.info('[Tracker] API donation total changed: $%s', total);
       donationTotal.value = total;
       // If we checked the donation total on an interval and it was different, the MQ
@@ -118,6 +120,8 @@ mq.evt.on('donationTotalUpdated', (data) => {
     );
   }
   if (donationTotal.value < total) {
+    const diff = total - donationTotal.value;
+    nodecg().sendMessage('donationTotalUpdated', { total, diff, showAlert: true });
     nodecg().log.debug('[Tracker] Updated donation total received: $%s', total.toFixed(2));
     donationTotal.value = total;
   }
diff --git a/src/graphics/omnibar/components/Total.vue b/src/graphics/omnibar/components/Total.vue
index 778a3efd..8ac77e90 100644
--- a/src/graphics/omnibar/components/Total.vue
+++ b/src/graphics/omnibar/components/Total.vue
@@ -137,7 +137,7 @@
 import { replicantModule } from '@esa-layouts/browser_shared/replicant_store';
 import { formatUSD } from '@esa-layouts/graphics/_misc/helpers';
 import gsap from 'gsap';
-import { Component, Vue, Watch } from 'vue-property-decorator';
+import { Component, Vue } from 'vue-property-decorator';
 
 @Component
 export default class extends Vue {
@@ -147,7 +147,7 @@ export default class extends Vue {
   playingAlerts = false;
   showAlert = false;
   alertText = '$0';
-  alertList: { total: number, amount: number }[] = [];
+  alertList: { total: number, amount: number, showAlert: boolean }[] = [];
 
   get rawTotal(): number {
     return replicantModule.repsTyped.donationTotal;
@@ -165,7 +165,8 @@ export default class extends Vue {
   async playNextAlert(start = false): Promise<void> {
     this.playingAlerts = true;
     if (!start) await new Promise((res) => { setTimeout(res, 500); });
-    if (this.alertList[0].amount > 0) { // Only show alerts for positive values
+    // Only show alerts for positive values and if the alert should be "shown".
+    if (this.alertList[0].amount > 0 && this.alertList[0].showAlert) {
       nodecg.sendMessage('omnibarPlaySound', { amount: this.alertList[0].amount });
       // await this.sfx.play();
       await new Promise((res) => { setTimeout(res, 500); });
@@ -183,17 +184,19 @@ export default class extends Vue {
     else this.playingAlerts = false;
   }
 
-  @Watch('rawTotal')
-  onRawTotalChanged(newVal: number, oldVal: number): void {
-    this.alertList.push({
-      total: newVal,
-      amount: newVal - oldVal,
-    });
-    if (!this.playingAlerts) this.playNextAlert(true);
-  }
-
   async created(): Promise<void> {
     this.total = this.rawTotal;
+    nodecg.listenFor(
+      'donationTotalUpdated',
+      (data: { total: number, diff: number, showAlert: boolean }) => {
+        this.alertList.push({
+          total: data.total,
+          amount: data.diff,
+          showAlert: data.showAlert,
+        });
+        if (!this.playingAlerts) this.playNextAlert(true);
+      },
+    );
   }
 }
 </script>