X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=53b67000d1ac96fb06ff0068561f41435b072b19;hp=fcbc8899dbffd18c192478852406f665ab054c80;hb=63a1491b93ba8c2541ff92aab80e27cd41eda2fb;hpb=4b3e0259621d107084ee624fe412750e712911c5

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index fcbc889..53b6700 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -877,6 +878,7 @@ public class Core implements IdentityListener, UpdateListener {
 		}
 		Sone sone = addLocalSone(ownIdentity);
 		sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
+		sone.addFriend("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI");
 		saveSone(sone);
 		return sone;
 	}
@@ -922,7 +924,7 @@ public class Core implements IdentityListener, UpdateListener {
 				@Override
 				@SuppressWarnings("synthetic-access")
 				public void run() {
-					soneDownloader.fetchSone(sone);
+					soneDownloader.fetchSone(sone, sone.getRequestUri());
 				}
 
 			}, "Sone Downloader").start();
@@ -1171,6 +1173,9 @@ public class Core implements IdentityListener, UpdateListener {
 			return;
 		}
 
+		/* initialize options. */
+		sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
+
 		/* load Sone. */
 		String sonePrefix = "Sone/" + sone.getId();
 		Long soneTime = configuration.getLongValue(sonePrefix + "/Time").getValue(null);
@@ -1271,7 +1276,6 @@ public class Core implements IdentityListener, UpdateListener {
 		}
 
 		/* load options. */
-		sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
 		sone.getOptions().getBooleanOption("AutoFollow").set(configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").getValue(null));
 
 		/* if we’re still here, Sone was loaded successfully. */
@@ -1918,6 +1922,48 @@ public class Core implements IdentityListener, UpdateListener {
 	@Override
 	public void identityRemoved(OwnIdentity ownIdentity, Identity identity) {
 		trustedIdentities.get(ownIdentity).remove(identity);
+		boolean foundIdentity = false;
+		for (Entry<OwnIdentity, Set<Identity>> trustedIdentity : trustedIdentities.entrySet()) {
+			if (trustedIdentity.getKey().equals(ownIdentity)) {
+				continue;
+			}
+			if (trustedIdentity.getValue().contains(identity)) {
+				foundIdentity = true;
+			}
+		}
+		if (foundIdentity) {
+			/* some local identity still trusts this identity, don’t remove. */
+			return;
+		}
+		Sone sone = getSone(identity.getId(), false);
+		if (sone == null) {
+			/* TODO - we don’t have the Sone anymore. should this happen? */
+			return;
+		}
+		synchronized (posts) {
+			synchronized (newPosts) {
+				for (Post post : sone.getPosts()) {
+					posts.remove(post.getId());
+					newPosts.remove(post.getId());
+					coreListenerManager.firePostRemoved(post);
+				}
+			}
+		}
+		synchronized (replies) {
+			synchronized (newReplies) {
+				for (Reply reply : sone.getReplies()) {
+					replies.remove(reply.getId());
+					newReplies.remove(reply.getId());
+					coreListenerManager.fireReplyRemoved(reply);
+				}
+			}
+		}
+		synchronized (remoteSones) {
+			remoteSones.remove(identity.getId());
+		}
+		synchronized (newSones) {
+			newSones.remove(identity.getId());
+		}
 	}
 
 	//