X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=42542c0937392c4f8b5195271baa664963b31fba;hb=18a45f362d69085b12fe3028e9320578e10cc968;hp=5a958107f1a027adf9a90de0a5087ec2a609aedf;hpb=c71b12d36779a677f1688f8fe173ef984d7447a0;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 5a95810..42542c0 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
@@ -68,8 +68,8 @@ import net.pterodactylus.sone.data.Profile;
 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.ShowCustomAvatars;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.data.SoneOptions.ShowCustomAvatars;
 import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.sone.database.AlbumBuilder;
 import net.pterodactylus.sone.database.Database;
@@ -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());
 	}
 
 	/**