Added avatar uploading, images to logs

5 files changed, 37 insertions, 36 deletions

diff --git a/src/site.clj b/src/site.clj
index 2936f13..4ffa3cf 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -123,6 +123,7 @@
 
 (defn process-message-for-output [d]
   {"nick" (escape-html (d :nick))
+   "avatar" (escape-html (d :avatar))
    "message_id" (d :message_id)
    "created_on" (.format formatter (d :created_on))
    "content" (escape-html (d :content))})
@@ -165,7 +166,7 @@
 (defn fetch-messages-by-room
   ([room-id image-only] (fetch-messages-by-room room-id image-only 0))
   ([room-id image-only offset]
-     (let [query (str "SELECT m.content, m.message_id, m.created_on, u.nick "
+     (let [query (str "SELECT m.content, m.message_id, m.created_on, u.nick, u.avatar "
 		      "FROM messages m, users u "
 		      "WHERE room_id = ? AND m.user_id = u.user_id "
                       (if image-only "AND m.is_image = true " "")
@@ -184,7 +185,7 @@
 (defn fetch-messages-by-nick 
   ([nick image-only] (fetch-messages-by-nick nick image-only 0))
   ([nick image-only offset]
-     (let [query (str "SELECT m.content, m.created_on, u.nick "
+     (let [query (str "SELECT m.content, m.created_on, u.nick, u.avatar "
                       "FROM messages m, users u, rooms r "
                       "WHERE m.user_id = u.user_id AND u.nick = ? "
                       "AND r.room_id = m.room_id AND r.admin_only = false "
@@ -240,22 +241,25 @@
 
 (defn parse-login-token [token]
   (let [x (.split token "\\%")]
-    (if (not (= (alength x) 3))
-      nil)
-    (try [(aget x 0) (Long/parseLong (aget x 1)) (aget x 2)]
-         (catch NumberFormatException _ nil))))
-
+    (if (= (alength x) 3)
+      (try [(aget x 0) (Long/parseLong (aget x 1)) (aget x 2)]
+           (catch NumberFormatException _ nil)))))
 
 (defn read-login-token [token]
-  nil)
+  (if-let [[nick expiry token-hash]  (parse-login-token token)]
+    (if (>= expiry (System/currentTimeMillis))
+      (let [db-info (fetch-nick nick)
+            computed-hash (sha1-hash (db-info :hash) expiry)]
+        (if (= token-hash computed-hash)
+          (select-keys db-info [:user_id :nick :is_admin :avatar]))))))
 
 (defn make-login-token
   [{nick :nick hash :hash}]
   (let [expiration (ms-in-future *login-token-expiry*)]
-    (set-cookie *login-token-key* (encode-login-token nick
-                                                      hash
-                                                      expiration)
-                :expires (gmt-string (new Date expiration)))))
+    (set-cookie *login-token-key* 
+                (encode-login-token nick hash expiration)
+                :expires 
+                (gmt-string (new Date expiration)))))
 
 ;; Landing
 
@@ -328,27 +332,26 @@
     (resp-error "NO_USER")))
 
 
-;; TODO: update chat w/ new avatar
-(defn do-update-avatar [session params]
-  nil)
-
-(defn do-update-profile [user-id attr val]
+(defn update-user-db [user-id attr val]
   (with-connection db
-    (update-values "users" ["user_id = ?" user-id] {attr val}))) 
+    (update-values "users" ["user_id = ?" user-id] {attr val})))
+
+(defn download-avatar [session url]
+  (let [url false]
+    (update-user-db (session :user_id) "avatar" url)
+    (resp-success url)))
 
 (defn update-profile [session params]
   (let [user-id (session :user_id)
         attr (params :attr)
         val (params :val)
         attr-set #{"avatar" "contact" "bio"}]
-    (if (and user-id attr val
-             (contains? attr-set attr))
-      (do
-        (do-update-profile attr val)
-        (if (= attr "avatar")
-          [(session-assoc :avatar val) "OK"]
-          "OK"))
-      (resp-error "BAD_REQUEST"))))
+    (cond (not user-id)                   (resp-error "MUST_LOGIN")
+          (not (and user-id attr val))    (resp-error "BAD_REQUEST")
+          (not (contains? attr-set attr)) (resp-error "BAD_REQUEST")
+          (= attr "avatar")               (download-avatar session val)
+          :else (do (update-user-db user-id attr val)
+                    (resp-success "OK")))))
 
 ;; Chat
 
@@ -395,7 +398,7 @@
        (if-let [user-info (@users nick)]
          ; Incorporate avatar updates
          (commute users assoc nick (merge user-info {:last-seen now
-                                                     :avatar (user-info :avatar)}))
+                                                     :avatar (session :avatar)}))
          (commute (room :users) assoc nick (user-struct-from-session session))))
      (resp-success (assoc (updates room since) :timestamp now)))))
 
@@ -543,14 +546,14 @@
   ; TODO: resize
   (copy image dest))
 
-;; NOTE -- Upload responses arent JSON-evaluated
+;; N.B. -- Upload responses aren't JSON-evaluated
 (defn do-upload-avatar [session image]
   (let [filename (format-filename (:filename image))
         dest (File. (rel-join *avatar-directory* filename))
         url (image-url-from-file "avatars" dest)]
     (do
       (copy-and-resize (:tempfile image) dest)
-      (do-update-profile (session :user_id) "avatar" url)
+      (update-user-db (session :user_id) "avatar" url)
       [(session-assoc :avatar url)
        [200 url]])))
 
diff --git a/static/js/home.js b/static/js/home.js
index 60b5d07..e9be833 100755
--- a/static/js/home.js
+++ b/static/js/home.js
@@ -152,7 +152,8 @@ function login() {
     var onSuccess = function(json) {
         location.href = location.href;
 	 if (typeof pageTracker !== 'undefined') {
-	   pageTracker._setCustomVar(1, "logged-in", nick, 
+	     pageTracker._setCustomVar(1, "logged-in", nick);
+         }
     };
 
     var onError = function(resp, textStatus, errorThrown) {
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 566bd10..92d24a1 100755
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -241,7 +241,6 @@ function initChat() {
 }
 
 function initProfile() {
-
     jQuery(".linkify").each(function() {
         var text = jQuery(this).text();
         jQuery(this).html(linkify(text));
diff --git a/template/log.st b/template/log.st
index 0a12550..97eaa78 100755
--- a/template/log.st
+++ b/template/log.st
@@ -16,12 +16,9 @@
 
 
       <div id="log">   
-	<div id="loghead">
-
-	</div>
+	<div id="loghead"></div>
         <br>
 
-
         <div id="posts">  
     $if(dumps)$
     $dumps: { d | $logged_dump(dump=d)$ }$
@@ -31,7 +28,7 @@
       <div id="pnav">
 
           $if(next)$
-        	  <div id="pnavn"><a href="/$roomkey$/log/$next$">next &#9758;</a></div> 
+          <div id="pnavn"><a href="/$roomkey$/log/$next$">next &#9758;</a></div> 
           $endif$
 
           &nbsp;
diff --git a/template/logged_dump.st b/template/logged_dump.st
index 86e23fc..01700b5 100755
--- a/template/logged_dump.st
+++ b/template/logged_dump.st
@@ -31,6 +31,7 @@ img{
 }
     </style>
 <div class="logged-dump">
+  <a href="/u/$dump.nick$"><img height="50" width="50" src="$dump.avatar$" /></a>
   <div>$dump.created_on$  -- by <a href="/u/$dump.nick$">$dump.nick$</a></div>
   <div class="content">$dump.content$</div>
   <hr />