X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=a8e80091596e7dce1786e638ade27db51cce51a2;hb=f10d40f746f6c7c716f783da11791d28c1117447;hp=63b6e0576dbf7c978f269c6e2406cb5ea5b6ba76;hpb=24a1147058b1a8e4c3021dd61b0b24d4e350eabb;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index 63b6e05..a8e8009 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -22,6 +22,7 @@ import static java.util.Arrays.asList;
 import static net.pterodactylus.sone.core.SoneUri.create;
 import static net.pterodactylus.sone.data.Album.FLATTENER;
 import static net.pterodactylus.sone.data.Album.IMAGES;
+import static net.pterodactylus.sone.template.SoneAccessor.getNiceName;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -34,12 +35,12 @@ import net.pterodactylus.sone.database.AlbumBuilder;
 import net.pterodactylus.sone.database.PostBuilder;
 import net.pterodactylus.sone.database.PostReplyBuilder;
 import net.pterodactylus.sone.freenet.wot.Identity;
-import net.pterodactylus.sone.template.SoneAccessor;
 
 import freenet.keys.FreenetURI;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
+import com.google.common.collect.ComparisonChain;
 import com.google.common.primitives.Ints;
 
 /**
@@ -99,15 +100,21 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 
 		@Override
 		public int compare(Sone leftSone, Sone rightSone) {
-			int diff = SoneAccessor.getNiceName(leftSone).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone));
-			if (diff != 0) {
-				return diff;
-			}
-			return leftSone.getId().compareToIgnoreCase(rightSone.getId());
+			return ComparisonChain.start()
+					.compare(getNiceName(leftSone).toLowerCase(), getNiceName(rightSone).toLowerCase())
+					.compare(leftSone.getId(), rightSone.getId())
+					.result();
 		}
 
 	};
 
+	public static final Function<Sone, String> TO_NICE_NAME = new Function<Sone, String>() {
+		@Override
+		public String apply(Sone sone) {
+			return (sone == null) ? null : getNiceName(sone);
+		}
+	};
+
 	/** Comparator that sorts Sones by last activity (least recent active first). */
 	public static final Comparator<Sone> LAST_ACTIVITY_COMPARATOR = new Comparator<Sone>() {