diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/site.clj | 77 |
1 files changed, 41 insertions, 36 deletions
diff --git a/src/site.clj b/src/site.clj index c63a6cb..3026108 100644 --- a/src/site.clj +++ b/src/site.clj @@ -415,42 +415,44 @@ WHERE user_id IN (format-yyyy-mm-dd (:created_on last-msg)) (:message_id last-msg))) -(defn user-log [session user-info date msg-id] - (let [st (fetch-template "userlog" session) - logger (make-time-logger) - raw-dumps (tags/fetch-dumps - :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 - :nick (:nick user-info) - :msg-id msg-id - :date (if msg-id nil date) - :limit (inc *dumps-per-page*) - :direction :forward)) - dumps (map process-message-for-output (take *dumps-per-page* raw-dumps))] - (.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)) - (.setAttribute st "recips" (json-str recips)) - (.setAttribute st "prev" - (if back-dumps - (cond - (> (count back-dumps) *dumps-per-page*) (log-next-page-link (last back-dumps)) - (> (count back-dumps) 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)))) - (.setAttribute st "debug_log_items" (logger)) - (.toString st))) +(defn user-log + ([session user-info date msg-id] (user-log session user-info date msg-id "userlog")) + ([session user-info date msg-id template] + (let [st (fetch-template template session) + logger (make-time-logger) + raw-dumps (tags/fetch-dumps + :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 + :nick (:nick user-info) + :msg-id msg-id + :date (if msg-id nil date) + :limit (inc *dumps-per-page*) + :direction :forward)) + dumps (map process-message-for-output (take *dumps-per-page* raw-dumps))] + (.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)) + (.setAttribute st "recips" (json-str recips)) + (.setAttribute st "prev" + (if back-dumps + (cond + (> (count back-dumps) *dumps-per-page*) (log-next-page-link (last back-dumps)) + (> (count back-dumps) 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)))) + (.setAttribute st "debug_log_items" (logger)) + (.toString st)))) -(defn user-log-handler [session nick date msg-id] +(defn user-log-handler [session nick date msg-id template] (generic-profile-handler session nick date msg-id user-log (fn [u] (redirect-to (str "/" (:nick u)))) @@ -1281,7 +1283,10 @@ WHERE user_id IN (GET "/roomlist" (show-rooms session)) (POST "/mute" (mute! session params)) (POST "/cancel-mute" (handle-cancel-mute! session params)) - (GET "/profile-test/:t" (profile session "ryder" (params :t))) + + (GET "/profile-test/:t" (profile session "ryder" (params :t))) + (GET "/log-test/:t" (user-log session (fetch-nick "ryder") nil nil (params :t))) + (GET "/reports" (list-reports-dir session)) (GET "/reports/:file" (show-report session (params :file))) |