X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=a74132230a584cc900b4529bd841029747f48c81;hb=53a71d1d6b91e4d56af49a06f2e06bc4d11bf3eb;hp=65254e34c46ff7a33bbafeed9328ab7381fca950;hpb=d5efb086bee8f103cbe90c7a953ffbb7ff27b689;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 65254e3..a741322 100644
--- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.web;
 
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -33,7 +35,6 @@ import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Ordering;
-import com.google.common.primitives.Ints;
 
 /**
  * This page shows all known Sones.
@@ -42,6 +43,9 @@ import com.google.common.primitives.Ints;
  */
 public class KnownSonesPage extends SoneTemplatePage {
 
+	private static final String defaultSortField = "activity";
+	private static final String defaultSortOrder = "desc";
+
 	/**
 	 * Creates a “known Sones” page.
 	 *
@@ -64,28 +68,28 @@ public class KnownSonesPage extends SoneTemplatePage {
 	@Override
 	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 sortField = request.getHttpRequest().getParam("sort", defaultSortField);
+		String sortOrder = request.getHttpRequest().getParam("order", defaultSortOrder);
 		String filter = request.getHttpRequest().getParam("filter");
-		templateContext.set("sort", (sortField != null) ? sortField : "name");
-		templateContext.set("order", (sortOrder != null) ? sortOrder : "asc");
+		templateContext.set("sort", sortField);
+		templateContext.set("order", sortOrder);
 		templateContext.set("filter", filter);
-		final Sone currentSone = getCurrentSone(request.getToadletContext(), false);
+		final Optional<Sone> currentSone = getCurrentSone(request.getToadletContext(), false);
 		Collection<Sone> knownSones = Collections2.filter(webInterface.getCore().getSones(), Sone.EMPTY_SONE_FILTER);
-		if ((currentSone != null) && "followed".equals(filter)) {
+		if (currentSone.isPresent() && "followed".equals(filter)) {
 			knownSones = Collections2.filter(knownSones, new Predicate<Sone>() {
 
 				@Override
 				public boolean apply(Sone sone) {
-					return currentSone.hasFriend(sone.getId());
+					return currentSone.get().hasFriend(sone.getId());
 				}
 			});
-		} else if ((currentSone != null) && "not-followed".equals(filter)) {
+		} else if (currentSone.isPresent() && "not-followed".equals(filter)) {
 			knownSones = Collections2.filter(knownSones, new Predicate<Sone>() {
 
 				@Override
 				public boolean apply(Sone sone) {
-					return !currentSone.hasFriend(sone.getId());
+					return !currentSone.get().hasFriend(sone.getId());
 				}
 			});
 		} else if ("new".equals(filter)) {
@@ -141,7 +145,7 @@ public class KnownSonesPage extends SoneTemplatePage {
 				Collections.sort(sortedSones, Sone.NICE_NAME_COMPARATOR);
 			}
 		}
-		Pagination<Sone> sonePagination = new Pagination<Sone>(sortedSones, 25).setPage(Optional.fromNullable(Ints.tryParse(request.getHttpRequest().getParam("page"))).or(0));
+		Pagination<Sone> sonePagination = new Pagination<Sone>(sortedSones, 25).setPage(parseInt(request.getHttpRequest().getParam("page"), 0));
 		templateContext.set("pagination", sonePagination);
 		templateContext.set("knownSones", sonePagination.getItems());
 	}