Deduplicate functionality.
[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java
index c41d04b..24f1209 100644 (file)
@@ -541,27 +541,63 @@ public class Core implements IdentityListener {
         *         otherwise
         */
        public boolean isNewPost(String postId) {
+               return isNewPost(postId, true);
+       }
+
+       /**
+        * Returns whether the given post ID is new. If {@code markAsKnown} is
+        * {@code true} then after this method returns the post ID is marked a known
+        * post ID.
+        *
+        * @param postId
+        *            The post ID
+        * @param markAsKnown
+        *            {@code true} to mark the post ID as known, {@code false} to
+        *            not to mark it as known
+        * @return {@code true} if the post is considered to be new, {@code false}
+        *         otherwise
+        */
+       public boolean isNewPost(String postId, boolean markAsKnown) {
                synchronized (newPosts) {
-                       boolean isNew = !knownPosts.contains(postId) && newPosts.remove(postId);
-                       knownPosts.add(postId);
-                       if (isNew) {
-                               coreListenerManager.fireMarkPostKnown(getPost(postId));
+                       boolean isNew = !knownPosts.contains(postId) && newPosts.contains(postId);
+                       if (markAsKnown) {
+                               Post post = getPost(postId, false);
+                               if (post != null) {
+                                       markPostKnown(post);
+                               }
                        }
                        return isNew;
                }
        }
 
        /**
-        * Returns the reply with the given ID.
+        * Returns the reply with the given ID. If there is no reply with the given
+        * ID yet, a new one is created.
         *
         * @param replyId
         *            The ID of the reply to get
-        * @return The reply, or {@code null} if there is no such reply
+        * @return The reply
         */
        public Reply getReply(String replyId) {
+               return getReply(replyId, true);
+       }
+
+       /**
+        * Returns the reply with the given ID. If there is no reply with the given
+        * ID yet, a new one is created, unless {@code create} is false in which
+        * case {@code null} is returned.
+        *
+        * @param replyId
+        *            The ID of the reply to get
+        * @param create
+        *            {@code true} to always return a {@link Reply}, {@code false}
+        *            to return {@code null} if no reply can be found
+        * @return The reply, or {@code null} if there is no such reply
+        */
+       public Reply getReply(String replyId, boolean create) {
                synchronized (replies) {
                        Reply reply = replies.get(replyId);
-                       if (reply == null) {
+                       if (create && (reply == null)) {
                                reply = new Reply(replyId);
                                replies.put(replyId, reply);
                        }
@@ -599,11 +635,28 @@ public class Core implements IdentityListener {
         *         otherwise
         */
        public boolean isNewReply(String replyId) {
+               return isNewReply(replyId, true);
+       }
+
+       /**
+        * Returns whether the reply with the given ID is new.
+        *
+        * @param replyId
+        *            The ID of the reply to check
+        * @param markAsKnown
+        *            {@code true} to mark the reply as known, {@code false} to not
+        *            to mark it as known
+        * @return {@code true} if the reply is considered to be new, {@code false}
+        *         otherwise
+        */
+       public boolean isNewReply(String replyId, boolean markAsKnown) {
                synchronized (newReplies) {
-                       boolean isNew = !knownReplies.contains(replyId) && newReplies.remove(replyId);
-                       knownReplies.add(replyId);
-                       if (isNew) {
-                               coreListenerManager.fireMarkReplyKnown(getReply(replyId));
+                       boolean isNew = !knownReplies.contains(replyId) && newReplies.contains(replyId);
+                       if (markAsKnown) {
+                               Reply reply = getReply(replyId, false);
+                               if (reply != null) {
+                                       markReplyKnown(reply);
+                               }
                        }
                        return isNew;
                }
@@ -961,13 +1014,18 @@ public class Core implements IdentityListener {
                        if (postId == null) {
                                break;
                        }
+                       String postRecipientId = configuration.getStringValue(postPrefix + "/Recipient").getValue(null);
                        long postTime = configuration.getLongValue(postPrefix + "/Time").getValue((long) 0);
                        String postText = configuration.getStringValue(postPrefix + "/Text").getValue(null);
                        if ((postTime == 0) || (postText == null)) {
                                logger.log(Level.WARNING, "Invalid post found, aborting load!");
                                return;
                        }
-                       posts.add(getPost(postId).setSone(sone).setTime(postTime).setText(postText));
+                       Post post = getPost(postId).setSone(sone).setTime(postTime).setText(postText);
+                       if ((postRecipientId != null) && (postRecipientId.length() == 43)) {
+                               post.setRecipient(getSone(postRecipientId));
+                       }
+                       posts.add(post);
                }
 
                /* load replies. */
@@ -1085,6 +1143,9 @@ public class Core implements IdentityListener {
                        for (Post post : sone.getPosts()) {
                                String postPrefix = sonePrefix + "/Posts/" + postCounter++;
                                configuration.getStringValue(postPrefix + "/ID").setValue(post.getId());
+                               if (post.getRecipient() != null) {
+                                       configuration.getStringValue(postPrefix + "/Recipient").setValue(post.getRecipient().getId());
+                               }
                                configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime());
                                configuration.getStringValue(postPrefix + "/Text").setValue(post.getText());
                        }
@@ -1135,9 +1196,41 @@ public class Core implements IdentityListener {
         *            The Sone that creates the post
         * @param text
         *            The text of the post
+        * @return The created post
+        */
+       public Post createPost(Sone sone, String text) {
+               return createPost(sone, System.currentTimeMillis(), text);
+       }
+
+       /**
+        * Creates a new post.
+        *
+        * @param sone
+        *            The Sone that creates the post
+        * @param time
+        *            The time of the post
+        * @param text
+        *            The text of the post
+        * @return The created post
+        */
+       public Post createPost(Sone sone, long time, String text) {
+               return createPost(sone, null, time, text);
+       }
+
+       /**
+        * Creates a new post.
+        *
+        * @param sone
+        *            The Sone that creates the post
+        * @param recipient
+        *            The recipient Sone, or {@code null} if this post does not have
+        *            a recipient
+        * @param text
+        *            The text of the post
+        * @return The created post
         */
-       public void createPost(Sone sone, String text) {
-               createPost(sone, System.currentTimeMillis(), text);
+       public Post createPost(Sone sone, Sone recipient, String text) {
+               return createPost(sone, recipient, System.currentTimeMillis(), text);
        }
 
        /**
@@ -1145,17 +1238,24 @@ public class Core implements IdentityListener {
         *
         * @param sone
         *            The Sone that creates the post
+        * @param recipient
+        *            The recipient Sone, or {@code null} if this post does not have
+        *            a recipient
         * @param time
         *            The time of the post
         * @param text
         *            The text of the post
+        * @return The created post
         */
-       public void createPost(Sone sone, long time, String text) {
+       public Post createPost(Sone sone, Sone recipient, long time, String text) {
                if (!isLocalSone(sone)) {
                        logger.log(Level.FINE, "Tried to create post for non-local Sone: %s", sone);
-                       return;
+                       return null;
                }
                Post post = new Post(sone, time, text);
+               if (recipient != null) {
+                       post.setRecipient(recipient);
+               }
                synchronized (posts) {
                        posts.put(post.getId(), post);
                }
@@ -1164,6 +1264,7 @@ public class Core implements IdentityListener {
                }
                sone.addPost(post);
                saveSone(sone);
+               return post;
        }
 
        /**
@@ -1185,6 +1286,22 @@ public class Core implements IdentityListener {
        }
 
        /**
+        * Marks the given post as known, if it is currently a new post (according
+        * to {@link #isNewPost(String)}).
+        *
+        * @param post
+        *            The post to mark as known
+        */
+       public void markPostKnown(Post post) {
+               synchronized (newPosts) {
+                       if (newPosts.remove(post.getId())) {
+                               knownPosts.add(post.getId());
+                               coreListenerManager.fireMarkPostKnown(post);
+                       }
+               }
+       }
+
+       /**
         * Creates a new reply.
         *
         * @param sone
@@ -1249,6 +1366,22 @@ public class Core implements IdentityListener {
        }
 
        /**
+        * Marks the given reply as known, if it is currently a new reply (according
+        * to {@link #isNewReply(String)}).
+        *
+        * @param reply
+        *            The reply to mark as known
+        */
+       public void markReplyKnown(Reply reply) {
+               synchronized (newReplies) {
+                       if (newReplies.remove(reply.getId())) {
+                               knownReplies.add(reply.getId());
+                               coreListenerManager.fireMarkReplyKnown(reply);
+                       }
+               }
+       }
+
+       /**
         * Starts the core.
         */
        public void start() {