From 612cf7de0edd2dbdf4d73e3b9eb300520fa7a5c2 Mon Sep 17 00:00:00 2001
From: dumpfmprod <dumpfmprod@ubuntu.(none)>
Date: Sat, 2 Oct 2010 19:58:48 -0400
Subject: timb: irl: fwd, altars: fix off by one, add previous paging

---
 src/site.clj | 51 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 19 deletions(-)

(limited to 'src/site.clj')

diff --git a/src/site.clj b/src/site.clj
index 620756d..f28aae0 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -850,22 +850,11 @@ WHERE  u.user_id = ANY(?)"
 ;; Altars
 
 (defn altar-log [session params]
-  (let [id         (params :id)
-        st         (fetch-template "altar_log" session)
-        raw-dumps  (tags/fetch-altars :message-id id :amount (+ 1 *dumps-per-page*))
-        dumps      (map tags/add-favorited-flag (take *dumps-per-page* raw-dumps) (repeat session))
-        dumps      (map tags/remove-tags-for-output dumps)
-        dumps      (map process-message-for-output dumps)]
-    (.setAttribute st "dumps" dumps)
-    (if (> (count raw-dumps) *dumps-per-page*)
-      (.setAttribute st "next" ((last raw-dumps) :message_id)))
-    (.toString st)))
-
-(defn altar-log-by-nick [session params]
   (let [id         (params :id)
         nick       (params :nick)
-        user-id    (user-id-from-nick nick)
-        st         (fetch-template "altar_user_log" session)
+        user-id    (if nick (user-id-from-nick nick) nil)
+        template   (if user-id "altar_user_log" "altar_log")
+        st         (fetch-template template session)
         raw-dumps  (tags/fetch-altars :message-id id :amount (+ 1 *dumps-per-page*) :user-id user-id)
         dumps      (map tags/add-favorited-flag (take *dumps-per-page* raw-dumps) (repeat session))
         dumps      (map tags/remove-tags-for-output dumps)
@@ -874,6 +863,8 @@ WHERE  u.user_id = ANY(?)"
     (.setAttribute st "nick" nick)
     (if (> (count raw-dumps) *dumps-per-page*)
       (.setAttribute st "next" ((last raw-dumps) :message_id)))
+    (if id
+      (.setAttribute st "prev" ((first raw-dumps) :message_id)))
     (.toString st)))
 
 ;; Tags 
@@ -1247,7 +1238,20 @@ WHERE  u.user_id = ANY(?)"
 (defroutes static
   (GET "/static/*"  (serve-static "static" (params :*)))
   (GET "/images/*"  (serve-static *image-directory* (params :*)))
-  (GET "/avatars/*" (serve-static *avatar-directory* (params :*))))
+  (GET "/avatars/*" (serve-static *avatar-directory* (params :*)))
+;; irl
+  (GET "/irl"      (redirect-to "/irl/"))
+  (GET "/irl/"     (serve-static "static/319"  "index.html"))
+  (GET "/irl/*"    (serve-static "static/319"  (params :*)))
+  (GET "/irl2"     (redirect-to "/irl2/"))
+  (GET "/irl2/"    (serve-static "static/319"  "res.html"))
+  (GET "/irl2/*"   (serve-static "static/319" (params :*)))
+  (GET "/irlhell"  (redirect-to "/irhell/"))
+  (GET "/irhell"   (redirect-to "/irhell/"))
+  (GET "/irhell/"  (serve-static "static/319"  "irhell.html"))
+  (GET "/irhell/*" (serve-static "static/319"  (params :*))))
+
+
 
 (defroutes pichat
   (GET "http://:sub.dump.fm/"     (validated-chat session (params :sub)))
@@ -1292,9 +1296,12 @@ WHERE  u.user_id = ANY(?)"
   (POST "/cmd/tag/add" (validated-add-tag session params))
   (POST "/cmd/tag/rm" (validated-remove-tag session params))
 
+  ;; Altars
   (GET "/altars" (altar-log session params))
   (GET "/altars/" (altar-log session params))
-  (GET "/altars/:id" (altar-log session params))
+  (GET "/altars/:id" (if (maybe-parse-int (params :id) false)
+                         (altar-log session params)
+                         (redirect-to (str "/" (params :id) "/altars")))) ;; redirect /altars/timb to /timb/altars
 
   ;; Events
   (GET "/event" (current-event session))
@@ -1346,9 +1353,9 @@ WHERE  u.user_id = ANY(?)"
   ;; Put username routes below all others in priority
   (GET "/:nick"           (profile session (params :nick)))
   (GET "/:nick/"          (profile session (params :nick)))
-  (GET "/:nick/altars"     (altar-log-by-nick session params))
-  (GET "/:nick/altars/"    (altar-log-by-nick session params))
-  (GET "/:nick/altars/:id" (altar-log-by-nick session params))
+  (GET "/:nick/altars"     (altar-log session params))
+  (GET "/:nick/altars/"    (altar-log session params))
+  (GET "/:nick/altars/:id" (altar-log session params))
   (GET "/:nick/tag/:tag" (tagged-dumps-by-nick session params (request-url request)))
   (GET "/:nick/tag/:tag/:offset" (tagged-dumps-by-nick session params (request-url request)))
   (GET "/:nick/favorites" (favorites-handler session (params :nick) nil nil))
@@ -1419,6 +1426,12 @@ WHERE  u.user_id = ANY(?)"
               "/static/*" (servlet static)
               "/images/*" (servlet static)
               "/avatars/*" (servlet static)
+              "/irl" (servlet static)
+              "/irl2" (servlet static)
+              "/irl/*" (servlet static)
+              "/irl2/*" (servlet static)
+              "/irhell" (servlet static)
+              "/irhell/*" (servlet static)
               "/upload/*" (servlet multipart)
               "/*" (servlet pichat)))
 
-- 
cgit v1.2.3-70-g09d2