X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FPost.java;h=759a8baaf916e2cf7d294f7f298e94c9147b3450;hb=518efffdab386d47882aedee35031e66852c2772;hp=160bb3284e330b55b646409723ab22e54be2701f;hpb=b04f97f923dcae625ee2aaa15491c75864936b82;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Post.java b/src/main/java/net/pterodactylus/sone/data/Post.java
index 160bb32..759a8ba 100644
--- a/src/main/java/net/pterodactylus/sone/data/Post.java
+++ b/src/main/java/net/pterodactylus/sone/data/Post.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.data;
 
 import java.util.Comparator;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 
 /**
@@ -27,7 +28,7 @@ import com.google.common.base.Predicate;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public interface Post {
+public interface Post extends Identified {
 
 	/** Comparator for posts, sorts descending by time. */
 	public static final Comparator<Post> TIME_COMPARATOR = new Comparator<Post>() {
@@ -44,7 +45,7 @@ public interface Post {
 
 		@Override
 		public boolean apply(Post post) {
-			return post.getTime() <= System.currentTimeMillis();
+			return (post == null) ? false : post.getTime() <= System.currentTimeMillis();
 		}
 
 	};
@@ -68,11 +69,20 @@ public interface Post {
 	public Sone getSone();
 
 	/**
+	 * Returns the ID of the recipient {@link Sone}, or
+	 * {@link Optional#absent()} if this post does not have a recipient.
+	 *
+	 * @return The ID of the recipient, or {@link Optional#absent()}
+	 */
+	public Optional<String> getRecipientId();
+
+	/**
 	 * Returns the recipient of this post, if any.
 	 *
-	 * @return The recipient of this post, or {@code null}
+	 * @return The recipient of this post, or {@link Optional#absent()} if there
+	 *         is no recipient
 	 */
-	public Sone getRecipient();
+	public Optional<Sone> getRecipient();
 
 	/**
 	 * Returns the time of the post.