1 files changed, 24 insertions, 3 deletions
diff --git a/bucky/db/index.js b/bucky/db/index.js
index f454c92..53e36dd 100644
--- a/bucky/db/index.js
+++ b/bucky/db/index.js
@@ -55,8 +55,13 @@ db.createUser = function(data){
 }
 db.getUsers = function () {
   return User.query(function(qb){
-    qb.orderBy("id", "desc")
-  }).fetchAll()
+    qb.orderBy("username", "desc")
+  }).fetchAll({
+    columns: [
+      "id", "username", "realname", "firstseen", "lastseen",
+      "location", "website", "avatar",
+    ]
+  })
 }
 db.getUser = function(id) {
   var model = new User({'id': id})
@@ -281,8 +286,24 @@ db.getKeyword = function (keyword) {
   return Keyword.query("where", "keyword", "=", keyword).fetch()
 }
 db.getThreadGroups = function (keyword) {
-  return knex.column('keyword').sum('viewed').as('viewed').count('*').as('count').column('id').column('title').column('lastmodified').column('privacy').select().from('threads').groupBy('keyword')
+  return (
+    knex.column('keyword')
+        .sum('viewed').as('viewed')
+        .count('*').as('count')
+        .select().from('threads').groupBy('keyword')
+  )
 }
+db.getLatestKeywordThreads = function (keyword) {
+  var ids = knex('threads').max('id').groupBy('keyword')
+  return (
+    knex.select('id', 'keyword', 'title', 'lastmodified', 'privacy').from('threads').where('id', 'in', ids)
+  )
+}
+        // .column('id')
+        // .column('title')
+        // .column('lastmodified')
+        // .column('privacy')
+
 db.createKeyword = function(data){
   return new db.Keyword(data).save()
 }