X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FReply.java;h=44aaf899e977181280b61992011ebc890f7e591e;hb=8bc55daff94063bc5cb6b1d240e408aac836f82b;hp=62aadeaf8bedf0f97a8a2a6c7d698ae9a94a76b2;hpb=ed360e7532ffc1c1f2cc77fb41fed7cc0557dd77;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Reply.java b/src/main/java/net/pterodactylus/sone/data/Reply.java
index 62aadea..44aaf89 100644
--- a/src/main/java/net/pterodactylus/sone/data/Reply.java
+++ b/src/main/java/net/pterodactylus/sone/data/Reply.java
@@ -27,6 +27,9 @@ import java.util.UUID;
  */
 public class Reply {
 
+	/** The Sone that posted this reply. */
+	private final Sone sone;
+
 	/** The ID of the reply. */
 	private final UUID id;
 
@@ -42,18 +45,22 @@ public class Reply {
 	/**
 	 * Creates a new reply.
 	 *
+	 * @param sone
+	 *            The sone that posted the reply
 	 * @param post
 	 *            The post to reply to
 	 * @param text
 	 *            The text of the reply
 	 */
-	public Reply(Post post, String text) {
-		this(post, System.currentTimeMillis(), text);
+	public Reply(Sone sone, Post post, String text) {
+		this(sone, post, System.currentTimeMillis(), text);
 	}
 
 	/**
 	 * Creates a new reply-
 	 *
+	 * @param sone
+	 *            The sone that posted the reply
 	 * @param post
 	 *            The post to reply to
 	 * @param time
@@ -61,13 +68,15 @@ public class Reply {
 	 * @param text
 	 *            The text of the reply
 	 */
-	public Reply(Post post, long time, String text) {
-		this(UUID.randomUUID(), post, time, text);
+	public Reply(Sone sone, Post post, long time, String text) {
+		this(sone, UUID.randomUUID(), post, time, text);
 	}
 
 	/**
 	 * Creates a new reply-
 	 *
+	 * @param sone
+	 *            The sone that posted the reply
 	 * @param id
 	 *            The ID of the reply
 	 * @param post
@@ -77,7 +86,8 @@ public class Reply {
 	 * @param text
 	 *            The text of the reply
 	 */
-	public Reply(UUID id, Post post, long time, String text) {
+	public Reply(Sone sone, UUID id, Post post, long time, String text) {
+		this.sone = sone;
 		this.id = id;
 		this.post = post;
 		this.time = time;
@@ -89,6 +99,15 @@ public class Reply {
 	//
 
 	/**
+	 * Returns the Sone that posted this reply.
+	 *
+	 * @return The Sone that posted this reply
+	 */
+	public Sone getSone() {
+		return sone;
+	}
+
+	/**
 	 * Returns the ID of the reply.
 	 *
 	 * @return The ID of the reply
@@ -133,7 +152,7 @@ public class Reply {
 	 */
 	@Override
 	public int hashCode() {
-		return post.hashCode() ^ id.hashCode();
+		return sone.hashCode() ^ id.hashCode() ^ post.hashCode() ^ (int) (time >> 32) ^ (int) (time & 0xffffffff);
 	}
 
 	/**
@@ -144,7 +163,8 @@ public class Reply {
 		if (!(object instanceof Reply)) {
 			return false;
 		}
-		return ((Reply) object).post.equals(post) && ((Reply) object).id.equals(id);
+		Reply reply = (Reply) object;
+		return reply.sone.equals(sone) && reply.id.equals(id) && reply.post.equals(post) && (reply.time == time) && reply.text.equals(text);
 	}
 
 }