X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=9af6328649fbec60085b61cf106181e18cdd5347;hb=7cb98875e6d24a4f4f54ceaadfa4fbab23183bdb;hp=cf85d03991bae4a87328f2f8c12af4b8098103b9;hpb=3b751d0c053450961bb66d2507d6187ce56f8785;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index cf85d03..9af6328 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -31,12 +31,12 @@ import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.PostBuilder;
 import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.data.PostReplyBuilder;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.database.PostBuilder;
+import net.pterodactylus.sone.database.PostReplyBuilder;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.number.Numbers;
@@ -166,6 +166,7 @@ public class SoneDownloader extends AbstractService {
 			Sone parsedSone = parseSone(sone, fetchResults.getFetchResult(), fetchResults.getFreenetUri());
 			if (parsedSone != null) {
 				if (!fetchOnly) {
+					parsedSone.setStatus((parsedSone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
 					core.updateSone(parsedSone);
 					addSone(parsedSone);
 				}
@@ -238,7 +239,7 @@ public class SoneDownloader extends AbstractService {
 			return null;
 		}
 
-		Sone sone = new Sone(originalSone.getId(), false).setIdentity(originalSone.getIdentity());
+		Sone sone = new Sone(originalSone.getId(), originalSone.isLocal()).setIdentity(originalSone.getIdentity());
 
 		SimpleXML soneXml;
 		try {
@@ -376,9 +377,9 @@ public class SoneDownloader extends AbstractService {
 				try {
 					PostBuilder postBuilder = core.postBuilder();
 					/* TODO - parse time correctly. */
-					postBuilder.withId(postId).from(sone).withTime(Long.parseLong(postTime)).withText(postText);
+					postBuilder.withId(postId).from(sone.getId()).withTime(Long.parseLong(postTime)).withText(postText);
 					if ((postRecipientId != null) && (postRecipientId.length() == 43)) {
-						postBuilder.to(core.getSone(postRecipientId));
+						postBuilder.to(postRecipientId);
 					}
 					posts.add(postBuilder.build());
 				} catch (NumberFormatException nfe1) {
@@ -409,7 +410,7 @@ public class SoneDownloader extends AbstractService {
 				try {
 					PostReplyBuilder postReplyBuilder = core.postReplyBuilder();
 					/* TODO - parse time correctly. */
-					postReplyBuilder.withId(replyId).from(sone).to(replyPostId).withTime(Long.parseLong(replyTime)).withText(replyText);
+					postReplyBuilder.withId(replyId).from(sone.getId()).to(replyPostId).withTime(Long.parseLong(replyTime)).withText(replyText);
 					replies.add(postReplyBuilder.build());
 				} catch (NumberFormatException nfe1) {
 					/* TODO - mark Sone as bad. */
@@ -517,7 +518,9 @@ public class SoneDownloader extends AbstractService {
 			sone.setReplies(replies);
 			sone.setLikePostIds(likedPostIds);
 			sone.setLikeReplyIds(likedReplyIds);
-			sone.setAlbums(topLevelAlbums);
+			for (Album album : topLevelAlbums) {
+				sone.getRootAlbum().addAlbum(album);
+			}
 		}
 
 		return sone;