X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=fa6f980ed08cbafc6006e05ddcc84712ef738d2a;hp=e2a7b5bb3896ca857fbc4a8a09483bf090c5a366;hb=afa3d007f883a710a94f74d21c179a006974bc7e;hpb=fc66bb049a3de0c3c12d5df53002a32cdf2ce6a5

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index e2a7b5b..fa6f980 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -32,13 +32,10 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.pterodactylus.sone.freenet.wot.Identity;
-import net.pterodactylus.sone.freenet.wot.OwnIdentity;
-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.primitives.Ints;
 
 /**
@@ -65,29 +62,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 		downloading,
 	}
 
-	/** comparator that sorts Sones by their nice name. */
-	public static final Comparator<Sone> NICE_NAME_COMPARATOR = new Comparator<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());
-		}
-
-	};
-
-	/** Comparator that sorts Sones by last activity (least recent active first). */
-	public static final Comparator<Sone> LAST_ACTIVITY_COMPARATOR = new Comparator<Sone>() {
-
-		@Override
-		public int compare(Sone firstSone, Sone secondSone) {
-			return (int) Math.min(Integer.MAX_VALUE, Math.max(Integer.MIN_VALUE, secondSone.getTime() - firstSone.getTime()));
-		}
-	};
-
 	/** Comparator that sorts Sones by numbers of posts (descending). */
 	public static final Comparator<Sone> POST_COUNT_COMPARATOR = new Comparator<Sone>() {
 
@@ -115,34 +89,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 		}
 	};
 
-	/** Filter to remove Sones that have not been downloaded. */
-	public static final Predicate<Sone> EMPTY_SONE_FILTER = new Predicate<Sone>() {
-
-		@Override
-		public boolean apply(Sone sone) {
-			return (sone != null) && (sone.getTime() != 0);
-		}
-	};
-
-	/** Filter that matches all {@link Sone#isLocal() local Sones}. */
-	public static final Predicate<Sone> LOCAL_SONE_FILTER = new Predicate<Sone>() {
-
-		@Override
-		public boolean apply(Sone sone) {
-			return (sone != null) && (sone.getIdentity() instanceof OwnIdentity);
-		}
-
-	};
-
-	/** Filter that matches Sones that have at least one album. */
-	public static final Predicate<Sone> HAS_ALBUM_FILTER = new Predicate<Sone>() {
-
-		@Override
-		public boolean apply(Sone sone) {
-			return (sone != null) && !sone.getRootAlbum().getAlbums().isEmpty();
-		}
-	};
-
 	public static final Function<Sone, List<Album>> toAllAlbums = new Function<Sone, List<Album>>() {
 		@Override
 		public List<Album> apply(@Nullable Sone sone) {