diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/site.clj | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/site.clj b/src/site.clj index e68d2ad..a79269d 100755 --- a/src/site.clj +++ b/src/site.clj @@ -188,7 +188,7 @@ (defn fetch-messages-by-nick ([nick image-only] (fetch-messages-by-nick nick image-only 0)) ([nick image-only offset] - (let [query (str "SELECT m.content, m.created_on, m.message_id, u.nick, u.avatar + (let [query (str "SELECT m.content, m.created_on, m.message_id, u.nick, u.avatar, r.key FROM messages m, users u, rooms r WHERE m.user_id = u.user_id AND u.nick = ? AND r.room_id = m.room_id AND r.admin_only = false " @@ -284,9 +284,7 @@ ;; Landing (defn landing [session] - (if (session :nick) - (redirect-to "/chat") - (serve-file "static" "index.html"))) + (redirect-to "/chat")) (defn login [session params cookies] (let [nick (params :nick) @@ -522,10 +520,11 @@ (or (not (room :admin_only)) (session :is_admin))))) -(defn chat [session room] +;; 3/20/10: add template so multiple chat urls for ryder +(defn chat [session room template] (let [now (System/currentTimeMillis) nick (session :nick) - st (fetch-template "chat" session) + st (fetch-template template session) message-list (to-array (map process-message-for-output ; TODO: remove db query @@ -544,9 +543,9 @@ (.setAttribute st "timestamp" now) (.toString st))) -(defn validated-chat [session room-key] +(defn validated-chat [session room-key template] (if (validate-room-access room-key session) - (chat session (@rooms room-key)) + (chat session (@rooms room-key) template) (resp-error "UNKNOWN_ROOM"))) (defn refresh [session params room] @@ -616,7 +615,7 @@ ;; Browser (defn browser [session] - (let [room (@rooms "RoomA") + (let [room (@rooms "dumpfm") now (System/currentTimeMillis) nick (session :nick) st (fetch-template "browser" session)] @@ -791,11 +790,12 @@ (GET "/login" (login session params cookies)) (GET "/logout" (logout session)) (GET "/register" (serve-static "static" "register.html")) - (GET "/:room/chat" (no-cache (validated-chat session (-> request :route-params :room)))) - (GET "/chat" (no-cache (validated-chat session "RoomA"))) + (GET "/:room/chat" (no-cache (validated-chat session (-> request :route-params :room) "chat"))) + (GET "/chat" (no-cache (validated-chat session "dumpfm" "chat"))) + (GET "/chat/:t" (no-cache (validated-chat session "dumpfm" (-> request :route-params :t)))) (GET "/browser" (browser session)) (GET "/refresh" (validated-refresh session params)) - (GET "/log" (validated-log session "RoomA" "0" params)) + (GET "/log" (validated-log session "dumpfm" "0" params)) (GET "/:room/log" (validated-log session (-> request :route-params :room) "0" params)) @@ -803,7 +803,6 @@ (-> request :route-params :room) (-> request :route-params :offset) params)) - ;; TODO: add form tokens for all destructive actions (POST "/msg" (validated-msg session params)) (POST "/submit-registration" (register session params)) (POST "/update-profile" (update-profile session params)) |