X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=9eba2b73569466f423c2db1e2bf0568daab18c60;hb=2c5d39efa620a564f9fe12f754d3f5bb3adf37fe;hp=3f2111a6e32dc49b5c142505e7863f7cfdb9e632;hpb=9dafc7dd9ac7da59e0b27581ea360f69e6097531;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 3f2111a..9eba2b7 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -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;
 		}
@@ -832,6 +885,9 @@ public class Core implements IdentityListener {
 				if (!soneRescueMode) {
 					for (Post post : storedSone.getPosts()) {
 						posts.remove(post.getId());
+						if (!sone.getPosts().contains(post)) {
+							coreListenerManager.firePostRemoved(post);
+						}
 					}
 				}
 				synchronized (newPosts) {
@@ -849,6 +905,9 @@ public class Core implements IdentityListener {
 				if (!soneRescueMode) {
 					for (Reply reply : storedSone.getReplies()) {
 						replies.remove(reply.getId());
+						if (!sone.getReplies().contains(reply)) {
+							coreListenerManager.fireReplyRemoved(reply);
+						}
 					}
 				}
 				synchronized (newReplies) {
@@ -961,13 +1020,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. */
@@ -1053,7 +1117,7 @@ public class Core implements IdentityListener {
 	 * @param sone
 	 *            The Sone to save
 	 */
-	public void saveSone(Sone sone) {
+	public synchronized void saveSone(Sone sone) {
 		if (!isLocalSone(sone)) {
 			logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone);
 			return;
@@ -1085,6 +1149,7 @@ public class Core implements IdentityListener {
 			for (Post post : sone.getPosts()) {
 				String postPrefix = sonePrefix + "/Posts/" + postCounter++;
 				configuration.getStringValue(postPrefix + "/ID").setValue(post.getId());
+				configuration.getStringValue(postPrefix + "/Recipient").setValue((post.getRecipient() != null) ? post.getRecipient().getId() : null);
 				configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime());
 				configuration.getStringValue(postPrefix + "/Text").setValue(post.getText());
 			}
@@ -1122,6 +1187,7 @@ public class Core implements IdentityListener {
 			}
 			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
+			configuration.save();
 			logger.log(Level.INFO, "Sone %s saved.", sone);
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
@@ -1153,11 +1219,48 @@ public class Core implements IdentityListener {
 	 * @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 Post createPost(Sone sone, Sone recipient, String text) {
+		return createPost(sone, recipient, System.currentTimeMillis(), 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 time
+	 *            The time of the post
+	 * @param text
+	 *            The text of the post
+	 * @return The created post
+	 */
+	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 null;
 		}
 		Post post = new Post(sone, time, text);
+		if (recipient != null) {
+			post.setRecipient(recipient);
+		}
 		synchronized (posts) {
 			posts.put(post.getId(), post);
 		}
@@ -1188,21 +1291,6 @@ public class Core implements IdentityListener {
 	}
 
 	/**
-	 * Creates a new reply.
-	 *
-	 * @param sone
-	 *            The Sone that creates the reply
-	 * @param post
-	 *            The post that this reply refers to
-	 * @param text
-	 *            The text of the reply
-	 * @return The created reply
-	 */
-	public Reply createReply(Sone sone, Post post, String text) {
-		return createReply(sone, post, System.currentTimeMillis(), text);
-	}
-
-	/**
 	 * Marks the given post as known, if it is currently a new post (according
 	 * to {@link #isNewPost(String)}).
 	 *
@@ -1225,6 +1313,21 @@ public class Core implements IdentityListener {
 	 *            The Sone that creates the reply
 	 * @param post
 	 *            The post that this reply refers to
+	 * @param text
+	 *            The text of the reply
+	 * @return The created reply
+	 */
+	public Reply createReply(Sone sone, Post post, String text) {
+		return createReply(sone, post, System.currentTimeMillis(), text);
+	}
+
+	/**
+	 * Creates a new reply.
+	 *
+	 * @param sone
+	 *            The Sone that creates the reply
+	 * @param post
+	 *            The post that this reply refers to
 	 * @param time
 	 *            The time of the reply
 	 * @param text
@@ -1306,7 +1409,7 @@ public class Core implements IdentityListener {
 	/**
 	 * Saves the current options.
 	 */
-	public void saveConfiguration() {
+	public synchronized void saveConfiguration() {
 		/* store the options first. */
 		try {
 			configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());