Resolved TODO conflict

1 files changed, 24 insertions, 9 deletions

diff --git a/src/site.clj b/src/site.clj
index 55a668a..a79269d 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -383,7 +383,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)))
@@ -398,17 +399,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]))]
@@ -432,6 +435,8 @@
     (cond (= offset 0) (.setAttribute st "prev" false)
           (= offset 1) (.setAttribute st "prev" "")
           :else (.setAttribute st "prev" (str "/" (dec offset))))
+    (if (> offset 0)
+      (.setAttribute st "cur" offset))
     (.setAttribute st "next" (str "/" (inc offset)))
     (if (zero? (count @*directory-listing*))
       (.setAttribute st "notloaded" true))
@@ -654,6 +659,17 @@
     (log session (@rooms room-key) offset params)
     (resp-error "UNKNOWN_ROOM")))
 
+;; Account resets
+
+(defn reset-page [session]
+  )
+
+(defn reset-account-request! [session params]
+  )
+
+(defn reset-account! [session key]
+  )
+
 ;; Upload
 
 (def *max-image-height* 2000)
@@ -720,10 +736,6 @@
           (not (validate-room-access room-key session)) [200 "UNKNOWN_ROOM"]
           :else (do-upload session image (@rooms room-key)))))
 
-(defn copy-and-resize [image dest]
-  ; TODO: resize
-  (copy image dest))
-
 ;; N.B. -- Upload responses aren't JSON-evaluated
 (defn do-upload-avatar [session image]
   (let [filename (format-filename (:filename image) (session :nick))
@@ -731,7 +743,7 @@
         dest (open-file [*avatar-directory* date] filename)
         url (image-url-from-file "avatars" date dest)]
     (do
-      (copy-and-resize (:tempfile image) dest)
+      (copy (:tempfile image) dest)
       (update-user-db (session :user_id) "avatar" url)
       [(session-assoc :avatar url)
        [200 url]])))
@@ -800,6 +812,9 @@
   (GET "/directory" (directory session 0))
   (GET "/directory/:offset"
        (directory session (maybe-parse-int (-> request :route-params :offset) 0)))
+  (GET "/reset" (reset-page session)) 
+  (POST "/reset-request" (reset-account-request! session params))
+  (POST "/reset/:key" (reset-account! session (-> request :route-params :key)))
   (GET "/about_us" (serve-template "about_us" session))
   (GET "/goodies" (serve-template "goodies" session))
   (GET "/help" (serve-template "help" session))