X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=82f8ed657bac94582c980867107ff7187db9c1ce;hp=e5acad5be197c7155868057b51a7ab16d0179a99;hb=a47643aed43d118ca68044f95451bb5374cdb332;hpb=d1e544ed3eb9d821b67b2d076ea56c83d5576eb4

diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
index e5acad5..82f8ed6 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
@@ -62,13 +62,13 @@ public class KnownSonesPage extends SoneTemplatePage {
 		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
@@ -76,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
@@ -84,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)) {
@@ -97,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));