Merge branch 'master' of ssh://dump.fm/pichat/repo

1 files changed, 6 insertions, 2 deletions

diff --git a/src/site.clj b/src/site.clj
index 1053658..18fe495 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -737,7 +737,7 @@ FROM   users u
   (let [nick (params :nick)
         tags (map url-decode (re-split #"\+" (undecoded-url-piece url 3)))
         user-id (user-id-from-nick nick)
-        url (str "u/" nick "/tag/" (str-join "+" (map url-encode tags)))
+        url (str nick "/tag/" (str-join "+" (map url-encode tags)))
         page-title (str "dumps " nick " tagged as '" (escape-html (str-join "' and '" tags)) "'")]
     (tagged-dumps-template session params tags url page-title :tag-user-id user-id)))
 
@@ -750,7 +750,7 @@ FROM   users u
 (defn favorites [session params]
   (let [nick (params :nick)
         user-id (user-id-from-nick nick)
-        url (str "u/" nick "/favorites")
+        url (str nick "/favorites")
         page-title (str nick "'s favorites")]
     (tagged-dumps-template session params "favorite" url page-title :tag-user-id user-id)))
 
@@ -985,6 +985,10 @@ FROM   users u
   ;; Put username routes below all others in priority
   (GET "/:nick"           (profile session (params :nick) "0"))
   (GET "/:nick/"          (profile session (params :nick) "0"))
+  (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 session params))
+  (GET "/:nick/favorites/:offset" (favorites session params))
   (GET "/:nick/:offset"   (profile session (params :nick) (params :offset)))
   (GET "/" (landing session))
   (ANY "*" (unknown-page)))