Merge branch 'hotfix/0.1.0-alpha.5'

ting-opensource · Dec 1, 2016 · 53c8b0b · 53c8b0b
2 parents 611a68d + 9243b98
commit 53c8b0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/live/LiveConnectionFacade.js b/live/LiveConnectionFacade.js
@@ -74,12 +74,14 @@ class LiveConnectionFacade
 
     subscribeToUpdatesForTopicBySocket(socket, topic)
     {
+        let subscriber = socket.auth.credentials.userId;
+
         let room = this.getRoomNameForTopic(topic);
         socket.join(room, () =>
         {
             socket.emit('subscription-live', topic.toJS());
 
-            let retrieveMessagesForTopicCommand = new RetrieveMessagesForTopicCommand(topic, 0, 25);
+            let retrieveMessagesForTopicCommand = new RetrieveMessagesForTopicCommand(topic, subscriber, 0, 25);
             retrieveMessagesForTopicCommand.execute()
             .then((messages) =>
             {
@@ -102,7 +104,7 @@ class LiveConnectionFacade
             let roomForUserId = this.getRoomNameForUserId(userId);
             _transport.to(roomForUserId).emit('subscription-live', topic.toJS());
 
-            let retrieveMessagesForTopicCommand = new RetrieveMessagesForTopicCommand(topic);
+            let retrieveMessagesForTopicCommand = new RetrieveMessagesForTopicCommand(topic, userId);
             retrieveMessagesForTopicCommand.execute()
             .then((messages) =>
             {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ting-server",
-  "version": "0.1.0-alpha.4",
+  "version": "0.1.0-alpha.5",
   "description": "Durable and Realtime Messaging System primarily geared towards Web Apps",
   "main": "index.js",
   "scripts": {