summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/rooms.clj1
-rw-r--r--src/site.clj3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rooms.clj b/src/rooms.clj
index d276944..4f7d6c4 100644
--- a/src/rooms.clj
+++ b/src/rooms.clj
@@ -73,6 +73,7 @@
:key (room-db :key)
:name (room-db :name)
:description (room-db :description)
+ :history_size (room-db :history_size)
:users (ref {})
:messages (ref (fetch-messages-by-room (room-db :room_id) false))
:topic (ref nil)
diff --git a/src/site.clj b/src/site.clj
index 23e2d8d..30aa90e 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -704,12 +704,11 @@ WHERE u.user_id = ANY(?)"
(if-let [st (lookup-room-template session (:key room) template)]
(let [now (System/currentTimeMillis)
nick (session :nick)
- limit (if (:admin_only room) *vip-dumps-per-page* *dumps-per-page*)
raw-msgs (reverse (tags/fetch-image-dumps :room (:key room)
:image-only false
:user-tag-id (:user_id session)
:hide-vip false
- :limit limit))
+ :limit (:history_size room)))
message-list (to-array (map process-message-for-output raw-msgs))]
(if nick
(dosync