X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=225e3e6181b30d772ff1811bc1bf6e26da617ec7;hb=cbeea5bd399143abd649bd295729137a886de3b6;hp=806ac21a10dfc7238cda765d29c7b75516a58220;hpb=e58ffeff69ff27c1174114e882cc9eab56b3bf8e;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 806ac21..225e3e6 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -495,9 +495,23 @@ public class Core implements IdentityListener {
 	 * @return The post, or {@code null} if there is no such post
 	 */
 	public Post getPost(String postId) {
+		return getPost(postId, true);
+	}
+
+	/**
+	 * Returns the post with the given ID, optionally creating a new post.
+	 *
+	 * @param postId
+	 *            The ID of the post to get
+	 * @param create
+	 *            {@code true} it create a new post if no post with the given ID
+	 *            exists, {@code false} to return {@code null}
+	 * @return The post, or {@code null} if there is no such post
+	 */
+	public Post getPost(String postId, boolean create) {
 		synchronized (posts) {
 			Post post = posts.get(postId);
-			if (post == null) {
+			if ((post == null) && create) {
 				post = new Post(postId);
 				posts.put(postId, post);
 			}
@@ -721,6 +735,7 @@ public class Core implements IdentityListener {
 						--edition;
 					}
 					logger.log(Level.INFO, "Finished restoring Sone from Freenet, starting Inserter…");
+					saveSone(sone);
 					coreListenerManager.fireRescuedSone(sone);
 					soneInserter.start();
 				}
@@ -809,8 +824,8 @@ public class Core implements IdentityListener {
 				}
 				synchronized (newPosts) {
 					for (Post post : sone.getPosts()) {
+						post.setSone(getSone(post.getSone().getId()));
 						if (!storedSone.getPosts().contains(post) && !knownPosts.contains(post.getId())) {
-							post.setSone(getSone(post.getSone().getId()));
 							newPosts.add(post.getId());
 							coreListenerManager.fireNewPostFound(post);
 						}
@@ -826,6 +841,7 @@ public class Core implements IdentityListener {
 				}
 				synchronized (newReplies) {
 					for (Reply reply : sone.getReplies()) {
+						reply.setSone(getSone(reply.getSone().getId()));
 						if (!storedSone.getReplies().contains(reply) && !knownReplies.contains(reply.getId())) {
 							newReplies.add(reply.getId());
 							coreListenerManager.fireNewReplyFound(reply);
@@ -835,7 +851,9 @@ public class Core implements IdentityListener {
 				}
 			}
 			synchronized (storedSone) {
-				storedSone.setTime(sone.getTime());
+				if (!soneRescueMode || (sone.getTime() > storedSone.getTime())) {
+					storedSone.setTime(sone.getTime());
+				}
 				storedSone.setClient(sone.getClient());
 				storedSone.setProfile(sone.getProfile());
 				if (soneRescueMode) {
@@ -857,7 +875,7 @@ public class Core implements IdentityListener {
 					storedSone.setLikePostIds(sone.getLikedPostIds());
 					storedSone.setLikeReplyIds(sone.getLikedReplyIds());
 				}
-				storedSone.setLatestEdition(sone.getRequestUri().getEdition());
+				storedSone.setLatestEdition(sone.getLatestEdition());
 			}
 		}
 	}