Merge branch 'edit-wot-trust' into next

[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 67d11c6..b0a27f7 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
@@ -19,12 +19,14 @@ package net.pterodactylus.sone.web;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 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.collection.Pagination;
+import net.pterodactylus.util.number.Numbers;
+import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Template;
 
 /**
@@ -42,7 +44,7 @@ public class IndexPage extends SoneTemplatePage {
         *            The Sone web interface
         */
        public IndexPage(Template template, WebInterface webInterface) {
-               super("index.html", template, "Page.Index.Title", webInterface);
+               super("index.html", template, "Page.Index.Title", webInterface, true);
        }
 
        //
@@ -53,39 +55,43 @@ 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<Post> allPosts = new ArrayList<Post>();
-               allPosts.addAll(sone.getPosts());
-               for (Sone friendSone : sone.getFriends()) {
-                       allPosts.addAll(friendSone.getPosts());
+               allPosts.addAll(currentSone.getPosts());
+               for (String friendSoneId : currentSone.getFriends()) {
+                       if (!webInterface.getCore().hasSone(friendSoneId)) {
+                               continue;
+                       }
+                       allPosts.addAll(webInterface.getCore().getSone(friendSoneId).getPosts());
                }
-               Collections.sort(allPosts, new Comparator<Post>() {
-
-                       @Override
-                       public int compare(Post leftPost, Post rightPost) {
-                               return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightPost.getTime() - leftPost.getTime()));
+               for (Sone sone : webInterface.getCore().getSones()) {
+                       for (Post post : sone.getPosts()) {
+                               if (currentSone.equals(post.getRecipient()) && !allPosts.contains(post)) {
+                                       allPosts.add(post);
+                               }
                        }
-
-               });
-               int page = request.getHttpRequest().getIntParam("page", 0);
-               Pagination<Post> postPagination = new Pagination<Post>(allPosts, 25).setPage(page);
-               List<Post> postsOnPage = postPagination.getItems();
-               template.set("posts", postsOnPage);
-               template.set("pagination", postPagination);
+               }
+               Collections.sort(allPosts, Post.TIME_COMPARATOR);
+               Pagination<Post> pagination = new Pagination<Post>(allPosts, 25).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
+               dataProvider.set("pagination", pagination);
+               dataProvider.set("posts", pagination.getItems());
        }
 
-       //
-       // SONETEMPLATEPAGE METHODS
-       //
-
        /**
         * {@inheritDoc}
         */
        @Override
-       protected boolean requiresLogin() {
-               return true;
+       protected void postProcess(Request request, DataProvider dataProvider) {
+               @SuppressWarnings("unchecked")
+               List<Post> posts = (List<Post>) dataProvider.get("posts");
+               for (Post post : posts) {
+                       webInterface.getCore().markPostKnown(post);
+                       for (Reply reply : webInterface.getCore().getReplies(post)) {
+                               webInterface.getCore().markReplyKnown(reply);
+                       }
+               }
        }
 
 }