X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=52e4239e3ae0257a4effa4b60ba9fef1ad7fa0bc;hb=45f92ec63dbf8134d92ceed67294faa38117b195;hp=0e42eb50918ffaa89660fba387f19ea4073a9f9c;hpb=9a254c2af6f176c8a95ef6accfdb288ad159d125;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 0e42eb5..52e4239 100644
--- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
@@ -22,6 +22,7 @@ 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;
@@ -57,11 +58,14 @@ 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");
+		templateContext.set("sort", (sortField != null) ? sortField : "name");
+		templateContext.set("order", (sortOrder != null) ? sortOrder : "asc");
+		templateContext.set("followedSones", followedSones);
 		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)) {
@@ -72,7 +76,6 @@ public class KnownSonesPage extends SoneTemplatePage {
 					return currentSone.hasFriend(sone.getId());
 				}
 			});
-			templateContext.set("followedSones", "show-only");
 		} else if ((currentSone != null) && "hide".equals(followedSones)) {
 			knownSones = Filters.filteredList(knownSones, new Filter<Sone>() {
 
@@ -81,24 +84,25 @@ public class KnownSonesPage extends SoneTemplatePage {
 					return !currentSone.hasFriend(sone.getId());
 				}
 			});
-			templateContext.set("followedSones", "hide");
 		}
-		if ("name".equals(sortField)) {
-			if ("desc".equals(sortOrder)) {
-				Collections.sort(knownSones, new ReverseComparator<Sone>(Sone.NICE_NAME_COMPARATOR));
-			} else {
-				Collections.sort(knownSones, Sone.NICE_NAME_COMPARATOR);
-			}
-			templateContext.set("sort", "name");
-			templateContext.set("order", "desc".equals(sortOrder) ? "desc" : "asc");
-		} else if ("activity".equals(sortField)) {
+		if ("activity".equals(sortField)) {
 			if ("asc".equals(sortOrder)) {
 				Collections.sort(knownSones, new ReverseComparator<Sone>(Sone.LAST_ACTIVITY_COMPARATOR));
 			} else {
 				Collections.sort(knownSones, Sone.LAST_ACTIVITY_COMPARATOR);
 			}
-			templateContext.set("sort", "activity");
-			templateContext.set("order", "asc".equals(sortOrder) ? "asc" : "desc");
+		} else if ("posts".equals(sortField)) {
+			if ("asc".equals(sortOrder)) {
+				Collections.sort(knownSones, new ReverseComparator<Sone>(Sone.POST_COUNT_COMPARATOR));
+			} else {
+				Collections.sort(knownSones, Sone.POST_COUNT_COMPARATOR);
+			}
+		} else {
+			if ("desc".equals(sortOrder)) {
+				Collections.sort(knownSones, new ReverseComparator<Sone>(Sone.NICE_NAME_COMPARATOR));
+			} else {
+				Collections.sort(knownSones, Sone.NICE_NAME_COMPARATOR);
+			}
 		}
 		Pagination<Sone> sonePagination = new Pagination<Sone>(knownSones, 25).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
 		templateContext.set("pagination", sonePagination);