summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorScott Ostler <scottbot9000@gmail.com>2010-06-17 02:46:33 -0400
committerScott Ostler <scottbot9000@gmail.com>2010-06-17 02:46:33 -0400
commitc47183393b9271c05e7c947340c499bda7ef0bda (patch)
treedece36feb4762db9b92c28cc136675c4f9ee861c /src
parent574b8b6b6c78729dddda2f7d98eb3ea9e200aa4e (diff)
Vip-only fav posts
Diffstat (limited to 'src')
-rw-r--r--src/site.clj4
-rw-r--r--src/tags.clj5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/site.clj b/src/site.clj
index e8f2b1e..e2947fc 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -781,7 +781,9 @@ FROM users u
avatar (:avatar user-info)
url (str nick "/favorites")
page-title (str nick "'s favorites")]
- (tagged-dumps-template session params "favorite" url page-title :tag-user-id user-id :avatar avatar)))
+ (tagged-dumps-template session params "favorite" url page-title :tag-user-id user-id
+ :avatar avatar
+ :include-vip (is-vip? session))))
(defn json-favorites [session params]
(let [nick (params :nick)
diff --git a/src/tags.clj b/src/tags.clj
index 7fdc0cd..d18bc5e 100644
--- a/src/tags.clj
+++ b/src/tags.clj
@@ -140,7 +140,7 @@
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] (str
+(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,
u.nick, u.avatar, r.key "
@@ -161,7 +161,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 (not include-vip) "AND r.admin_only = false" "")))
;; 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