diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/site.clj | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/site.clj b/src/site.clj index 3f30090..f04edb4 100644 --- a/src/site.clj +++ b/src/site.clj @@ -665,6 +665,7 @@ ORDER BY msg_count DESC") ;; Browser +;; TODO: make work for all rooms (defn browser [session] (let [room (lookup-room "dumpfm") now (System/currentTimeMillis) @@ -815,7 +816,6 @@ ORDER BY msg_count DESC") favs (reduce (fn [m fav] (assoc m (str (fav :message_id)) (fav :content))) {} raw-favs)] (str "RawFavs=" (json-str favs)))) - ;; Account resets (defn reset-request-page [session] @@ -969,7 +969,18 @@ ORDER BY msg_count DESC") (GET "/avatars/*" (serve-static *avatar-directory* (params :*)))) (defroutes pichat - (GET "/" (landing session)) + (GET "http://:sub.dump.fm/" (validated-chat session (params :sub) "chat")) + (GET "http://:sub.dump.fm/chat" (validated-chat session (params :sub) "chat")) + (GET "/:room/chat" (validated-chat session (params :room) "chat")) + (GET "/chat" (validated-chat session "dumpfm" "chat")) + (GET "/chat/:t" (validated-chat session "dumpfm" (params :t))) + + (GET "http://:sub.dump.fm/log" (validated-log session (params :sub) "0" params)) + (GET "http://:sub.dump.fm/log/:offset" (validated-log session (params :room) (params :offset) params)) + (GET "/log" (validated-log session "dumpfm" "0" params)) + (GET "/:room/log" (validated-log session (params :room) "0" params)) + (GET "/:room/log/:offset" (validated-log session (params :room) (params :offset))) + (GET "/favicon.ico" (serve-static "static" "favicon.ico")) (GET "/u/:nick" (profile session (params :nick) "0")) (GET "/u/:nick/" (profile session (params :nick) "0")) @@ -986,19 +997,13 @@ ORDER BY msg_count DESC") (GET "/login" (login session params cookies)) (GET "/logout" (logout session)) (GET "/register" (serve-static "static" "register.html")) - (GET "/:room/chat" (validated-chat session (params :room) "chat")) - (GET "/chat" (validated-chat session "dumpfm" "chat")) - (GET "/chat/:t" (validated-chat session "dumpfm" (params :t))) (GET "/browser" (browser session)) (GET "/refresh" (validated-refresh session params)) (GET "/tag/:tag" (tagged-dumps session params (request-url request))) (GET "/tag/:tag/:offset" (tagged-dumps session params (request-url request))) (POST "/cmd/tag/add" (validated-add-tag session params)) (POST "/cmd/tag/rm" (validated-remove-tag session params)) - (GET "/log" (validated-log session "dumpfm" "0" params)) - (GET "/:room/log" (validated-log session (params :room) "0" params)) - (GET "/:room/log/:offset" (validated-log session (params :room) (params :offset) - params)) + ;; TODO: add form tokens for all destructive actions (POST "/msg" (validated-msg session params)) (POST "/submit-registration" (register session params)) @@ -1031,7 +1036,7 @@ ORDER BY msg_count DESC") (GET "/:nick" (profile session (params :nick) "0")) (GET "/:nick/:offset" (profile session (params :nick) (params :offset))) - + (GET "/" (landing session)) (ANY "*" (unknown-page))) (defroutes multipart |