diff options
Diffstat (limited to 'src/site.clj')
| -rwxr-xr-x | src/site.clj | 214 |
1 files changed, 107 insertions, 107 deletions
diff --git a/src/site.clj b/src/site.clj index 2cd3314..466da1f 100755 --- a/src/site.clj +++ b/src/site.clj @@ -117,7 +117,7 @@ (defn fetch-public-message-by-id [m-id viewer-nick] - (if-let [msg (tags/fetch-dump-by-id m-id viewer-nick)] + (if-let [msg (tags/fetch-hump-by-id m-id viewer-nick)] (if-not (:admin_only msg) msg))) @@ -158,7 +158,7 @@ ; Login-token version history ; ; v0: Format: nick%expiry%token-hash -; Date: Mists of dump antiquity +; Date: Mists of hump antiquity ; ; v1: Format: v1%nick%expiry%token-hash ; Date: 2010/04/24 @@ -232,7 +232,7 @@ (catch Exception e (println e) []))) 3600 nil)) -(def num-frontpage-dumps 20) +(def num-frontpage-humps 20) (defn front-page ([session] @@ -246,12 +246,12 @@ (cond (.before cur-date earliest-daily-hall) (redirect-to "/") (.after cur-date today) (redirect-to "/") :else (let [st (fetch-template "frontpage" session) - dumps (map process-message-for-output + humps (map process-message-for-output (if (:nick session) (fetch-redis-daily-hall cur-date 0 20 (:user_id session)) - (take num-frontpage-dumps + (take num-frontpage-humps (shuffle (poll frontpage-posts-agent)))))] - (.setAttribute st "dumps" dumps) + (.setAttribute st "humps" humps) (if-not (.after next-date today) (.setAttribute st "next_date" (format-yyyymmdd next-date))) (if-not (.before prev-date earliest-daily-hall) @@ -395,16 +395,16 @@ WHERE user_id IN ;; Profile -(defn pull-random-dump-images [dumps num] +(defn pull-random-hump-images [humps num] (take num (shuffle (set (apply concat (map (comp take-images :content) - dumps)))))) + humps)))))) -(defn pull-recips [dumps] - (set (apply concat (map #(get % "recips" []) dumps)))) +(defn pull-recips [humps] + (set (apply concat (map #(get % "recips" []) humps)))) (defn profile ([session profile-nick] (profile session profile-nick "profile")) @@ -416,13 +416,13 @@ WHERE user_id IN logger (make-time-logger) is-home (and nick (= nick profile-nick)) score (fetch-redis-favscore profile-nick) - dumps (logger tags/fetch-dumps + humps (logger tags/fetch-humps :user-tag-id (:user_id session) - :nick profile-nick - :limit 10) + :nick profile-nick + :limit 10) dms (fetch-direct-messages (:user_id user-info)) recips (pull-recips dms) - imgs (pull-random-dump-images dumps 5)] + imgs (pull-random-hump-images humps 5)] (do (.setAttribute st "is_home" is-home) (doseq [a [:nick :avatar :contact :bio]] @@ -483,7 +483,7 @@ WHERE user_id IN (.setAttribute "score_ent" (score-to-entity score)) (.toString)))) -;; The next-page link is generated by retrieving one additional dump, +;; The next-page link is generated by retrieving one additional hump, ;; and creating a link from its date and message id. (defn log-next-page-link [last-msg] (format "/%s/%s/%s" @@ -496,35 +496,35 @@ WHERE user_id IN ([session user-info date msg-id template] (let [st (fetch-template template session) logger (make-time-logger) - raw-dumps (tags/fetch-dumps + raw-humps (tags/fetch-humps :nick (:nick user-info) :user-tag-id (:user_id session) :msg-id msg-id :date (if msg-id nil date) - :limit (inc *dumps-per-page*)) - recips (map :nick (get-recips-from-msgs raw-dumps)) - back-dumps (if (or date msg-id) - (tags/fetch-dumps + :limit (inc *humps-per-page*)) + recips (map :nick (get-recips-from-msgs raw-humps)) + back-humps (if (or date msg-id) + (tags/fetch-humps :nick (:nick user-info) :msg-id msg-id :date (if msg-id nil date) - :limit (inc *dumps-per-page*) + :limit (inc *humps-per-page*) :direction :forward)) - dumps (map process-message-for-output (take *dumps-per-page* raw-dumps))] + humps (map process-message-for-output (take *humps-per-page* raw-humps))] (.setAttribute st "nick" (:nick user-info)) (.setAttribute st "is_home" (= (:nick user-info) (:nick session))) (.setAttribute st "mini_profile" (build-mini-profile user-info)) - (when (> (count dumps) 0) - (.setAttribute st "dumps" dumps)) + (when (> (count humps) 0) + (.setAttribute st "humps" humps)) (.setAttribute st "recips" (json-str recips)) (.setAttribute st "prev" - (if back-dumps + (if back-humps (cond - (> (count back-dumps) *dumps-per-page*) (log-next-page-link (last back-dumps)) - (> (count back-dumps) 1) (format "/%s/log" (:nick user-info)) + (> (count back-humps) *humps-per-page*) (log-next-page-link (last back-humps)) + (> (count back-humps) 1) (format "/%s/log" (:nick user-info)) :else nil))) - (if (> (count raw-dumps) *dumps-per-page*) - (.setAttribute st "next" (log-next-page-link (last raw-dumps)))) + (if (> (count raw-humps) *humps-per-page*) + (.setAttribute st "next" (log-next-page-link (last raw-humps)))) (.setAttribute st "debug_log_items" (logger)) (.toString st)))) @@ -540,13 +540,13 @@ WHERE user_id IN (if-let [user-info (fetch-nick profile-nick)] (let [st (fetch-template "popular" session) profile-nick (:nick user-info) - raw-dumps (fetch-popular-dumps-redis profile-nick (:nick session)) - raw-dumps (filter #(> (:count %) 0) raw-dumps) - recips (map :nick (get-recips-from-msgs raw-dumps)) - dumps (map process-message-for-output raw-dumps)] + raw-humps (fetch-popular-humps-redis profile-nick (:nick session)) + raw-humps (filter #(> (:count %) 0) raw-humps) + recips (map :nick (get-recips-from-msgs raw-humps)) + humps (map process-message-for-output raw-humps)] (.setAttribute st "nick" profile-nick) (.setAttribute st "mini_profile" (build-mini-profile user-info)) - (.setAttribute st "dumps" dumps) + (.setAttribute st "humps" humps) (.setAttribute st "recips" (json-str recips)) (.toString st)) (resp-error "NO_USER"))) @@ -610,9 +610,9 @@ WHERE user_id IN (if-let [message (fetch-public-message-by-id id-from-url (:nick session))] ; error if nick in url doesn't match the nick who posted the message from the id in url ; this prevents people from scraping all the content by incrementing the id in the url - (if (= nick-from-url (:nick message)) - (let [st (fetch-template "single_message" session)] - (.setAttribute st "dump" (process-message-for-output message)) + (if (= nick-from-url (:nick message)) + (let [st (fetch-template "single_message" session)] + (.setAttribute st "hump" (process-message-for-output message)) (.setAttribute st "recips" (json-str (map :nick (get-recips (:content message))))) (.toString st)) (resp-error "NO_MESSAGE")) @@ -636,7 +636,7 @@ WHERE user_id IN (if-let [st (lookup-room-template session (:key room) template)] (let [now (System/currentTimeMillis) nick (session :nick) - raw-msgs (reverse (tags/fetch-dumps :room (:key room) + raw-msgs (reverse (tags/fetch-humps :room (:key room) :image-only false :user-tag-id (:user_id session) :hide-vip false @@ -762,7 +762,7 @@ WHERE user_id IN (.setAttribute st "recips" (json-str recips)) (.setAttribute st "topic" topic) (if-not (empty? msgs) - (.setAttribute st "dumps" msgs)) + (.setAttribute st "humps" msgs)) (.toString st))) ;; Chat Log @@ -772,24 +772,24 @@ WHERE user_id IN st (fetch-template "log" session) logger (make-time-logger) offset (maybe-parse-int offset 0) - dump-offset (* offset *dumps-per-page*) + hump-offset (* offset *humps-per-page*) image-only (and (not (room :admin_only)) (not= (params :show) "all")) - raw-dumps (logger tags/fetch-dumps-by-room + raw-humps (logger tags/fetch-humps-by-room :room-id (room :room_id) :image-only image-only - :amount (+ 1 *dumps-per-page*) - :offset dump-offset) - dumps (map tags/add-favorited-flag - (take *dumps-per-page* raw-dumps) + :amount (+ 1 *humps-per-page*) + :offset hump-offset) + humps (map tags/add-favorited-flag + (take *humps-per-page* raw-humps) (repeat session)) - dumps (map tags/remove-tags-for-output dumps) - dumps (logger doall (map process-message-for-output dumps))] - (if (> (count raw-dumps) *dumps-per-page*) + humps (map tags/remove-tags-for-output humps) + humps (logger doall (map process-message-for-output humps))] + (if (> (count raw-humps) *humps-per-page*) (.setAttribute st "next" (inc offset))) (if (not= offset 0) (.setAttribute st "prev" (max (dec offset) 0))) - (.setAttribute st "dumps" dumps) + (.setAttribute st "humps" humps) (if (default-room? roomkey) (.setAttribute st "roomkey" "") (.setAttribute st "roomkey" (str roomkey "."))) @@ -814,13 +814,13 @@ WHERE user_id IN (defn hiscore-test [session params period] (let [st (fetch-template "hiscore_test" session) - dumps (tags/fetch-dumps-by-ids (redis-ids-test period)) - dumps (map tags/add-favorited-flag dumps (repeat session)) - dumps (map tags/add-fav-count dumps) - dumps (reverse (sort-by :favcount dumps)) - dumps (map tags/remove-tags-for-output dumps) - dumps (map process-message-for-output dumps)] - (.setAttribute st "dumps" dumps) + humps (tags/fetch-humps-by-ids (redis-ids-test period)) + humps (map tags/add-favorited-flag humps (repeat session)) + humps (map tags/add-fav-count humps) + humps (reverse (sort-by :favcount humps)) + humps (map tags/remove-tags-for-output humps) + humps (map process-message-for-output humps)] + (.setAttribute st "humps" humps) (.toString st))) ;; Altars @@ -834,16 +834,16 @@ WHERE user_id IN user-id (if nick (user-id-from-nick nick) nil) template (if user-id "altar_user_log" "altar_log") st (fetch-template template session) - raw-dumps (tags/fetch-altars :message-id id :amount (+ 1 *dumps-per-page*) :user-id user-id) - dumps (map tags/add-favorited-flag (take *dumps-per-page* raw-dumps) (repeat session)) - dumps (map tags/remove-tags-for-output dumps) - dumps (map process-message-for-output dumps)] - (.setAttribute st "dumps" dumps) + raw-humps (tags/fetch-altars :message-id id :amount (+ 1 *humps-per-page*) :user-id user-id) + humps (map tags/add-favorited-flag (take *humps-per-page* raw-humps) (repeat session)) + humps (map tags/remove-tags-for-output humps) + humps (map process-message-for-output humps)] + (.setAttribute st "humps" humps) (.setAttribute st "nick" nick) - (if (> (count raw-dumps) *dumps-per-page*) - (.setAttribute st "next" ((last raw-dumps) :message_id))) + (if (> (count raw-humps) *humps-per-page*) + (.setAttribute st "next" ((last raw-humps) :message_id))) (if id - (.setAttribute st "prev" ((first raw-dumps) :message_id))) + (.setAttribute st "prev" ((first raw-humps) :message_id))) (.toString st))) ;; Tags @@ -908,52 +908,52 @@ WHERE user_id IN ;; 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 info-bar +(defnk tagged-humps-template [session params tags url page-title info-bar :message-user-id false :tag-user-id false :logger (make-time-logger) :include-vip false] - (let [st (fetch-template "tagged_dumps" session) - offset (maybe-parse-int (params :offset) 0) - dump-offset (* offset *dumps-per-page*) - raw-dumps (logger tags/fetch-dumps-by-tag :tags tags + (let [st (fetch-template "tagged_humps" session) + offset (maybe-parse-int (params :offset) 0) + hump-offset (* offset *humps-per-page*) + raw-humps (logger tags/fetch-humps-by-tag :tags tags :image-only false - :amount (+ 1 *dumps-per-page*) - :offset dump-offset + :amount (+ 1 *humps-per-page*) + :offset hump-offset :message-user-id message-user-id :tag-user-id tag-user-id :include-vip include-vip) - dumps (map tags/add-favorited-flag (take *dumps-per-page* raw-dumps) (repeat session)) - dumps (map tags/remove-tags-for-output dumps) - dumps (logger doall (map process-message-for-output dumps))] - (.setAttribute st "dumps" dumps) + humps (map tags/add-favorited-flag (take *humps-per-page* raw-humps) (repeat session)) + humps (map tags/remove-tags-for-output humps) + humps (logger doall (map process-message-for-output humps))] + (.setAttribute st "humps" humps) (.setAttribute st "infobar" info-bar) (.setAttribute st "page_title" page-title) (.setAttribute st "page_url" url) (if (not= offset 0) (.setAttribute st "prev" (format "/%s/%s" url (max 0 (dec offset))))) - (if (> (count raw-dumps) *dumps-per-page*) + (if (> (count raw-humps) *humps-per-page*) (.setAttribute st "next" (format "/%s/%s" url (inc offset)))) (.setAttribute st "debug_log_items" (logger)) (.toString st))) ;; gotta parse tag intersections myself because +'s get decoded into spaces ;; there's probably a less hacky way to do this -(defn tagged-dumps-by-nick [session params url] +(defn tagged-humps-by-nick [session params url] (let [nick (params :nick) user-id (user-id-from-nick nick) user-info (fetch-nick nick) info-bar (build-mini-profile user-info) tags (map url-decode (re-split #"\+" (undecoded-url-piece url 2))) 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 info-bar :tag-user-id user-id))) + page-title (str "humps " nick " tagged as '" (escape-html (str-join "' and '" tags)) "'")] + (tagged-humps-template session params tags url page-title info-bar :tag-user-id user-id))) -(defn tagged-dumps [session params url] +(defn tagged-humps [session params url] (let [tags (map url-decode (re-split #"\+" (undecoded-url-piece url 1))) url (str "tag/" (str-join "+" (map url-encode tags))) - page-title (str "dumps tagged as '" (escape-html (str-join "' and '" tags)) "'")] - (tagged-dumps-template session params tags url page-title ""))) + page-title (str "humps tagged as '" (escape-html (str-join "' and '" tags)) "'")] + (tagged-humps-template session params tags url page-title ""))) (defn favorites-next-page-link [nick last-msg] (format "/%s/favorites/%s/%s" @@ -962,35 +962,35 @@ WHERE user_id IN (:message_id last-msg))) (defn favorites [session user-info date msg-id] - (let [st (fetch-template "tagged_dumps" session) + (let [st (fetch-template "tagged_humps" session) logger (make-time-logger) - raw-dumps (tags/fetch-tagged-dumps + raw-humps (tags/fetch-tagged-humps :nick (:nick user-info) :user-tag-id (:user_id session) :msg-id msg-id :hide-vip (not (:is_admin session)) :date (if msg-id nil date) - :limit (inc *dumps-per-page*)) - recips (map :nick (get-recips-from-msgs raw-dumps)) - back-dumps (if (or date msg-id) - (tags/fetch-tagged-dumps + :limit (inc *humps-per-page*)) + recips (map :nick (get-recips-from-msgs raw-humps)) + back-humps (if (or date msg-id) + (tags/fetch-tagged-humps :nick (:nick user-info) :msg-id msg-id :hide-vip (not (:is_admin session)) :date (if msg-id nil date) - :limit (inc *dumps-per-page*) + :limit (inc *humps-per-page*) :direction :forward)) - dumps (map process-message-for-output (butlast raw-dumps))] + humps (map process-message-for-output (butlast raw-humps))] (.setAttribute st "prev" - (if back-dumps + (if back-humps (cond - (> (count back-dumps) *dumps-per-page*) (favorites-next-page-link (:nick user-info) - (last back-dumps)) - (> (count back-dumps) 1) (format "/%s/favorites" (:nick user-info)) + (> (count back-humps) *humps-per-page*) (favorites-next-page-link (:nick user-info) + (last back-humps)) + (> (count back-humps) 1) (format "/%s/favorites" (:nick user-info)) :else nil))) - (if (> (count raw-dumps) *dumps-per-page*) - (.setAttribute st "next" (favorites-next-page-link (:nick user-info) (last raw-dumps)))) - (.setAttribute st "dumps" dumps) + (if (> (count raw-humps) *humps-per-page*) + (.setAttribute st "next" (favorites-next-page-link (:nick user-info) (last raw-humps)))) + (.setAttribute st "humps" humps) (.setAttribute st "recips" (json-str recips)) (.setAttribute st "infobar" (build-mini-profile user-info)) (.setAttribute st "page_title" (format "%s'S FAVS" (:nick user-info))) @@ -1006,13 +1006,13 @@ WHERE user_id IN (defn json-favorites [session params] (let [nick (params :nick) user-id (user-id-from-nick nick) - raw-favs (tags/fetch-tagged-dumps :nick nick + raw-favs (tags/fetch-tagged-humps :nick nick :limit 50) favs (reduce (fn [m fav] (assoc m (str (fav :message_id)) (fav :content))) {} raw-favs)] (str "RawFavs=" (json-str favs)))) (defn json-log [session params] - (json-str (fetch-dumps-by-nick + (json-str (fetch-humps-by-nick :nick (params :nick) :offset (or (maybe-parse-int (params :offset)) 0)))) @@ -1052,7 +1052,7 @@ WHERE user_id IN (def random-posts ["http://24.media.tumblr.com/tumblr_l41x4eLWZm1qzon5ko1_400.png hi" "lol http://29.media.tumblr.com/tumblr_l3o3wuRFpM1qawuaao1_500.jpg" - "https://archive.hump.fm/images/20100819/1282199186063-dumpfm-timb-dump.stone.logo.gif http://teamassignment.com/images/getmesomemore.jpg http://26.media.tumblr.com/tumblr_l7kro0os531qaajkio1_500.gif"]) + "https://archive.hump.fm/images/20100819/1282199186063-humpfm-timb-hump.stone.logo.gif http://teamassignment.com/images/getmesomemore.jpg http://26.media.tumblr.com/tumblr_l7kro0os531qaajkio1_500.gif"]) (defn make-random-post! [] (msg {:user_id 1 @@ -1218,7 +1218,7 @@ WHERE user_id IN (defn hall-of-fame [session] (let [st (fetch-template "fame" session) msgs (fetch-redis-hall (:nick session))] - (.setAttribute st "dumps" (map process-message-for-output msgs)) + (.setAttribute st "humps" (map process-message-for-output msgs)) (.toString st))) ;; MGMT @@ -1287,8 +1287,8 @@ WHERE user_id IN (GET "/u/:nick" (redirect-to (str "/" (params :nick)))) (GET "/u/:nick/" (redirect-to (str "/" (params :nick)))) - (GET "/u/:nick/tag/:tag" (tagged-dumps-by-nick session params (request-url request))) - (GET "/u/:nick/tag/:tag/:offset" (tagged-dumps-by-nick session params (request-url request))) + (GET "/u/:nick/tag/:tag" (tagged-humps-by-nick session params (request-url request))) + (GET "/u/:nick/tag/:tag/:offset" (tagged-humps-by-nick session params (request-url request))) (GET "/u/:nick/favorites" (redirect-to (format "/%s/favorites" (params :nick)))) (GET "/u/:nick/favorites/:offset" (redirect-to (format "/%s/favorites" (params :nick)))) (GET "/json/:nick/favorites" (json-favorites session params)) @@ -1308,8 +1308,8 @@ WHERE user_id IN (GET "/registerdis" (serve-static "static" "registerdis.html")) (GET "/browser" (browser session)) (GET "/refresh" (validated-refresh session params)) - (GET "/tag/:tag" (tagged-dumps session params (request-url request))) - (GET "/tag/:tag/:offset" (tagged-dumps session params (request-url request))) + (GET "/tag/:tag" (tagged-humps session params (request-url request))) + (GET "/tag/:tag/:offset" (tagged-humps session params (request-url request))) (POST "/cmd/tag/add" (validated-tag-access session params add-tag)) (POST "/cmd/tag/rm" (validated-tag-access session params remove-tag)) @@ -1394,8 +1394,8 @@ WHERE user_id IN (GET "/:nick/altars" (altar-log session params)) (GET "/:nick/altars/" (altar-log session params)) (GET "/:nick/altars/:id" (altar-log session params)) - (GET "/:nick/tag/:tag" (tagged-dumps-by-nick session params (request-url request))) - (GET "/:nick/tag/:tag/:offset" (tagged-dumps-by-nick session params (request-url request))) + (GET "/:nick/tag/:tag" (tagged-humps-by-nick session params (request-url request))) + (GET "/:nick/tag/:tag/:offset" (tagged-humps-by-nick session params (request-url request))) (GET "/:nick/favorites" (favorites-handler session (params :nick) nil nil)) (GET "/:nick/favorites/" (favorites-handler session (params :nick) nil nil)) (GET "/:nick/favorites/:date" (favorites-handler session (params :nick) (params :date) nil)) |