diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/site.clj | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/site.clj b/src/site.clj index 47226f9..9a5cda3 100644 --- a/src/site.clj +++ b/src/site.clj @@ -730,8 +730,9 @@ FROM users u ;; message-user-id: get messages posted by this user ;; tag-user-id: get messages tagged by this user (defnk tagged-dumps-template [session params tags url page-title :message-user-id false - :tag-user-id false - :logger (make-time-logger)] + :tag-user-id false + :avatar nil + :logger (make-time-logger)] (let [st (fetch-template "tagged_dumps" session) offset (maybe-parse-int (params :offset) 0) dump-offset (* offset *dumps-per-page*) @@ -750,6 +751,8 @@ FROM users u (.setAttribute st "prev" (max (dec offset) 0))) (.setAttribute st "dumps" dumps) (.setAttribute st "page_title" page-title) + (if avatar + (.setAttribute st "avatar" avatar)) (.setAttribute st "page_url" url) (.setAttribute st "debug_log_items" (logger)) (.toString st))) @@ -758,8 +761,8 @@ FROM users u ;; there's probably a less hacky way to do this (defn tagged-dumps-by-nick [session params url] (let [nick (params :nick) + user-id (user-id-from-nick nick) tags (map url-decode (re-split #"\+" (undecoded-url-piece url 3))) - user-id (user-id-from-nick nick) url (str nick "/tag/" (str-join "+" (map url-encode tags))) page-title (str "dumps " nick " tagged as '" (escape-html (str-join "' and '" tags)) "'")] (tagged-dumps-template session params tags url page-title :tag-user-id user-id))) @@ -772,10 +775,13 @@ FROM users u (defn favorites [session params] (let [nick (params :nick) - user-id (user-id-from-nick nick) + user-info (lookup-user-info nick) + user-id (:user_id user-info) + avatar (:avatar user-info) url (str nick "/favorites") page-title (str nick "'s favorites")] - (tagged-dumps-template session params "favorite" url page-title :tag-user-id user-id))) + (println user-info) + (tagged-dumps-template session params "favorite" url page-title :tag-user-id user-id :avatar avatar))) (defn json-favorites [session params] (let [nick (params :nick) @@ -1083,5 +1089,5 @@ FROM users u (Thread/sleep 3000) ; Delay these to reduce start-load (start-user-flusher!) (start-session-pruner!) -(start! feed-downloader) +;(start! feed-downloader) (start! feed-inserter) |