diff options
| author | timb <timb@mb.local> | 2010-01-21 03:48:25 -0800 |
|---|---|---|
| committer | timb <timb@mb.local> | 2010-01-21 03:48:25 -0800 |
| commit | 51727e64db58dcc79ecaf073425e97d259a1e016 (patch) | |
| tree | 3908ad3c4f4217aa2efa4a5296e701867535de18 | |
| parent | f69cd3b50f35c97eba1a4f1ed47e933edc2ec2f6 (diff) | |
add '?show=all' to a log url to include text messages
| -rwxr-xr-x | src/site.clj | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/site.clj b/src/site.clj index 4f6ca71..65890ef 100755 --- a/src/site.clj +++ b/src/site.clj @@ -421,11 +421,12 @@ ;; Chat Log ; TODO: Optimize dump counts -(defn log [session room offset] +(defn log [session room offset params] (let [st (fetch-template "log" session) offset (maybe-parse-int offset 0) dump-offset (* offset dumps-per-page) - image-only (not (room :admin_only)) + image-only (and (not (room :admin_only)) + (not= (params :show) "all")) dumps (to-array (map process-message-for-output (fetch-messages-by-room (room :room_id) image-only dump-offset))) dump-count (count-messages-by-room (room :room_id) image-only)] @@ -438,10 +439,10 @@ (.setAttribute st "roomname" (room :name)) (.toString st))) -(defn validated-log [session room-key offset] +(defn validated-log [session room-key offset params] (let [room (@rooms room-key)] (if (validate-room-access room session) - (log session room offset) + (log session room offset params) (resp-error "UNKNOWN_ROOM")))) ;; Upload @@ -484,13 +485,14 @@ (GET "/browser" (browser session)) (GET "/refresh" (validated-refresh session params)) (GET "/msg" (validated-msg session params)) - (GET "/log" (validated-log session "RoomA" "0")) + (GET "/log" (validated-log session "RoomA" "0" params)) (GET "/:room/log" (validated-log session (-> request :route-params :room) - "0")) + "0" params)) (GET "/:room/log/:offset" (validated-log session (-> request :route-params :room) - (-> request :route-params :offset))) + (-> request :route-params :offset) + params)) (GET "/upload" (upload session)) (ANY "*" [404 "Page not found"])) |