X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=70d9ea2c6dc01a086f3e5e0b32b342cf7a6ca68e;hp=5a26b558a8ee74471585d889b370ba7eabeccd61;hb=93fdf9e218d808f65f618abbddce183191d8c15b;hpb=2ac7816ee8cff5d974ffbc9017681c49772c6fe2

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 5a26b55..70d9ea2 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -87,9 +87,13 @@ import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
 
+import com.google.common.base.Function;
+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.Ordering;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
@@ -577,9 +581,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * {@inheritDoc}
 	 */
 	@Override
-	public PostReply getPostReply(String replyId) {
+	public Optional<PostReply> getPostReply(String replyId) {
 		synchronized (replies) {
-			return replies.get(replyId);
+			return Optional.fromNullable(replies.get(replyId));
 		}
 	}
 
@@ -587,18 +591,20 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * {@inheritDoc}
 	 */
 	@Override
-	public List<PostReply> getReplies(Post post) {
-		Set<Sone> sones = getSones();
-		List<PostReply> replies = new ArrayList<PostReply>();
-		for (Sone sone : sones) {
-			for (PostReply reply : sone.getReplies()) {
-				if (reply.getPost().equals(post)) {
-					replies.add(reply);
-				}
+	public List<PostReply> getReplies(final Post post) {
+		return Ordering.from(Reply.TIME_COMPARATOR).sortedCopy(FluentIterable.from(getSones()).transformAndConcat(new Function<Sone, Iterable<PostReply>>() {
+
+			@Override
+			public Iterable<PostReply> apply(Sone sone) {
+				return sone.getReplies();
 			}
-		}
-		Collections.sort(replies, Reply.TIME_COMPARATOR);
-		return replies;
+		}).filter(new Predicate<PostReply>() {
+
+			@Override
+			public boolean apply(PostReply reply) {
+				return post.equals(reply.getPost());
+			}
+		}));
 	}
 
 	/**
@@ -871,7 +877,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (sones) {
 			final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity);
 			boolean newSone = sone.getRequestUri() == null;
-			sone.setRequestUri(getSoneUri(identity.getRequestUri()));
+			sone.setRequestUri(SoneUri.create(identity.getRequestUri()));
 			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
 			if (newSone) {
 				synchronized (knownSones) {
@@ -1307,7 +1313,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				logger.log(Level.WARNING, "Invalid post found, aborting load!");
 				return;
 			}
-			PostBuilder postBuilder = postBuilderFactory.newPostBuilder().withId(postId).from(sone).withTime(postTime).withText(postText);
+			PostBuilder postBuilder = postBuilder().withId(postId).from(sone).withTime(postTime).withText(postText);
 			if ((postRecipientId != null) && (postRecipientId.length() == 43)) {
 				postBuilder.to(getSone(postRecipientId));
 			}
@@ -1330,7 +1336,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				return;
 			}
 			PostReplyBuilder postReplyBuilder = postReplyBuilderFactory.newPostReplyBuilder();
-			postReplyBuilder.withId(replyId).from(sone).to(getPost(postId)).withTime(replyTime).withText(replyText);
+			postReplyBuilder.withId(replyId).from(sone).to(postId).withTime(replyTime).withText(replyText);
 			replies.add(postReplyBuilder.build());
 		}
 
@@ -1663,7 +1669,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			return null;
 		}
 		PostReplyBuilder postReplyBuilder = postReplyBuilderFactory.newPostReplyBuilder();
-		postReplyBuilder.randomId().from(sone).to(post).currentTime().withText(text.trim());
+		postReplyBuilder.randomId().from(sone).to(post.getId()).currentTime().withText(text.trim());
 		final PostReply reply = postReplyBuilder.build();
 		synchronized (replies) {
 			replies.put(reply.getId(), reply);
@@ -2304,23 +2310,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
-	 * Generate a Sone URI from the given URI and latest edition.
-	 *
-	 * @param uriString
-	 *            The URI to derive the Sone URI from
-	 * @return The derived URI
-	 */
-	private static FreenetURI getSoneUri(String uriString) {
-		try {
-			FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
-			return uri;
-		} catch (MalformedURLException mue1) {
-			logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString), mue1);
-			return null;
-		}
-	}
-
-	/**
 	 * Notifies the core that a new {@link OwnIdentity} was added.
 	 *
 	 * @param ownIdentityAddedEvent