diff options
| author | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2012-12-30 20:04:41 -0500 |
|---|---|---|
| committer | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2012-12-30 20:04:41 -0500 |
| commit | 200ea4abd13eaffad5151eb62fc54a90e5346022 (patch) | |
| tree | d9fab334fc616449b3fe726c050ba1cdd96cc4c9 /src/site.clj | |
| parent | fdb3b4169f8056922344e6735c77d1c7679a3953 (diff) | |
| parent | ab3c66a6db7c4c2dbc3795c3b11132a535a3aeb3 (diff) | |
Merge branch 'master' of /pichat/repo
Diffstat (limited to 'src/site.clj')
| -rw-r--r-- | src/site.clj | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/site.clj b/src/site.clj index f38c67b..a736562 100644 --- a/src/site.clj +++ b/src/site.clj @@ -193,6 +193,13 @@ ;; Landing +(defn serve-meme [session meme] + (if-let [st (fetch-template meme session)] + (let [now (System/currentTimeMillis)] + (.setAttribute st "timestamp" now) + (.toString st)) + (unknown-page))) + (defn- parse-front-page-date [dt-str] (if-let [dt (parse-yyyymmdd-date dt-str)] [(advance-date dt -1) @@ -219,13 +226,15 @@ (def num-frontpage-dumps 20) (defn front-page - ([session] (front-page session (format-yyyymmdd (Date.)))) + ([session] + (cond + (not (:nick session)) (serve-meme session "fullscreen") + :else (front-page session (format-yyyymmdd (Date.))) )) ([session dt-str] (let [today (Date.)] (if-let [[prev-date cur-date next-date] (parse-front-page-date dt-str)] (cond (.before cur-date earliest-daily-hall) (redirect-to "/") (.after cur-date today) (redirect-to "/") - ;(not (:nick session)) (serve-meme session "fullscreen") :else (let [st (fetch-template "frontpage" session) dumps (map process-message-for-output (if (:nick session) @@ -715,7 +724,7 @@ WHERE user_id IN (let [roomkey (room :key) st (fetch-template "log" session) logger (make-time-logger) - offset (maybe-parse-int offset 0) + offset (maybe-parse-int offset 0) dump-offset (* offset *dumps-per-page*) image-only (and (not (room :admin_only)) (not= (params :show) "all")) @@ -1159,13 +1168,6 @@ WHERE user_id IN [200 err] (do-upload-avatar session image))))) -(defn serve-meme [session meme] - (if-let [st (fetch-template meme session)] - (let [now (System/currentTimeMillis)] - (.setAttribute st "timestamp" now) - (.toString st)) - (unknown-page))) - (defn hall-of-fame [session] (let [st (fetch-template "fame" session) msgs (fetch-redis-hall (:nick session))] |