From 7474492caad7baf3eba7b9e0b33922963de632f8 Mon Sep 17 00:00:00 2001 From: Scott Ostler Date: Sat, 26 Mar 2011 13:52:18 -0400 Subject: added try-catch to fetch-redis-zset --- src/datalayer.clj | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/datalayer.clj b/src/datalayer.clj index 6a7995f..255a239 100644 --- a/src/datalayer.clj +++ b/src/datalayer.clj @@ -146,14 +146,18 @@ WHERE u.nick = ANY(?)" (str "hall:daily:" (format-yyyymmdd date))) (defn fetch-redis-zset [key symbol offset num] - (for [t (with-jedis - #(.zrevrangeWithScores % - key - offset - (+ offset num 1))) - :when (> (int (.getScore t)) 0)] - {symbol (.getElement t) - :score (int (.getScore t))})) + (try + (for [t (with-jedis + #(.zrevrangeWithScores % + key + offset + (+ offset num 1))) + :when (> (int (.getScore t)) 0)] + {symbol (.getElement t) + :score (int (.getScore t))}) + (catch Exception e + (println "jedis exception" e) + []))) (defn fetch-redis-daily-hall [date offset num user-id] (let [msg-ids (fetch-redis-zset (redis-daily-hall-key date) -- cgit v1.2.3-70-g09d2 From 0a4b3ff7a6163e43230418433f4c67fbb15d8621 Mon Sep 17 00:00:00 2001 From: Scott Ostler Date: Tue, 19 Apr 2011 10:03:42 -0400 Subject: Change frontpage layout for visitors --- docs/frontpage_msgs.txt | 16 ++++++++++++++++ src/site.clj | 21 ++++++++++++++++++++- template/frontpage.st | 14 ++++++++------ 3 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 docs/frontpage_msgs.txt (limited to 'src') diff --git a/docs/frontpage_msgs.txt b/docs/frontpage_msgs.txt new file mode 100644 index 0000000..79e9553 --- /dev/null +++ b/docs/frontpage_msgs.txt @@ -0,0 +1,16 @@ +1020124 +960980 +675137 +653108 +1882023 +822990 +1245092 +805380 +2078006 +972195 +793027 +805450 +1353545 +970172 +1038771 +1129104 diff --git a/src/site.clj b/src/site.clj index b6c8882..6668fc7 100644 --- a/src/site.clj +++ b/src/site.clj @@ -22,6 +22,7 @@ email fame message + jedis utils cookie-login session-sweeper @@ -200,6 +201,21 @@ (def earliest-daily-hall (parse-yyyymmdd-date "20100409")) +(defn hall-score [msg-id] + (first (do-select ["select count(*) from tags where message_id = ?" msg-id]))) + +(def frontpage-posts-path "docs/frontpage_msgs.txt") +(def frontpage-posts-agent + (scheduled-agent (fn [] + (try + (let [msg-ids (re-seq #"\w+" + (slurp frontpage-posts-path)) + msgs (datalayer/fetch-messages-by-id (shuffle msg-ids))] + (for [m msgs] + (assoc m :score (hall-score (:message_id m))))) + (catch Exception e (println e) []))) + 12000 + nil)) (defn front-page ([session] (front-page session (format-yyyymmdd (Date.)))) ([session dt-str] @@ -209,7 +225,9 @@ (.after cur-date today) (redirect-to "/") :else (let [st (fetch-template "frontpage" session) dumps (map process-message-for-output - (fetch-redis-daily-hall cur-date 0 20 (:user_id session)))] + (if (:nick session) + (fetch-redis-daily-hall cur-date 0 20 (:user_id session)) + (poll frontpage-posts-agent)))] (.setAttribute st "dumps" dumps) (if-not (.after next-date today) (.setAttribute st "next_date" (format-yyyymmdd next-date))) @@ -1393,6 +1411,7 @@ WHERE user_id IN (def server (start-server (options :port))) (start! active-mutes) +(start! frontpage-posts-agent) (start-user-flusher!) (start-session-pruner!) diff --git a/template/frontpage.st b/template/frontpage.st index 22c47fe..22c780c 100644 --- a/template/frontpage.st +++ b/template/frontpage.st @@ -468,22 +468,23 @@ jQuery(window).load(function(){ $else$ - Currently hot on dump.fm
-
Join the conversation!

