From 05ce8923e6e4042fa115de10960b146f8e028d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Mon, 11 Sep 2017 16:24:13 +0200 Subject: [PATCH 1/2] Fixed issue with infinate counter --- server/server.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/server.js b/server/server.js index b58ba250..4f0224c7 100755 --- a/server/server.js +++ b/server/server.js @@ -127,7 +127,7 @@ db.on('error',function(err) { console.log("\n" + new Date().toString() + "\n Database error: ", err); }); -db.collection("frontpage_lists").update({viewers: {$gt: 0}}, {$set: {"viewers": 0}}, function(err, docs) {}); +db.collection("frontpage_lists").update({viewers: {$gt: 0}}, {$set: {"viewers": 0}}, {multi: true}, function(err, docs) {}); io.on('connection', function(socket){ socket.emit("get_list"); @@ -168,7 +168,8 @@ io.on('connection', function(socket){ lists[channel] = []; } lists[channel].push(guid); - db.collection("frontpage_lists").update({"_id": channel}, {$inc: {viewers: 1}}, function(){}); + + db.collection("frontpage_lists").update({"_id": msg.channel}, {$inc: {viewers: 1}}, function(err, docs){}); } tot_view += 1 }); @@ -1204,7 +1205,7 @@ function send_ping() { lists = {}; offline_users = []; tot_view = 0; - db.collection("frontpage_lists").update({viewers: {$gt: 0}}, {$set: {"viewers": 0}}, function(err, docs) { + db.collection("frontpage_lists").update({viewers: {$ne: 0}}, {$set: {"viewers": 0}}, {multi: true}, function(err, docs) { io.emit("self_ping"); setTimeout(send_ping, 4000); }); From 02081d9bb5c10ee48833d953b8b735ba73c97de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 12 Sep 2017 16:52:04 +0200 Subject: [PATCH 2/2] Fixed issue with toasts acting weird --- server/public/assets/css/style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css index b45e07f0..5db72082 100755 --- a/server/public/assets/css/style.css +++ b/server/public/assets/css/style.css @@ -272,6 +272,9 @@ li.disabled span { left:2%; cursor:pointer; width:70vw; + display: flex; + flex-direction: column; + align-items: baseline; /*pointer-events:none;*/ }