X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilter.java;h=d6b64ba01ebe24b63f922ce4c6f5f4b208fd171b;hb=e0174ef813d7fac8d552e964a3abae216e99f99a;hp=5f156f167420694414b24cdd7f4c3a9083ce80d1;hpb=00be7dff1eec2c325b03b0a6bbe7b1c9c515003b;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 5f156f1..d6b64ba 100644
--- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
@@ -213,7 +213,7 @@ public class ParserFilter implements Filter {
 	 *            The part to render
 	 */
 	private void render(Writer writer, LinkPart linkPart) {
-		renderLink(writer, "/?_CHECKED_HTTP_=" + linkPart.getLink(), linkPart.getText(), linkPart.getTitle(), "internet");
+		renderLink(writer, "/external-link/?_CHECKED_HTTP_=" + linkPart.getLink(), linkPart.getText(), linkPart.getTitle(), "internet");
 	}
 
 	/**
@@ -249,7 +249,13 @@ public class ParserFilter implements Filter {
 			for (Part part : parts) {
 				excerpt.append(part.getText());
 				if (excerpt.length() > 20) {
-					excerpt.setLength(20);
+					int lastSpace = excerpt.lastIndexOf(" ", 20);
+					if (lastSpace > -1) {
+						excerpt.setLength(lastSpace);
+					} else {
+						excerpt.setLength(20);
+					}
+					excerpt.append("…");
 					break;
 				}
 			}
@@ -282,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;
-	}
-
 }