Remove unused request.

[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 8833a2d..a531843 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
@@ -84,9 +84,6 @@ public class ParserFilter implements Filter {
                this.soneTextParser = soneTextParser;
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
                String text = String.valueOf(data);
@@ -94,10 +91,10 @@ public class ParserFilter implements Filter {
                int cutOffLength = Numbers.safeParseInteger(parameters.get("cut-off-length"), Numbers.safeParseInteger(templateContext.get(String.valueOf(parameters.get("cut-off-length"))), length));
                Object sone = parameters.get("sone");
                if (sone instanceof String) {
-                       sone = core.getSone((String) sone);
+                       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();
                try {
                        Iterable<Part> parts = soneTextParser.parse(context, new StringReader(text));
@@ -248,8 +245,8 @@ public class ParserFilter implements Filter {
         *            The part to render
         */
        private void render(Writer writer, PostPart postPart) {
-               SoneTextParser parser = new SoneTextParser(core, core);
-               SoneTextParserContext parserContext = new SoneTextParserContext(null, postPart.getPost().getSone());
+               SoneTextParser parser = new SoneTextParser(core.getDatabase());
+               SoneTextParserContext parserContext = new SoneTextParserContext(postPart.getPost().getSone());
                try {
                        Iterable<Part> parts = parser.parse(parserContext, new StringReader(postPart.getPost().getText()));
                        StringBuilder excerpt = new StringBuilder();