Sort posts in Sones.

[Sone.git] / src / main / java / net / pterodactylus / sone / data / Sone.java

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index 27c7852..3baed89 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -19,6 +19,7 @@ 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;
@@ -27,8 +28,8 @@ import java.util.UUID;
 import freenet.keys.FreenetURI;
 
 /**
- * A Sone defines everything about a user: the {@link User} itself, her profile,
- * her status updates.
+ * A Sone defines everything about a user: her profile, her status updates, her
+ * replies, her likes and dislikes, etc.
  * <p>
  * Operations that modify the Sone need to synchronize on the Sone in question.
  *
@@ -58,6 +59,9 @@ public class Sone {
        /** All posts. */
        private final List<Post> posts = new ArrayList<Post>();
 
+       /** All replies. */
+       private final Set<Reply> replies = new HashSet<Reply>();
+
        /** Modification count. */
        private volatile long modificationCounter = 0;
 
@@ -208,23 +212,32 @@ public class Sone {
        }
 
        /**
-        * Returns the list of posts of this Sone.
+        * Returns the list of posts of this Sone, sorted by time, newest first.
         *
         * @return All posts of this Sone
         */
        public List<Post> getPosts() {
-               return Collections.unmodifiableList(posts);
+               List<Post> sortedPosts = new ArrayList<Post>(posts);
+               Collections.sort(sortedPosts, new Comparator<Post>() {
+
+                       @Override
+                       public int compare(Post leftPost, Post rightPost) {
+                               return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightPost.getTime() - leftPost.getTime()));
+                       }
+
+               });
+               return sortedPosts;
        }
 
        /**
-        * Adds a post with the given text to this Sone.
+        * Adds the given post to this Sone. The post will not be added if its
+        * {@link Post#getSone() Sone} is not this Sone.
         *
-        * @param text
-        *            The text to post
+        * @param post
+        *            The post to add
         */
-       public synchronized void addPost(String text) {
-               Post post = new Post(this, System.currentTimeMillis(), text);
-               if (posts.add(post)) {
+       public synchronized void addPost(Post post) {
+               if (post.getSone().equals(this) && posts.add(post)) {
                        modificationCounter++;
                }
        }
@@ -236,7 +249,41 @@ public class Sone {
         *            The post to remove
         */
        public synchronized void removePost(Post post) {
-               if (posts.remove(post)) {
+               if (post.getSone().equals(this) && posts.remove(post)) {
+                       modificationCounter++;
+               }
+       }
+
+       /**
+        * Returns all replies this Sone made.
+        *
+        * @return All replies this Sone made
+        */
+       public Set<Reply> getReplies() {
+               return Collections.unmodifiableSet(replies);
+       }
+
+       /**
+        * Adds a reply to this Sone. If the given reply was not made by this Sone,
+        * nothing is added to this Sone.
+        *
+        * @param reply
+        *            The reply to add
+        */
+       public synchronized void addReply(Reply reply) {
+               if (reply.getSone().equals(this) && replies.add(reply)) {
+                       modificationCounter++;
+               }
+       }
+
+       /**
+        * Removes a reply from this Sone.
+        *
+        * @param reply
+        *            The reply to remove
+        */
+       public synchronized void removeReply(Reply reply) {
+               if (reply.getSone().equals(this) && replies.remove(reply)) {
                        modificationCounter++;
                }
        }