X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=8e20176d9ca4bb2f5b224fa1db548bbdbe0fbbed;hp=4319d8bc56a28b1013391d437ce7c3ff39eb78e2;hb=cdee9199c8ab6a1646ef9fce6930ce41f1b1b25b;hpb=456676dc95a161603707fc8e2021a6c396ef1e24

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 4319d8b..8e20176 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -48,8 +48,6 @@ import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidImageFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidParentAlbumFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostReplyFound;
-import net.pterodactylus.sone.core.SoneChangeDetector.PostProcessor;
-import net.pterodactylus.sone.core.SoneChangeDetector.PostReplyProcessor;
 import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
 import net.pterodactylus.sone.core.event.InsertionDelayChangedEvent;
 import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
@@ -851,48 +849,33 @@ 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.getSone().equals(newSone)) {
-					post.setKnown(true);
-				} else if (post.getTime() < database.getFollowingTime(newSone.getId())) {
-					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.getSone().equals(newSone)) {
-					postReply.setKnown(true);
-				} else if (postReply.getTime() < database.getFollowingTime(newSone.getId())) {
-					postReply.setKnown(true);
-				} else if (!postReply.isKnown()) {
-					events.add(new NewPostReplyFoundEvent(postReply));
-				}
+	private List<Object> collectEventsForChangesInSone(Sone oldSone, Sone newSone) {
+		List<Object> events = new ArrayList<>();
+		SoneComparison soneComparison = new SoneComparison(oldSone, newSone);
+		for (Post newPost : soneComparison.getNewPosts()) {
+			if (newPost.getSone().equals(newSone)) {
+				newPost.setKnown(true);
+			} else if (newPost.getTime() < database.getFollowingTime(newSone.getId())) {
+				newPost.setKnown(true);
+			} else if (!newPost.isKnown()) {
+				events.add(new NewPostFoundEvent(newPost));
 			}
-		});
-		soneChangeDetector.onRemovedPostReplies(new PostReplyProcessor() {
-			@Override
-			public void processPostReply(PostReply postReply) {
-				events.add(new PostReplyRemovedEvent(postReply));
+		}
+		for (Post post : soneComparison.getRemovedPosts()) {
+			events.add(new PostRemovedEvent(post));
+		}
+		for (PostReply postReply : soneComparison.getNewPostReplies()) {
+			if (postReply.getSone().equals(newSone)) {
+				postReply.setKnown(true);
+			} else if (postReply.getTime() < database.getFollowingTime(newSone.getId())) {
+				postReply.setKnown(true);
+			} else if (!postReply.isKnown()) {
+				events.add(new NewPostReplyFoundEvent(postReply));
 			}
-		});
-		soneChangeDetector.detectChanges(newSone);
+		}
+		for (PostReply postReply : soneComparison.getRemovedPostReplies()) {
+			events.add(new PostReplyRemovedEvent(postReply));
+		}
 		return events;
 	}