X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=95b4bfe5ce6be6b872e0330092123e109a005b4a;hb=1a6760ab3b643704667659b6a2f85db29dd1bc17;hp=dc5e207125ea0f2e6d88359c2bf3da43714ebb5b;hpb=161c216be80f6f0438bacd2642b1aa0091ba1b1f;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 dc5e207..95b4bfe 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -96,6 +96,7 @@ import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
@@ -318,6 +319,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		return database.getSones();
 	}
 
+	@Override
+	public Function<String, Optional<Sone>> soneLoader() {
+		return database.soneLoader();
+	}
+
 	/**
 	 * Returns the Sone with the given ID, regardless whether it’s local or
 	 * remote.
@@ -635,16 +641,18 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		}
 		logger.info(String.format("Adding Sone from OwnIdentity: %s", ownIdentity));
 		Sone sone = database.newSoneBuilder().local().from(ownIdentity).build();
-		sone.setLatestEdition(fromNullable(tryParse(ownIdentity.getProperty("Sone.LatestEdition"))).or(0L));
+		String property = fromNullable(ownIdentity.getProperty("Sone.LatestEdition")).or("0");
+		sone.setLatestEdition(fromNullable(tryParse(property)).or(0L));
 		sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
 		sone.setKnown(true);
+		loadSone(sone);
+		sone.setStatus(SoneStatus.idle);
+		database.storeSone(sone);
 		SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, ownIdentity.getId());
 		eventBus.register(soneInserter);
 		synchronized (soneInserters) {
 			soneInserters.put(sone, soneInserter);
 		}
-		loadSone(sone);
-		sone.setStatus(SoneStatus.idle);
 		soneInserter.start();
 		return sone;
 	}
@@ -720,7 +728,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	public void followSone(Sone sone, String soneId) {
 		checkNotNull(sone, "sone must not be null");
 		checkNotNull(soneId, "soneId must not be null");
-		sone.addFriend(soneId);
+		database.addFriend(sone, soneId);
 		synchronized (soneFollowingTimes) {
 			if (!soneFollowingTimes.containsKey(soneId)) {
 				long now = System.currentTimeMillis();
@@ -755,7 +763,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	public void unfollowSone(Sone sone, String soneId) {
 		checkNotNull(sone, "sone must not be null");
 		checkNotNull(soneId, "soneId must not be null");
-		sone.removeFriend(soneId);
+		database.removeFriend(sone, soneId);
 		boolean unfollowedSoneStillFollowed = false;
 		for (Sone localSone : getLocalSones()) {
 			unfollowedSoneStillFollowed |= localSone.hasFriend(soneId);
@@ -1021,9 +1029,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		Set<String> likedReplyIds =
 				configurationSoneParser.parseLikedPostReplyIds();
 
-		/* load friends. */
-		Set<String> friends = configurationSoneParser.parseFriends();
-
 		/* load albums. */
 		List<Album> topLevelAlbums;
 		try {
@@ -1075,25 +1080,16 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			sone.setReplies(replies);
 			sone.setLikePostIds(likedPostIds);
 			sone.setLikeReplyIds(likedReplyIds);
-			for (String friendId : friends) {
-				followSone(sone, friendId);
-			}
 			for (Album album : sone.getRootAlbum().getAlbums()) {
 				sone.getRootAlbum().removeAlbum(album);
 			}
 			for (Album album : topLevelAlbums) {
 				sone.getRootAlbum().addAlbum(album);
 			}
-			database.storeSone(sone);
 			synchronized (soneInserters) {
 				soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
 			}
 		}
-		synchronized (knownSones) {
-			for (String friend : friends) {
-				knownSones.add(friend);
-			}
-		}
 		for (Post post : posts) {
 			post.setKnown(true);
 		}
@@ -1415,6 +1411,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				saveSone(soneInserter.getKey());
 			}
 		}
+		synchronized (soneRescuers) {
+			for (SoneRescuer soneRescuer : soneRescuers.values()) {
+				soneRescuer.stop();
+			}
+		}
 		saveConfiguration();
 		database.stop();
 		webOfTrustUpdater.stop();
@@ -1507,13 +1508,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			}
 			configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter + "/ID").setValue(null);
 
-			/* save friends. */
-			int friendCounter = 0;
-			for (String friendId : sone.getFriends()) {
-				configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter++ + "/ID").setValue(friendId);
-			}
-			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
-
 			/* save albums. first, collect in a flat structure, top-level first. */
 			List<Album> albums = FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).toList();