X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FPostAccessor.java;h=26a05db673e4105e6d53efbad994314e5dfb7bcd;hb=953c41bc82b474680d84266fd7227ce08480883c;hp=abdc4c8407c8c3b142c34075762003d57409a338;hpb=9e4db46b86d084eba9029906e779ec1d96f78ac4;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..26a05db 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–2013 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,8 +17,11 @@
 
 package net.pterodactylus.sone.template;
 
+import static com.google.common.collect.FluentIterable.from;
+
 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.template.ReflectionAccessor;
 import net.pterodactylus.util.template.TemplateContext;
@@ -47,21 +50,22 @@ public class PostAccessor extends ReflectionAccessor {
 		this.core = core;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public Object get(TemplateContext templateContext, Object object, String member) {
 		Post post = (Post) object;
 		if ("replies".equals(member)) {
-			return core.getReplies(post);
+			return from(post.getReplies()).filter(Reply.FUTURE_REPLY_FILTER).toList();
 		} else if (member.equals("likes")) {
-			return core.getLikes(post);
+			return post.getLikes();
 		} else if (member.equals("liked")) {
 			Sone currentSone = (Sone) templateContext.get("currentSone");
-			return (currentSone != null) && (currentSone.isLikedPostId(post.getId()));
+			return (currentSone != null) && post.isLiked(currentSone);
 		} 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);
 	}