X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=238d9d5ac8eedaeb937f0bebfe14a3d92266b03b;hb=a7bd72e4db218681c02e7115f743e91b31af28e9;hp=fcbc8899dbffd18c192478852406f665ab054c80;hpb=c5e641893a2656ebf2c2c8c369fe75eaf3061b52;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 fcbc889..238d9d5 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -25,6 +25,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.Map.Entry;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -106,6 +109,9 @@ public class Core implements IdentityListener, UpdateListener {
 	/** The Sone downloader. */
 	private final SoneDownloader soneDownloader;
 
+	/** Sone downloader thread-pool. */
+	private final ExecutorService soneDownloaders = Executors.newFixedThreadPool(10);
+
 	/** The update checker. */
 	private final UpdateChecker updateChecker;
 
@@ -877,6 +883,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;
 	}
@@ -917,15 +924,15 @@ public class Core implements IdentityListener, UpdateListener {
 			remoteSones.put(identity.getId(), sone);
 			soneDownloader.addSone(sone);
 			setSoneStatus(sone, SoneStatus.unknown);
-			new Thread(new Runnable() {
+			soneDownloaders.execute(new Runnable() {
 
 				@Override
 				@SuppressWarnings("synthetic-access")
 				public void run() {
-					soneDownloader.fetchSone(sone);
+					soneDownloader.fetchSone(sone, sone.getRequestUri());
 				}
 
-			}, "Sone Downloader").start();
+			});
 			return sone;
 		}
 	}
@@ -1171,6 +1178,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 +1281,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 +1927,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());
+		}
 	}
 
 	//