Room filter is required to list files or messages

1 files changed, 7 insertions, 5 deletions

diff --git a/app/core/files.js b/app/core/files.js
index 752ec2e..45923f3 100644
--- a/app/core/files.js
+++ b/app/core/files.js
@@ -102,6 +102,10 @@ FileManager.prototype.list = function(options, cb) {
 
     options = options || {};
 
+    if (!options.room) {
+        return cb(null, []);
+    }
+
     options = helpers.sanitizeQuery(options, {
         defaults: {
             reverse: true,
@@ -113,11 +117,9 @@ FileManager.prototype.list = function(options, cb) {
     var File = mongoose.model('File'),
         User = mongoose.model('User');
 
-    var find = File.find();
-
-    if (options.room) {
-        find.where('room', options.room);
-    }
+    var find = File.find({
+        room: options.room
+    });
 
     if (options.from) {
         find.where('uploaded').gt(options.from);