X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=e1dcb9c3c74d17dd6dd4f5b1efdcc19eb5f221bd;hb=4316b669b28d294dd2b4b9a34e45f080c77037fe;hp=90443ce833c534d9b25f80b7633abf820bfb554b;hpb=f2dee89b35c6ff8acf80ea9cb355aa9c45d829a1;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 90443ce..e1dcb9c 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -572,16 +572,33 @@ public class Core implements IdentityListener {
 	}
 
 	/**
-	 * 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);
 			}
@@ -999,13 +1016,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. */
@@ -1123,6 +1145,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());
 			}