X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilter.java;h=42e40356dcbb0d22fbc762971dd2f710dbeb623f;hb=66a45de8c5f247d03382a570e960ac3e8cee8c79;hp=5f6fd3e5790d7f266e5220c357ca5cd8f6c79ba1;hpb=7755990dfedede27bb6422de66e27b484255a1ad;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 5f6fd3e..42e4035 100644
--- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
@@ -35,7 +35,7 @@ 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.Page.Request;
+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;
@@ -93,6 +93,13 @@ public class ParserFilter implements Filter {
 		} catch (NumberFormatException nfe1) {
 			/* ignore. */
 		}
+		if ((length == -1) && (parameters.get("length") != null)) {
+			try {
+				length = Integer.parseInt(String.valueOf(templateContext.get(parameters.get("length"))));
+			} catch (NumberFormatException nfe1) {
+				/* ignore. */
+			}
+		}
 		String soneKey = parameters.get("sone");
 		if (soneKey == null) {
 			soneKey = "sone";
@@ -101,7 +108,7 @@ public class ParserFilter implements Filter {
 		if (sone == null) {
 			sone = core.getSone(soneKey, false);
 		}
-		Request request = (Request) templateContext.get("request");
+		FreenetRequest request = (FreenetRequest) templateContext.get("request");
 		SoneTextParserContext context = new SoneTextParserContext(request, sone);
 		StringWriter parsedTextWriter = new StringWriter();
 		try {
@@ -114,7 +121,7 @@ public class ParserFilter implements Filter {
 						if (length >= longText.length()) {
 							shortenedParts.add(part);
 						} else {
-							shortenedParts.add(new PlainTextPart(longText.substring(0, length)));
+							shortenedParts.add(new PlainTextPart(longText.substring(0, length) + "…"));
 						}
 						length -= longText.length();
 					} else if (part instanceof LinkPart) {
@@ -226,7 +233,11 @@ public class ParserFilter implements Filter {
 	 *            The part to render
 	 */
 	private void render(Writer writer, SonePart sonePart) {
-		renderLink(writer, "viewSone.html?sone=" + sonePart.getSone().getId(), SoneAccessor.getNiceName(sonePart.getSone()), SoneAccessor.getNiceName(sonePart.getSone()), "in-sone");
+		if ((sonePart.getSone() != null) && (sonePart.getSone().getName() != null)) {
+			renderLink(writer, "viewSone.html?sone=" + sonePart.getSone().getId(), SoneAccessor.getNiceName(sonePart.getSone()), SoneAccessor.getNiceName(sonePart.getSone()), "in-sone");
+		} else {
+			renderLink(writer, "/WebOfTrust/ShowIdentity?id=" + sonePart.getSone().getId(), sonePart.getSone().getId(), sonePart.getSone().getId(), "in-sone");
+		}
 	}
 
 	/**
@@ -279,10 +290,11 @@ public class ParserFilter implements Filter {
 	 * @return The excerpt of the text
 	 */
 	private static String getExcerpt(String text, int length) {
-		if (text.length() > length) {
-			return text.substring(0, 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 text;
+		return filteredText;
 	}
 
 }