Merge branch 'next' into edit-wot-trust

[Sone.git] / src / main / java / net / pterodactylus / sone / web / IndexPage.java

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 (file)
--- 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<Post> allPosts = new ArrayList<Post>();
-               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<Post> posts = (List<Post>) template.get("posts");
+               for (Post post : posts) {
+                       webInterface.getCore().markPostKnown(post);
+                       for (Reply reply : webInterface.getCore().getReplies(post)) {
+                               webInterface.getCore().markReplyKnown(reply);
+                       }
+               }
+       }
+
 }