summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Ostler <sbsotler@gmail.com>2010-11-29 01:35:54 -0500
committerScott Ostler <sbsotler@gmail.com>2010-11-29 01:35:54 -0500
commit7eb9104e5b0525dc2ad8c41c42577c5f9efcb910 (patch)
treed8f1023778c306d406a4cdf5d841dc488a92e90e
parentdd46cb29fa939546908db15fc92491bc49f3130f (diff)
Correct recipient merging
-rw-r--r--src/datalayer.clj2
-rw-r--r--src/site.clj2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/datalayer.clj b/src/datalayer.clj
index 28ef3bf..6b2a466 100644
--- a/src/datalayer.clj
+++ b/src/datalayer.clj
@@ -207,5 +207,5 @@ order by count desc limit ? offset ?")
info (fetch-user-id (get dm "author_id"))]
{"nick" (:nick info)
"content" (get dm "content")
- "recips" (get dm "recips")
+ "recips" (get dm "recips" [])
"avatar" (:avatar info)})))
diff --git a/src/site.clj b/src/site.clj
index 7db43e7..67fc8d4 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -396,7 +396,7 @@ ORDER BY cnt DESC
dms (if-vip
(fetch-private-messages (:user_id user-info)))
recips (if dms
- (set (concat (map #(get % "recips") dms))))
+ (set (apply concat (map #(get % "recips") dms))))
imgs (pull-random-dump-images dumps 5)]
(do
(.setAttribute st "is_home" is-home)