diff options
| -rw-r--r-- | src/site.clj | 16 | ||||
| -rw-r--r-- | src/tags.clj | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/site.clj b/src/site.clj index 838923c..ce5796b 100644 --- a/src/site.clj +++ b/src/site.clj @@ -430,7 +430,7 @@ ORDER BY cnt DESC logger (make-time-logger)
is-home (and nick (= nick profile-nick))
score (lookup-score profile-nick)
- dumps (logger tags/fetch-image-dumps
+ dumps (logger tags/fetch-dumps
:user-tag-id (:user_id session)
:nick profile-nick
:limit 10)
@@ -513,14 +513,14 @@ ORDER BY cnt DESC (defn user-log [session user-info date msg-id]
(let [st (fetch-template "userlog" session)
logger (make-time-logger)
- raw-dumps (tags/fetch-image-dumps
+ 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*))
back-dumps (if (or date msg-id)
- (tags/fetch-image-dumps
+ (tags/fetch-dumps
:nick (:nick user-info)
:msg-id msg-id
:date (if msg-id nil date)
@@ -696,11 +696,11 @@ WHERE u.user_id = ANY(?)" (if-let [st (lookup-room-template session (:key room) template)]
(let [now (System/currentTimeMillis)
nick (session :nick)
- raw-msgs (reverse (tags/fetch-image-dumps :room (:key room)
- :image-only false
- :user-tag-id (:user_id session)
- :hide-vip false
- :limit (:history_size room)))
+ raw-msgs (reverse (tags/fetch-dumps :room (:key room)
+ :image-only false
+ :user-tag-id (:user_id session)
+ :hide-vip false
+ :limit (:history_size room)))
message-list (to-array (map process-message-for-output raw-msgs))]
(if nick
(dosync
diff --git a/src/tags.clj b/src/tags.clj index d292471..3abeee9 100644 --- a/src/tags.clj +++ b/src/tags.clj @@ -159,7 +159,7 @@ WHERE EXISTS :forward ["ASC" ">="] (except! "Unknown direction: " d))) -(defnk fetch-image-dumps [:nick nil :room nil +(defnk fetch-dumps [:nick nil :room nil :date nil :msg-id nil :direction :backward :image-only true :user-tag-id nil :hide-vip true :limit 21] @@ -171,7 +171,7 @@ WHERE EXISTS :else (let [[direction comp-str] (lookup-direction direction)] (do-select (build-query - :select ["m.content, m.message_id, m.created_on" + :select ["m.content, m.message_id, m.created_on, m.is_image" "u.nick, u.avatar, r.key" (if user-tag-id "t.created_on IS NOT NULL as favorited")] |