X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=c6476effcc0d37ecbf0d8b86a3c384c3a83fedbd;hb=85aad5a15fc8213950d3a40dfe1737d23986da40;hp=14327bdad93b61e4e9e1501d56ed94b8226a7e49;hpb=43740d6a1dfc686ab54d0aebd4a5b1bce75b9ed6;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 14327bd..c6476ef 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -926,10 +926,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.WARNING, String.format("Tried to delete non-local Sone: %s", sone));
 			return;
 		}
-		// FIXME – implement in database
-//		sones.remove(sone.getId());
 		SoneInserter soneInserter = soneInserters.remove(sone);
 		soneInserter.stop();
+		database.removeSone(sone);
 		webOfTrustUpdater.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
 		webOfTrustUpdater.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
 		try {
@@ -1612,13 +1611,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			/* save known posts. */
 			database.save();
 
-			/* save bookmarked posts. */
-			int bookmarkedPostCounter = 0;
-			for (Post bookmarkedPost : getBookmarkedPosts()) {
-				configuration.getStringValue("Bookmarks/Post/" + bookmarkedPostCounter++ + "/ID").setValue(bookmarkedPost.getId());
-			}
-			configuration.getStringValue("Bookmarks/Post/" + bookmarkedPostCounter++ + "/ID").setValue(null);
-
 			/* now save it. */
 			configuration.save();
 
@@ -1664,17 +1656,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			}
 			++soneCounter;
 		}
-
-		/* load bookmarked posts. */
-		int bookmarkedPostCounter = 0;
-		while (true) {
-			String bookmarkedPostId = configuration.getStringValue("Bookmarks/Post/" + bookmarkedPostCounter++ + "/ID").getValue(null);
-			if (bookmarkedPostId == null) {
-				break;
-			}
-			database.bookmarkPost(bookmarkedPostId);
-		}
-
 	}
 
 	/**
@@ -1761,16 +1742,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			/* TODO - we don’t have the Sone anymore. should this happen? */
 			return;
 		}
-		database.removePosts(sone.get());
-		for (Post post : sone.get().getPosts()) {
-			eventBus.post(new PostRemovedEvent(post));
-		}
-		database.removePostReplies(sone.get());
-		for (PostReply reply : sone.get().getReplies()) {
-			eventBus.post(new PostReplyRemovedEvent(reply));
-		}
-//		TODO – implement in database
-//		sones.remove(identity.getId());
+		database.removeSone(sone.get());
 		eventBus.post(new SoneRemovedEvent(sone.get()));
 	}