X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FPostShell.java;h=05b0045c3e0a31d566741ce99354719f43a3a705;hb=742e80b7603f489795158399f69e19d5aabd524f;hp=af9598e94d9a20f6fe71b074b24ed04061ea6846;hpb=60e05f5839cc3c00610d861a24003781c3040e11;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/PostShell.java b/src/main/java/net/pterodactylus/sone/data/PostShell.java
index af9598e..05b0045 100644
--- a/src/main/java/net/pterodactylus/sone/data/PostShell.java
+++ b/src/main/java/net/pterodactylus/sone/data/PostShell.java
@@ -17,8 +17,11 @@
 
 package net.pterodactylus.sone.data;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.logging.Level;
@@ -128,7 +131,7 @@ public class PostShell extends Post implements Shell<Post> {
 	 */
 	@Override
 	public long getTime() {
-		return time;
+		return (time != null) ? time : 0;
 	}
 
 	/**
@@ -171,8 +174,17 @@ public class PostShell extends Post implements Shell<Post> {
 	 * @return All replies to this post
 	 */
 	@Override
-	public Set<Reply> getReplies() {
-		return Collections.unmodifiableSet(replies);
+	public List<Reply> getReplies() {
+		List<Reply> sortedReplies = new ArrayList<Reply>(replies);
+		Collections.sort(sortedReplies, new Comparator<Reply>() {
+
+			@Override
+			public int compare(Reply leftReply, Reply rightReply) {
+				return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, leftReply.getTime() - rightReply.getTime()));
+			}
+
+		});
+		return sortedReplies;
 	}
 
 	/**