From: Luigi Pinca <luigipinca@gmail.com>
Date: Sun, 23 Feb 2014 14:14:23 +0000 (+0100)
Subject: bumped Primus to version 2.0.x
X-Git-Url: https://git.saalbach.dev/?a=commitdiff_plain;h=288c1ffdb47e81fe66b953f0f1fb968ccc6ada6c;p=binbsis50.git

bumped Primus to version 2.0.x
---

diff --git a/lib/rooms.js b/lib/rooms.js
index 39c159e..a7ab507 100644
--- a/lib/rooms.js
+++ b/lib/rooms.js
@@ -145,7 +145,7 @@ function Room(roomname) {
     // Broadcast new user event
     primus.send('updateoverview', roomname, totusers);
     spark.send('ready', usersData, trackscount, loggedin);
-    spark.room(roomname).send('newuser', spark.nickname, usersData);
+    primus.room(roomname).except(spark.id).send('newuser', spark.nickname, usersData);
   };
 
   var gameOver = function() {
diff --git a/lib/sparks.js b/lib/sparks.js
index 42df453..c719043 100644
--- a/lib/sparks.js
+++ b/lib/sparks.js
@@ -43,6 +43,11 @@ module.exports = function(options) {
 
   primus.on('connection', connection);
   primus.on('joinroom', joinRoom);
+  primus.on('leaveallrooms', function(rms, spark) {
+    rms.forEach(function(room) {
+      rooms[room].removeUser(spark.nickname);
+    });
+  });
   primus.on('log', function(type) {
     if (type === 'error') {
       var err = arguments[1];
@@ -140,9 +145,6 @@ var joinRoom = function(room, spark) {
       rooms[room].kick(who, why, spark.nickname, callback);
     }
   });
-  spark.on('leaveallrooms', function() {
-    rooms[room].removeUser(spark.nickname);
-  });
   spark.on('sendchatmsg', function(msg, to) {
     if (isString(msg)) {
       rooms[room].sendChatMessage(msg, spark, to);
diff --git a/package.json b/package.json
index fe1e2ad..b024054 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,9 @@
     "express": "3.4.x",
     "jade": "1.1.x",
     "nodemailer": "0.6.x",
-    "primus": "1.5.x",
-    "primus-emitter": "2.0.x",
-    "primus-rooms": "2.3.x",
+    "primus": "2.0.x",
+    "primus-emitter": "3.0.x",
+    "primus-rooms": "3.0.x",
     "redis": "0.10.x",
     "uglify-js": "2.4.x",
     "ws": "0.4.x"
@@ -30,5 +30,5 @@
     "start": "node app.js"
   },
   "subdomain": "binb",
-  "version": "0.4.4"
+  "version": "0.4.5"
 }