X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=b40515a1903bf0fef1626630e7c37dde95a33a97;hb=0acd68634f3e73c62087609c1faa2dfc53da506d;hp=ad63791636428c969b9d7b57b5b815e76b8cf197;hpb=cf5e594a01b0ad11b1365e8d3f7b1c56f352d3f2;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
index ad63791..b40515a 100644
--- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - KnownSonesPage.java - Copyright © 2010 David Roden
+ * Sone - KnownSonesPage.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
@@ -22,10 +22,11 @@ import java.util.Collections;
 import java.util.List;
 
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.collection.Pagination;
 import net.pterodactylus.util.collection.ReverseComparator;
-import net.pterodactylus.util.filter.Filter;
-import net.pterodactylus.util.filter.Filters;
+import net.pterodactylus.util.collection.filter.Filter;
+import net.pterodactylus.util.collection.filter.Filters;
 import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
@@ -57,17 +58,17 @@ public class KnownSonesPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		String sortField = request.getHttpRequest().getParam("sort");
 		String sortOrder = request.getHttpRequest().getParam("order");
-		String followedSones = request.getHttpRequest().getParam("followedSones");
+		String filter = request.getHttpRequest().getParam("filter");
 		templateContext.set("sort", (sortField != null) ? sortField : "name");
 		templateContext.set("order", (sortOrder != null) ? sortOrder : "asc");
-		templateContext.set("followedSones", followedSones);
+		templateContext.set("filter", filter);
 		final Sone currentSone = getCurrentSone(request.getToadletContext(), false);
 		List<Sone> knownSones = Filters.filteredList(new ArrayList<Sone>(webInterface.getCore().getSones()), Sone.EMPTY_SONE_FILTER);
-		if ((currentSone != null) && "show-only".equals(followedSones)) {
+		if ((currentSone != null) && "followed".equals(filter)) {
 			knownSones = Filters.filteredList(knownSones, new Filter<Sone>() {
 
 				@Override
@@ -75,7 +76,7 @@ public class KnownSonesPage extends SoneTemplatePage {
 					return currentSone.hasFriend(sone.getId());
 				}
 			});
-		} else if ((currentSone != null) && "hide".equals(followedSones)) {
+		} else if ((currentSone != null) && "not-followed".equals(filter)) {
 			knownSones = Filters.filteredList(knownSones, new Filter<Sone>() {
 
 				@Override
@@ -83,6 +84,26 @@ public class KnownSonesPage extends SoneTemplatePage {
 					return !currentSone.hasFriend(sone.getId());
 				}
 			});
+		} else if ("new".equals(filter)) {
+			knownSones = Filters.filteredList(knownSones, new Filter<Sone>() {
+				/**
+				 * {@inheritDoc}
+				 */
+				@Override
+				public boolean filterObject(Sone sone) {
+					return !sone.isKnown();
+				}
+			});
+		} else if ("not-new".equals(filter)) {
+			knownSones = Filters.filteredList(knownSones, new Filter<Sone>() {
+				/**
+				 * {@inheritDoc}
+				 */
+				@Override
+				public boolean filterObject(Sone sone) {
+					return sone.isKnown();
+				}
+			});
 		}
 		if ("activity".equals(sortField)) {
 			if ("asc".equals(sortOrder)) {
@@ -96,6 +117,12 @@ public class KnownSonesPage extends SoneTemplatePage {
 			} else {
 				Collections.sort(knownSones, Sone.POST_COUNT_COMPARATOR);
 			}
+		} else if ("images".equals(sortField)) {
+			if ("asc".equals(sortOrder)) {
+				Collections.sort(knownSones, new ReverseComparator<Sone>(Sone.IMAGE_COUNT_COMPARATOR));
+			} else {
+				Collections.sort(knownSones, Sone.IMAGE_COUNT_COMPARATOR);
+			}
 		} else {
 			if ("desc".equals(sortOrder)) {
 				Collections.sort(knownSones, new ReverseComparator<Sone>(Sone.NICE_NAME_COMPARATOR));
@@ -107,4 +134,5 @@ public class KnownSonesPage extends SoneTemplatePage {
 		templateContext.set("pagination", sonePagination);
 		templateContext.set("knownSones", sonePagination.getItems());
 	}
+
 }