+ dump.fm is a real-time image chat!

+ check out our top dumps +

- or register! + or register
$endif$ - $if(dumps)$ $dumps: { dump | $hall_log_dump()$ }$ $endif$ - + +$if(user_nick)$
$if(prev_date)$ <- $prev_date$ @@ -493,12 +494,13 @@ jQuery(window).load(function(){ $next_date$ -> $endif$
+$endif$

diff --git a/template/pogs.st b/template/pogs.st index 63bc29e..e2f0dbd 100644 --- a/template/pogs.st +++ b/template/pogs.st @@ -216,7 +216,6 @@ font-size:100%;} - -- cgit v1.2.3-70-g09d2 From a440f0e6766e543212fd2182f11090a8bcbc2570 Mon Sep 17 00:00:00 2001 From: Scott Ostler Date: Tue, 19 Apr 2011 10:13:58 -0400 Subject: Randomize and limit frontpage dumps --- src/site.clj | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/site.clj b/src/site.clj index 6668fc7..87f9734 100644 --- a/src/site.clj +++ b/src/site.clj @@ -210,12 +210,14 @@ (try (let [msg-ids (re-seq #"\w+" (slurp frontpage-posts-path)) - msgs (datalayer/fetch-messages-by-id (shuffle msg-ids))] + msgs (datalayer/fetch-messages-by-id msg-ids)] (for [m msgs] (assoc m :score (hall-score (:message_id m))))) (catch Exception e (println e) []))) 12000 nil)) +(def num-frontpage-dumps 20) + (defn front-page ([session] (front-page session (format-yyyymmdd (Date.)))) ([session dt-str] @@ -227,7 +229,8 @@ dumps (map process-message-for-output (if (:nick session) (fetch-redis-daily-hall cur-date 0 20 (:user_id session)) - (poll frontpage-posts-agent)))] + (take num-frontpage-dumps + (shuffle (poll frontpage-posts-agent)))))] (.setAttribute st "dumps" dumps) (if-not (.after next-date today) (.setAttribute st "next_date" (format-yyyymmdd next-date))) -- cgit v1.2.3-70-g09d2 From f101b7566d2bbee8fc36f8fb827a78a65eba38c6 Mon Sep 17 00:00:00 2001 From: Scott Ostler Date: Tue, 19 Apr 2011 10:20:47 -0400 Subject: Chnage frontpage dump reload rate --- src/site.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/site.clj b/src/site.clj index 87f9734..f386f2a 100644 --- a/src/site.clj +++ b/src/site.clj @@ -214,7 +214,7 @@ (for [m msgs] (assoc m :score (hall-score (:message_id m))))) (catch Exception e (println e) []))) - 12000 + 3600 nil)) (def num-frontpage-dumps 20) -- cgit v1.2.3-70-g09d2 From 39230d6ce132259d0c2efce231119ea57b413ccc Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Mon, 4 Jul 2011 22:32:34 -0400 Subject: Switch email to info@dump.fm --- src/email.clj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/email.clj b/src/email.clj index d387624..3231b60 100644 --- a/src/email.clj +++ b/src/email.clj @@ -66,9 +66,7 @@ :text text :mime (classify-mimetype text))) -(def *admin-lists* {"dumpfmprod" ["opuscule@gmail.com" - "sbostler@gmail.com" - "theryderproject@gmail.com"] +(def *admin-lists* {"dumpfmprod" ["info@dump.fm"] "sostler" ["sbostler@gmail.com"]}) (defn get-admins [] @@ -93,4 +91,4 @@ body (format "Reason: %s" reason)] (dump-mail (get-admins) subject body))) - \ No newline at end of file + -- cgit v1.2.3-70-g09d2