Remove obsolete loading animation

[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..1d40f45 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
@@ -1,5 +1,5 @@
 /*
- * FreenetSone - IndexPage.java - Copyright © 2010 David Roden
+ * Sone - IndexPage.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,15 +17,23 @@
 
 package net.pterodactylus.sone.web;
 
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.notify.PostVisibilityFilter;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.collection.Pagination;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.Collections2;
 
 /**
  * The index page shows the main page of Sone. This page will contain the posts
@@ -35,14 +43,11 @@ import net.pterodactylus.util.template.Template;
  */
 public class IndexPage extends SoneTemplatePage {
 
-       /**
-        * @param template
-        *            The template to render
-        * @param webInterface
-        *            The Sone web interface
-        */
-       public IndexPage(Template template, WebInterface webInterface) {
-               super("index.html", template, "Page.Index.Title", webInterface);
+       private final PostVisibilityFilter postVisibilityFilter;
+
+       public IndexPage(Template template, WebInterface webInterface, PostVisibilityFilter postVisibilityFilter) {
+               super("index.html", template, "Page.Index.Title", webInterface, true);
+               this.postVisibilityFilter = postVisibilityFilter;
        }
 
        //
@@ -53,39 +58,30 @@ 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());
-               List<Post> allPosts = new ArrayList<Post>();
-               allPosts.addAll(sone.getPosts());
-               for (Sone friendSone : sone.getFriends()) {
-                       allPosts.addAll(friendSone.getPosts());
+       protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+               final Sone currentSone = getCurrentSone(request.getToadletContext());
+               Collection<Post> allPosts = new ArrayList<Post>();
+               allPosts.addAll(currentSone.getPosts());
+               for (String friendSoneId : currentSone.getFriends()) {
+                       Optional<Sone> friendSone = webInterface.getCore().getSone(friendSoneId);
+                       if (!friendSone.isPresent()) {
+                               continue;
+                       }
+                       allPosts.addAll(friendSone.get().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().orNull()) && !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);
-       }
-
-       //
-       // SONETEMPLATEPAGE METHODS
-       //
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected boolean requiresLogin() {
-               return true;
+               }
+               allPosts = Collections2.filter(allPosts, postVisibilityFilter.isVisible(currentSone));
+               List<Post> sortedPosts = new ArrayList<Post>(allPosts);
+               Collections.sort(sortedPosts, Post.NEWEST_FIRST);
+               Pagination<Post> pagination = new Pagination<Post>(sortedPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(parseInt(request.getHttpRequest().getParam("page"), 0));
+               templateContext.set("pagination", pagination);
+               templateContext.set("posts", pagination.getItems());
        }
 
 }