X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=ce16e6f4ad6c7aa008a6a87189b7e4d57087b822;hb=1deeb8285b1347baa98994b10322b548fd71a449;hp=0b9b08f8a47d0297b37e5a6f5cc577e6c31afb5c;hpb=9d32a0f70e14a764946ae29edcf07304f9e5f75e;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 0b9b08f..ce16e6f 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -62,6 +62,7 @@ import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.data.SoneImpl;
 import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.sone.database.DatabaseException;
@@ -378,11 +379,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (sones) {
 			Sone sone = sones.get(id);
 			if ((sone == null) && create) {
-				sone = new Sone(id, true);
+				sone = new SoneImpl(id, true);
 				sones.put(id, sone);
 			}
 			if ((sone != null) && !sone.isLocal()) {
-				sone = new Sone(id, true);
+				sone = new SoneImpl(id, true);
 				sones.put(id, sone);
 			}
 			return sone;
@@ -419,7 +420,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (sones) {
 			Sone sone = sones.get(id);
 			if ((sone == null) && create && (id != null) && (id.length() == 43)) {
-				sone = new Sone(id, false);
+				sone = new SoneImpl(id, false);
 				sones.put(id, sone);
 			}
 			return sone;
@@ -435,7 +436,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *         {@code false} otherwise
 	 */
 	public boolean isModifiedSone(Sone sone) {
-		return (soneInserters.containsKey(sone)) ? soneInserters.get(sone).isModified() : false;
+		return soneInserters.containsKey(sone) && soneInserters.get(sone).isModified();
 	}
 
 	/**
@@ -993,10 +994,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				return;
 			}
 			/* find removed posts. */
+			Collection<Post> removedPosts = new ArrayList<Post>();
+			Collection<Post> newPosts = new ArrayList<Post>();
 			Collection<Post> existingPosts = database.getPosts(sone.getId());
 			for (Post oldPost : existingPosts) {
 				if (!sone.getPosts().contains(oldPost)) {
-					eventBus.post(new PostRemovedEvent(oldPost));
+					removedPosts.add(oldPost);
 				}
 			}
 			/* find new posts. */
@@ -1007,15 +1010,17 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				if (newPost.getTime() < getSoneFollowingTime(sone)) {
 					newPost.setKnown(true);
 				} else if (!newPost.isKnown()) {
-					eventBus.post(new NewPostFoundEvent(newPost));
+					newPosts.add(newPost);
 				}
 			}
 			/* store posts. */
 			database.storePosts(sone, sone.getPosts());
+			Collection<PostReply> newPostReplies = new ArrayList<PostReply>();
+			Collection<PostReply> removedPostReplies = new ArrayList<PostReply>();
 			if (!soneRescueMode) {
 				for (PostReply reply : storedSone.get().getReplies()) {
 					if (!sone.getReplies().contains(reply)) {
-						eventBus.post(new PostReplyRemovedEvent(reply));
+						removedPostReplies.add(reply);
 					}
 				}
 			}
@@ -1027,7 +1032,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				if (reply.getTime() < getSoneFollowingTime(sone)) {
 					reply.setKnown(true);
 				} else if (!reply.isKnown()) {
-					eventBus.post(new NewPostReplyFoundEvent(reply));
+					newPostReplies.add(reply);
 				}
 			}
 			database.storePostReplies(sone, sone.getReplies());
@@ -1037,6 +1042,18 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 					database.removeImage(image);
 				}
 			}
+			for (Post removedPost : removedPosts) {
+				eventBus.post(new PostRemovedEvent(removedPost));
+			}
+			for (Post newPost : newPosts) {
+				eventBus.post(new NewPostFoundEvent(newPost));
+			}
+			for (PostReply removedPostReply : removedPostReplies) {
+				eventBus.post(new PostReplyRemovedEvent(removedPostReply));
+			}
+			for (PostReply newPostReply : newPostReplies) {
+				eventBus.post(new NewPostReplyFoundEvent(newPostReply));
+			}
 			for (Album album : sone.getRootAlbum().getAlbums()) {
 				database.storeAlbum(album);
 				for (Image image : album.getImages()) {
@@ -1762,7 +1779,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (sones) {
 			for (Entry<Sone, SoneInserter> soneInserter : soneInserters.entrySet()) {
 				soneInserter.getValue().stop();
-				saveSone(soneInserter.getKey());
+				saveSone(getLocalSone(soneInserter.getKey().getId(), false));
 			}
 		}
 		saveConfiguration();