Added multiple-window posting, removed posting delay

1 files changed, 37 insertions, 41 deletions

diff --git a/src/site.clj b/src/site.clj
index 796e833..1d27753 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -116,12 +116,10 @@
    "created_on" (.format formatter (d :created_on))
    "content" (encode-html-entities (d :content))})
 
-(defn new-messages 
-  ([room since-ts]
-     (let [since-date (new Date (long since-ts))]
-       (reverse (take-while (fn [m] (.after (m :created_on) since-date)) 
-			    @(room :messages)))))
-  ([room] (reverse (take 25 @(room :messages)))))
+(defn new-messages [room since-ts]
+  (let [since-date (new Date (long since-ts))]
+    (reverse (take-while (fn [m] (.after (m :created_on) since-date)) 
+                         @(room :messages)))))
 
 (defn process-user [u]
   (if (u :avatar)   
@@ -133,11 +131,10 @@
   (map process-user (sort-by #(% :nick)
 			     (vals @(room :users)))))
 
-(defn updates
-  ([room] {"users" (prepare-user-list room)
-           "messages" (map process-message-for-json (new-messages room))})
-  ([room since] {"users" (prepare-user-list room)
-                 "messages" (map process-message-for-json (new-messages room since))}))
+(defn updates [room since] 
+  {"users" (prepare-user-list room)
+   "messages" (map process-message-for-json
+                   (new-messages room since))})
 
 (def dumps-per-page 20)
 
@@ -204,10 +201,9 @@
 		 :avatar (user-info :avatar)))
 
 (defn landing [session]
-  (let [nick (session :nick)]
-    (if nick
-      (redirect-to "/chat")
-      (serve-file "static" "index.html"))))
+  (if (session :nick)
+    (redirect-to "/chat")
+    (serve-file "static" "index.html")))
 
 (defn login [session params]
   (let [nick (params :nick)
@@ -313,13 +309,12 @@
       (.setAttribute st "users" user-list))
     (.setAttribute st "messages" message-list)
     (.setAttribute st "roomkey" (room :key))
+    (.setAttribute st "isadmin" (session :is_admin))
     (.setAttribute st "json_room_key" (json-str (room :key)))
-    (.setAttribute st "roomname" (room :name))
     (.setAttribute st "json_user_nick" (if nick (json-str nick) "null"))
-    (if nick
-      (.toString st)
-      [(session-assoc :last-seen now)
-       (.toString st)])))
+    (.setAttribute st "roomname" (room :name))
+    (.setAttribute st "timestamp" now)
+    (.toString st)))
 
 (defn validated-chat [session room-key]
   (let [room (@rooms room-key)]
@@ -327,21 +322,16 @@
       (chat session room)
       (resp-error "UNKNOWN_ROOM"))))
 
-; TODO: handle anonymous users in multiple rooms        
 (defn refresh [session params room]
   (dosync
    (let [now (System/currentTimeMillis)
+         since (Long/parseLong (params :since))
          nick (session :nick)
          users (room :users)]
-      (if (or nick (session :last-seen))
-        (if (contains? @users nick)
-          (let [last-seen (get-in @users [nick :last-seen])]
-            (alter users assoc-in [nick :last-seen] now)
-            (resp-success (updates room last-seen)))
-          (let [last-seen (session :last-seen)]
-            [(session-assoc :last-seen now)
-             (resp-success (updates room last-seen))]))
-      (resp-error "NOT_IN_CHAT")))))
+     (if (contains? @users nick)
+       (alter users assoc-in [nick :last-seen] now))
+     (resp-success (assoc (updates room since)
+                     :timestamp now)))))
 
 (defn validated-refresh [session params]
   (let [room-key (params :room)
@@ -353,7 +343,7 @@
 
 ;; http://snippets.dzone.com/posts/show/6995
 (def single-url-regex #"(?i)^((http\:\/\/|https\:\/\/|ftp\:\/\/)|(www\.))+(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$")
-(def pic-regex #"(?i)\.(jpg|jpeg|png|gif|bmp)$")
+(def pic-regex #"(?i)\.(jpg|jpeg|png|gif|bmp|ico)$")
 
 (defn strip-params [s]
   (.replaceFirst s "\\?.*$" ""))
@@ -369,7 +359,6 @@
         (alter (room :messages) (swap cons) msg)
         true)))
 
-; TODO: validate user
 (defn msg-db [user-id room-id msg]
   (let [content (.trim (msg :content))
         is-image (is-image? content)]
@@ -401,7 +390,6 @@
 ;; Chat Log
 
 ; TODO: Optimize dump counts
-
 (defn log [session room offset]
   (let [st (fetch-template "log" session)
 	offset (maybe-parse-int offset 0)
@@ -436,16 +424,24 @@
   [{:headers {"Cache-Control" "no-cache, no-store, max-age=0, must-revalidate"}}
    resp])
 
+(defn serve-static [path]
+  ; TODO: cache policy for other static files (js, css, etc.)
+  (let [cache-header (if (re-find pic-regex path)
+                       {:headers {"Cache-Control"
+                                  "post-check=3600,pre-check=43200"}}
+                       {})]
+    [cache-header
+     (serve-file "static" path)]))
+
 (defroutes pichat
   (GET "/" (no-cache (landing session)))
-  (GET "/static/*" (or (serve-file "static" (params :*))
-                       :next))
-  (GET "/favicon.ico" (serve-file "static" "favicon.ico"))
-  (GET "/u/:nick" (profile session (-> request :route-params :nick) "0"))
-  (GET "/u/:nick/" (profile session (-> request :route-params :nick) "0"))
-  (GET "/u/:nick/:offset" (profile session 
-                                   (-> request :route-params :nick)
-                                   (-> request :route-params :offset)))
+  (GET "/static/*" (serve-static (params :*)))
+  (GET "/favicon.ico" (serve-static "favicon.ico"))
+  (GET "/u/:nick" (profile session (params :nick) "0"))
+  (GET "/u/:nick/" (profile session (params :nick) "0"))
+  (GET "/u/:nick/:offset" (profile session
+                                   (params :nick)
+                                   (params :offset)))
   (GET "/update-profile" (update-profile session params))
   (GET "/login" (login session params))
   (GET "/logout" (logout session))