summaryrefslogtreecommitdiff
path: root/server/lib
diff options
context:
space:
mode:
Diffstat (limited to 'server/lib')
-rw-r--r--server/lib/api/media.js13
-rw-r--r--server/lib/schemas/Media.js3
2 files changed, 13 insertions, 3 deletions
diff --git a/server/lib/api/media.js b/server/lib/api/media.js
index 16f9d41..1eb08c1 100644
--- a/server/lib/api/media.js
+++ b/server/lib/api/media.js
@@ -8,8 +8,13 @@ var _ = require('lodash'),
Media = require('../schemas/Media');
var media = {
+
user: function(req, res){
- Media.find({ user_id: req.user._id }, function(err, media){
+ 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 || [])
})
},
@@ -18,10 +23,14 @@ var media = {
var data = util.cleanQuery(req.body)
data.user_id = req.user._id
data.created_at = new Date ()
+
+ if (data.tag) {
+ data.tag = util.sanitize(data.tag)
+ }
new Media(data).save(function(err, rec){
if (err || ! rec) { return res.json({ error: err }) }
- return res.json(rec)
+ return res.json(rec)
})
},
diff --git a/server/lib/schemas/Media.js b/server/lib/schemas/Media.js
index 1f26b8e..1de354d 100644
--- a/server/lib/schemas/Media.js
+++ b/server/lib/schemas/Media.js
@@ -41,7 +41,8 @@ var MediaSchema = new mongoose.Schema({
loop: { type: Boolean, default: false },
mute: { type: Boolean, default: true },
keyframe: { type: Number, default: 0.0 },
-
+ tag: { type: String, default: "" },
+
widthDimension: { type: Number },
heightDimension: { type: Number },
units: { type: String },