X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=fa98bbb3126e90a6003221b96783ebf7a2c1681a;hp=fb3c8a9432385991c64a0d8d824dda69cf2d1e40;hb=8f02544d31f323ae9053dd9a11a99eacd8cf5bcd;hpb=4acdae8d247379dedcc5d41c8aded9503fcbaf72

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index fb3c8a9..fa98bbb 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -90,9 +90,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;
@@ -483,10 +487,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	public long getSoneFollowingTime(Sone sone) {
 		synchronized (soneFollowingTimes) {
-			if (soneFollowingTimes.containsKey(sone)) {
-				return soneFollowingTimes.get(sone);
-			}
-			return Long.MAX_VALUE;
+			return Optional.fromNullable(soneFollowingTimes.get(sone.getId())).or(Long.MAX_VALUE);
 		}
 	}
 
@@ -519,9 +520,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Post getPost(String postId) {
+	public Optional<Post> getPost(String postId) {
 		synchronized (posts) {
-			return posts.get(postId);
+			return Optional.fromNullable(posts.get(postId));
 		}
 	}
 
@@ -554,9 +555,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));
 		}
 	}
 
@@ -564,18 +565,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.getId().equals(reply.getPostId());
+			}
+		}));
 	}
 
 	/**
@@ -647,9 +650,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		Set<Post> posts = new HashSet<Post>();
 		synchronized (bookmarkedPosts) {
 			for (String bookmarkedPostId : bookmarkedPosts) {
-				Post post = getPost(bookmarkedPostId);
-				if (post != null) {
-					posts.add(post);
+				Optional<Post> post = getPost(bookmarkedPostId);
+				if (!post.isPresent()) {
+					posts.add(post.get());
 				}
 			}
 		}
@@ -1046,18 +1049,16 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				List<Post> storedPosts = storedSone.getPosts();
 				synchronized (knownPosts) {
 					for (Post post : sone.getPosts()) {
-						PostBuilder postBuilder = postBuilderFactory.newPostBuilder();
-						postBuilder.copyPost(post).from(storedSone.getId());
-						Post newPost = postBuilder.build().setKnown(knownPosts.contains(post.getId()));
-						if (!storedPosts.contains(newPost)) {
-							if (newPost.getTime() < getSoneFollowingTime(sone)) {
-								knownPosts.add(newPost.getId());
-								newPost.setKnown(true);
-							} else if (!knownPosts.contains(newPost.getId())) {
-								eventBus.post(new NewPostFoundEvent(newPost));
+						post.setKnown(knownPosts.contains(post.getId()));
+						if (!storedPosts.contains(post)) {
+							if (post.getTime() < getSoneFollowingTime(sone)) {
+								knownPosts.add(post.getId());
+								post.setKnown(true);
+							} else if (!knownPosts.contains(post.getId())) {
+								eventBus.post(new NewPostFoundEvent(post));
 							}
 						}
-						posts.put(newPost.getId(), newPost);
+						posts.put(post.getId(), post);
 					}
 				}
 			}
@@ -1102,36 +1103,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 					}
 				}
 			}
-			synchronized (storedSone) {
-				if (!soneRescueMode || (sone.getTime() > storedSone.getTime())) {
-					storedSone.setTime(sone.getTime());
-				}
-				storedSone.setClient(sone.getClient());
-				storedSone.setProfile(sone.getProfile());
-				if (soneRescueMode) {
-					for (Post post : sone.getPosts()) {
-						storedSone.addPost(post);
-					}
-					for (PostReply reply : sone.getReplies()) {
-						storedSone.addReply(reply);
-					}
-					for (String likedPostId : sone.getLikedPostIds()) {
-						storedSone.addLikedPostId(likedPostId);
-					}
-					for (String likedReplyId : sone.getLikedReplyIds()) {
-						storedSone.addLikedReplyId(likedReplyId);
-					}
-					for (Album album : sone.getAlbums()) {
-						storedSone.addAlbum(album);
-					}
-				} else {
-					storedSone.setPosts(sone.getPosts());
-					storedSone.setReplies(sone.getReplies());
-					storedSone.setLikePostIds(sone.getLikedPostIds());
-					storedSone.setLikeReplyIds(sone.getLikedReplyIds());
-					storedSone.setAlbums(sone.getAlbums());
-				}
-				storedSone.setLatestEdition(sone.getLatestEdition());
+			synchronized (sones) {
+				sones.put(sone.getId(), sone);
 			}
 		}
 	}
@@ -1250,7 +1223,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.getId()).withTime(postTime).withText(postText);
+			PostBuilder postBuilder = postBuilder().withId(postId).from(sone.getId()).withTime(postTime).withText(postText);
 			if ((postRecipientId != null) && (postRecipientId.length() == 43)) {
 				postBuilder.to(postRecipientId);
 			}
@@ -1879,6 +1852,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		webOfTrustUpdater.stop();
 		updateChecker.stop();
 		soneDownloader.stop();
+		soneDownloaders.shutdown();
 		identityManager.stop();
 	}
 
@@ -1945,7 +1919,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			for (PostReply reply : sone.getReplies()) {
 				String replyPrefix = sonePrefix + "/Replies/" + replyCounter++;
 				configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
-				configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPost().getId());
+				configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPostId());
 				configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
 				configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());
 			}