diff options
| -rwxr-xr-x | src/site.clj | 78 | ||||
| -rwxr-xr-x | static/pichat.js | 31 | ||||
| -rwxr-xr-x | template/chat.st | 7 | ||||
| -rwxr-xr-x | template/footer.st | 13 |
4 files changed, 75 insertions, 54 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)) diff --git a/static/pichat.js b/static/pichat.js index 51489a4..3267b49 100755 --- a/static/pichat.js +++ b/static/pichat.js @@ -57,15 +57,12 @@ function handleMsgError(resp) { } function submitMessage() { - var content = $('#msgInput').val(); + var content = $.trim($('#msgInput').val()); if (content == '') { return; } - - $('#msgInput, #msgSubmit').attr('disabled', 'disabled'); - var onSuccess = function(json) { - $('#msgInput, #msgSubmit').removeAttr('disabled'); - $('#msgInput').val(''); - }; - + PostedMessages.push(content); + $('#msgInput').val(''); + + var onSuccess = function(json) {}; var onError = function(resp, textStatus, errorThrown) { $('#msgInput, #msgSubmit').removeAttr('disabled'); handleMsgError(resp); @@ -120,12 +117,24 @@ function updateUI(msgs, users) { } } +// A duplicate message is a message that was likely to have +// originated from this browser. +function isDuplicateMessage(m) { + if (m.nick != Nick || $.inArray(m.content, PostedMessages) == -1) { + return false; + } + var now = new Date().getTime(); + console.log(now, m.created_on); + return m.created_on - now < 5000; +} + function refresh() { var onSuccess = function(json) { + Timestamp = json.timestamp; var messages = $.grep( json.messages, - function(m) { return m.nick != Nick }); - updateUI(messages, json.users); + function(m) { return !isDuplicateMessage(m) }); + updateUI(messages, json.users); setTimeout(refresh, 1000); }; var onError = function(resp, textStatus, errorThrown) { @@ -136,7 +145,7 @@ function refresh() { type: 'GET', timeout: 5000, url: '/refresh', - data: { 'room': Room }, + data: { 'room': Room, 'since': Timestamp }, cache: false, dataType: 'json', success: onSuccess, diff --git a/template/chat.st b/template/chat.st index c5f176e..1bbdaf4 100755 --- a/template/chat.st +++ b/template/chat.st @@ -7,9 +7,14 @@ jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; + var Timestamp = $timestamp$; + var PostedMessages = []; </script> </head> - <body> + <body> + $if(isadmin)$ + <h1>FUCK WE AN ADMIN</h1> + $endif$ $banner()$ <div id="chatrap"><div id="logc"> <div id="content"> diff --git a/template/footer.st b/template/footer.st index 58f5357..9fb6471 100755 --- a/template/footer.st +++ b/template/footer.st @@ -4,4 +4,15 @@ <a title="Web Analytics" href="http://getclicky.com/170656"><img alt="Web Analytics" src="http://static.getclicky.com/media/links/badge.gif" border="0" /></a> <script src="http://static.getclicky.com/js" type="text/javascript"></script> <script type="text/javascript">clicky.init(170656);</script> -<noscript><p><img alt="Clicky" width="1" height="1" src="http://static.getclicky.com/170656ns.gif" /></p></noscript>
\ No newline at end of file + +<noscript><p><img alt="Clicky" width="1" height="1" src="http://static.getclicky.com/170656ns.gif" /></p></noscript> + +<script type="text/javascript"> +var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); +document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); +</script> +<script type="text/javascript"> +try { +var pageTracker = _gat._getTracker("UA-12364576-1"); +pageTracker._trackPageview(); +} catch(err) {}</script> |