X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=ff50c84dc30eed89c1674eea3eb9da3cf911d7c2;hb=8267f9d6c363afdb68f28d84837cb05f95aacc0b;hp=6a2d8a38a579a6c7d0db156d30ced8bc0644535d;hpb=897f2c637fc197ae67903671c200e590084dd460;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 6a2d8a3..ff50c84 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -574,6 +574,8 @@ public class Core extends AbstractService {
 		SoneInserter soneInserter = soneInserters.remove(sone);
 		soneInserter.stop();
 		localSones.remove(sone);
+		soneStatuses.remove(sone);
+		soneCache.remove(sone.getId());
 	}
 
 	/**
@@ -715,6 +717,20 @@ public class Core extends AbstractService {
 	private void loadConfiguration() {
 		logger.entering(Core.class.getName(), "loadConfiguration()");
 
+		boolean firstStart = configuration.getBooleanValue("FirstStart").getValue(true);
+		if (firstStart) {
+			logger.log(Level.INFO, "First start of Sone, adding a couple of default Sones…");
+			/* Sone’s Sone. */
+			loadSone("USK@eRHt0ceFsHjRZ11j6dd68RSdIvfd8f9YjJLZ9lnhEyo,iJWjIWh6TkMZm1NY8qBranKTIuwsCPkVPG6T6c6ft-I,AQACAAE/Sone/0");
+			/* Bombe’s Sone. */
+			loadSone("USK@RuW~uAO35Ipne896-1OmaVJNPuYE4ZIB5oZ5ziaU57A,7rV3uiyztXBDt03DCoRiNwiGjgFCJuznM9Okc1opURU,AQACAAE/Sone/15");
+			try {
+				configuration.getBooleanValue("FirstStart").setValue(false);
+			} catch (ConfigurationException ce1) {
+				logger.log(Level.WARNING, "Could not clear “first start” flag!");
+			}
+		}
+
 		options.addIntegerOption("InsertionDelay", new DefaultOption<Integer>(60, new OptionWatcher<Integer>() {
 
 			@Override
@@ -724,9 +740,15 @@ public class Core extends AbstractService {
 
 		}));
 
-		options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false)).set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
-		options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false)).set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
+		options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false));
+		options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false));
+
+		if (firstStart) {
+			return;
+		}
 
+		options.getBooleanOption("ClearOnNextRestart").set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
+		options.getBooleanOption("ReallyClearOnNextRestart").set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
 		boolean clearConfiguration = options.getBooleanOption("ClearOnNextRestart").get() && options.getBooleanOption("ReallyClearOnNextRestart").get();
 		options.getBooleanOption("ClearOnNextRestart").set(null);
 		options.getBooleanOption("ReallyClearOnNextRestart").set(null);
@@ -997,7 +1019,7 @@ public class Core extends AbstractService {
 				configuration.getStringValue(blacklistedSonePrefix + "/ID").setValue(blacklistedSone.getId());
 				configuration.getStringValue(blacklistedSonePrefix + "/Name").setValue(blacklistedSone.getName());
 				configuration.getStringValue(blacklistedSonePrefix + "/Key").setValue(blacklistedSone.getRequestUri().toString());
-				configuration.getStringValue(blacklistedSonePrefix + "/InsertKey").setValue(blacklistedSone.getInsertUri().toString());
+				configuration.getStringValue(blacklistedSonePrefix + "/InsertKey").setValue((blacklistedSone.getInsertUri() != null) ? blacklistedSone.getInsertUri().toString() : null);
 				/* TODO - store all known stuff? */
 			}
 			configuration.getStringValue("BlacklistedSone." + blacklistedSonesCounter + "/ID").setValue(null);