X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FIndexPage.java;h=a33072f6477ab2b504217cdae168face11b00566;hb=4a2fdf3b0b3dfcfc761c83797018237ec4c82a4b;hp=00ccc35ccec41de61ce1ba014d05db4a6398b81a;hpb=62ebf3da00001abb841c92128c4fdb57d0795ee2;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/IndexPage.java b/src/main/java/net/pterodactylus/sone/web/IndexPage.java index 00ccc35..a33072f 100644 --- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java +++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.List; import net.pterodactylus.sone.data.Post; +import net.pterodactylus.sone.data.Reply; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.util.template.Template; @@ -53,17 +54,39 @@ public class IndexPage extends SoneTemplatePage { @Override protected void processTemplate(Request request, Template template) throws RedirectException { super.processTemplate(request, template); - Sone sone = getCurrentSone(request.getToadletContext()); + Sone currentSone = getCurrentSone(request.getToadletContext()); List allPosts = new ArrayList(); - allPosts.addAll(sone.getPosts()); - for (String friendSoneId : sone.getFriends()) { + allPosts.addAll(currentSone.getPosts()); + for (String friendSoneId : currentSone.getFriends()) { if (!webInterface.getCore().hasSone(friendSoneId)) { continue; } allPosts.addAll(webInterface.getCore().getSone(friendSoneId).getPosts()); } + for (Sone sone : webInterface.getCore().getSones()) { + for (Post post : sone.getPosts()) { + if (currentSone.equals(post.getRecipient()) && !allPosts.contains(post)) { + allPosts.add(post); + } + } + } Collections.sort(allPosts, Post.TIME_COMPARATOR); template.set("posts", allPosts); } + /** + * {@inheritDoc} + */ + @Override + protected void postProcess(Request request, Template template) { + @SuppressWarnings("unchecked") + List posts = (List) template.get("posts"); + for (Post post : posts) { + webInterface.getCore().markPostKnown(post); + for (Reply reply : webInterface.getCore().getReplies(post)) { + webInterface.getCore().markReplyKnown(reply); + } + } + } + }