X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FNewPage.java;h=406054d36aa654b46c5d4c43fc51bcab057c742c;hp=6aa07d99ab2b5881a456066bb20f08ba5dad9362;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=3da1daa6488c642430858a4baacc0aa986a6ebc1

diff --git a/src/main/java/net/pterodactylus/sone/web/NewPage.java b/src/main/java/net/pterodactylus/sone/web/NewPage.java
index 6aa07d9..406054d 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–2015 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
@@ -21,7 +21,9 @@ 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 net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
@@ -60,20 +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. */
-		List<Post> posts = new ArrayList<Post>(webInterface.getNewPosts(getCurrentSone(request.getToadletContext(), false)));
+		Set<Post> posts = new HashSet<Post>(webInterface.getNewPosts(getCurrentSone(request.getToadletContext(), false)));
 		for (PostReply reply : webInterface.getNewReplies(getCurrentSone(request.getToadletContext(), false))) {
 			posts.add(reply.getPost().get());
 		}
 
 		/* filter and sort them. */
-		Collections.sort(posts, Post.TIME_COMPARATOR);
+		List<Post> sortedPosts = new ArrayList(posts);
+		Collections.sort(sortedPosts, Post.NEWEST_FIRST);
 
 		/* paginate them. */
-		Pagination<Post> pagination = new Pagination<Post>(posts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(parseInt(request.getHttpRequest().getParam("page"), 0));
+		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());
 	}