X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreateAlbumPage.java;h=bd36d898c2a48b392bf9b2b84f772179aa53990a;hb=ad2366bcfe62b7bcd855791447781fdeddda0188;hp=a8d024a8d69bc78b7bb39c8c88db0f50aa986287;hpb=c2f9f5293a81bdf2606f56f3822779a4639a1356;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
index a8d024a..bd36d89 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.database.AlbumBuilderFactory;
 import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
@@ -63,11 +64,8 @@ public class CreateAlbumPage extends SoneTemplatePage {
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 256).trim();
 			Sone currentSone = getCurrentSone(request.getToadletContext());
 			String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
-			Album parent = webInterface.getCore().getAlbum(parentId, false);
-			if (parentId.equals("")) {
-				parent = currentSone.getRootAlbum();
-			}
-			Album album = webInterface.getCore().createAlbum(currentSone, parent);
+			AlbumBuilderFactory parent = parentId.equals("") ? currentSone : webInterface.getCore().getAlbum(parentId).get();
+			Album album = parent.newAlbumBuilder().randomId().build();
 			album.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 			webInterface.getCore().touchConfiguration();
 			throw new RedirectException("imageBrowser.html?album=" + album.getId());