summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsostler <sbostler@gmail.com>2010-03-20 22:57:04 -0400
committersostler <sbostler@gmail.com>2010-03-20 22:57:04 -0400
commitf6cfd190a8a118d08d0c66818c94028f4336f5bb (patch)
tree371f6b957e35a2d6753ce64749e698a6f894573b /src
parenta379035eec3a36b9bbd990367bef457c595f05fe (diff)
Added variable chat templates
Diffstat (limited to 'src')
-rwxr-xr-xsrc/site.clj16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/site.clj b/src/site.clj
index b6643a9..f36d740 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -285,9 +285,6 @@
(defn landing [session]
(redirect-to "/chat"))
-; (if (session :nick)
-; (redirect-to "/chat")
-; (serve-file "static" "index.html")))
(defn login [session params cookies]
(let [nick (params :nick)
@@ -518,10 +515,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
@@ -540,9 +538,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]
@@ -781,7 +779,8 @@
(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 "/chat" (no-cache (validated-chat session "RoomA" "chat")))
+ (GET "/chat/:t" (no-cache (validated-chat session "RoomA" (-> request :route-params :t))))
(GET "/browser" (browser session))
(GET "/refresh" (validated-refresh session params))
(GET "/log" (validated-log session "RoomA" "0" params))
@@ -792,7 +791,6 @@
(-> request :route-params :room)
(-> request :route-params :offset)
params))
- ;; TODO: validate POST Referrer headers for POSTs
(POST "/msg" (validated-msg session params))
(POST "/submit-registration" (register session params))
(POST "/update-profile" (update-profile session params))