summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Ostler <sbsotler@gmail.com>2010-11-15 01:54:43 -0800
committerScott Ostler <sbsotler@gmail.com>2010-11-15 01:54:43 -0800
commitc37bcf6d26abf3fdadd41deda24b020b71627630 (patch)
treeaa9079d58b55d0f896df2e848a423cca2f0e7caa
parent9b5fb453d7fbe79918fe012badbf6a515092cb48 (diff)
Moved constants to config.clj
-rw-r--r--src/config.clj3
-rw-r--r--src/rooms.clj2
-rw-r--r--src/site.clj2
-rwxr-xr-xsrc/utils.clj3
4 files changed, 4 insertions, 6 deletions
diff --git a/src/config.clj b/src/config.clj
index fdb33ed..7a4a6a2 100644
--- a/src/config.clj
+++ b/src/config.clj
@@ -28,3 +28,6 @@
;; Numerical constants
(def num-popular-dumps 40)
+(def *dumps-per-page* 20)
+(def *vip-dumps-per-page* 200)
+(def message-count-limit 200)
diff --git a/src/rooms.clj b/src/rooms.clj
index e919557..7745630 100644
--- a/src/rooms.clj
+++ b/src/rooms.clj
@@ -101,8 +101,6 @@
(defn build-msg [nick content msg-id]
(struct message-struct nick content (new Date) msg-id))
-(def message-count-limit 200)
-
(defn add-message [msg room]
(insert-and-truncate! (room :messages) msg message-count-limit))
diff --git a/src/site.clj b/src/site.clj
index 4c3560e..5d7f9a3 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -677,7 +677,7 @@ ORDER BY cnt DESC
mute (resp-error (format-mute mute))
:else
(let [content (validated-content content session)
- msg-id (msg-db user-id (room :room_id) content)]
+ msg-id (msg-db user-id (room :room_id) content)]
(dosync
(if (not (contains? (ensure (room :users)) nick))
(login-user (user-struct-from-session session) room))
diff --git a/src/utils.clj b/src/utils.clj
index 9d7fd3a..84454cd 100755
--- a/src/utils.clj
+++ b/src/utils.clj
@@ -35,9 +35,6 @@
(.setPassword db-pass)
(.setMaxConnections 10))}))
-;; moved this to here which doesn't seem right... maybe a 'settings.clj' or something?
-(def *dumps-per-page* 20)
-(def *vip-dumps-per-page* 200)
;; Message parsing