Added faving to hall of fame

3 files changed, 26 insertions, 3 deletions

diff --git a/src/fame.clj b/src/fame.clj
index 8f0ae4f..cd28e05 100644
--- a/src/fame.clj
+++ b/src/fame.clj
@@ -3,7 +3,7 @@
 	utils))
 
 ; should probably cache this to disk somewhere
-(def hall-of-fame-update-frequency (* 4 60 60))
+(def hall-of-fame-update-frequency (* 3 60 60))
 
 (def hall-of-fame-query "
 select m.created_on, m.message_id, m.content, u.nick, u.avatar, r.key, count(*)
diff --git a/src/site.clj b/src/site.clj
index 6a011c6..0967431 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -1047,8 +1047,11 @@ FROM   users u
     (unknown-page)))
 
 (defn hall-of-fame [session]
-  (let [st (fetch-template "fame" session)]
-    (.setAttribute st "dumps" (map process-message-for-output (poll hall-results)))
+  (let [st   (fetch-template "fame" session)
+	msgs (add-user-favs-to-msgs (poll hall-results)
+				    (session :user_id))]
+    (println "hall msgs:" msgs)
+    (.setAttribute st "dumps" (map process-message-for-output msgs))
     (.toString st)))
 
 ;; Compojure Routes
diff --git a/src/tags.clj b/src/tags.clj
index 4d1dda0..de0b476 100644
--- a/src/tags.clj
+++ b/src/tags.clj
@@ -63,6 +63,26 @@
       (assoc row :favorited true)
       row))
 
+(def user-fav-query "
+SELECT v
+FROM UNNEST(?) as v
+WHERE EXISTS
+    (SELECT 1 FROM tags
+     WHERE user_id = ?
+     AND message_id = v
+     AND tag = 'favorite')
+")
+
+(defn add-user-favs-to-msgs [msgs user-id]
+  (let [faved-ids  (set
+		    (map :v
+			 (do-select [user-fav-query
+				     (sql-array "int" (map :message_id msgs))
+				     user-id])))]
+    (for [m msgs]
+      (if (contains? faved-ids (:message_id m))
+	(assoc m :favorited true)
+	m))))
 
 (defn explain-query [query] (str "EXPLAIN ANALYZE " query))