X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FPostAccessor.java;h=ef8577dbe8cbfc0a15f49e09e6d8acc6ae736b4d;hb=e22ec3673d5b9ced3522395d936def235a4b0505;hp=746ed256593a57703e616748222151ccde1933c8;hpb=74f4317a5515c53c39690c8d75f396c472e20ae9;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/PostAccessor.java b/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
index 746ed25..ef8577d 100644
--- a/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
@@ -24,6 +24,7 @@ import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.text.FreenetLinkParser;
+import net.pterodactylus.sone.text.FreenetLinkParserContext;
 import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
 import net.pterodactylus.util.template.TemplateFactory;
@@ -69,14 +70,17 @@ public class PostAccessor extends ReflectionAccessor {
 		} else if (member.equals("likes")) {
 			return core.getLikes(post);
 		} else if (member.equals("liked")) {
-			Sone currentSone = (Sone) dataProvider.getData("currentSone");
+			Sone currentSone = (Sone) dataProvider.get("currentSone");
 			return (currentSone != null) && (currentSone.isLikedPostId(post.getId()));
 		} else if (member.equals("new")) {
 			return core.isNewPost(post.getId(), false);
 		} else if (member.equals("text")) {
 			String text = post.getText();
+			if (text == null) {
+				return null;
+			}
 			try {
-				return linkParser.parse(new StringReader(text));
+				return linkParser.parse(new FreenetLinkParserContext(post.getSone()), new StringReader(text));
 			} catch (IOException ioe1) {
 				/* ignore. */
 			}