X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilter.java;h=75eff8bbb7bc85aa09612e0ffda21126c1da6af1;hp=90744e722b21a7d555bfe9ba6e2d0d8cd1b389c8;hb=358b2cc71703c3cb12355f9a109e0b484ed8c1ba;hpb=689913e068c06d6cd4bdff17f5da30be2000df6c

diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
index 90744e7..75eff8b 100644
--- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
@@ -241,7 +241,28 @@ 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) {
+					int lastSpace = excerpt.lastIndexOf(" ", 20);
+					if (lastSpace > -1) {
+						excerpt.setLength(lastSpace);
+					} else {
+						excerpt.setLength(20);
+					}
+					excerpt.append("…");
+					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. */
+		}
 	}
 
 	/**
@@ -267,26 +288,4 @@ public class ParserFilter implements Filter {
 		linkTemplate.render(templateContext, writer);
 	}
 
-	//
-	// STATIC METHODS
-	//
-
-	/**
-	 * Returns up to {@code length} characters from the given text, appending
-	 * “…” if the text is longer.
-	 *
-	 * @param text
-	 *            The text to get an excerpt from
-	 * @param length
-	 *            The maximum length of the excerpt (without the ellipsis)
-	 * @return The excerpt of the text
-	 */
-	private static String getExcerpt(String text, int length) {
-		String filteredText = text.replaceAll("(\r\n)+", "\r\n").replaceAll("\n+", "\n").replace("\r\n", " ").replace('\n', ' ');
-		if (filteredText.length() > length) {
-			return filteredText.substring(0, length) + "…";
-		}
-		return filteredText;
-	}
-
 }