Fixed directory offset bug; restrict directory to images from RoomA

1 files changed, 7 insertions, 4 deletions

diff --git a/src/site.clj b/src/site.clj
index b3e7e70..e5107e5 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -385,7 +385,8 @@
 (defn directory-search [offset]
   (let [directory @*directory-listing* 
         users (subvec directory
-                      (* offset *per-directory-page*)
+                      (min (count directory) 
+                           (* offset *per-directory-page*))
                       (min (count directory)
                            (* (inc offset) *per-directory-page*)))
         user-ids (apply str (interpose ", " (map #(%1 :user_id) users)))
@@ -400,17 +401,19 @@
                            ORDER BY created_on DESC LIMIT 1)")]
     (when (> (count user-ids) 0)
       (let [res (do-select [qry])
-            keys (map :user_id res)           
-            dict (zipmap keys res)]
+            keys (map :user_id res)
+            res-dict (zipmap keys res)]
         (map (fn [u]
                (let [u-id (u :user_id)]
-                 (process-directory-listing (merge u (dict u-id)))))
+                 (process-directory-listing (merge u (res-dict u-id)))))
              users)))))
            
 (defn update-directory! []
   (let [qry "SELECT u.user_id, COUNT(m) as cnt
              FROM users u, messages m
              WHERE u.user_id = m.user_id
+             AND m.room_id = 1
+             AND m.is_image = true
              GROUP BY u.user_id
              ORDER BY COUNT(m) DESC"
         res (vec (do-select [qry]))]