diff options
| author | Scott Ostler <scottbot9000@gmail.com> | 2010-06-17 03:14:31 -0400 |
|---|---|---|
| committer | Scott Ostler <scottbot9000@gmail.com> | 2010-06-17 03:14:31 -0400 |
| commit | e8a727a9abf2d1ebb8563de2e8068c88a2d3fd6f (patch) | |
| tree | 75b9d1b53ba629780d87dc7ef3d4d827cd8fed3a | |
| parent | 214002d7001f52d8d837bb628f045ec1ea26ee0b (diff) | |
fixed include-vip usage
| -rw-r--r-- | src/tags.clj | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/tags.clj b/src/tags.clj index d18bc5e..4d1dda0 100644 --- a/src/tags.clj +++ b/src/tags.clj @@ -139,7 +139,7 @@ AND m.user_id = u.user_id AND r.room_id = m.room_id")) -;; todo: only return distinct dumps? sorted by tag.created_on? + (defnk fetch-dumps-by-tag-query [:image-only true :message-user-id false :tag-user-id false :with-tags true :include-vip false] (str " SELECT m.content, m.message_id, m.created_on, @@ -162,10 +162,11 @@ WHERE m.message_id = sq.message_id AND m.user_id = u.user_id AND r.room_id = m.room_id " - (if (not include-vip) "AND r.admin_only = false" ""))) + (if include-vip "" "AND r.admin_only = false"))) +;; todo: only return distinct dumps? sorted by tag.created_on? ;; tag intersections -(defnk fetch-dumps-by-tags-query [:image-only true :num-tags 1 :message-user-id false :tag-user-id false :with-tags true] (str +(defnk fetch-dumps-by-tags-query [:image-only true :num-tags 1 :message-user-id false :tag-user-id false :with-tags true :include-vip false] (str " SELECT m.content, m.message_id, m.created_on, u.nick, u.avatar, r.key " @@ -187,7 +188,8 @@ ) as sq, messages m, users u, rooms r WHERE m.message_id = sq.message_id AND m.user_id = u.user_id - AND r.room_id = m.room_id")) + AND r.room_id = m.room_id " + (if include-vip "" "AND r.admin_only = false"))) (defnk fetch-dumps-by-room [:room-id 1 :image-only true :amount *dumps-per-page* :offset 0] @@ -211,18 +213,21 @@ :image-only true :amount *dumps-per-page* :offset 0 - :with-tags true] + :with-tags true + :include-vip false] (let [tags (if (string? tags) [tags] tags) query (if (= 1 (count tags)) (fetch-dumps-by-tag-query :image-only image-only :message-user-id message-user-id :tag-user-id tag-user-id - :with-tags with-tags) + :with-tags with-tags + :include-vip include-vip) (fetch-dumps-by-tags-query :image-only image-only :message-user-id message-user-id :tag-user-id tag-user-id :num-tags (count tags) - :with-tags with-tags)) + :with-tags with-tags + :include-vip include-vip)) query-vars [amount offset] query-vars (if message-user-id (concat [message-user-id] query-vars ) query-vars) query-vars (if tag-user-id (concat [tag-user-id] query-vars ) query-vars) |