Use internal image IDs for temporary images

[Sone.git] / src / main / java / net / pterodactylus / sone / template / ImageLinkFilter.java

diff --git a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
index 1ac7360..31f53a7 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
@@ -84,7 +84,7 @@ public class ImageLinkFilter implements Filter {
                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);
@@ -92,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();