X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=441112a99f1a78cd84aa58e0e72724ab9db29f23;hb=df0abbdc635a8b927474515bb100882e6d850336;hp=c27e8cc46bbdb7b0e2ab4a5f072639b31689744d;hpb=2b47186b72e30460a6710f95a76e4a99c305909a;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 c27e8cc..441112a 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -28,7 +28,6 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -36,6 +35,7 @@ import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.template.SoneAccessor;
 
+import com.google.common.base.Optional;
 import freenet.keys.FreenetURI;
 
 import com.google.common.base.Function;
@@ -48,7 +48,7 @@ import com.google.common.primitives.Ints;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
+public interface Sone extends Fingerprintable, Comparable<Sone> {
 
 	/**
 	 * Enumeration for the possible states of a {@link Sone}.
@@ -172,17 +172,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 		}
 	};
 
-	public static final Function<Sone, String> toSoneXmlUri =
-			new Function<Sone, String>() {
-				@Nonnull
-				@Override
-				public String apply(@Nullable Sone input) {
-					return input.getRequestUri()
-							.setMetaString(new String[] { "sone.xml" })
-							.toString();
-				}
-			};
-
 	public static final Function<Sone, List<Album>> toAllAlbums = new Function<Sone, List<Album>>() {
 		@Override
 		public List<Album> apply(@Nullable Sone sone) {
@@ -200,6 +189,15 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 		}
 	};
 
+	Function<Sone, Collection<Post>> toAllPosts = new Function<Sone, Collection<Post>>() {
+		@Override
+		public Collection<Post> apply(@Nullable Sone sone) {
+			return (sone != null) ? sone.getPosts() : Collections.<Post>emptyList();
+		}
+	};
+
+	String getId();
+	
 	/**
 	 * Returns the identity of this Sone.
 	 *
@@ -229,15 +227,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	FreenetURI getRequestUri();
 
 	/**
-	 * Sets the request URI of this Sone.
-	 *
-	 * @param requestUri
-	 * 		The request URI of this Sone
-	 * @return This Sone (for method chaining)
-	 */
-	Sone setRequestUri(FreenetURI requestUri);
-
-	/**
 	 * Returns the insert URI of this Sone.
 	 *
 	 * @return The insert URI of this Sone
@@ -351,7 +340,7 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	 *
 	 * @return The friend Sones of this Sone
 	 */
-	List<String> getFriends();
+	Collection<String> getFriends();
 
 	/**
 	 * Returns whether this Sone has the given Sone as a friend Sone.
@@ -364,24 +353,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	boolean hasFriend(String friendSoneId);
 
 	/**
-	 * Adds the given Sone as a friend Sone.
-	 *
-	 * @param friendSone
-	 * 		The friend Sone to add
-	 * @return This Sone (for method chaining)
-	 */
-	Sone addFriend(String friendSone);
-
-	/**
-	 * Removes the given Sone as a friend Sone.
-	 *
-	 * @param friendSoneId
-	 * 		The ID of the friend Sone to remove
-	 * @return This Sone (for method chaining)
-	 */
-	Sone removeFriend(String friendSoneId);
-
-	/**
 	 * Returns the list of posts of this Sone, sorted by time, newest first.
 	 *
 	 * @return All posts of this Sone
@@ -541,6 +512,7 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	 * @return The root album of this Sone
 	 */
 	Album getRootAlbum();
+	Optional<Image> getImageByInternalId(final String internalId);
 
 	/**
 	 * Returns Sone-specific options.