X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=bca789501669e16b84576861661fe7397e7abdb6;hb=0a4b6fc252003c71f4bdef09560e87982838d9c8;hp=44929c6916fb56273ddb6f987ee7a42c73e4e7cd;hpb=6abff3e875d253a011c73574f2a6012a28af279a;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 44929c6..bca7895 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;
@@ -29,17 +30,20 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 import net.pterodactylus.sone.core.Options;
 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 net.pterodactylus.sone.freenet.wot.OwnIdentity;
 
 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 +103,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>() {
 
@@ -179,6 +189,13 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 		}
 	};
 
+	public static final Function<Sone, FreenetURI> TO_INSERT_URI = new Function<Sone, FreenetURI>() {
+		@Override
+		public FreenetURI apply(@Nullable Sone sone) {
+			return ((sone == null) || !sone.isLocal()) ? null : create(((OwnIdentity) sone.getIdentity()).getInsertUri());
+		}
+	};
+
 	public static final Function<Sone, List<Post>> TO_POSTS = new Function<Sone, List<Post>>() {
 		@Override
 		public List<Post> apply(Sone sone) {
@@ -424,34 +441,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	Sone setLikeReplyIds(Set<String> likedReplyIds);
 
 	/**
-	 * Checks whether the given reply ID is liked by this Sone.
-	 *
-	 * @param replyId
-	 * 		The ID of the reply
-	 * @return {@code true} if this Sone likes the given reply, {@code false}
-	 *         otherwise
-	 */
-	boolean isLikedReplyId(String replyId);
-
-	/**
-	 * Adds the given reply ID to the list of replies this Sone likes.
-	 *
-	 * @param replyId
-	 * 		The ID of the reply
-	 * @return This Sone (for method chaining)
-	 */
-	Sone addLikedReplyId(String replyId);
-
-	/**
-	 * Removes the given post ID from the list of replies this Sone likes.
-	 *
-	 * @param replyId
-	 * 		The ID of the reply
-	 * @return This Sone (for method chaining)
-	 */
-	Sone removeLikedReplyId(String replyId);
-
-	/**
 	 * Returns the root album that contains all visible albums of this Sone.
 	 *
 	 * @return The root album of this Sone