Move isLikedPostId from Sone to Post.

[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 d05b074..26a05db 100644 (file)
--- 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,11 +17,12 @@
 
 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.collection.filter.Filters;
 import net.pterodactylus.util.template.ReflectionAccessor;
 import net.pterodactylus.util.template.TemplateContext;
 
@@ -49,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 Filters.filteredList(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")) {