Merge branch 'master' of /pichat/repo

1 files changed, 33 insertions, 28 deletions

diff --git a/src/site.clj b/src/site.clj
index 5f4463b..ac7ae7d 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -445,32 +445,36 @@ ORDER BY created_on DESC;
     (.setAttribute st "dumps" dumps)
     (.toString st)))
       
-(defn profile [session profile-nick offset]
-  (if-let [user-info (fetch-nick profile-nick)]
-    (let [st            (fetch-template "profile" session)
-          profile-nick  (:nick user-info)
-          nick          (session :nick)
-          logger        (make-time-logger)
-          is-home       (and nick (= nick profile-nick))
-          has-avatar    (non-empty-string? (user-info :avatar))
-          offset        (maybe-parse-int offset 0)
-          score         (or ((poll *user-scores*) profile-nick) 0)
-          dump-offset   (* offset *dumps-per-page*)
-          raw-dumps     (logger tags/fetch-dumps-by-nick
-                                :nick profile-nick
-                                :amount (+ 1 *dumps-per-page*)
-                                :offset dump-offset)
-          dumps         (map tags/add-favorited-flag (take *dumps-per-page* raw-dumps) (repeat session))
-          dumps         (map tags/remove-tags-for-output dumps)
-          dumps         (logger doall (map process-message-for-output dumps))]
-      (do
-        (.setAttribute st "is_home" is-home)
-        (doseq [a [:nick :avatar :contact :bio]]
+(defn profile
+  ([session profile-nick offset] (profile session profile-nick offset "profile"))
+  ([session profile-nick offset template]
+     (if-let [user-info (fetch-nick profile-nick)]
+       (let [st            (fetch-template template session)
+             profile-nick  (:nick user-info)
+             nick          (session :nick)
+             logger        (make-time-logger)
+             is-home       (and nick (= nick profile-nick))
+             has-avatar    (non-empty-string? (user-info :avatar))
+             offset        (maybe-parse-int offset 0)
+             score         (if (= (lower-case profile-nick) "scottbot")
+                             9999
+                             (or ((poll *user-scores*) profile-nick) 0))
+             dump-offset   (* offset *dumps-per-page*)
+             raw-dumps     (logger tags/fetch-dumps-by-nick
+                                   :nick profile-nick
+                                   :amount (+ 1 *dumps-per-page*)
+                                   :offset dump-offset)
+             dumps         (map tags/add-favorited-flag (take *dumps-per-page* raw-dumps) (repeat session))
+             dumps         (map tags/remove-tags-for-output dumps)
+             dumps         (logger doall (map process-message-for-output dumps))]
+         (do
+           (.setAttribute st "is_home" is-home)
+           (doseq [a [:nick :avatar :contact :bio]]
           (let [v (user-info a)]
             (.setAttribute st (name a)
                            (if (non-empty-string? v) (escape-html v)))))
-        (if (> (count dumps) 0)
-          (.setAttribute st "dumps" dumps))
+           (if (> (count dumps) 0)
+             (.setAttribute st "dumps" dumps))
         (if (> (count raw-dumps) *dumps-per-page*)
           (.setAttribute st "next" (inc offset)))
         (.setAttribute st "score" score)
@@ -479,7 +483,7 @@ ORDER BY created_on DESC;
           (.setAttribute st "prev" (max (dec offset) 0)))
         (.setAttribute st "debug_log_items" (logger))
         (.toString st)))
-    (resp-error "NO_USER")))
+       (resp-error "NO_USER"))))
 
 (defn update-user-db [user-id attr val]
   (with-connection *db*
@@ -1117,6 +1121,7 @@ ORDER  BY msg_count DESC")
   (POST "/cancel-mute" (handle-cancel-mute! session params))
   (GET "/feed-test" (feed-test-page session))
   (POST "/feed-test" (feed-test session params))
+  (GET "/profile-test/:t" (profile session "ryder" "0" (params :t)))
 
   ;; Footer pages
   (GET "/about_us" (serve-template "about_us" session))
@@ -1127,10 +1132,10 @@ ORDER  BY msg_count DESC")
   (GET "/error/ie" (serve-template "error_ie" session))
 
   ;; Put username routes below all others in priority
-  (GET "/zoeee/nudes"   (zoeee-nudes session))
-  (GET "/:nick"         (profile session (params :nick) "0"))
-  (GET "/:nick/"        (profile session (params :nick) "0"))
-  (GET "/:nick/:offset" (profile session (params :nick) (params :offset)))
+  (GET "/zoeee/nudes"     (zoeee-nudes session))
+  (GET "/:nick"           (profile session (params :nick) "0"))
+  (GET "/:nick/"          (profile session (params :nick) "0"))
+  (GET "/:nick/:offset"   (profile session (params :nick) (params :offset)))
   (GET "/" (landing session))
   (ANY "*" (unknown-page)))