diff options
Diffstat (limited to 'src/utils.clj')
| -rwxr-xr-x | src/utils.clj | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/utils.clj b/src/utils.clj index 8aaffba..ca527ac 100755 --- a/src/utils.clj +++ b/src/utils.clj @@ -27,7 +27,6 @@ db-name "dumpfm" db-user "postgres" db-pass "root"] - ; TODO: use c3p0 for pooling? (def *db* {:datasource (doto (new PGPoolingDataSource) (.setServerName db-host) (.setDatabaseName db-name) @@ -48,9 +47,8 @@ (throw (Exception. (str "Invalid url " u)))))) (defn get-ip [request] - (let [ip (get (:headers request) "x-real-ip") ; behind nginx - ip (if ip ip (:remote-addr request))] (str ip)) ; deployed locally -) + (let [ip (get (:headers request) "x-real-ip") ; behind nginx + ip (if ip ip (:remote-addr request))] (str ip))) ; deployed locally (defn append [& seqs] (reduce into (map vector seqs))) @@ -70,6 +68,9 @@ (defn stringify-and-escape [m] (zipmap (map str* (keys m)) (map escape-html-deep (vals m)))) +(defn keywordify [m] + (zipmap (map keyword (keys m)) (vals m))) + (defn nor [& args] (not-any? identity args)) @@ -371,16 +372,15 @@ (.setRefreshInterval template-group 10) (defn initialize-template [st session] + (.setAttribute st "domain" config/*server-url*) (if (session :nick) (doto st (.setAttribute "user_email" (session :email)) (.setAttribute "user_nick" (session :nick)) (.setAttribute "user_avatar" (if (non-empty-string? (session :avatar)) - (session :avatar) nil)) - (.setAttribute "isadmin" (session :is_admin)) - (.setAttribute "domain" config/*server-url*)) - (doto st - (.setAttribute "domain" config/*server-url*)))) + (session :avatar) + nil)) + (.setAttribute "isadmin" (session :is_admin))))) (defn fetch-template [template session] (try @@ -446,7 +446,7 @@ { :result result :time (System/currentTimeMillis)}) result))))) -;; Taken from Programming Clojure by Stuart Halloway +;; From Programming Clojure by Stuart Halloway (defn index-filter [pred coll] (for [[idx elt] (indexed coll) :when (pred elt)] idx)) |