summaryrefslogtreecommitdiff
path: root/src/site.clj
diff options
context:
space:
mode:
authorScott Ostler <sbsotler@gmail.com>2010-11-23 01:58:52 -0500
committerScott Ostler <sbsotler@gmail.com>2010-11-23 01:58:52 -0500
commit048783c9e591d859bda8b51a63086e0330f6fd30 (patch)
treee7735969788a110e72747b777b7fb89e73b4d060 /src/site.clj
parentad83cbd56471a628cf4cd657bdea962f4f323973 (diff)
Updated fav handling
Diffstat (limited to 'src/site.clj')
-rw-r--r--src/site.clj8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/site.clj b/src/site.clj
index 3548149..3a9c379 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -823,8 +823,8 @@ ORDER BY cnt DESC
[(:user_id user) (:message_id msg) tag])
(when (and (= tag "favorite")
(not (= (msg :nick) (:nick user))))
- (if-not (:admin_only msg)
- (incrby-redis-favscore! (:nick msg) (:message_id msg) 1))
+ (if-not (or (:admin_only msg) (= (:user_id user) (:user_id msg)))
+ (incrby-redis-favscore! (:nick msg) (:message_id msg) 1 (:is_image msg)))
(insert-fav-notification! (msg :nick)
(user :nick)
(user :avatar)
@@ -861,8 +861,8 @@ ORDER BY cnt DESC
(let [rows-deleted (first (do-delete "tags" [query user-id msg-id tag]))]
(if-not (zero? rows-deleted)
(do
- (if-not (:admin_only msg)
- (incrby-redis-favscore! (:nick msg) msg-id -1))
+ (if-not (or (:admin_only msg) (= user-id (:user_id msg)))
+ (incrby-redis-favscore! (:nick msg) msg-id -1 (:is_image msg)))
(resp-success "OK"))
(resp-error "NO_TAG")))))