merge

1 files changed, 10 insertions, 4 deletions

diff --git a/server/lib/api/media.js b/server/lib/api/media.js
index 1eb08c1..85cbdd6 100644
--- a/server/lib/api/media.js
+++ b/server/lib/api/media.js
@@ -10,13 +10,19 @@ var _ = require('lodash'),
 var media = {
 
 	user: function(req, res){
+	  var offset = Number(req.query.offset) || 0
+	  var limit = Math.min( Number(req.query.limit), 50 ) || 20
 	  var query = { user_id: req.user._id }
 	  if (req.query.tag) {
 	    query.tag = req.query.tag
 	  }
-		Media.find(query, function(err, media){
-			res.json(media || [])
-		})
+		Media.find(query)
+			.sort({'created_at': -1})
+			.skip(offset)
+			.limit(limit)
+		  .exec(function(err, media){
+				res.json(media || [])
+			})
 	},
 	
 	create: function(req, res){
@@ -43,7 +49,7 @@ var media = {
 		upload.put("media", req.files.image, {
 			username: req.user.username,
 			unacceptable: function(err){
-				res.json({ error: { errors: { avatar: { message: "Problem saving image: " + err } } } })
+				res.json({ error: { errors: { media: { message: "Problem saving image: " + err } } } })
 			},
 			success: function(url){
 				data.url = url