X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FViewSonePage.java;h=82284d59dfa9346447899868c4070131c7244d68;hb=9ee1da2306234248b6077946fc254d8436fb4bd1;hp=3f4d92d730ec47ca7087b856aa8cb55d263523e4;hpb=ece9119924c20b12ef1c2f0908a92dc8323f8884;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
index 3f4d92d..82284d5 100644
--- a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
@@ -28,6 +28,8 @@ import java.util.Set;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.template.SoneAccessor;
+import net.pterodactylus.util.collection.ListBuilder;
 import net.pterodactylus.util.collection.Pagination;
 import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
@@ -49,7 +51,7 @@ public class ViewSonePage extends SoneTemplatePage {
 	 *            The Sone web interface
 	 */
 	public ViewSonePage(Template template, WebInterface webInterface) {
-		super("viewSone.html", template, "Page.ViewSone.Title", webInterface, false);
+		super("viewSone.html", template, webInterface, false);
 	}
 
 	//
@@ -60,16 +62,36 @@ public class ViewSonePage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
+	protected String getPageTitle(Request request) {
+		String soneId = request.getHttpRequest().getParam("sone");
+		Sone sone = webInterface.getCore().getSone(soneId, false);
+		if ((sone != null) && (sone.getTime() > 0)) {
+			String soneName = SoneAccessor.getNiceName(sone);
+			return soneName + " - " + webInterface.getL10n().getString("Page.ViewSone.Title");
+		}
+		return webInterface.getL10n().getString("Page.ViewSone.Page.TitleWithoutSone");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
 	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		String soneId = request.getHttpRequest().getParam("sone");
 		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());
 		Set<Reply> replies = sone.getReplies();
 		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));
@@ -87,22 +109,10 @@ public class ViewSonePage extends SoneTemplatePage {
 		Pagination<Post> repliedPostPagination = new Pagination<Post>(posts, 10).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("repliedPostPage"), 0));
 		templateContext.set("repliedPostPagination", repliedPostPagination);
 		templateContext.set("repliedPosts", repliedPostPagination.getItems());
-	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	@SuppressWarnings("unchecked")
-	protected void postProcess(Request request, TemplateContext templateContext) {
-		Sone sone = (Sone) templateContext.get("sone");
-		if (sone == null) {
-			return;
-		}
+		/* mark Sone and posts and replies as known. */
 		webInterface.getCore().markSoneKnown(sone);
-		List<Post> posts = sone.getPosts();
-		posts.addAll((List<Post>) templateContext.get("repliedPosts"));
-		for (Post post : posts) {
+		for (Post post : new ListBuilder<Post>().addAll(postPagination.getItems()).addAll(repliedPostPagination.getItems()).get()) {
 			if (post.getSone() != null) {
 				webInterface.getCore().markPostKnown(post);
 			}