X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FIndexPage.java;h=825267b04f0993c840a4f4a68ddf0fa1db474eb2;hb=e31ead2b972074c1e5ecc5213b2bdc34c453d8b6;hp=756252693d9c91c08b173750c635336421c036bb;hpb=533720edfdc8c59088db00fef5374c6a8f461a1a;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 7562526..825267b 100644 --- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java +++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java @@ -24,6 +24,7 @@ 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.DataProvider; import net.pterodactylus.util.template.Template; /** @@ -52,28 +53,35 @@ public class IndexPage extends SoneTemplatePage { * {@inheritDoc} */ @Override - protected void processTemplate(Request request, Template template) throws RedirectException { - super.processTemplate(request, template); - Sone sone = getCurrentSone(request.getToadletContext()); + protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException { + super.processTemplate(request, dataProvider); + 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); + dataProvider.set("posts", allPosts); } /** * {@inheritDoc} */ @Override - protected void postProcess(Request request, Template template) { + protected void postProcess(Request request, DataProvider dataProvider) { @SuppressWarnings("unchecked") - List posts = (List) template.get("posts"); + List posts = (List) dataProvider.get("posts"); for (Post post : posts) { webInterface.getCore().markPostKnown(post); for (Reply reply : webInterface.getCore().getReplies(post)) {