X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FImageLinkFilter.java;h=31f53a750b4bcaf501dcf7a413356513af550b44;hb=449c24942c72153666e261b4b35df5cf2e0ac2ac;hp=9ede85143caf60f0c99700e5fbe62e278fc8d0e2;hpb=f6d9b5d748432a6765e508447b2cc954bd45d807;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
index 9ede851..31f53a7 100644
--- a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
@@ -33,6 +33,7 @@ import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.template.TemplateContextFactory;
 import net.pterodactylus.util.template.TemplateParser;
 
+import com.google.common.base.Function;
 import com.google.common.base.Optional;
 
 /**
@@ -79,11 +80,11 @@ public class ImageLinkFilter implements Filter {
 		if (image == null) {
 			return null;
 		}
-		String imageClass = valueOf(parameters.get("class"));
+		String imageClass = Optional.fromNullable(parameters.get("class")).transform(getStringValue()).orNull();
 		int maxWidth = parseInt(valueOf(parameters.get("max-width")), MAX_VALUE);
 		int maxHeight = parseInt(valueOf(parameters.get("max-height")), MAX_VALUE);
 		String mode = valueOf(parameters.get("mode"));
-		String title = valueOf(parameters.get("title"));
+		String title = Optional.fromNullable(parameters.get("title")).transform(getStringValue()).orNull();
 
 		TemplateContext linkTemplateContext = templateContextFactory.createTemplateContext();
 		linkTemplateContext.set("class", imageClass);
@@ -91,7 +92,7 @@ public class ImageLinkFilter implements Filter {
 			linkTemplateContext.set("src", "/" + image.getKey());
 			linkTemplateContext.set("forceDownload", true);
 		} else {
-			linkTemplateContext.set("src", "getImage.html?image=" + image.getId());
+			linkTemplateContext.set("src", "getImage.html?image=" + image.getInternalId());
 		}
 		int imageWidth = image.getWidth();
 		int imageHeight = image.getHeight();
@@ -117,4 +118,13 @@ public class ImageLinkFilter implements Filter {
 		return stringWriter.toString();
 	}
 
+	private Function<Object, String> getStringValue() {
+		return new Function<Object, String>() {
+			@Override
+			public String apply(Object input) {
+				return (input != null) ? input.toString() : null;
+			}
+		};
+	}
+
 }