X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FEditImageAjaxPage.java;h=e11a2b25e5481ba828145561f0d49e467eca1df0;hp=3c4de8ead04dd48b334b60fe0e6c03b1a1ffb3fd;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=7d5aff5d52afa5d9725ce252c846b1aca6f1a761

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.java
index 3c4de8e..e11a2b2 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - EditImageAjaxPage.java - Copyright © 2011 David Roden
+ * Sone - EditImageAjaxPage.java - Copyright © 2011–2015 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
@@ -22,10 +22,10 @@ import net.pterodactylus.sone.template.ParserFilter;
 import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.collection.MapBuilder;
-import net.pterodactylus.util.json.JsonObject;
 import net.pterodactylus.util.template.TemplateContext;
 
+import com.google.common.collect.ImmutableMap;
+
 /**
  * Page that stores a user’s image modifications.
  *
@@ -57,13 +57,13 @@ public class EditImageAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String imageId = request.getHttpRequest().getParam("image");
 		Image image = webInterface.getCore().getImage(imageId, false);
 		if (image == null) {
 			return createErrorJsonObject("invalid-image-id");
 		}
-		if (!webInterface.getCore().isLocalSone(image.getSone())) {
+		if (!image.getSone().isLocal()) {
 			return createErrorJsonObject("not-authorized");
 		}
 		if ("true".equals(request.getHttpRequest().getParam("moveLeft"))) {
@@ -77,10 +77,13 @@ public class EditImageAjaxPage extends JsonPage {
 			return createSuccessJsonObject().put("sourceImageId", image.getId()).put("destinationImageId", swappedImage.getId());
 		}
 		String title = request.getHttpRequest().getParam("title").trim();
+		if (title.isEmpty()) {
+			return createErrorJsonObject("invalid-image-title");
+		}
 		String description = request.getHttpRequest().getParam("description").trim();
-		image.setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description));
+		image.modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 		webInterface.getCore().touchConfiguration();
-		return createSuccessJsonObject().put("imageId", image.getId()).put("title", image.getTitle()).put("description", image.getDescription()).put("parsedDescription", (String) parserFilter.format(new TemplateContext(), image.getDescription(), new MapBuilder<String, String>().put("sone", image.getSone().getId()).get()));
+		return createSuccessJsonObject().put("imageId", image.getId()).put("title", image.getTitle()).put("description", image.getDescription()).put("parsedDescription", (String) parserFilter.format(new TemplateContext(), image.getDescription(), ImmutableMap.<String, Object>builder().put("sone", image.getSone()).build()));
 	}
 
 }