X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilter.java;h=7cf8c706f36448f528b1eca283bd5c688cdbed08;hb=e9dd4ebd28b5a429573f54565ea8215de5266a87;hp=ac092d8892683e4d7fcf1c44103416573d6e58da;hpb=8ee3de9a7ed7c65b5f695dd60da6e55d94c1125e;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
index ac092d8..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,10 +96,9 @@ 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<Part> parts = soneTextParser.parse(context, text);
+		Iterable<Part> parts = soneTextParser.parse(text, context);
 		if (length > -1) {
 			int allPartsLength = 0;
 			List<Part> shortenedParts = new ArrayList<Part>();
@@ -247,8 +244,8 @@ 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());
-		Iterable<Part> parts = parser.parse(parserContext, postPart.getPost().getText());
+		SoneTextParserContext parserContext = new SoneTextParserContext(postPart.getPost().getSone());
+		Iterable<Part> parts = parser.parse(postPart.getPost().getText(), parserContext);
 		StringBuilder excerpt = new StringBuilder();
 		for (Part part : parts) {
 			excerpt.append(part.getText());