ui/viewers: Fix utf-8 encoding

sogebot · Mar 22, 2018 · 7e5f198 · 7e5f198
1 parent 5cdb09c
commit 7e5f198
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/libs/users.js b/libs/users.js
@@ -149,7 +149,7 @@ Users.prototype.getViewers = async function (self, socket) {
       _.set(viewer, 'stats.bits', 0)
     }
   }
-  socket.emit('Viewers', Buffer.from(JSON.stringify(viewers)).toString('base64'))
+  socket.emit('Viewers', Buffer.from(JSON.stringify(viewers), 'utf8').toString('base64'))
 }
 
 Users.prototype.deleteViewer = function (self, socket, username) {

diff --git a/public/pages/viewers.html b/public/pages/viewers.html
@@ -382,7 +382,9 @@
 
     socket.off('Viewers')
     socket.on('Viewers', function (list) {
-      viewers.list = JSON.parse(atob(list))
+      viewers.list = JSON.parse(decodeURIComponent(Array.prototype.map.call(atob(list), function(c) {
+        return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)
+      }).join('')))
       viewers.update(viewers.paging())
     });