X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FNewPage.java;h=9eab69a4b628644f93194704877ac39ad6fcd99a;hb=fe8a83bdb1d644d4d1bf4342feab4c58115409b3;hp=71200d85ab68c44ef0a8bb22386c6b0faf5fa6d0;hpb=6e9a43ccd93ae125720547c0fe421dc81a54ba90;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/web/NewPage.java b/src/main/java/net/pterodactylus/sone/web/NewPage.java
index 71200d8..9eab69a 100644
--- a/src/main/java/net/pterodactylus/sone/web/NewPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/NewPage.java
@@ -1,5 +1,5 @@
/*
- * Sone - NewPage.java - Copyright © 2013 David Roden
+ * Sone - NewPage.java - Copyright © 2013â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,27 +17,26 @@
package net.pterodactylus.sone.web;
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.google.common.collect.Collections2;
-
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.notify.ListNotificationFilters;
+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.number.Numbers;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
/**
* Page that displays all new posts and replies. The posts are filtered using
- * {@link ListNotificationFilters#filterPosts(java.util.Collection, net.pterodactylus.sone.data.Sone)}
- * and sorted by time.
+ * {@link PostVisibilityFilter#isPostVisible(Sone, Post)} and sorted by time.
*
* @author David âBombeâ Roden
*/
@@ -63,21 +62,19 @@ public class NewPage 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 {
/* collect new elements from notifications. */
- Set posts = new HashSet(webInterface.getNewPosts());
- for (PostReply reply : Collections2.filter(webInterface.getNewReplies(), PostReply.HAS_POST_FILTER)) {
+ Set posts = new HashSet(webInterface.getNewPosts(getCurrentSoneWithoutCreatingSession(request.getToadletContext())));
+ for (PostReply reply : webInterface.getNewReplies(getCurrentSoneWithoutCreatingSession(request.getToadletContext()))) {
posts.add(reply.getPost().get());
}
/* filter and sort them. */
- List sortedPosts = ListNotificationFilters.filterPosts(new ArrayList(posts), webInterface.getCurrentSone(request.getToadletContext(), false));
- Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
+ List sortedPosts = new ArrayList<>(posts);
+ Collections.sort(sortedPosts, Post.NEWEST_FIRST);
/* paginate them. */
- Pagination pagination = new Pagination(sortedPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
+ Pagination pagination = new Pagination<>(sortedPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(parseInt(request.getHttpRequest().getParam("page"), 0));
templateContext.set("pagination", pagination);
templateContext.set("posts", pagination.getItems());
}