X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FIndexPage.java;h=4c0d73aec6e9bfe6bc189f1666678a6e90a70277;hp=67d11c694f925677034b253dcd5f31a12b4d50ad;hb=a47643aed43d118ca68044f95451bb5374cdb332;hpb=680d60dc6802454fe812f1ceea163a1415aaee0e

diff --git a/src/main/java/net/pterodactylus/sone/web/IndexPage.java b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
index 67d11c6..4c0d73a 100644
--- 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–2012 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
@@ -19,13 +19,18 @@ 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.Sone;
+import net.pterodactylus.sone.notify.ListNotificationFilters;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.collection.Pagination;
+import net.pterodactylus.util.filter.Filter;
+import net.pterodactylus.util.filter.Filters;
+import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * The index page shows the main page of Sone. This page will contain the posts
@@ -42,7 +47,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 +58,36 @@ 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(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+		super.processTemplate(request, templateContext);
+		final 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());
+		}
+		for (Sone sone : webInterface.getCore().getSones()) {
+			for (Post post : sone.getPosts()) {
+				if (currentSone.equals(post.getRecipient()) && !allPosts.contains(post)) {
+					allPosts.add(post);
+				}
+			}
 		}
-		Collections.sort(allPosts, new Comparator<Post>() {
+		allPosts = Filters.filteredList(allPosts, new Filter<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()));
+			public boolean filterObject(Post post) {
+				return ListNotificationFilters.isPostVisible(currentSone, 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 = Filters.filteredList(allPosts, Post.FUTURE_POSTS_FILTER);
+		Collections.sort(allPosts, Post.TIME_COMPARATOR);
+		Pagination<Post> pagination = new Pagination<Post>(allPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
+		templateContext.set("pagination", pagination);
+		templateContext.set("posts", pagination.getItems());
 	}
 
 }