diff options
Diffstat (limited to 'src/site.clj')
| -rw-r--r-- | src/site.clj | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/src/site.clj b/src/site.clj index baec484..56b7167 100644 --- a/src/site.clj +++ b/src/site.clj @@ -239,19 +239,19 @@ (defn session-map-from-db [user-info] - {:user_id (user-info :user_id) - :nick (user-info :nick) + {:user_id (user-info :user_id) + :nick (user-info :nick) :is_admin (user-info :is_admin) - :avatar (user-info :avatar)}) + :avatar (user-info :avatar)}) (defn session-assoc-from-db [user-info] (session-assoc - :user_id (user-info :user_id) - :nick (user-info :nick) - :email (user-info :email) - :is_admin (user-info :is_admin) - :avatar (user-info :avatar) + :user_id (user-info :user_id) + :nick (user-info :nick) + :email (user-info :email) + :is_admin (user-info :is_admin) + :avatar (user-info :avatar) :password_login true)) ;; login-token functions @@ -318,8 +318,8 @@ (defn login [session params cookies] (let [nick (or (params :nick) "") hash (or (params :hash) "") - db-user (authorize-nick-hash nick hash) remember-me (= (params :rememberme) "yes") + db-user (authorize-nick-hash nick hash) login-cookie (if remember-me (make-login-token db-user) (clear-login-token *login-token-key*))] @@ -344,7 +344,7 @@ (defn load-invalid-nicks [] (set (read-lines *reserved-nicks-path*))) -(def *reserved-nicks* +(def *reserved-nicks* (scheduled-agent (no-args-adaptor load-invalid-nicks) *reserved-nicks-refresh-period-sec* (load-invalid-nicks))) @@ -390,7 +390,7 @@ ORDER BY created_on DESC; ") (defn zoeee-nudes [session] - (let [raw-dumps (map tags/parse-tags-from-row-as-tag-map + (let [raw-dumps (map tags/parse-tags-from-row-as-tag-map (do-select [*zoeee-query*])) dumps (map tags/add-favorited-flag raw-dumps (repeat session)) dumps (map tags/remove-tags-for-output dumps) @@ -406,18 +406,21 @@ ORDER BY created_on DESC; (defn profile [session profile-nick offset] (if-let [user-info (fetch-nick profile-nick)] - (let [st (fetch-template "profile" session) - profile-nick (:nick user-info) - nick (session :nick) - logger (make-time-logger) - is-home (and nick (= nick profile-nick)) - has-avatar (non-empty-string? (user-info :avatar)) - offset (maybe-parse-int offset 0) - dump-offset (* offset *dumps-per-page*) - raw-dumps (logger tags/fetch-dumps-by-nick :nick profile-nick :amount (+ 1 *dumps-per-page*) :offset dump-offset) - 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))] + (let [st (fetch-template "profile" session) + profile-nick (:nick user-info) + nick (session :nick) + logger (make-time-logger) + is-home (and nick (= nick profile-nick)) + has-avatar (non-empty-string? (user-info :avatar)) + offset (maybe-parse-int offset 0) + dump-offset (* offset *dumps-per-page*) + raw-dumps (logger tags/fetch-dumps-by-nick + :nick profile-nick + :amount (+ 1 *dumps-per-page*) + :offset dump-offset) + 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))] (do (.setAttribute st "is_home" is-home) (doseq [a [:nick :avatar :contact :bio]] @@ -1068,6 +1071,8 @@ ORDER BY msg_count DESC") (GET "/mutes" (show-mutes session)) (POST "/mute" (mute! session params)) (POST "/cancel-mute" (handle-cancel-mute! session params)) + (GET "/feed-test" (feed-test-page session)) + (POST "/feed-test" (feed-test session params)) ;; Footer pages (GET "/about_us" (serve-template "about_us" session)) |