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

diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
index 715b87f..fe1ccd3 100644
--- a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ReplyAccessor.java - Copyright © 2010 David Roden
+ * Sone - ReplyAccessor.java - Copyright © 2010–2020 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,29 +17,20 @@
 
 package net.pterodactylus.sone.template;
 
-import java.io.IOException;
-import java.io.StringReader;
-
 import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.data.PostReply;
 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;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * {@link Accessor} implementation that adds a couple of properties to
  * {@link Reply}s.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class ReplyAccessor extends ReflectionAccessor {
 
-	/** Parser for Freenet links. */
-	private final FreenetLinkParser linkParser;
-
 	/** The core. */
 	private final Core core;
 
@@ -48,39 +39,28 @@ public class ReplyAccessor extends ReflectionAccessor {
 	 *
 	 * @param core
 	 *            The core
-	 * @param templateFactory
-	 *            The template factory for the text parser
 	 */
-	public ReplyAccessor(Core core, TemplateFactory templateFactory) {
+	public ReplyAccessor(Core core) {
 		this.core = core;
-		linkParser = new FreenetLinkParser(templateFactory);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object get(DataProvider dataProvider, Object object, String member) {
-		Reply reply = (Reply) object;
+	public Object get(TemplateContext templateContext, Object object, String member) {
+		PostReply reply = (PostReply) object;
 		if ("likes".equals(member)) {
 			return core.getLikes(reply);
 		} else if (member.equals("liked")) {
-			Sone currentSone = (Sone) dataProvider.getData("currentSone");
+			Sone currentSone = (Sone) templateContext.get("currentSone");
 			return (currentSone != null) && (currentSone.isLikedReplyId(reply.getId()));
 		} else if (member.equals("new")) {
-			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 !reply.isKnown();
+		} else if (member.equals("loaded")) {
+			return reply.getSone() != null;
 		}
-		return super.get(dataProvider, object, member);
+		return super.get(templateContext, object, member);
 	}
 
 }