X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=dfe8074f5fd28d14c90b49081fcc391c5b1103b0;hp=c00a635e95fcbfb8a4f544c1f425bbc77fc24732;hb=b9281ba712aac6ea70b7dc217607608ae80b594d;hpb=10cf6b7763dac7e48768114e910209231461ffe3

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index c00a635..dfe8074 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -25,6 +25,7 @@ import static java.lang.String.format;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -95,6 +96,7 @@ import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
@@ -317,6 +319,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		return database.getSones();
 	}
 
+	@Override
+	public Function<String, Optional<Sone>> soneLoader() {
+		return database.soneLoader();
+	}
+
 	/**
 	 * Returns the Sone with the given ID, regardless whether it’s local or
 	 * remote.
@@ -864,42 +871,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				logger.log(Level.FINE, String.format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone));
 				return;
 			}
-			/* find removed posts. */
-			SoneChangeDetector soneChangeDetector = new SoneChangeDetector(storedSone.get());
-			soneChangeDetector.onNewPosts(new PostProcessor() {
-				@Override
-				public void processPost(Post post) {
-					if (post.getTime() < getSoneFollowingTime(sone)) {
-						post.setKnown(true);
-					} else if (!post.isKnown()) {
-						eventBus.post(new NewPostFoundEvent(post));
-					}
-				}
-			});
-			soneChangeDetector.onRemovedPosts(new PostProcessor() {
-				@Override
-				public void processPost(Post post) {
-					eventBus.post(new PostRemovedEvent(post));
-				}
-			});
-			soneChangeDetector.onNewPostReplies(new PostReplyProcessor() {
-				@Override
-				public void processPostReply(PostReply postReply) {
-					if (postReply.getTime() < getSoneFollowingTime(sone)) {
-						postReply.setKnown(true);
-					} else if (!postReply.isKnown()) {
-						eventBus.post(new NewPostReplyFoundEvent(postReply));
-					}
-				}
-			});
-			soneChangeDetector.onRemovedPostReplies(new PostReplyProcessor() {
-				@Override
-				public void processPostReply(PostReply postReply) {
-					eventBus.post(new PostReplyRemovedEvent(postReply));
-				}
-			});
-			soneChangeDetector.detectChanges(sone);
+			List<Object> events =
+					collectEventsForChangesInSone(storedSone.get(), sone);
 			database.storeSone(sone);
+			for (Object event : events) {
+				eventBus.post(event);
+			}
 			sone.setOptions(storedSone.get().getOptions());
 			sone.setKnown(storedSone.get().isKnown());
 			sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
@@ -909,6 +886,47 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		}
 	}
 
+	private List<Object> collectEventsForChangesInSone(Sone oldSone,
+			final Sone newSone) {
+		final List<Object> events = new ArrayList<Object>();
+		SoneChangeDetector soneChangeDetector = new SoneChangeDetector(
+				oldSone);
+		soneChangeDetector.onNewPosts(new PostProcessor() {
+			@Override
+			public void processPost(Post post) {
+				if (post.getTime() < getSoneFollowingTime(newSone)) {
+					post.setKnown(true);
+				} else if (!post.isKnown()) {
+					events.add(new NewPostFoundEvent(post));
+				}
+			}
+		});
+		soneChangeDetector.onRemovedPosts(new PostProcessor() {
+			@Override
+			public void processPost(Post post) {
+				events.add(new PostRemovedEvent(post));
+			}
+		});
+		soneChangeDetector.onNewPostReplies(new PostReplyProcessor() {
+			@Override
+			public void processPostReply(PostReply postReply) {
+				if (postReply.getTime() < getSoneFollowingTime(newSone)) {
+					postReply.setKnown(true);
+				} else if (!postReply.isKnown()) {
+					events.add(new NewPostReplyFoundEvent(postReply));
+				}
+			}
+		});
+		soneChangeDetector.onRemovedPostReplies(new PostReplyProcessor() {
+			@Override
+			public void processPostReply(PostReply postReply) {
+				events.add(new PostReplyRemovedEvent(postReply));
+			}
+		});
+		soneChangeDetector.detectChanges(newSone);
+		return events;
+	}
+
 	/**
 	 * Deletes the given Sone. This will remove the Sone from the
 	 * {@link #getLocalSones() local Sones}, stop its {@link SoneInserter} and
@@ -1105,24 +1123,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The created post
 	 */
 	public Post createPost(Sone sone, Optional<Sone> recipient, String text) {
-		return createPost(sone, recipient, System.currentTimeMillis(), text);
-	}
-
-	/**
-	 * Creates a new post.
-	 *
-	 * @param sone
-	 *            The Sone that creates the post
-	 * @param recipient
-	 *            The recipient Sone, or {@code null} if this post does not have
-	 *            a recipient
-	 * @param time
-	 *            The time of the post
-	 * @param text
-	 *            The text of the post
-	 * @return The created post
-	 */
-	public Post createPost(Sone sone, Optional<Sone> recipient, long time, String text) {
 		checkNotNull(text, "text must not be null");
 		checkArgument(text.trim().length() > 0, "text must not be empty");
 		if (!sone.isLocal()) {
@@ -1130,7 +1130,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			return null;
 		}
 		PostBuilder postBuilder = database.newPostBuilder();
-		postBuilder.from(sone.getId()).randomId().withTime(time).withText(text.trim());
+		postBuilder.from(sone.getId()).randomId().currentTime().withText(text.trim());
 		if (recipient.isPresent()) {
 			postBuilder.to(recipient.get().getId());
 		}
@@ -1611,13 +1611,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			/* save known posts. */
 			database.save();
 
-			/* save bookmarked posts. */
-			int bookmarkedPostCounter = 0;
-			for (Post bookmarkedPost : getBookmarkedPosts()) {
-				configuration.getStringValue("Bookmarks/Post/" + bookmarkedPostCounter++ + "/ID").setValue(bookmarkedPost.getId());
-			}
-			configuration.getStringValue("Bookmarks/Post/" + bookmarkedPostCounter++ + "/ID").setValue(null);
-
 			/* now save it. */
 			configuration.save();