diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/config.clj | 26 | ||||
| -rwxr-xr-x | src/datalayer.clj | 10 | ||||
| -rwxr-xr-x | src/email.clj | 29 | ||||
| -rwxr-xr-x | src/events.clj | 2 | ||||
| -rwxr-xr-x | src/redisload.clj | 4 | ||||
| -rwxr-xr-x | src/rooms.clj | 2 | ||||
| -rwxr-xr-x | src/site.clj | 214 | ||||
| -rwxr-xr-x | src/tags.clj | 60 | ||||
| -rwxr-xr-x | src/utils.clj | 8 |
9 files changed, 178 insertions, 177 deletions
diff --git a/src/config.clj b/src/config.clj index bec5768..4e1eb2c 100755 --- a/src/config.clj +++ b/src/config.clj @@ -25,45 +25,45 @@ (contains? #{"1" "true" "yes" "on"} (.toLowerCase v)))))) (def *server-url* - (getenv "DUMPFM_SERVER_URL" + (getenv "HUMPFM_SERVER_URL" (if (= *server-user* "humpfmprod") "/" "http://localhost:8080"))) (def *public-host* - (getenv "DUMPFM_PUBLIC_HOST" + (getenv "HUMPFM_PUBLIC_HOST" (try (.getHost (URL. *server-url*)) (catch Exception _ "")))) (def *public-scheme* - (getenv "DUMPFM_PUBLIC_SCHEME" + (getenv "HUMPFM_PUBLIC_SCHEME" (try (.getProtocol (URL. *server-url*)) (catch Exception _ "http")))) (def *cookie-domain* - (getenv "DUMPFM_COOKIE_DOMAIN" + (getenv "HUMPFM_COOKIE_DOMAIN" (if (= *server-user* "humpfmprod") ".hump.fm" ""))) (def *passwordless-login* - (getenv-bool "DUMPFM_PASSWORDLESS_LOGIN" false)) + (getenv-bool "HUMPFM_PASSWORDLESS_LOGIN" false)) (def db-server - (getenv "DUMPFM_DB_HOST" + (getenv "HUMPFM_DB_HOST" (if (= *server-user* "humpfmprod") "localhost"; "192.168.162.138" "localhost"))) (def redis-server - {:host (getenv "DUMPFM_REDIS_HOST" + {:host (getenv "HUMPFM_REDIS_HOST" (if (= *server-user* "humpfmprod") "127.0.0.1" "127.0.0.1")) - :port (getenv-int "DUMPFM_REDIS_PORT" 6379) - :db (getenv-int "DUMPFM_REDIS_DB" 0)}) + :port (getenv-int "HUMPFM_REDIS_PORT" 6379) + :db (getenv-int "HUMPFM_REDIS_DB" 0)}) (def *root-directory* (System/getProperty "user.dir")) (def *image-directory* "images") @@ -72,9 +72,9 @@ ;; Settings -(def num-popular-dumps 40) -(def *dumps-per-page* 20) -(def *vip-dumps-per-page* 200) +(def num-popular-humps 40) +(def *humps-per-page* 20) +(def *vip-humps-per-page* 200) (def message-count-limit 200) -(def num-hall-dumps 50) +(def num-hall-humps 50) (def max-content-size 2468) diff --git a/src/datalayer.clj b/src/datalayer.clj index cea5f3d..b65056c 100755 --- a/src/datalayer.clj +++ b/src/datalayer.clj @@ -99,16 +99,16 @@ WHERE u.nick = ANY(?)" (defn redis-popular-key [nick] (str "popular:" nick)) -(defn fetch-popular-dumps-redis [nick viewer-nick] +(defn fetch-popular-humps-redis [nick viewer-nick] (let [msg-ids (redis/with-server redis-server (redis/zrevrange (redis-popular-key nick) 0 - (dec num-popular-dumps))) + (dec num-popular-humps))) msg-ids (map maybe-parse-int msg-ids)] (if-not (empty? msg-ids) (sort-by #(* -1 (:count %)) - (tags/fetch-dumps-by-ids msg-ids viewer-nick))))) + (tags/fetch-humps-by-ids msg-ids viewer-nick))))) ;;;; Redis Favscores and Hall @@ -118,11 +118,11 @@ WHERE u.nick = ANY(?)" (defn fetch-redis-hall [viewer-nick] (let [ids (map maybe-parse-int (redis/with-server redis-server - (redis/zrevrange redis-hall-key 0 (dec num-hall-dumps))))] + (redis/zrevrange redis-hall-key 0 (dec num-hall-humps))))] (if-not (empty? ids) (sort-by #(* -1 (:count %)) - (tags/fetch-dumps-by-ids ids viewer-nick))))) + (tags/fetch-humps-by-ids ids viewer-nick))))) (def score-piece-map (zipmap diff --git a/src/email.clj b/src/email.clj index 6c09115..dded4a6 100755 --- a/src/email.clj +++ b/src/email.clj @@ -1,7 +1,8 @@ (ns email (:import org.antlr.stringtemplate.StringTemplateGroup) (:require [clojure.contrib.str-utils2 :as s]) - (:use utils)) + (:use utils + config)) (defn base-mail [& m] (let [mail (apply hash-map m) @@ -55,16 +56,16 @@ "text/html" "text/plain")) -(defn dump-mail [to subject text] - (base-mail :user "info@hump.fm" - :password "UHR4Moghu5a2" - :host "smtpout.secureserver.net" - :port 465 - :ssl true - :to [(join to ",")] - :subject subject - :text text - :mime (classify-mimetype text))) +(defn hump-mail [to subject text] + (base-mail :user (getenv "HUMPFM_SMTP_USER" "info@hump.fm") + :password (getenv "HUMPFM_SMTP_PASSWORD" "") + :host (getenv "HUMPFM_SMTP_HOST" "smtpout.secureserver.net") + :port (getenv-int "HUMPFM_SMTP_PORT" 465) + :ssl (getenv-bool "HUMPFM_SMTP_SSL" true) + :to [(join to ",")] + :subject subject + :text text + :mime (classify-mimetype text))) (def *admin-lists* {"humpfmprod" ["info@hump.fm"] "sostler" ["sbostler@gmail.com"] @@ -78,12 +79,12 @@ ([nick email] (send-registration-email nick email "welcome")) ([nick email temp] (let [[s b] (parse-mail-template temp {"nick" nick})] - (dump-mail [email] s b)))) + (hump-mail [email] s b)))) (defn send-reset-email ([nick email link temp] (let [[s b] (parse-mail-template temp {"nick" nick "link" link})] - (dump-mail [email] s b))) + (hump-mail [email] s b))) ([nick email link] (send-reset-email nick email link "reset"))) (defn send-mute-email [user-nick admin-nick reason duration] @@ -91,5 +92,5 @@ user-nick admin-nick duration) body (format "Reason: %s" reason)] - (dump-mail (get-admins) subject body))) + (hump-mail (get-admins) subject body))) diff --git a/src/events.clj b/src/events.clj index 4b8f58f..8091ff2 100755 --- a/src/events.clj +++ b/src/events.clj @@ -17,7 +17,7 @@ (def sample-event {:name "TMZ Maker!"
:key "tmz"
- :template "/event/proxy?url=https://archive.hump.fm/images/20100629/1277836809689-dumpfm-ryder-tmz_template.png"
+ :template "/event/proxy?url=https://archive.hump.fm/images/20100629/1277836809689-humpfm-ryder-tmz_template.png"
:author {:nick "ryder" }})
(defn event-page [session]
diff --git a/src/redisload.clj b/src/redisload.clj index abb0252..86dac0d 100755 --- a/src/redisload.clj +++ b/src/redisload.clj @@ -75,7 +75,7 @@ WHERE userkey (redis-popular-key nick)] (redis/atomically (redis/del key) - (doseq [[msg-id score] (take (* num-popular-dumps 2) + (doseq [[msg-id score] (take (* num-popular-humps 2) sorted-msgs)] (redis/zadd userkey score msg-id))))) (println "cached popular data for" (count @popular-map) "users")) @@ -88,7 +88,7 @@ WHERE (println "cached favscores for " (count @score-map) "users")) (defn transmit-hall [] - (let [scores (take (* 2 num-hall-dumps) +(let [scores (take (* 2 num-hall-humps) (sort #(>= (second %1) (second %2)) @hall-map))] (redis/atomically (redis/del redis-hall-key) diff --git a/src/rooms.clj b/src/rooms.clj index 617a14d..402fc57 100755 --- a/src/rooms.clj +++ b/src/rooms.clj @@ -67,7 +67,7 @@ (if image-only "AND m.is_image = true " "") "ORDER BY created_on DESC LIMIT ? OFFSET ?")] - (do-select [query room-id *dumps-per-page* offset])))) + (do-select [query room-id *humps-per-page* offset])))) (defn build-room-map-from-db [room-db] {:admin_only (room-db :admin_only) 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)) diff --git a/src/tags.clj b/src/tags.clj index e325a0d..9f0ca83 100755 --- a/src/tags.clj +++ b/src/tags.clj @@ -91,7 +91,7 @@ WHERE EXISTS (defn explain-query [query] (str "EXPLAIN ANALYZE " query)) -(defn fetch-dumps-by-room-query [image-only] (str +(defn fetch-humps-by-room-query [image-only] (str " SELECT m.content, m.message_id, m.created_on, u.nick, u.avatar, @@ -107,7 +107,7 @@ WHERE EXISTS ;; unoptimized ;; the room join here is very bad on large offsets... -(defn fetch-dumps-by-nick-query [image-only] (str +(defn fetch-humps-by-nick-query [image-only] (str " SELECT m.content, m.message_id, m.created_on, u.nick, u.avatar, r.key, @@ -127,14 +127,14 @@ WHERE EXISTS :forward ["ASC" ">="] (except! "Unknown direction: " d))) -(defnk fetch-dumps [:nick nil :room nil +(defnk fetch-humps [:nick nil :room nil :date nil :msg-id nil :direction :backward :image-only true :user-tag-id nil :hide-vip true :limit 21] (cond - (and nick room) (except! "Cannot provide both nick and room for fetch-image-dumps") - (not (or nick room)) (except! "Must provide nick or room for fetch-image-dumps") - (and date msg-id) (except! "Cannot provide both date and msg-id for fetch-image-dumps") + (and nick room) (except! "Cannot provide both nick and room for fetch-image-humps") + (not (or nick room)) (except! "Must provide nick or room for fetch-image-humps") + (and date msg-id) (except! "Cannot provide both date and msg-id for fetch-image-humps") (and nick (not image-only)) (except! "messages_user_created_on_image_only_idx only covers image messages") :else (let [[direction comp-str] (lookup-direction direction)] (do-select @@ -161,10 +161,10 @@ WHERE EXISTS :order (format "m.created_on %s" direction) :limit limit))))) -(defnk fetch-tagged-dumps [:nick nil :date nil :msg-id nil :tag "favorite" :direction :backward +(defnk fetch-tagged-humps [:nick nil :date nil :msg-id nil :tag "favorite" :direction :backward :user-tag-id nil :hide-vip true :limit 21] (cond - (not nick) (except! "Must provide nick for fetch-tagged-dumps") + (not nick) (except! "Must provide nick for fetch-tagged-humps") :else (let [select-user-id "(SELECT user_id FROM users WHERE LOWER(nick) = lower(?))" [dir comp-str] (lookup-direction direction)] (do-select @@ -195,7 +195,7 @@ WHERE EXISTS ;; SPEED HACK ;; explicit use of room ids, but fast ;; (not used yet) -(defnk fetch-dumps-by-user-id-query [:image-only true :with-tags true] (str +(defnk fetch-humps-by-user-id-query [:image-only true :with-tags true] (str " SELECT m.content, m.message_id, m.created_on, u.nick, u.avatar, r.key" @@ -215,7 +215,7 @@ WHERE EXISTS AND m.user_id = u.user_id AND r.room_id = m.room_id")) -(defnk fetch-dumps-by-message-id-query [:with-tags true :num-messages 1] (str +(defnk fetch-humps-by-message-id-query [:with-tags true :num-messages 1] (str " SELECT m.content, m.message_id, m.created_on, u.nick, u.avatar, r.key, r.admin_only" @@ -231,7 +231,7 @@ WHERE EXISTS AND r.room_id = m.room_id")) -(defnk fetch-dumps-by-tag-query [:image-only true :message-user-id false :tag-user-id false :with-tags true :include-vip false] (str +(defnk fetch-humps-by-tag-query [:image-only true :message-user-id false :tag-user-id false :with-tags true :include-vip false] (str " SELECT m.content, m.message_id, m.created_on, u.nick, u.avatar, r.key " @@ -255,10 +255,10 @@ WHERE EXISTS AND r.room_id = m.room_id " (if include-vip "" "AND r.admin_only = false"))) -;; todo: only return distinct dumps? sorted by tag.created_on? +;; todo: only return distinct humps? sorted by tag.created_on? ;; tag intersections ;; timb: just realized this is implemented wrongly... looking up "foo+bar" will also match stuff tagged "foo" by two people -(defnk fetch-dumps-by-tags-query [:image-only true :num-tags 1 :message-user-id false :tag-user-id false :with-tags true :include-vip false] (str +(defnk fetch-humps-by-tags-query [:image-only true :num-tags 1 :message-user-id false :tag-user-id false :with-tags true :include-vip false] (str " SELECT m.content, m.message_id, m.created_on, u.nick, u.avatar, r.key " @@ -308,12 +308,12 @@ WHERE EXISTS ORDER BY message_id DESC " ;; needed in case subquery was selected ASC )) -(defn fetch-dumps-by-ids - ([ids] (fetch-dumps-by-ids ids nil)) +(defn fetch-humps-by-ids + ([ids] (fetch-humps-by-ids ids nil)) ([ids viewer-nick] (if-not (empty? ids) (let [ids (map maybe-parse-int ids) - query (fetch-dumps-by-message-id-query :num-messages (count ids)) + query (fetch-humps-by-message-id-query :num-messages (count ids)) raw-rows (do-select (vec (concat [query] ids))) tagged-rows (map parse-tags-from-row-as-tag-map raw-rows)] (for [m (sort-by-index-in tagged-rows ids :message_id)] @@ -326,13 +326,13 @@ WHERE EXISTS :favorited favorited :count (count filtered-favers)))))))) -(defn fetch-dump-by-id +(defn fetch-hump-by-id ([m-id] - (first (fetch-dumps-by-ids [m-id]))) + (first (fetch-humps-by-ids [m-id]))) ([m-id viewer-nick] - (first (fetch-dumps-by-ids [m-id] viewer-nick)))) + (first (fetch-humps-by-ids [m-id] viewer-nick)))) -(defnk fetch-altars [:message-id 0 :user-id false :amount *dumps-per-page* :offset 0] +(defnk fetch-altars [:message-id 0 :user-id false :amount *humps-per-page* :offset 0] (let [message-id (maybe-parse-int message-id 0) abs-m-id (if (neg? message-id) (- message-id) message-id) page-type (cond @@ -346,37 +346,37 @@ WHERE EXISTS rows (do-select (vec (concat [query] query-vars)))] (map parse-tags-from-row-as-tag-map rows))) -(defnk fetch-dumps-by-room [:room-id 1 :image-only true :amount *dumps-per-page* :offset 0] - (let [query (fetch-dumps-by-room-query image-only)] +(defnk fetch-humps-by-room [:room-id 1 :image-only true :amount *humps-per-page* :offset 0] + (let [query (fetch-humps-by-room-query image-only)] (let [rows (do-select [query room-id amount offset])] (map parse-tags-from-row-as-tag-map rows)))) -(defnk fetch-dumps-by-nick [:nick "anon" :image-only true :amount *dumps-per-page* :offset 0] - (let [query (fetch-dumps-by-nick-query image-only)] +(defnk fetch-humps-by-nick [:nick "anon" :image-only true :amount *humps-per-page* :offset 0] + (let [query (fetch-humps-by-nick-query image-only)] (let [rows (do-select [query nick amount offset])] (map parse-tags-from-row-as-tag-map rows)))) -(defnk fetch-dumps-by-user-id [user-id :image-only true :amount *dumps-per-page* :offset 0] - (let [query (fetch-dumps-by-user-id-query image-only)] +(defnk fetch-humps-by-user-id [user-id :image-only true :amount *humps-per-page* :offset 0] + (let [query (fetch-humps-by-user-id-query image-only)] (let [rows (do-select [query user-id amount offset])] (map parse-tags-from-row-as-tag-map rows)))) -(defnk fetch-dumps-by-tag [:tags "favorite" +(defnk fetch-humps-by-tag [:tags "favorite" :message-user-id false :tag-user-id false :image-only true - :amount *dumps-per-page* + :amount *humps-per-page* :offset 0 :with-tags true :include-vip false] (let [tags (if (string? tags) [tags] tags) query (if (= 1 (count tags)) - (fetch-dumps-by-tag-query :image-only image-only + (fetch-humps-by-tag-query :image-only image-only :message-user-id message-user-id :tag-user-id tag-user-id :with-tags with-tags :include-vip include-vip) - (fetch-dumps-by-tags-query :image-only image-only + (fetch-humps-by-tags-query :image-only image-only :message-user-id message-user-id :tag-user-id tag-user-id :num-tags (count tags) diff --git a/src/utils.clj b/src/utils.clj index 0be144c..b5a4eaa 100755 --- a/src/utils.clj +++ b/src/utils.clj @@ -24,10 +24,10 @@ config )) -(let [db-name (or (System/getenv "DUMPFM_DB_NAME") "humpfm") - db-user (or (System/getenv "DUMPFM_DB_USER") "postgres") - db-pass (or (System/getenv "DUMPFM_DB_PASSWORD") "") - db-port (let [p (System/getenv "DUMPFM_DB_PORT")] +(let [db-name (or (System/getenv "HUMPFM_DB_NAME") "humpfm") + db-user (or (System/getenv "HUMPFM_DB_USER") "postgres") + db-pass (or (System/getenv "HUMPFM_DB_PASSWORD") "") + db-port (let [p (System/getenv "HUMPFM_DB_PORT")] (if p (Integer/parseInt p) 5432))] (def *db* {:datasource (doto (new PGPoolingDataSource) (.setServerName db-server) |