summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorScott Ostler <sostler@deathmachine.local>2010-03-11 23:27:42 -0500
committerScott Ostler <sostler@deathmachine.local>2010-03-11 23:27:42 -0500
commitb9279bb808b9189f103b82358dbb21bd70f15868 (patch)
tree715bbd3463bc1a7379ba475a2dbfdc7e74135b61 /src
parentcc9a731ff8c3bd96453b70027665fd9e952ea015 (diff)
Fixed is-file-too-big?
Diffstat (limited to 'src')
-rwxr-xr-xsrc/site.clj9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/site.clj b/src/site.clj
index 30cbf45..7925aa1 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -605,17 +605,12 @@
(let [room (@rooms "RoomA")
now (System/currentTimeMillis)
nick (session :nick)
- st (fetch-template "browser" session)
- message-list (to-array
- (map process-message-for-output
- ; TODO: remove db query
- (reverse (fetch-messages-by-room (room :room_id) false))))]
+ st (fetch-template "browser" session)]
(if nick
(dosync
(login-user (user-struct-from-session session) room)))
(let [user-list (to-array (prepare-user-list room))]
(.setAttribute st "users" user-list))
- (.setAttribute st "messages" message-list)
(.setAttribute st "roomkey" (room :key))
(.setAttribute st "isadminroom" (room :admin_only))
(.setAttribute st "json_room_key" (json-str (room :key)))
@@ -668,7 +663,7 @@
(defn is-file-too-big? [f vip]
(let [limit (file-size-limit vip)]
(if (> (.length f) limit)
- (str "FILE_TOO_BIG " (limit vip)))))
+ (str "FILE_TOO_BIG " limit))))
(defn is-image-invalid? [f]
(try