fix(tips): add correctly to currentTips stats new tip (#2821)

Fixes #2819
sogebot · Oct 21, 2019 · 07db39c · 07db39c
1 parent e4aaadd
commit 07db39c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/bot/integrations/donationalerts.ts b/src/bot/integrations/donationalerts.ts
@@ -91,7 +91,7 @@ class Donationalerts extends Integration {
           timestamp: Date.now(),
         });
 
-        tip(`${data.username.toLowerCase()}, amount: ${data.amount}${data.currency}, message: ${data.message}`);
+        tip(`${data.username.toLowerCase()}, amount: ${Number(data.amount).toFixed(2)}${data.currency}, message: ${data.message}`);
         global.events.fire('tip', {
           username: data.username.toLowerCase(),
           amount: parseFloat(data.amount).toFixed(2),
@@ -124,7 +124,7 @@ class Donationalerts extends Integration {
             });
           }
           if (global.api.isStreamOnline) {
-            global.api.stats.currentTips = parseFloat(global.currency.exchange(data.amount, data.currency, global.currency.mainCurrency));
+            global.api.stats.currentTips += parseFloat(global.currency.exchange(data.amount, data.currency, global.currency.mainCurrency));
           }
         }
 

diff --git a/src/bot/integrations/qiwi.ts b/src/bot/integrations/qiwi.ts
@@ -72,7 +72,7 @@ class Qiwi extends Integration {
       }
 
       if (global.api.isStreamOnline) {
-        global.api.stats.currentTips = parseFloat(global.currency.exchange(amount, currency, global.currency.mainCurrency));
+        global.api.stats.currentTips += parseFloat(global.currency.exchange(amount, currency, global.currency.mainCurrency));
       }
 
       global.overlays.eventlist.add({
@@ -84,7 +84,7 @@ class Qiwi extends Integration {
         timestamp: Date.now(),
       });
 
-      tip(`${username ? username : 'Anonymous'}${id ? '#' + id : ''}, amount: ${amount}${DONATION_CURRENCY}, ${message ? 'message: ' + message : ''}`);
+      tip(`${username ? username : 'Anonymous'}${id ? '#' + id : ''}, amount: ${Number(amount).toFixed(2)}${DONATION_CURRENCY}, ${message ? 'message: ' + message : ''}`);
 
       global.events.fire('tip', {
         username: username || 'Anonymous',

diff --git a/src/bot/integrations/streamelements.ts b/src/bot/integrations/streamelements.ts
@@ -104,7 +104,7 @@ class StreamElements extends Integration {
       global.db.engine.insert('users.tips', { id, amount: eventData.data.amount, message: eventData.data.message, currency: eventData.data.currency, timestamp: Date.now() });
     }
     if (global.api.isStreamOnline) {
-      global.api.stats.currentTips = parseFloat(global.currency.exchange(eventData.data.amount, eventData.data.currency, global.currency.mainCurrency));
+      global.api.stats.currentTips += parseFloat(global.currency.exchange(eventData.data.amount, eventData.data.currency, global.currency.mainCurrency));
     }
     global.overlays.eventlist.add({
       type: 'tip',
@@ -114,7 +114,7 @@ class StreamElements extends Integration {
       message: eventData.data.message,
       timestamp: Date.now(),
     });
-    tip(`${username.toLowerCase()}${id ? '#' + id : ''}, amount: ${eventData.data.amount}${eventData.data.currency}, message: ${eventData.data.message}`);
+    tip(`${username.toLowerCase()}${id ? '#' + id : ''}, amount: ${Number(eventData.data.amount).toFixed(2)}${eventData.data.currency}, message: ${eventData.data.message}`);
     global.events.fire('tip', {
       username: username.toLowerCase(),
       amount: parseFloat(eventData.data.amount).toFixed(2),

diff --git a/src/bot/integrations/streamlabs.ts b/src/bot/integrations/streamlabs.ts
@@ -79,7 +79,7 @@ class Streamlabs extends Integration {
             });
           }
           if (global.api.isStreamOnline) {
-            global.api.stats.currentTips = parseFloat(global.currency.exchange(event.amount, event.currency, global.currency.mainCurrency));
+            global.api.stats.currentTips += parseFloat(global.currency.exchange(event.amount, event.currency, global.currency.mainCurrency));
           }
         }
         global.overlays.eventlist.add({
@@ -90,7 +90,7 @@ class Streamlabs extends Integration {
           message: event.message,
           timestamp: Date.now(),
         });
-        tip(`${event.from.toLowerCase()}, amount: ${event.amount}${event.currency}, message: ${event.message}`);
+        tip(`${event.from.toLowerCase()}, amount: ${Number(event.amount).toFixed(2)}${event.currency}, message: ${event.message}`);
         global.events.fire('tip', {
           username: event.from.toLowerCase(),
           amount: parseFloat(event.amount).toFixed(2),

diff --git a/test/tests/events/tip.js b/test/tests/events/tip.js
@@ -58,7 +58,7 @@ describe('Events - tip event', () => {
     for (const username of ['losslezos', 'rigneir', 'mikasa_hraje', 'foufhs']) {
       describe(username + ' tip event', () => {
         it('trigger tip event for 10 EUR - ' + username, async () => {
-          log.tip(`${username}, amount: 10EUR, message: Ahoj jak je`);
+          log.tip(`${username}, amount: 10.00EUR, message: Ahoj jak je`);
           global.events.fire('tip', { username: username, amount: 10.00, message: 'Ahoj jak je', currency: 'EUR' });
         });