Use new parser filter for posts and replies, too.

[Sone.git] / src / main / java / net / pterodactylus / sone / template / PostAccessor.java

diff --git a/src/main/java/net/pterodactylus/sone/template/PostAccessor.java b/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
index 495d805..d3af897 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
@@ -17,16 +17,11 @@
 
 package net.pterodactylus.sone.template;
 
-import java.io.IOException;
-import java.io.StringReader;
-
 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.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
-import net.pterodactylus.util.template.TemplateFactory;
 
 /**
  * Accessor for {@link Post} objects that adds additional properties:
@@ -39,9 +34,6 @@ import net.pterodactylus.util.template.TemplateFactory;
  */
 public class PostAccessor extends ReflectionAccessor {
 
-       /** Parser for Freenet links. */
-       private final FreenetLinkParser linkParser;
-
        /** The core to get the replies from. */
        private final Core core;
 
@@ -50,12 +42,9 @@ public class PostAccessor extends ReflectionAccessor {
         *
         * @param core
         *            The core to get the replies from
-        * @param templateFactory
-        *            The template factory for the text parser
         */
-       public PostAccessor(Core core, TemplateFactory templateFactory) {
+       public PostAccessor(Core core) {
                this.core = core;
-               linkParser = new FreenetLinkParser(templateFactory);
        }
 
        /**
@@ -69,20 +58,10 @@ 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));
-                       } catch (IOException ioe1) {
-                               /* ignore. */
-                       }
                }
                return super.get(dataProvider, object, member);
        }