X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FPostAccessor.java;h=26a05db673e4105e6d53efbad994314e5dfb7bcd;hb=9411a2829261e28c88709228b07e1784e7333bd6;hp=574eb1cf8929361c51482117683dd0a80a38552c;hpb=fbc4cd017e9453094a63f92a87951caa31d8de71;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 574eb1c..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,11 +17,14 @@
 
 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.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * Accessor for {@link Post} objects that adds additional properties:
@@ -47,23 +50,24 @@ public class PostAccessor extends ReflectionAccessor {
 		this.core = core;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	public Object get(DataProvider dataProvider, Object object, String member) {
+	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) dataProvider.getData("currentSone");
-			return (currentSone != null) && (currentSone.isLikedPostId(post.getId()));
+			Sone currentSone = (Sone) templateContext.get("currentSone");
+			return (currentSone != null) && post.isLiked(currentSone);
 		} 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(dataProvider, object, member);
+		return super.get(templateContext, object, member);
 	}
 
 }