diff options
Diffstat (limited to 'src/site.clj')
| -rwxr-xr-x | src/site.clj | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/site.clj b/src/site.clj index df7cb81..50a382b 100755 --- a/src/site.clj +++ b/src/site.clj @@ -22,7 +22,7 @@ (def template-group (new StringTemplateGroup "dumpfm" "template")) (.setRefreshInterval template-group 3) -(defstruct user-struct :user_id :nick :avatar :last-seen) +(defstruct user-struct :nick :user_id :avatar :last-seen) (defstruct message-struct :nick :content :created_on) (def users (ref {})) @@ -280,10 +280,8 @@ ;; Chat (defn user-struct-from-session [session] - {:nick (session :nick) - :user_id (session :user_id) - :avatar (session :avatar) - :last-seen (System/currentTimeMillis)}) + (struct user-struct (session :nick) (session :user_id) (session :avatar) + (System/currentTimeMillis))) (defn chat [session] (let [now (System/currentTimeMillis) @@ -315,8 +313,7 @@ (resp-success (updates last-seen))) (let [last-seen (session :last-seen)] [(session-assoc :last-seen now) - (updates last-seen)]))) - ; TODO: better handle anonymous users + (resp-success (updates last-seen))]))) (resp-error "NOT_IN_CHAT")))) ;; http://snippets.dzone.com/posts/show/6995 @@ -392,6 +389,7 @@ :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))) @@ -404,6 +402,7 @@ (GET "/refresh" (refresh session)) (GET "/msg" (msg session params)) (GET "/log" (log session "0")) + (GET "/log/" (log session "0")) (GET "/log/:offset" (log session (-> request :route-params :offset))) (GET "/upload" (upload session)) (ANY "*" [404 "Page not found"])) @@ -413,7 +412,7 @@ (with-session {:type :memory, :expires (* 60 60)})) -; Load messages from database +;; Load messages from database (dosync (ref-set messages (fetch-messages-by-room 1 false))) |