Merge branch 'master' of ssh://dump.fm/pichat/repo

1 files changed, 12 insertions, 2 deletions

diff --git a/src/site.clj b/src/site.clj
index 4cde45d..567c3af 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -1085,6 +1085,13 @@ order by count desc limit ? offset ?")
           (not has-access) [200 "UNKNOWN_ROOM"]
           :else (do-upload session image (lookup-room room-key)))))
 
+(defn upload-photo [session params]
+  (let [room-key   (params :room)
+        nick       "~photobot"
+        user-id    (rooms/fetch-or-create-bot-id! nick)
+        image      (params :image)]
+    (do-upload {:is_admin true :nick nick :user_id user-id} image (lookup-room room-key))))
+
 ;; N.B. -- Upload responses aren't JSON-evaluated
 (defn do-upload-avatar [session image]
   (let [filename (format-filename (:filename image) (session :nick))
@@ -1106,8 +1113,10 @@ order by count desc limit ? offset ?")
 		  (do-upload-avatar session image)))))
 
 (defn serve-meme [session meme]
-  (if-let [st (fetch-template meme session)]
-    (.toString st)
+  (if-let [st   (fetch-template meme session)]
+    (let [now  (System/currentTimeMillis)]
+      (.setAttribute st "timestamp" now)
+      (.toString st))
     (unknown-page)))
 
 (defn hall-of-fame [session]
@@ -1227,6 +1236,7 @@ order by count desc limit ? offset ?")
 
 (defroutes multipart
   (POST "/upload/message" (upload session params))
+  (POST "/upload/photo" (upload-photo session params))
   (POST "/upload/avatar" (upload-avatar session params)))
 
 ;; Add jpeg to list