projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add more information to new reply information and don’t load replies if obviously...
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
IndexPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/IndexPage.java
b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
index
2d61cf3
..
825267b
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/IndexPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/IndexPage.java
@@
-24,6
+24,7
@@
import java.util.List;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
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.Template;
/**
import net.pterodactylus.util.template.Template;
/**
@@
-52,8
+53,8
@@
public class IndexPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(Request request,
Template template
) throws RedirectException {
- super.processTemplate(request,
template
);
+ protected void processTemplate(Request request,
DataProvider dataProvider
) throws RedirectException {
+ super.processTemplate(request,
dataProvider
);
Sone currentSone = getCurrentSone(request.getToadletContext());
List<Post> allPosts = new ArrayList<Post>();
allPosts.addAll(currentSone.getPosts());
Sone currentSone = getCurrentSone(request.getToadletContext());
List<Post> allPosts = new ArrayList<Post>();
allPosts.addAll(currentSone.getPosts());
@@
-63,17
+64,24
@@
public class IndexPage extends SoneTemplatePage {
}
allPosts.addAll(webInterface.getCore().getSone(friendSoneId).getPosts());
}
}
allPosts.addAll(webInterface.getCore().getSone(friendSoneId).getPosts());
}
+ for (Sone sone : webInterface.getCore().getSones()) {
+ for (Post post : sone.getPosts()) {
+ if (currentSone.equals(post.getRecipient()) && !allPosts.contains(post)) {
+ allPosts.add(post);
+ }
+ }
+ }
Collections.sort(allPosts, Post.TIME_COMPARATOR);
Collections.sort(allPosts, Post.TIME_COMPARATOR);
-
template
.set("posts", allPosts);
+
dataProvider
.set("posts", allPosts);
}
/**
* {@inheritDoc}
*/
@Override
}
/**
* {@inheritDoc}
*/
@Override
- protected void postProcess(Request request,
Template template
) {
+ protected void postProcess(Request request,
DataProvider dataProvider
) {
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked")
- List<Post> posts = (List<Post>)
template
.get("posts");
+ List<Post> posts = (List<Post>)
dataProvider
.get("posts");
for (Post post : posts) {
webInterface.getCore().markPostKnown(post);
for (Reply reply : webInterface.getCore().getReplies(post)) {
for (Post post : posts) {
webInterface.getCore().markPostKnown(post);
for (Reply reply : webInterface.getCore().getReplies(post)) {