X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=7232b729b8f35f84aecde554b4d1a0f8e8b22305;hp=d66e0326f663e331a384c37082802e854da06090;hb=ce58ae7224b867106e255b5b8c345817dd3ed094;hpb=de928fae67034e4694d7d8e8ea73573d400491f4

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index d66e032..7232b72 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -93,8 +92,11 @@ import net.pterodactylus.util.thread.NamedThreadFactory;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
 import com.google.common.collect.FluentIterable;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
@@ -183,7 +185,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	private final Set<String> bookmarkedPosts = new HashSet<String>();
 
 	/** Trusted identities, sorted by own identities. */
-	private final Map<OwnIdentity, Set<Identity>> trustedIdentities = Collections.synchronizedMap(new HashMap<OwnIdentity, Set<Identity>>());
+	private final Multimap<OwnIdentity, Identity> trustedIdentities = Multimaps.synchronizedSetMultimap(HashMultimap.<OwnIdentity, Identity>create());
 
 	/** All known albums. */
 	private final Map<String, Album> albums = new HashMap<String, Album>();
@@ -358,13 +360,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	@Override
 	public Collection<Sone> getLocalSones() {
 		synchronized (sones) {
-			return Collections2.filter(sones.values(), new Predicate<Sone>() {
+			return FluentIterable.from(sones.values()).filter(new Predicate<Sone>() {
 
 				@Override
 				public boolean apply(Sone sone) {
 					return sone.isLocal();
 				}
-			});
+			}).toSet();
 		}
 	}
 
@@ -399,13 +401,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	@Override
 	public Collection<Sone> getRemoteSones() {
 		synchronized (sones) {
-			return Collections2.filter(sones.values(), new Predicate<Sone>() {
+			return FluentIterable.from(sones.values()).filter(new Predicate<Sone>() {
 
 				@Override
 				public boolean apply(Sone sone) {
 					return !sone.isLocal();
 				}
-			});
+			}).toSet();
 		}
 	}
 
@@ -469,7 +471,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		checkNotNull(origin, "origin must not be null");
 		checkNotNull(target, "target must not be null");
 		checkArgument(origin.getIdentity() instanceof OwnIdentity, "origin’s identity must be an OwnIdentity");
-		return trustedIdentities.containsKey(origin.getIdentity()) && trustedIdentities.get(origin.getIdentity()).contains(target.getIdentity());
+		return trustedIdentities.containsEntry(origin.getIdentity(), target.getIdentity());
 	}
 
 	/**
@@ -751,7 +753,6 @@ 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);
@@ -800,7 +801,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			return null;
 		}
 		synchronized (sones) {
-			final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity);
+			final Sone sone = getRemoteSone(identity.getId(), true);
+			if (sone.isLocal()) {
+				return sone;
+			}
+			sone.setIdentity(identity);
 			boolean newSone = sone.getRequestUri() == null;
 			sone.setRequestUri(SoneUri.create(identity.getRequestUri()));
 			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
@@ -2123,7 +2128,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	public void ownIdentityRemoved(OwnIdentityRemovedEvent ownIdentityRemovedEvent) {
 		OwnIdentity ownIdentity = ownIdentityRemovedEvent.ownIdentity();
 		logger.log(Level.FINEST, String.format("Removing OwnIdentity: %s", ownIdentity));
-		trustedIdentities.remove(ownIdentity);
+		trustedIdentities.removeAll(ownIdentity);
 	}
 
 	/**
@@ -2136,7 +2141,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	public void identityAdded(IdentityAddedEvent identityAddedEvent) {
 		Identity identity = identityAddedEvent.identity();
 		logger.log(Level.FINEST, String.format("Adding Identity: %s", identity));
-		trustedIdentities.get(identityAddedEvent.ownIdentity()).add(identity);
+		trustedIdentities.put(identityAddedEvent.ownIdentity(), identity);
 		addRemoteSone(identity);
 	}
 
@@ -2173,9 +2178,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	public void identityRemoved(IdentityRemovedEvent identityRemovedEvent) {
 		OwnIdentity ownIdentity = identityRemovedEvent.ownIdentity();
 		Identity identity = identityRemovedEvent.identity();
-		trustedIdentities.get(ownIdentity).remove(identity);
+		trustedIdentities.remove(ownIdentity, identity);
 		boolean foundIdentity = false;
-		for (Entry<OwnIdentity, Set<Identity>> trustedIdentity : trustedIdentities.entrySet()) {
+		for (Entry<OwnIdentity, Collection<Identity>> trustedIdentity : trustedIdentities.asMap().entrySet()) {
 			if (trustedIdentity.getKey().equals(ownIdentity)) {
 				continue;
 			}