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 b4307e3..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 @@
 /*
- * Sone - IndexPage.java - Copyright © 2010–2013 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,6 +17,8 @@
 
 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;
@@ -24,14 +26,13 @@ import java.util.List;
 
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.notify.ListNotificationFilters;
+import net.pterodactylus.sone.notify.PostVisibilityFilter;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.collection.Pagination;
-import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
-import com.google.common.base.Predicate;
+import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
 
 /**
@@ -42,14 +43,11 @@ import com.google.common.collect.Collections2;
  */
 public class IndexPage extends SoneTemplatePage {
 
-       /**
-        * @param template
-        *            The template to render
-        * @param webInterface
-        *            The Sone web interface
-        */
-       public IndexPage(Template template, WebInterface 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;
        }
 
        //
@@ -60,35 +58,28 @@ public class IndexPage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-               super.processTemplate(request, templateContext);
+       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()) {
-                       if (!webInterface.getCore().hasSone(friendSoneId)) {
+                       Optional<Sone> friendSone = webInterface.getCore().getSone(friendSoneId);
+                       if (!friendSone.isPresent()) {
                                continue;
                        }
-                       allPosts.addAll(webInterface.getCore().getSone(friendSoneId).getPosts());
+                       allPosts.addAll(friendSone.get().getPosts());
                }
                for (Sone sone : webInterface.getCore().getSones()) {
                        for (Post post : sone.getPosts()) {
-                               if (currentSone.equals(post.getRecipient()) && !allPosts.contains(post)) {
+                               if (currentSone.equals(post.getRecipient().orNull()) && !allPosts.contains(post)) {
                                        allPosts.add(post);
                                }
                        }
                }
-               allPosts = Collections2.filter(allPosts, new Predicate<Post>() {
-
-                       @Override
-                       public boolean apply(Post post) {
-                               return ListNotificationFilters.isPostVisible(currentSone, post);
-                       }
-               });
-               allPosts = Collections2.filter(allPosts, Post.FUTURE_POSTS_FILTER);
+               allPosts = Collections2.filter(allPosts, postVisibilityFilter.isVisible(currentSone));
                List<Post> sortedPosts = new ArrayList<Post>(allPosts);
-               Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
-               Pagination<Post> pagination = new Pagination<Post>(sortedPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
+               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());
        }