Resolve dailyimgupload

3 files changed, 17 insertions, 77 deletions

diff --git a/scripts/dailyimgupload.py b/scripts/dailyimgupload.py
index 66f2b7b..e7378b1 100644
--- a/scripts/dailyimgupload.py
+++ b/scripts/dailyimgupload.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 import ctypes
 import datetime
 import os
diff --git a/src/site.clj b/src/site.clj
index fc7d541..3ec07a5 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -566,8 +566,19 @@ ORDER BY cnt DESC
       (for [u users]
         (merge u (find-first #(= (:nick u) (:nick %)) res))))))
 
+(defn try-execute [f n]
+  (try
+    (f)
+    (catch Exception e
+      (if (> n 0)
+        (try-execute f (dec n))
+        (throw e)))))
+
+(def redis-directory-attempts 3)
+
 (defn get-directory-info [user-id offset]
-  (let [res (fetch-redis-directory offset *per-directory-page*)]
+  (let [res (try-execute #(fetch-redis-directory offset *per-directory-page*)
+                         redis-directory-attempts)]
     (map process-directory-entry
          (add-recent-posts-nick user-id res))))
     
@@ -1430,7 +1441,7 @@ ORDER BY cnt DESC
 (start-user-flusher!)
 (start-session-pruner!)
 
-;(if (not= *server-url* "http://dump.fm")
-;  (start! random-poster))
+(if (not= *server-url* "http://dump.fm")
+  (start! random-poster))
   
 
diff --git a/static/js/pichat.js b/static/js/pichat.js
index f378f3f..a33209b 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -391,7 +391,6 @@ function showFav(f) {
     buildFav(f).appendTo('#favbox').animate(
         {"opacity": 0},
         {"duration": 9000,
-         "easing": "easeInExpo",
          "complete": removeFavAndHideBox
         });
 }
@@ -583,7 +582,7 @@ function refresh() {
                 console.error(e);
             }
         }
-        setTimeout(refresh, 3000);
+        setTimeout(refresh, 1500);
     };
     var onError = function(resp, textStatus, errorThrown) {
         var msg = $.trim(resp.responseText);
@@ -592,7 +591,7 @@ function refresh() {
         if (IsAdmin && window.console) {
             console.error(resp, textStatus, errorThrown);
         }
-        setTimeout(refresh, 1000);
+        setTimeout(refresh, 4000);
     };
 
     $.ajax({
@@ -1718,77 +1717,6 @@ function initChatMsgs() {
     });
 }
 
-var Event = {
-    "init": function(eventKey, templateSrc, urlInput, urlSubmit,
-                     canvas, submitButton,
-                     entryList, proxyToken) {
-        var canvas = $(canvas).get(0);
-        var ctx = canvas.getContext('2d');
-        ctx.clearRect(0, 0, canvas.width, canvas.height);
-
-        var UrlEntered = false;
-
-        var url;
-
-        var UserLoaded = false;
-        var UserImg = new Image();
-
-        var TemplateLoaded = false;
-        var TemplateImg = new Image();
-        
-        TemplateImg.onload = function() {
-            TemplateLoaded = true;
-            ctx.drawImage(TemplateImg, 0, 0, cn.width, cn.height);
-        };
-        TemplateImg.src = templateSrc;
-        
-        $(urlSubmit).click(function() {
-            url = $(urlInput).val();
-            var urlSrc = '/event/proxy?url=' + url;
-            if (!urlSrc || urlSrc.length == 0) {
-                alert('Please enter an image url!');
-                $(urlInput).focus();
-                return;
-            }
-
-            UrlEntered = true;
-
-            UserImg.src = urlSrc;
-            UserImg.onload = function () {
-                ctx.drawImage(UserImg, 0, 0, cn.width, cn.height);
-                ctx.drawImage(TemplateImg, 0, 0, cn.width, cn.height);
-                return false;
-            };
-            UserImg.onerror = function() {
-                console.log("Unable to retrieve image for " + url);
-                return false;
-            };
-        });
-
-        $(submitButton).click(function() {
-            if (!UrlEntered) {
-                alert('Please enter a url!');
-                $(urlInput).focus();
-                return;
-            }
-            var data = canvas.toDataURL('image/png').replace(/^data:image\/(png|jpg);base64,/, "");
-            var success = function() {
-                console.log('success');
-            };
-            var error = function() {
-                console.log('error');
-            };
-            $.ajax({ type: 'POST',
-                     url: '/event/dump',
-                     data: { 'event': eventKey, 'image': data, 'src':  url },
-                     success: success,
-                     error: error,
-                     cache: false
-                   });
-        });
-    }
-};
-
 // sha1.js
 
 /* SHA1.js (timb: compressed this)