Merge branch 'master' of /pichat/repo

3 files changed, 6 insertions, 10 deletions

diff --git a/db/0-create.psql b/db/0-create.psql
index 3479159..649d74f 100644
--- a/db/0-create.psql
+++ b/db/0-create.psql
@@ -21,13 +21,6 @@ ALTER TABLE users ADD CONSTRAINT users_nick_constraint UNIQUE (LOWER(nick));
 
 CREATE INDEX users_nick_lowercase_idx ON users (lower(nick));
 
---    ALTER TABLE users
---    ADD COLUMN last_login timestamp;
---    ALTER TABLE users
---    ADD COLUMN created_ip cidr DEFAULT '0';
---    ALTER TABLE users
---    ADD COLUMN last_ip cidr DEFAULT '0';
-
 CREATE TABLE rooms (
     room_id SERIAL PRIMARY KEY,
     key text UNIQUE NOT NULL,
@@ -35,9 +28,12 @@ CREATE TABLE rooms (
     description text NOT NULL,
     created_on timestamp NOT NULL DEFAULT now(),
     admin_only bool NOT NULL DEFAULT false,
-    active bool NOT NULL DEFAULT true
+    active bool NOT NULL DEFAULT true,
+    history_size integer NOT NULL DEFAULT 25
 );
 
+-- ALTER TABLE rooms ADD COLUMN history_size integer NOT NULL DEFAULT 25;
+
 CREATE TABLE messages (
     message_id SERIAL PRIMARY KEY,
     user_id integer NOT NULL REFERENCES users,
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