X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FReplyAccessor.java;h=715b87f500693684c0e1c92c1f9b8bf4ed12da09;hb=02de134dcf3d4500ae02320aab2dae827d499fa1;hp=08c91c74857751ce9fc99b59d5b8d5c5ca3d373d;hpb=19ff2e20cd414bfa9e600ff01500c8aed44f8519;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
index 08c91c7..715b87f 100644
--- a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
@@ -17,12 +17,17 @@
 
 package net.pterodactylus.sone.template;
 
+import java.io.IOException;
+import java.io.StringReader;
+
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.text.FreenetLinkParser;
 import net.pterodactylus.util.template.Accessor;
 import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateFactory;
 
 /**
  * {@link Accessor} implementation that adds a couple of properties to
@@ -32,6 +37,9 @@ import net.pterodactylus.util.template.ReflectionAccessor;
  */
 public class ReplyAccessor extends ReflectionAccessor {
 
+	/** Parser for Freenet links. */
+	private final FreenetLinkParser linkParser;
+
 	/** The core. */
 	private final Core core;
 
@@ -40,9 +48,12 @@ public class ReplyAccessor extends ReflectionAccessor {
 	 *
 	 * @param core
 	 *            The core
+	 * @param templateFactory
+	 *            The template factory for the text parser
 	 */
-	public ReplyAccessor(Core core) {
+	public ReplyAccessor(Core core, TemplateFactory templateFactory) {
 		this.core = core;
+		linkParser = new FreenetLinkParser(templateFactory);
 	}
 
 	/**
@@ -57,7 +68,17 @@ public class ReplyAccessor extends ReflectionAccessor {
 			Sone currentSone = (Sone) dataProvider.getData("currentSone");
 			return (currentSone != null) && (currentSone.isLikedReplyId(reply.getId()));
 		} else if (member.equals("new")) {
-			return core.isNewReply(reply.getId());
+			return core.isNewReply(reply.getId(), false);
+		} else if (member.equals("text")) {
+			String text = reply.getText();
+			try {
+				synchronized (linkParser) {
+					linkParser.setPostingSone(reply.getSone());
+					return linkParser.parse(new StringReader(text));
+				}
+			} catch (IOException ioe1) {
+				/* ignore. */
+			}
 		}
 		return super.get(dataProvider, object, member);
 	}