X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilter.java;h=7cf8c706f36448f528b1eca283bd5c688cdbed08;hp=96d2f72390c619aceafe2ba6754d8aa3c86ab954;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=e484183c582bfa805a4f5eabae8e3c97cacde97e diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java index 96d2f72..7cf8c70 100644 --- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java @@ -1,5 +1,5 @@ /* - * Sone - ParserFilter.java - Copyright © 2011–2015 David Roden + * Sone - ParserFilter.java - Copyright © 2011–2016 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 @@ -20,7 +20,6 @@ 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; import java.io.UnsupportedEncodingException; @@ -40,7 +39,6 @@ import net.pterodactylus.sone.text.PostPart; 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.template.Filter; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; @@ -98,8 +96,7 @@ public class ParserFilter implements Filter { if (sone instanceof String) { sone = core.getSone((String) sone).orNull(); } - FreenetRequest request = (FreenetRequest) templateContext.get("request"); - SoneTextParserContext context = new SoneTextParserContext(request, (Sone) sone); + SoneTextParserContext context = new SoneTextParserContext((Sone) sone); StringWriter parsedTextWriter = new StringWriter(); Iterable parts = soneTextParser.parse(text, context); if (length > -1) { @@ -247,7 +244,7 @@ public class ParserFilter implements Filter { */ private void render(Writer writer, PostPart postPart) { SoneTextParser parser = new SoneTextParser(core, core); - SoneTextParserContext parserContext = new SoneTextParserContext(null, postPart.getPost().getSone()); + SoneTextParserContext parserContext = new SoneTextParserContext(postPart.getPost().getSone()); Iterable parts = parser.parse(postPart.getPost().getText(), parserContext); StringBuilder excerpt = new StringBuilder(); for (Part part : parts) {