X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=5018b258b1305d3aa5e37ae323cd871249e89e20;hb=4850adf910f409f122e3df9cd0be1d0dad9e19e5;hp=827729c938690ace677419006f6a7233132517ee;hpb=78e60dc26c8ad078237ee2e2f763e53fd84a3764;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 827729c..5018b25 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -603,7 +603,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (bookmarkedPosts) {
 			for (String bookmarkedPostId : bookmarkedPosts) {
 				Optional<Post> post = getPost(bookmarkedPostId);
-				if (!post.isPresent()) {
+				if (post.isPresent()) {
 					posts.add(post.get());
 				}
 			}
@@ -741,6 +741,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.WARNING, "Given OwnIdentity is null!");
 			return null;
 		}
+		logger.info(String.format("Adding Sone from OwnIdentity: %s", ownIdentity));
 		synchronized (sones) {
 			final Sone sone;
 			try {
@@ -1050,6 +1051,15 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			}
 			synchronized (sones) {
 				sone.setOptions(storedSone.get().getOptions());
+				sone.setKnown(storedSone.get().isKnown());
+				sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
+				if (sone.isLocal()) {
+					soneInserters.remove(storedSone.get()).stop();
+					SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, sone);
+					soneInserters.put(sone, soneInserter);
+					soneInserter.start();
+					touchConfiguration();
+				}
 				sones.put(sone.getId(), sone);
 			}
 		}
@@ -1116,6 +1126,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.FINE, String.format("Tried to load non-local Sone: %s", sone));
 			return;
 		}
+		logger.info(String.format("Loading local Sone: %s", sone));
 
 		/* initialize options. */
 		sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
@@ -1327,6 +1338,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		for (PostReply reply : replies) {
 			reply.setKnown(true);
 		}
+
+		logger.info(String.format("Sone loaded successfully: %s", sone));
 	}
 
 	/**
@@ -2160,6 +2173,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				Sone sone = getRemoteSone(identity.getId(), false);
+				if (sone.isLocal()) {
+					return;
+				}
 				sone.setIdentity(identity);
 				sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition()));
 				soneDownloader.addSone(sone);