summaryrefslogtreecommitdiff
path: root/server.js
diff options
context:
space:
mode:
Diffstat (limited to 'server.js')
-rw-r--r--server.js21
1 files changed, 12 insertions, 9 deletions
diff --git a/server.js b/server.js
index 948bc9e..e8d0aec 100644
--- a/server.js
+++ b/server.js
@@ -20,6 +20,9 @@ app.configure(function(){
app.use(express.static(__dirname + '/public'));
});
+/******************************* ROUTES
+*/
+
app.get('/latest', function(req, res){
var data = { 'image_url': Images.latest() };
res.setHeader('Content-Type', 'application/json');
@@ -49,19 +52,14 @@ app.post('/upload', function(req, res) {
});
});
+/******************************* WEBSOCKETS
+*/
+
io.sockets.on( 'connection', function(socket){
socket.emit( 'join', Channel.join() );
function echo
});
-var port = process.env.PORT || 5000;
-server.listen(port);
-console.log('Listening on port ' + port);
-
-function timestamp() {
- return Math.round(new Date().getTime());
-}
-
var State = {
WAITING: 0,
DRAWING: 1,
@@ -77,7 +75,7 @@ function Channel() {
}
Channel.prototype.push = function(message){
if (this.messages.length > 20) this.messages.shift();
- var message = { id: ++this.message_id, content: message, user: username, faves: 0 };
+ var message = { id: ++this.message_id, content: message, user: username, faves: 0, time: Date.now() };
this.messages.push(message);
io.sockets.emit('message', JSON.stringify(message));
}
@@ -96,4 +94,9 @@ Channel.prototype.join = function(){
}
}
+/******************************* DONE
+*/
+var port = process.env.PORT || 5000;
+server.listen(port);
+console.log('Listening on port ' + port);