X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FPostAccessor.java;h=d05b074781eed71de050ad287d0d8f6f2d0b7fe8;hb=0acd68634f3e73c62087609c1faa2dfc53da506d;hp=abdc4c8407c8c3b142c34075762003d57409a338;hpb=ecf753a31601e558b681daab0598009fe9eec99a;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 abdc4c8..d05b074 100644
--- a/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Sone - PostAccessor.java - Copyright © 2010 David Roden
+ * Sone - PostAccessor.java - Copyright © 2010–2012 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
@@ -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.collection.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(), false);
+			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);
 	}