X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FImageLinkFilter.java;h=31f53a750b4bcaf501dcf7a413356513af550b44;hb=df37c71a5b53af746f2c0c8b7ce8c1d4ae33486f;hp=eea912142f6dfcdd5e069669ddf9cef36efc84e8;hpb=d5efb086bee8f103cbe90c7a953ffbb7ff27b689;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 eea9121..31f53a7 100644
--- a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
@@ -17,6 +17,10 @@
 
 package net.pterodactylus.sone.template;
 
+import static java.lang.Integer.MAX_VALUE;
+import static java.lang.String.valueOf;
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Map;
@@ -29,8 +33,8 @@ 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;
-import com.google.common.primitives.Ints;
 
 /**
  * Template filter that turns an {@link Image} into an HTML <img> tag,
@@ -76,11 +80,11 @@ public class ImageLinkFilter implements Filter {
 		if (image == null) {
 			return null;
 		}
-		String imageClass = String.valueOf(parameters.get("class"));
-		int maxWidth = Optional.fromNullable(Ints.tryParse(String.valueOf(parameters.get("max-width")))).or(Integer.MAX_VALUE);
-		int maxHeight = Optional.fromNullable(Ints.tryParse(String.valueOf(parameters.get("max-height")))).or(Integer.MAX_VALUE);
-		String mode = String.valueOf(parameters.get("mode"));
-		String title = String.valueOf(parameters.get("title"));
+		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 = Optional.fromNullable(parameters.get("title")).transform(getStringValue()).orNull();
 
 		TemplateContext linkTemplateContext = templateContextFactory.createTemplateContext();
 		linkTemplateContext.set("class", imageClass);
@@ -88,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();
@@ -114,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;
+			}
+		};
+	}
+
 }