summaryrefslogtreecommitdiff
path: root/src/site.clj
diff options
context:
space:
mode:
authorScott Ostler <scottbot9000@gmail.com>2011-02-22 21:42:33 -0500
committerScott Ostler <scottbot9000@gmail.com>2011-02-22 21:42:33 -0500
commit92fc288f6200ff0c8943cde89c62f675862cb1fa (patch)
treef1b34e0451eb296b4b6931d6ed4c04a72250b636 /src/site.clj
parente9f3ddc2286f93ba07788dea0a1cecb24af60d03 (diff)
Add friendly dates to mute error
Diffstat (limited to 'src/site.clj')
-rw-r--r--src/site.clj10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/site.clj b/src/site.clj
index 98524d4..6fce880 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -607,7 +607,7 @@ WHERE user_id IN
(defn msg [session params]
(let [user-id (session :user_id)
- mute (get (poll *active-mutes*) user-id)
+ mute (get (poll active-mutes) user-id)
nick (session :nick)
room-key (params :room)
room (lookup-room room-key)
@@ -617,7 +617,7 @@ WHERE user_id IN
(cond (not room) (resp-error "BAD_ROOM")
(not nick) (resp-error "NOT_LOGGED_IN")
content-too-long? (resp-error "TOO_LONG")
- mute (resp-error (format-mute mute))
+ mute (resp-error (format-mute-error mute))
:else
(let [content (validated-content content session)
msg-info (insert-message! user-id nick (:avatar session) room content)
@@ -1086,11 +1086,11 @@ WHERE user_id IN
nick (session :nick)
user-id (session :user_id)
image (params :image)
- mute (get (poll *active-mutes*) user-id)
+ mute (get (poll active-mutes) user-id)
has-access (validate-room-access room-key session)]
(cond (not nick) [200 "NOT_LOGGED_IN"]
(not image) [200 "INVALID_REQUEST"]
- mute [200 (format-mute mute)]
+ mute [200 (format-mute-error mute)]
(not has-access) [200 "UNKNOWN_ROOM"]
:else (do-upload session image (lookup-room room-key)))))
@@ -1385,7 +1385,7 @@ WHERE user_id IN
(def server (start-server (options :port)))
-(start! *active-mutes*)
+(start! active-mutes)
(start-user-flusher!)
(start-session-pruner!)