From 7eb9104e5b0525dc2ad8c41c42577c5f9efcb910 Mon Sep 17 00:00:00 2001 From: Scott Ostler Date: Mon, 29 Nov 2010 01:35:54 -0500 Subject: Correct recipient merging --- src/datalayer.clj | 2 +- src/site.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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) -- cgit v1.2.3-70-g09d2