Cleaning up serialization of objects to JSON

2 files changed, 4 insertions, 7 deletions

diff --git a/app/core/messages.js b/app/core/messages.js
index b34deaa..66831eb 100644
--- a/app/core/messages.js
+++ b/app/core/messages.js
@@ -33,11 +33,8 @@ MessageManager.prototype.create = function(options, cb) {
                     console.error(err);
                     return cb(err);
                 }
-                message = message.toJSON();
-                message.owner = user.toJSON();
-                message.room = room.toJSON();
-                cb(null, message);
-                this.core.emit('messages:new', message);
+                cb(null, message, room, user);
+                this.core.emit('messages:new', message, room, user);
             }.bind(this));
         }.bind(this));
     }.bind(this));
diff --git a/app/core/rooms.js b/app/core/rooms.js
index bd09d8c..cebf260 100644
--- a/app/core/rooms.js
+++ b/app/core/rooms.js
@@ -15,7 +15,7 @@ RoomManager.prototype.create = function(options, cb) {
         }
 
         if (cb) {
-            room = room.toJSON();
+            room = room;
             cb(null, room);
             this.core.emit('rooms:new', room);
         }
@@ -47,7 +47,7 @@ RoomManager.prototype.update = function(roomId, options, cb) {
                 console.error(err);
                 return cb(err);
             }
-            room = room.toJSON();
+            room = room;
             cb(null, room);
             this.core.emit('rooms:update', room);