projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'configurable-notifications-250' into next
[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
de96780
..
bef94d6
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/PostAccessor.java
+++ b/
src/main/java/net/pterodactylus/sone/template/PostAccessor.java
@@
-19,9
+19,11
@@
package net.pterodactylus.sone.template;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Post;
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.sone.data.Sone;
-import net.pterodactylus.util.
template.DataProvider
;
+import net.pterodactylus.util.
filter.Filters
;
import net.pterodactylus.util.template.ReflectionAccessor;
import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
/**
* Accessor for {@link Post} objects that adds additional properties:
/**
* Accessor for {@link Post} objects that adds additional properties:
@@
-51,19
+53,23
@@
public class PostAccessor extends ReflectionAccessor {
* {@inheritDoc}
*/
@Override
* {@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)) {
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")) {
} else if (member.equals("likes")) {
return core.getLikes(post);
} else if (member.equals("liked")) {
- Sone currentSone = (Sone)
dataProvider.getData
("currentSone");
+ Sone currentSone = (Sone)
templateContext.get
("currentSone");
return (currentSone != null) && (currentSone.isLikedPostId(post.getId()));
} else if (member.equals("new")) {
return (currentSone != null) && (currentSone.isLikedPostId(post.getId()));
} else if (member.equals("new")) {
- return core.isNewPost(post.getId(), false);
+ return core.isNewPost(post.getId());
+ } 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);
}
}
}
}