From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 24 Jan 2013 05:10:32 +0000 (+0100)
Subject: Merge commit 'fcabe38e9b3abacc0d580bf0513600858aee2eca' into less-critical
X-Git-Tag: 0.8.5^2~3^2~58^2~5
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=3b751d0c053450961bb66d2507d6187ce56f8785;hp=fcabe38e9b3abacc0d580bf0513600858aee2eca

Merge commit 'fcabe38e9b3abacc0d580bf0513600858aee2eca' into less-critical

Conflicts:
	src/main/java/net/pterodactylus/sone/core/Core.java
---

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 8172b45..f056c0e 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -87,9 +87,12 @@ 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.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;
@@ -587,18 +590,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());
+			}
+		}));
 	}
 
 	/**
@@ -1307,7 +1312,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));
 			}
diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 60cda15..d9a9dfb 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -964,7 +964,6 @@ public class WebInterface {
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				lockedSonesNotification.add(sone);
-				lockedSonesTickerObjects.remove(sone);
 				notificationManager.addNotification(lockedSonesNotification);
 			}
 		}, 5, TimeUnit.MINUTES);