X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=90d03555bb35f9247cf3406d8c92be162d7ea4b0;hb=c1f6e1176c57d470eb98ed45cfa268faff8e4009;hp=b43d02544d769c2d626e07e42b325db624210396;hpb=438378deab1514f0f608d975ef65f5b7aea44ccb;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 b43d025..90d0355 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -32,13 +32,11 @@ 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;
 
 /**
@@ -115,34 +113,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) {
@@ -192,14 +162,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	FreenetURI getRequestUri();
 
 	/**
-	 * Returns the insert URI of this Sone.
-	 *
-	 * @return The insert URI of this Sone
-	 */
-	@Nullable
-	FreenetURI getInsertUri();
-
-	/**
 	 * Returns the latest edition of this Sone.
 	 *
 	 * @return The latest edition of this Sone