X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=91825a61ab256e28b3901994c85fe71041714b6e;hp=5a958107f1a027adf9a90de0a5087ec2a609aedf;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=c71b12d36779a677f1688f8fe173ef984d7447a0

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 5a95810..91825a6 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1,5 +1,5 @@
 /*
- * Sone - Core.java - Copyright © 2010–2015 David Roden
+ * Sone - Core.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -643,7 +643,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		Sone sone = database.newSoneBuilder().local().from(ownIdentity).build();
 		String property = fromNullable(ownIdentity.getProperty("Sone.LatestEdition")).or("0");
 		sone.setLatestEdition(fromNullable(tryParse(property)).or(0L));
-		sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
+		sone.setClient(new Client("Sone", SonePlugin.getPluginVersion()));
 		sone.setKnown(true);
 		SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, ownIdentity.getId());
 		eventBus.register(soneInserter);
@@ -1518,7 +1518,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				configuration.getStringValue(albumPrefix + "/Title").setValue(album.getTitle());
 				configuration.getStringValue(albumPrefix + "/Description").setValue(album.getDescription());
 				configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent().equals(sone.getRootAlbum()) ? null : album.getParent().getId());
-				configuration.getStringValue(albumPrefix + "/AlbumImage").setValue(album.getAlbumImage() == null ? null : album.getAlbumImage().getId());
 			}
 			configuration.getStringValue(sonePrefix + "/Albums/" + albumCounter + "/ID").setValue(null);
 
@@ -1730,8 +1729,14 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			/* TODO - we don’t have the Sone anymore. should this happen? */
 			return;
 		}
-		database.removeSone(sone.get());
+		for (PostReply postReply : sone.get().getReplies()) {
+			eventBus.post(new PostReplyRemovedEvent(postReply));
+		}
+		for (Post post : sone.get().getPosts()) {
+			eventBus.post(new PostRemovedEvent(post));
+		}
 		eventBus.post(new SoneRemovedEvent(sone.get()));
+		database.removeSone(sone.get());
 	}
 
 	/**