From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 5 Apr 2011 04:27:51 +0000 (+0200)
Subject: Add posts that are directed at a Sone to “view Sone” page.
X-Git-Tag: 0.6.1^2~45
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=52a5187a49bde69f9fffb361c644a115e40fdf0a;p=Sone.git

Add posts that are directed at a Sone to “view Sone” page.
---

diff --git a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
index 758b93d..c7edc32 100644
--- a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
@@ -81,6 +81,8 @@ public class ViewSonePage extends SoneTemplatePage {
 		Sone sone = webInterface.getCore().getSone(soneId, false);
 		templateContext.set("sone", sone);
 		List<Post> sonePosts = sone.getPosts();
+		sonePosts.addAll(webInterface.getCore().getDirectedPosts(sone));
+		Collections.sort(sonePosts, Post.TIME_COMPARATOR);
 		Pagination<Post> postPagination = new Pagination<Post>(sonePosts, 10).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("postPage"), 0));
 		templateContext.set("postPagination", postPagination);
 		templateContext.set("posts", postPagination.getItems());
@@ -88,7 +90,7 @@ public class ViewSonePage extends SoneTemplatePage {
 		final Map<Post, List<Reply>> repliedPosts = new HashMap<Post, List<Reply>>();
 		for (Reply reply : replies) {
 			Post post = reply.getPost();
-			if (repliedPosts.containsKey(post) || sone.equals(post.getSone())) {
+			if (repliedPosts.containsKey(post) || sone.equals(post.getSone()) || (sone.equals(post.getRecipient()))) {
 				continue;
 			}
 			repliedPosts.put(post, webInterface.getCore().getReplies(post));