Parse album:// links

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

diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
index d2f2619..2aafd1f 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
@@ -17,6 +17,9 @@
 
 package net.pterodactylus.sone.template;
 
+import static java.lang.String.valueOf;
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -28,7 +31,9 @@ import java.util.List;
 import java.util.Map;
 
 import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.text.AlbumPart;
 import net.pterodactylus.sone.text.FreenetLinkPart;
 import net.pterodactylus.sone.text.LinkPart;
 import net.pterodactylus.sone.text.Part;
@@ -38,7 +43,6 @@ import net.pterodactylus.sone.text.SonePart;
 import net.pterodactylus.sone.text.SoneTextParser;
 import net.pterodactylus.sone.text.SoneTextParserContext;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Filter;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
@@ -89,12 +93,12 @@ public class ParserFilter implements Filter {
         */
        @Override
        public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
-               String text = String.valueOf(data);
-               int length = Numbers.safeParseInteger(parameters.get("length"), Numbers.safeParseInteger(templateContext.get(String.valueOf(parameters.get("length"))), -1));
-               int cutOffLength = Numbers.safeParseInteger(parameters.get("cut-off-length"), Numbers.safeParseInteger(templateContext.get(String.valueOf(parameters.get("cut-off-length"))), length));
+               String text = valueOf(data);
+               int length = parseInt(valueOf(parameters.get("length")), -1);
+               int cutOffLength = parseInt(valueOf(parameters.get("cut-off-length")), length);
                Object sone = parameters.get("sone");
                if (sone instanceof String) {
-                       sone = core.getSone((String) sone, false);
+                       sone = core.getSone((String) sone).orNull();
                }
                FreenetRequest request = (FreenetRequest) templateContext.get("request");
                SoneTextParserContext context = new SoneTextParserContext(request, (Sone) sone);
@@ -175,6 +179,8 @@ public class ParserFilter implements Filter {
                        render(writer, (SonePart) part);
                } else if (part instanceof PostPart) {
                        render(writer, (PostPart) part);
+               } else if (part instanceof AlbumPart) {
+                       render(writer, (AlbumPart) part);
                } else if (part instanceof Iterable<?>) {
                        render(writer, (Iterable<Part>) part);
                }
@@ -248,7 +254,7 @@ public class ParserFilter implements Filter {
         *            The part to render
         */
        private void render(Writer writer, PostPart postPart) {
-               SoneTextParser parser = new SoneTextParser(core, core);
+               SoneTextParser parser = new SoneTextParser(core, core, core);
                SoneTextParserContext parserContext = new SoneTextParserContext(null, postPart.getPost().getSone());
                try {
                        Iterable<Part> parts = parser.parse(parserContext, new StringReader(postPart.getPost().getText()));
@@ -266,12 +272,18 @@ public class ParserFilter implements Filter {
                                        break;
                                }
                        }
-                       renderLink(writer, "viewPost.html?post=" + postPart.getPost().getId(), excerpt.toString(), SoneAccessor.getNiceName(postPart.getPost().getSone()), "in-sone");
+                       renderLink(writer, "viewPost.html?post=" + postPart.getPost().getId(), excerpt.toString(),
+                               SoneAccessor.getNiceName(postPart.getPost().getSone()), postPart.usesDeprecatedLink() ? "internet" : "in-sone");
                } catch (IOException ioe1) {
                        /* StringReader shouldn’t throw. */
                }
        }
 
+       private void render(Writer writer, AlbumPart albumPart) {
+               Album album = albumPart.getAlbum();
+               renderLink(writer, String.format("imageBrowser.html?album=%s", album.getId()), album.getTitle(), album.getDescription(), "in-sone");
+       }
+
        /**
         * Renders the given link.
         *