X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=da1b2f853f2b701c7b5a3ba26a33ab778442e5a5;hb=HEAD;hp=ce5daa2f07595609d8b94894de5d1de67505e569;hpb=76f80f2904bc44149bda93e7c93e90568f2e4a80;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 ce5daa2..da1b2f8 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -24,7 +24,7 @@ import static com.google.common.primitives.Longs.tryParse;
 import static java.lang.String.format;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
-import static net.pterodactylus.sone.data.AlbumsKt.getAllImages;
+import static net.pterodactylus.sone.data.AlbumKt.getAllImages;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -62,6 +62,7 @@ import net.pterodactylus.sone.data.Profile.Field;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.data.SoneKt;
 import net.pterodactylus.sone.data.SoneOptions.LoadExternalContent;
 import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.sone.database.AlbumBuilder;
@@ -90,7 +91,6 @@ import net.pterodactylus.util.thread.NamedThreadFactory;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
-import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
@@ -797,9 +797,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		}
 		for (PostReply postReply : soneComparison.getNewPostReplies()) {
 			if (postReply.getSone().equals(newSone)) {
-				postReply.setKnown(true);
+				database.setPostReplyKnown(postReply);
 			} else if (postReply.getTime() < database.getFollowingTime(newSone.getId())) {
-				postReply.setKnown(true);
+				database.setPostReplyKnown(postReply);
 			} else if (!postReply.isKnown()) {
 				events.add(new NewPostReplyFoundEvent(postReply));
 			}
@@ -976,7 +976,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			post.setKnown(true);
 		}
 		for (PostReply reply : replies) {
-			reply.setKnown(true);
+			database.setPostReplyKnown(reply);
 		}
 
 		logger.info(String.format("Sone loaded successfully: %s", sone));
@@ -1118,7 +1118,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	public void markReplyKnown(PostReply reply) {
 		boolean previouslyKnown = reply.isKnown();
-		reply.setKnown(true);
+		database.setPostReplyKnown(reply);
 		eventBus.post(new MarkPostReplyKnownEvent(reply));
 		if (!previouslyKnown) {
 			touchConfiguration();
@@ -1392,7 +1392,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter + "/ID").setValue(null);
 
 			/* save albums. first, collect in a flat structure, top-level first. */
-			List<Album> albums = FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).toList();
+			List<Album> albums = SoneKt.getAllAlbums(sone);
 
 			int albumCounter = 0;
 			for (Album album : albums) {