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

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..a40a955 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–2013 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
@@ -17,15 +17,19 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import java.util.Collections;
+
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.template.ParserFilter;
+import net.pterodactylus.sone.template.RenderFilter;
+import net.pterodactylus.sone.text.Part;
 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.
  *
@@ -33,8 +37,8 @@ import net.pterodactylus.util.template.TemplateContext;
  */
 public class EditImageAjaxPage extends JsonPage {
 
-	/** Parser for image descriptions. */
 	private final ParserFilter parserFilter;
+	private final RenderFilter renderFilter;
 
 	/**
 	 * Creates a new edit image AJAX page.
@@ -44,9 +48,10 @@ public class EditImageAjaxPage extends JsonPage {
 	 * @param parserFilter
 	 *            The parser filter for image descriptions
 	 */
-	public EditImageAjaxPage(WebInterface webInterface, ParserFilter parserFilter) {
+	public EditImageAjaxPage(WebInterface webInterface, ParserFilter parserFilter, RenderFilter renderFilter) {
 		super("editImage.ajax", webInterface);
 		this.parserFilter = parserFilter;
+		this.renderFilter = renderFilter;
 	}
 
 	//
@@ -57,13 +62,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 +82,22 @@ 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", parseDescription(image));
+	}
+
+	private String parseDescription(Image image) {
+		Iterable<Part> parts = (Iterable<Part>) parserFilter.format(new TemplateContext(), image.getDescription(),
+				ImmutableMap.<String, Object>builder().put("sone", image.getSone()).build());
+		return (String) renderFilter.format(new TemplateContext(), parts, Collections.<String, Object>emptyMap());
 	}
 
 }