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

diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
index 75eff8b..ac092d8 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–2012 David Roden
+ * Sone - ParserFilter.java - Copyright © 2011–2015 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
@@ -17,10 +17,15 @@
 
 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;
 import java.io.Writer;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +41,6 @@ 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.number.Numbers;
 import net.pterodactylus.util.template.Filter;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
@@ -87,51 +91,47 @@ public class ParserFilter implements Filter {
 	 */
 	@Override
 	public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
-		String text = String.valueOf(data);
-		int length = Numbers.safeParseInteger(parameters.get("length"), Numbers.safeParseInteger(templateContext.get(String.valueOf(parameters.get("length"))), -1));
-		int cutOffLength = Numbers.safeParseInteger(parameters.get("cut-off-length"), Numbers.safeParseInteger(templateContext.get(String.valueOf(parameters.get("cut-off-length"))), length));
+		String text = valueOf(data);
+		int length = parseInt(valueOf(parameters.get("length")), -1);
+		int cutOffLength = parseInt(valueOf(parameters.get("cut-off-length")), length);
 		Object sone = parameters.get("sone");
 		if (sone instanceof String) {
-			sone = core.getSone((String) sone, false);
+			sone = core.getSone((String) sone).orNull();
 		}
 		FreenetRequest request = (FreenetRequest) templateContext.get("request");
 		SoneTextParserContext context = new SoneTextParserContext(request, (Sone) sone);
 		StringWriter parsedTextWriter = new StringWriter();
-		try {
-			Iterable<Part> parts = soneTextParser.parse(context, new StringReader(text));
-			if (length > -1) {
-				int allPartsLength = 0;
-				List<Part> shortenedParts = new ArrayList<Part>();
-				for (Part part : parts) {
-					if (part instanceof PlainTextPart) {
-						String longText = ((PlainTextPart) part).getText();
-						if (allPartsLength < cutOffLength) {
-							if ((allPartsLength + longText.length()) > cutOffLength) {
-								shortenedParts.add(new PlainTextPart(longText.substring(0, cutOffLength - allPartsLength) + "…"));
-							} else {
-								shortenedParts.add(part);
-							}
-						}
-						allPartsLength += longText.length();
-					} else if (part instanceof LinkPart) {
-						if (allPartsLength < cutOffLength) {
-							shortenedParts.add(part);
-						}
-						allPartsLength += ((LinkPart) part).getText().length();
-					} else {
-						if (allPartsLength < cutOffLength) {
+		Iterable<Part> parts = soneTextParser.parse(context, text);
+		if (length > -1) {
+			int allPartsLength = 0;
+			List<Part> shortenedParts = new ArrayList<Part>();
+			for (Part part : parts) {
+				if (part instanceof PlainTextPart) {
+					String longText = part.getText();
+					if (allPartsLength < cutOffLength) {
+						if ((allPartsLength + longText.length()) > cutOffLength) {
+							shortenedParts.add(new PlainTextPart(longText.substring(0, cutOffLength - allPartsLength) + "…"));
+						} else {
 							shortenedParts.add(part);
 						}
 					}
+					allPartsLength += longText.length();
+				} else if (part instanceof LinkPart) {
+					if (allPartsLength < cutOffLength) {
+						shortenedParts.add(part);
+					}
+					allPartsLength += part.getText().length();
+				} else {
+					if (allPartsLength < cutOffLength) {
+						shortenedParts.add(part);
+					}
 				}
-				if (allPartsLength >= length) {
-					parts = shortenedParts;
-				}
 			}
-			render(parsedTextWriter, parts);
-		} catch (IOException ioe1) {
-			/* no exceptions in a StringReader or StringWriter, ignore. */
+			if (allPartsLength >= length) {
+				parts = shortenedParts;
+			}
 		}
+		render(parsedTextWriter, parts);
 		return parsedTextWriter.toString();
 	}
 
@@ -213,7 +213,12 @@ 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");
+		try {
+			renderLink(writer, "/external-link/?_CHECKED_HTTP_=" + URLEncoder.encode(linkPart.getLink(), "UTF-8"), linkPart.getText(), linkPart.getTitle(), "internet");
+		} catch (UnsupportedEncodingException uee1) {
+			/* not possible for UTF-8. */
+			throw new RuntimeException("The JVM does not support UTF-8 encoding!", uee1);
+		}
 	}
 
 	/**
@@ -243,26 +248,22 @@ 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());
-		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;
+		Iterable<Part> parts = parser.parse(parserContext, 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. */
 		}
+		renderLink(writer, "viewPost.html?post=" + postPart.getPost().getId(), excerpt.toString(), SoneAccessor.getNiceName(postPart.getPost().getSone()), "in-sone");
 	}
 
 	/**