X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=9ccaa799868f05189150c5162fab46c01dcd9d9f;hp=4a71e53f9ad4fb72e4a6d63beea0bff6af1c0fa4;hb=10fa1478fef15624a873c0878ed017603742bcfe;hpb=45803a1c678d6811f7bbf85d50c79844031be0f0

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 4a71e53..9ccaa79 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -347,12 +347,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
-	 * Returns all Sones, remote and local.
-	 *
-	 * @return All Sones
+	 * {@inheritDocs}
 	 */
-	public Set<Sone> getSones() {
-		return new HashSet<Sone>(sones.values());
+	@Override
+	public Collection<Sone> getSones() {
+		synchronized (sones) {
+			return Collections.unmodifiableCollection(sones.values());
+		}
 	}
 
 	/**
@@ -372,24 +373,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
-	 * Checks whether the core knows a Sone with the given ID.
-	 *
-	 * @param id
-	 *            The ID of the Sone
-	 * @return {@code true} if there is a Sone with the given ID, {@code false}
-	 *         otherwise
-	 */
-	public boolean hasSone(String id) {
-		synchronized (sones) {
-			return sones.containsKey(id);
-		}
-	}
-
-	/**
-	 * Returns all local Sones.
-	 *
-	 * @return All local Sones
+	 * {@inheritDocs}
 	 */
+	@Override
 	public Collection<Sone> getLocalSones() {
 		synchronized (sones) {
 			return Collections2.filter(sones.values(), new Predicate<Sone>() {
@@ -428,10 +414,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
-	 * Returns all remote Sones.
-	 *
-	 * @return All remote Sones
+	 * {@inheritDocs}
 	 */
+	@Override
 	public Collection<Sone> getRemoteSones() {
 		synchronized (sones) {
 			return Collections2.filter(sones.values(), new Predicate<Sone>() {
@@ -527,6 +512,14 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
+	 * {@inheritDocs}
+	 */
+	@Override
+	public Collection<Post> getPosts(String soneId) {
+		return postDatabase.getPosts(soneId);
+	}
+
+	/**
 	 * {@inheritDoc}
 	 */
 	@Override
@@ -802,6 +795,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
 			sone.setKnown(true);
 			/* TODO - load posts ’n stuff */
+			trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet<Identity>()));
 			sones.put(ownIdentity.getId(), sone);
 			final SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, sone);
 			soneInserters.put(sone, soneInserter);
@@ -1105,6 +1099,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				}
 			}
 			synchronized (sones) {
+				sone.setOptions(storedSone.get().getOptions());
 				sones.put(sone.getId(), sone);
 			}
 		}
@@ -2236,7 +2231,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		OwnIdentity ownIdentity = ownIdentityAddedEvent.ownIdentity();
 		logger.log(Level.FINEST, String.format("Adding OwnIdentity: %s", ownIdentity));
 		if (ownIdentity.hasContext("Sone")) {
-			trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet<Identity>()));
 			addLocalSone(ownIdentity);
 		}
 	}