X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=0f22b812b0f8d1a38898c6f1f839d26964e7b870;hb=49ff797a72d192c6772cd3f9e201beb8146d2462;hp=3a02f15af72d96aede9f5c1c5f82e1da58c33b6c;hpb=0540df74082148c5b14d8e968157b6113368a130;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 3a02f15..0f22b81 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -17,6 +17,7 @@
 
 package net.pterodactylus.sone.core;
 
+import static com.google.common.base.Optional.absent;
 import static com.google.common.base.Optional.of;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -24,6 +25,7 @@ import static com.google.common.base.Predicates.not;
 import static com.google.common.collect.FluentIterable.from;
 import static net.pterodactylus.sone.data.Identified.GET_ID;
 import static net.pterodactylus.sone.data.Sone.LOCAL_SONE_FILTER;
+import static net.pterodactylus.sone.data.Sone.TO_FREENET_URI;
 
 import java.net.MalformedURLException;
 import java.util.Collection;
@@ -74,6 +76,7 @@ import net.pterodactylus.sone.database.PostBuilder;
 import net.pterodactylus.sone.database.PostBuilder.PostCreated;
 import net.pterodactylus.sone.database.PostReplyBuilder;
 import net.pterodactylus.sone.database.PostReplyBuilder.PostReplyCreated;
+import net.pterodactylus.sone.database.SoneBuilder.SoneCreated;
 import net.pterodactylus.sone.database.SoneProvider;
 import net.pterodactylus.sone.fcp.FcpInterface;
 import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired;
@@ -556,14 +559,8 @@ public class Core extends AbstractService implements SoneProvider {
 		logger.info(String.format("Adding Sone from OwnIdentity: %s", ownIdentity));
 		synchronized (sones) {
 			final Sone sone;
-			try {
-				sone = database.newSoneBuilder().by(ownIdentity).local().build().setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
-			} catch (MalformedURLException mue1) {
-				logger.log(Level.SEVERE, String.format("Could not convert the Identity’s URIs to Freenet URIs: %s, %s", ownIdentity.getInsertUri(), ownIdentity.getRequestUri()), mue1);
-				return null;
-			}
-			sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
-			sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
+			sone = database.newSoneBuilder().by(ownIdentity.getId()).local().using(new Client("Sone", SonePlugin.VERSION.toString())).build(Optional.<SoneCreated>absent());
+			sone.modify().setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0)).update();
 			sone.setKnown(true);
 			/* TODO - load posts ’n stuff */
 			sones.put(ownIdentity.getId(), sone);
@@ -614,14 +611,13 @@ public class Core extends AbstractService implements SoneProvider {
 			return null;
 		}
 		synchronized (sones) {
-			final Sone sone = database.newSoneBuilder().by(identity).build();
-			if (sone.isLocal()) {
-				return sone;
-			}
-			sone.setIdentity(identity);
-			boolean newSone = sone.getRequestUri() == null;
-			sone.setRequestUri(SoneUri.create(identity.getRequestUri()));
-			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
+			Optional<Sone> existingSone = database.getSone(identity.getId());
+			if (existingSone.isPresent() && existingSone.get().isLocal()) {
+				return existingSone.get();
+			}
+			boolean newSone = !existingSone.isPresent();
+			final Sone sone = newSone ? database.newSoneBuilder().by(identity.getId()).build(Optional.<SoneCreated>absent()) : existingSone.get();
+			sone.modify().setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0)).update();
 			if (newSone) {
 				synchronized (knownSones) {
 					newSone = !knownSones.contains(sone.getId());
@@ -642,7 +638,7 @@ public class Core extends AbstractService implements SoneProvider {
 				@Override
 				@SuppressWarnings("synthetic-access")
 				public void run() {
-					soneDownloader.fetchSone(sone, sone.getRequestUri());
+					soneDownloader.fetchSone(sone, TO_FREENET_URI.apply(sone));
 				}
 
 			});
@@ -1728,8 +1724,7 @@ public class Core extends AbstractService implements SoneProvider {
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				Optional<Sone> sone = getRemoteSone(identity.getId());
-				sone.get().setIdentity(identity);
-				sone.get().setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.get().getLatestEdition()));
+				sone.get().modify().setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.get().getLatestEdition())).update();
 				soneDownloader.addSone(sone.get());
 				soneDownloader.fetchSone(sone.get());
 			}