From 68dcd98a08b00bc42d2511dc5f9e8beec6784646 Mon Sep 17 00:00:00 2001
From: Michal Orlik <sogehige@gmail.com>
Date: Mon, 12 Nov 2018 13:34:40 +0100
Subject: [PATCH] credits: usernames are unique and merged

Fixes #1549
---
 src/overlay/components/credits.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/overlay/components/credits.vue b/src/overlay/components/credits.vue
index 1ac5c9dac84..11b3b3442ac 100644
--- a/src/overlay/components/credits.vue
+++ b/src/overlay/components/credits.vue
@@ -108,23 +108,24 @@ export default {
           withoutPadding = false
         }
 
-        for (let o of object) {
-          let html = o.username
+        const groupByUsername = Object.entries(_.groupBy(object, 'username'))
+        for (let [username, o] of groupByUsername) {
+          let html = username
           if (key === 'cheer') {
-            html = `<strong style="font-size:65%">${o.bits} bits</strong> <br> ${o.username}`
+            html = `<strong style="font-size:65%">${o.reduce((a, b) => ({ bits: Number(a.bits) + Number(b.bits) })).bits} bits</strong> <br> ${username}`
           } else if (['raid', 'host'].includes(key)) {
-            html = `<strong style="font-size:65%">${o.viewers} viewers</strong> <br> ${o.username}`
+            html = `<strong style="font-size:65%">${o.reduce((a, b) => ({ viewers: Number(a.viewers) + Number(b.viewers) })).viewers} viewers</strong> <br> ${username}`
           } else if (['resub'].includes(key)) {
-            html = `<strong style="font-size:65%">${o.months} months</strong> <br> ${o.username}`
+            html = `<strong style="font-size:65%">${o[0].months} months</strong> <br> ${username}`
           } else if (['tip'].includes(key)) {
-            html = `<strong style="font-size:65%">${Number(o.amount).toFixed(2)} ${o.currency}</strong> <br> ${o.username}`
+            html = `<strong style="font-size:65%">${Number(o.reduce((a, b) => ({ amount: Number(a.amount) + Number(b.amount) })).amount).toFixed(2)} ${o[0].currency}</strong> <br> ${username}`
           }
           page.push({
             text: html,
             class: "text4 column"
           })
         }
-        for (let i = 0; i < 3 - (object.length % 3); i++) {
+        for (let i = 0; i < 3 - (groupByUsername.length % 3); i++) {
           page.push({
             text: '',
             class: "text4 column"