sort file list by name or date, updates audio player

1 files changed, 11 insertions, 4 deletions

diff --git a/bucky/db/index.js b/bucky/db/index.js
index 652f723..f92ba2f 100644
--- a/bucky/db/index.js
+++ b/bucky/db/index.js
@@ -18,8 +18,9 @@ var Thread = db.Thread = bookshelf.Model.extend({
     if (this.get('privacy') === 0) return true
     let username = user.get('username')
     if (this.get('username') === username) return true
-    let allowed = this.get('allowed').split(',')
-    if (allowed.findIndex(username) !== -1) return true
+    let allowed = (this.get('allowed') || '').split(',')
+    if (allowed.indexOf(username) !== -1) return true
+    return false
   }
 })
 var ThreadUser = db.ThreadUser = bookshelf.Model.extend({
@@ -65,13 +66,19 @@ db.getUsersById = function(ids){
   return User.where("id", "in", ids).fetchAll()
 }
 db.getUsernamesById = function(ids){
-  return User.column("id").column("username").where("id", "in", ids).fetchAll()
+  return knex.column("id").column("username")
+    .select().from('users').where("id", "in", ids)
+}
+db.checkUsernames = function(usernames){
+  return knex.column("username")
+    .select().distinct().from('users').where("username", "in", usernames)
 }
 db.getUserByUsername = function(username) {
   return new User({'username': username}).fetch()
 }
 db.getLastlog = function(limit){
-  return knex.column('id').column('username').column('lastseen').select().from('users').orderBy('lastseen', 'desc').limit(limit || 10)
+  return knex.column('id').column('username').column('lastseen')
+    .select().from('users').orderBy('lastseen', 'desc').limit(limit || 10)
 }
 
 /* THREADS */