diff options
| author | sostler <sbostler@gmail.com> | 2010-01-24 18:58:10 -0500 |
|---|---|---|
| committer | sostler <sbostler@gmail.com> | 2010-01-24 18:58:10 -0500 |
| commit | 12548ad8f1107e4dda3580124bcceb3c491adcfa (patch) | |
| tree | 9b5d78d1a329cac472fabdedb9595f8f9b596f0c /src | |
| parent | eb51bce12f0e866d09ce7df2e619820d76061af3 (diff) | |
| parent | e41bdf3a328e9984fba4cf1d6d43d96fbe3cd396 (diff) | |
commit changes from prod
Diffstat (limited to 'src')
| -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 9d66735..b5c7ade 100755 --- a/src/site.clj +++ b/src/site.clj @@ -422,11 +422,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)] @@ -439,10 +440,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 @@ -485,13 +486,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"])) |