Store a reply’s known status in the reply itself.

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

diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
index efba587..7b89713 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
@@ -18,6 +18,7 @@
 package net.pterodactylus.sone.template;
 
 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.util.template.Accessor;
@@ -50,14 +51,16 @@ public class ReplyAccessor extends ReflectionAccessor {
         */
        @Override
        public Object get(TemplateContext templateContext, Object object, String member) {
-               Reply reply = (Reply) object;
+               PostReply reply = (PostReply) object;
                if ("likes".equals(member)) {
                        return core.getLikes(reply);
                } else if (member.equals("liked")) {
                        Sone currentSone = (Sone) templateContext.get("currentSone");
                        return (currentSone != null) && (currentSone.isLikedReplyId(reply.getId()));
                } else if (member.equals("new")) {
-                       return core.isNewReply(reply.getId(), false);
+                       return !reply.isKnown();
+               } else if (member.equals("loaded")) {
+                       return reply.getSone() != null;
                }
                return super.get(templateContext, object, member);
        }