X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FPostAccessor.java;h=26a05db673e4105e6d53efbad994314e5dfb7bcd;hb=7fb49938b9198110c34bcc600c545bfa91acf6f2;hp=6064017c1b216f56cc7b83340aec07b67e1d1289;hpb=26dbc1f7ba2c4243d8cc07986b0e943a2238ea08;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 6064017..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–2012 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,6 +17,8 @@
 
 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;
@@ -24,8 +26,6 @@ import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.template.ReflectionAccessor;
 import net.pterodactylus.util.template.TemplateContext;
 
-import com.google.common.collect.Collections2;
-
 /**
  * Accessor for {@link Post} objects that adds additional properties:
  * <dl>
@@ -50,19 +50,16 @@ 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 Collections2.filter(core.getReplies(post), Reply.FUTURE_REPLY_FILTER);
+			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 !post.isKnown();
 		} else if (member.equals("bookmarked")) {