X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilter.java;h=5f156f167420694414b24cdd7f4c3a9083ce80d1;hb=efb1006429e52a74f41fb6e1d7736736156bb13a;hp=83023699b05c8e0a880294b62077a832654d33a9;hpb=50ce65f69e49ed10abeedaeb6615ffb37a0c0772;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 8302369..5f156f1 100644
--- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
@@ -60,10 +60,10 @@ public class ParserFilter implements Filter {
 	private final TemplateContextFactory templateContextFactory;
 
 	/** The template for {@link PlainTextPart}s. */
-	private final Template plainTextTemplate = TemplateParser.parse(new StringReader("<%text|html>"));
+	private static final Template plainTextTemplate = TemplateParser.parse(new StringReader("<%text|html>"));
 
 	/** The template for {@link FreenetLinkPart}s. */
-	private final Template linkTemplate = TemplateParser.parse(new StringReader("<a class=\"<%cssClass|html>\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html></a>"));
+	private static final Template linkTemplate = TemplateParser.parse(new StringReader("<a class=\"<%cssClass|html>\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html></a>"));
 
 	/**
 	 * Creates a new filter that runs its input through a {@link SoneTextParser}
@@ -241,7 +241,22 @@ public class ParserFilter implements Filter {
 	 *            The part to render
 	 */
 	private void render(Writer writer, PostPart postPart) {
-		renderLink(writer, "viewPost.html?post=" + postPart.getPost().getId(), getExcerpt(postPart.getPost().getText(), 20), SoneAccessor.getNiceName(postPart.getPost().getSone()), "in-sone");
+		SoneTextParser parser = new SoneTextParser(core, core);
+		SoneTextParserContext parserContext = new SoneTextParserContext(null, postPart.getPost().getSone());
+		try {
+			Iterable<Part> parts = parser.parse(parserContext, new StringReader(postPart.getPost().getText()));
+			StringBuilder excerpt = new StringBuilder();
+			for (Part part : parts) {
+				excerpt.append(part.getText());
+				if (excerpt.length() > 20) {
+					excerpt.setLength(20);
+					break;
+				}
+			}
+			renderLink(writer, "viewPost.html?post=" + postPart.getPost().getId(), excerpt.toString(), SoneAccessor.getNiceName(postPart.getPost().getSone()), "in-sone");
+		} catch (IOException ioe1) {
+			/* StringReader shouldn’t throw. */
+		}
 	}
 
 	/**