Avatar-uploading

5 files changed, 136 insertions, 54 deletions

diff --git a/src/image_utils.clj b/src/image_utils.clj
new file mode 100644
index 0000000..638cd05
--- /dev/null
+++ b/src/image_utils.clj
@@ -0,0 +1,3 @@
+(ns image-utils
+  (:import javax.imageio.ImageIO))
+
diff --git a/src/site.clj b/src/site.clj
index c36f1ae..7b75b71 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -14,6 +14,7 @@
         clojure.contrib.sql
         compojure
         cookie-login
+        image-utils
         ))
 
 (let [db-host "localhost"
@@ -63,9 +64,11 @@
     "http://localhost:8080"))
 
 (def *image-directory* "images")
+(def *avatar-directory* "avatars")
 
-; Create image directory if it doesn't exist.
+; Create image directories if they don't exist.
 (.mkdir (new File *image-directory*))
+(.mkdir (new File *avatar-directory*))
 
 ;; Utils
 
@@ -333,41 +336,48 @@
 ;; Profile
 
 (defn profile [session profile-nick offset]
-  (let [user-info (fetch-nick profile-nick)]
-    (if user-info
-      (let [nick (session :nick)
-            is-home (and nick (= nick profile-nick))
-            has-avatar (non-empty-string? (user-info :avatar))
-            offset (maybe-parse-int offset 0)
-            dump-offset (* offset *dumps-per-page*)
-            dumps (fetch-messages-by-nick profile-nick true dump-offset)
-	    dump-count (count-messages-by-nick profile-nick true)
-            st (fetch-template "profile" session)]
-        (do
-          (.setAttribute st "is_home" is-home)
-          (doseq [a [:nick :avatar :contact :bio]]
-            (let [v (user-info a)]
-              (.setAttribute st (name a)
-                             (if (non-empty-string? v) (escape-html v)))))
-          (.setAttribute st "dumps"
-                         (to-array (map process-message-for-output dumps)))
-	  (if (< (+ dump-offset *dumps-per-page*) dump-count)
-	    (.setAttribute st "next" (inc offset)))
-	  (if (not= offset 0)
-	    (.setAttribute st "prev" (max (dec offset) 0)))
+  (if-let [user-info (fetch-nick profile-nick)]
+    (let [nick (session :nick)
+          is-home (and nick (= nick profile-nick))
+          has-avatar (non-empty-string? (user-info :avatar))
+          offset (maybe-parse-int offset 0)
+          dump-offset (* offset *dumps-per-page*)
+          dumps (fetch-messages-by-nick profile-nick true dump-offset)
+          dump-count (count-messages-by-nick profile-nick true)
+          st (fetch-template "profile" session)]
+      (do
+        (.setAttribute st "is_home" is-home)
+        (doseq [a [:nick :avatar :contact :bio]]
+          (let [v (user-info a)]
+            (.setAttribute st (name a)
+                           (if (non-empty-string? v) (escape-html v)))))
+        (.setAttribute st "dumps"
+                       (to-array (map process-message-for-output dumps)))
+        (if (< (+ dump-offset *dumps-per-page*) dump-count)
+          (.setAttribute st "next" (inc offset)))
+        (if (not= offset 0)
+          (.setAttribute st "prev" (max (dec offset) 0)))
         (.toString st)))
-      (resp-error "NO_USER"))))
+    (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]
+  (with-connection db
+    (update-values "users" ["user_id = ?" user-id] {attr val}))) 
 
 (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 
+    (if (and user-id attr val
              (contains? attr-set attr))
       (do
-        (with-connection db
-          (update-values "users" ["user_id = ?" user-id] {attr val}))
+        (do-update-profile attr val)
         (if (= attr "avatar")
           [(session-assoc :avatar val) "OK"]
           "OK"))
@@ -415,11 +425,12 @@
          nick (session :nick)
          users (room :users)]
      (if nick
-       (if (contains? @users nick)
-         (alter users assoc-in [nick :last-seen] now)
-         (alter (room :users) assoc nick (user-struct-from-session session))))
-     (resp-success (assoc (updates room since)
-                     :timestamp now)))))
+       (if-let [user-info (@users nick)]
+         ; Incorporate avatar updates
+         (commute users assoc nick (merge user-info {:last-seen now
+                                                     :avatar (user-info :avatar)}))
+         (commute (room :users) assoc nick (user-struct-from-session session))))
+     (resp-success (assoc (updates room since) :timestamp now)))))
 
 (defn validated-refresh [session params]
   (let [room-key (params :room)
@@ -525,32 +536,64 @@
 
 ;; Upload
 
+(def *avatar-dimensions* [50 50])
+
+(defn is-image-file? [path]
+  true)
+
 (defn format-filename [s]
   (let [spaceless (.replace s \space \-)
         subbed (re-gsub #"[^\w.-]" "" spaceless)]
     (str (System/currentTimeMillis) "-" subbed)))
 
-(defn image-url-from-file [f]
-  (str-join "/" [*server-url* "images" (.getName f)]))
+(defn image-url-from-file [d f] 
+  (str-join "/" [*server-url* d (.getName f)]))
+
 
 (defn do-upload [session image room]
   (let [filename (format-filename (:filename image))
         dest (File. (rel-join *image-directory* filename))
-        url (image-url-from-file dest)
+        url (image-url-from-file "images" dest)
         msg-id (msg-db (session :user_id) (room :room_id) url)
-        now (new Date)
-        msg (struct message-struct (session :nick) url now msg-id)]
-    (dosync
-     (add-message msg room))
-    (copy (:tempfile image) dest)
-    [200 url]))
+        msg (struct message-struct (session :nick) url (new Date) msg-id)]
+    (do 
+      (dosync
+       (add-message msg room))
+      (copy (:tempfile image) dest)
+      (resp-success url))))
 
 (defn upload [session params]
   (let [room-key (params :room)
-        nick (session :nick)]
+        nick (session :nick)
+        image (params :image)]
     (cond (not nick) [200 "NOT_LOGGED_IN"]
+          (not image) [200 "INVALID_REQUEST"]
+          (not (is-image-file? (image :filename))) [200 "INVALID_IMAGE"]
           (not (validate-room-access room-key session)) [200 "UNKNOWN_ROOM"]
-          :else (do-upload session (:image params) (@rooms room-key)))))
+          :else (do-upload session image (@rooms room-key)))))
+
+(defn copy-and-resize [image dest]
+  ; TODO: resize
+  (copy image dest))
+
+;; NOTE -- Upload responses arent 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)
+      [(session-assoc :avatar url)
+       [200 url]])))
+
+(defn upload-avatar [session params]
+  (let [image (params :image)]
+    (cond (not image) [200 "INVALID_REQUEST"]
+          (not (session :nick)) [200 "NOT_LOGGED_IN"]
+          (not (is-image-file? (image :filename))) [200 "INVALID_IMAGE"]
+          :else (do-upload-avatar session image))))
+
 ;; 404
 
 (defn unknown-page [params]
@@ -573,7 +616,8 @@
 
 (defroutes static
   (GET "/static/*" (serve-static "static" (params :*)))
-  (GET "/images/*" (serve-static *image-directory* (params :*))))
+  (GET "/images/*" (serve-static *image-directory* (params :*)))
+  (GET "/avatars/*" (serve-static *avatar-directory* (params :*))))
 
 (defroutes pichat
   (GET "/" (no-cache (landing session)))
@@ -605,7 +649,8 @@
   (ANY "*" (unknown-page params)))
 
 (defroutes multipart
-  (POST "/upload" (upload session params)))
+  (POST "/upload/message" (upload session params))
+  (POST "/upload/avatar" (upload-avatar session params)))
 
 ;; Add jpeg to list
 (def mimetypes
@@ -647,7 +692,8 @@
 (run-server {:port 8080}
   "/static/*" (servlet static)
   "/images/*" (servlet static)
-  "/upload" (servlet multipart)
+  "/avatars/*" (servlet static)
+  "/upload/*" (servlet multipart)
   "/*" (servlet pichat))
 
 (send-off flusher flush!)
\ No newline at end of file
diff --git a/static/js/home.js b/static/js/home.js
index b37bc8d..59d4c3d 100755
--- a/static/js/home.js
+++ b/static/js/home.js
@@ -145,14 +145,13 @@ function initBigHand(id){
 }
 
 function login() {
-    //$('#passwordInput, #loginSubmit').blur();
     var nick = $('#nickInput').val();
     var password = $('#passwordInput').val();
     var rememberme = $('#remembermeInput').attr('checked') ? 'yes' : '';
     var hash = hex_sha1(nick + '$' + password + '$dumpfm');
 
     var onSuccess = function(json) {
-        location.href = "/chat";
+        location.href = location.href;
     };
 
     var onError = function(resp, textStatus, errorThrown) {
diff --git a/static/js/pichat.js b/static/js/pichat.js
index d3da949..06c859d 100755
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -225,7 +225,7 @@ function initProfile() {
     $('.logged-dump .content').each(function() {
         var t = $(this);
         t.html(buildMsgContent(t.text()));
-    });
+    });    
 
     var onSubmit = function(attr, newVal, oldVal) {
         newVal = $.trim(newVal);
@@ -260,6 +260,10 @@ function initProfile() {
                          'callbackShowErrors': false };
     $('#contact.editable, #bio.editable').editInPlace(textareaOpts);
 
+    if ($('#upload').length > 0) {
+        setupUploadAvatar('upload');
+    }
+
 };
 
 function initLog() {
@@ -267,7 +271,6 @@ function initLog() {
         var t = $(this);
         t.html(buildMsgContent(t.text()));
     });
-
 }
 
 // TODO
@@ -275,13 +278,42 @@ function favoriteImage() {};
 
 function setupUpload(elementId, roomKey) {
     new AjaxUpload(elementId, {
-        action: '/upload',
+        action: '/upload/message',
         autoSubmit: true,
         name: 'image',
         data: { room: roomKey }
     });
 }
 
+function setupUploadAvatar(elementId) {
+    // NOTE: AjaxUpload responses aren't converted from JSON.
+    var onSubmit = function(file, error) {
+        $('#spinner').show();
+    };
+    var onComplete = function(file, resp) {
+        $('#spinner').hide();
+        if (resp == 'INVALID_REQUEST') {
+            location.href = location.href;
+        } else if (resp == 'NOT_LOGGED_IN') {
+            location.href = location.href;
+        } else if (resp == 'INVALID_IMAGE') {
+            alert("Sorry, dump.fm can't deal with your image. Pick another :(");
+            return;
+        }
+        var s = '<img id="avatarPic" src="' + resp + '" width="150" />';        
+        $('#avatarPic').replaceWith(s).show();
+        $('#avatar').text(resp);
+    };
+    new AjaxUpload(elementId, {
+        action: '/upload/avatar',
+        autoSubmit: true,
+        name: 'image',
+        onSubmit: onSubmit,
+        onComplete: onComplete
+    });
+}
+ 
+
 // scrolling stuff
 // this code keeps the div scrolled to the bottom, but will also let the user scroll up, without jumping down
 
diff --git a/template/profile.st b/template/profile.st
index c3d77e2..071b888 100755
--- a/template/profile.st
+++ b/template/profile.st
@@ -5,8 +5,8 @@
     <link rel="stylesheet" type="text/css" media="screen"
           href="/static/profile.css">
     <script src="/static/jquery.editinplace.1.0.1.packed.js"
-            type="text/javascript" >
-    </script>
+            type="text/javascript"></script>
+    <script src="/static/js/ajaxupload.js"></script>
 
     <script type="text/javascript" src="/static/jquery.editinplace.1.0.1.packed.js"></script>
     <link type="text/css" href="http://jqueryui.com/latest/themes/base/ui.all.css" rel="stylesheet" />
@@ -20,7 +20,7 @@
                 var text = jQuery(this).text();
                 jQuery(this).html(linkify(text));
             });
-        });  
+        });
   </script> 
 		
   </head>
@@ -51,6 +51,8 @@
 
           $if(is_home)$
           <div id="avatar" class="editable">$avatar$</div>
+          <input id="upload" value="Upload" type="submit">
+          <img id="spinner" src="/static/spinner.gif" style="display: none" />
           $endif$