Store a post’s known-status in the post itself.

[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 f6a9c06..93ff569 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
@@ -19,7 +19,9 @@ package net.pterodactylus.sone.template;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.util.filter.Filters;
 import net.pterodactylus.util.template.ReflectionAccessor;
 import net.pterodactylus.util.template.TemplateContext;
 
@@ -54,14 +56,18 @@ public class PostAccessor extends ReflectionAccessor {
        public Object get(TemplateContext templateContext, Object object, String member) {
                Post post = (Post) object;
                if ("replies".equals(member)) {
-                       return core.getReplies(post);
+                       return Filters.filteredList(core.getReplies(post), Reply.FUTURE_REPLY_FILTER);
                } else if (member.equals("likes")) {
                        return core.getLikes(post);
                } else if (member.equals("liked")) {
                        Sone currentSone = (Sone) templateContext.get("currentSone");
                        return (currentSone != null) && (currentSone.isLikedPostId(post.getId()));
                } else if (member.equals("new")) {
-                       return core.isNewPost(post.getId());
+                       return !post.isKnown();
+               } else if (member.equals("bookmarked")) {
+                       return core.isBookmarked(post);
+               } else if (member.equals("loaded")) {
+                       return post.getSone() != null;
                }
                return super.get(templateContext, object, member);
        }