From 0454587099771272fd374900225cc2d109bc3726 Mon Sep 17 00:00:00 2001
From: sogehige <sogehige@gmail.com>
Date: Mon, 1 Jul 2019 21:15:23 +0200
Subject: [PATCH] fix(users): return bits correctly (#2364)

Fixes #2362
---
 public/pages/viewers/edit.html | 2 +-
 src/bot/systems/userinfo.ts    | 2 +-
 src/bot/users.js               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/pages/viewers/edit.html b/public/pages/viewers/edit.html
index b791dbfb77c..50bdf35ce4e 100644
--- a/public/pages/viewers/edit.html
+++ b/public/pages/viewers/edit.html
@@ -120,7 +120,7 @@
                 <td scope="row">{{ moment(bits.timestamp).format('LLL') }}</td>
                 <td>
                   <input type="number" min="0" v-model="bits.amount" v-if="bits.editation" class="form-control">
-                  <strong v-else>{{ bits.amount }}</strong>
+                  <strong v-else>{{ Number(bits.amount) }}</strong>
                 </td>
                 <td>
                   <textarea v-model="bits.message" class="form-control" v-if="bits.editation"></textarea>
diff --git a/src/bot/systems/userinfo.ts b/src/bot/systems/userinfo.ts
index 768241cc2c5..9a20edc2e6f 100644
--- a/src/bot/systems/userinfo.ts
+++ b/src/bot/systems/userinfo.ts
@@ -254,7 +254,7 @@ class UserInfo extends System {
       if (message.includes('$bits')) {
         const idx = message.indexOf('$bits');
         const bits = await global.db.engine.find('users.bits', { id: opts.sender.userId });
-        let bitAmount = bits.map(o => o.amount).reduce((a, b) => a + b, 0);
+        let bitAmount = bits.map(o => Number(o.amount)).reduce((a, b) => a + b, 0);
         message[idx] = `${bitAmount} ${getLocalizedName(bitAmount, 'core.bits')}`;
       }
       sendMessage(message.join(this.formatSeparator), opts.sender, opts.attr);
diff --git a/src/bot/users.js b/src/bot/users.js
index 0593e9b8e95..83252413b09 100644
--- a/src/bot/users.js
+++ b/src/bot/users.js
@@ -269,7 +269,7 @@ class Users extends Core {
 
         for (const v of viewers) {
           _.set(v, 'stats.tips', v.tips.map((o) => global.currency.exchange(o.amount, o.currency, global.currency.mainCurrency)).reduce((a, b) => a + b, 0));
-          _.set(v, 'stats.bits', v.bits.map((o) => o.amount).reduce((a, b) => a + b, 0));
+          _.set(v, 'stats.bits', v.bits.map((o) => Number(o.amount)).reduce((a, b) => a + b, 0));
           _.set(v, 'custom.currency', global.currency.mainCurrency);
           _.set(v, 'points', (v.points[0] || { points: 0 }).points);
           _.set(v, 'messages', (v.messages[0] || { messages: 0 }).messages);