projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-0.8.5'
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ajax
/
GetPostAjaxPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
index
f12f603
..
8eeedc9
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - GetPostAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - GetPostAjaxPage.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
*
* 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
@@
-19,9
+19,12
@@
package net.pterodactylus.sone.web.ajax;
import java.io.StringWriter;
import java.io.StringWriter;
+import com.google.common.base.Optional;
+
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
+import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.json.JsonObject;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.json.JsonObject;
import net.pterodactylus.util.template.Template;
@@
-56,13
+59,13
@@
public class GetPostAjaxPage extends JsonPage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected JsonObject createJsonObject(Request request) {
+ protected JsonObject createJsonObject(
Freenet
Request request) {
String postId = request.getHttpRequest().getParam("post");
String postId = request.getHttpRequest().getParam("post");
-
Post post = webInterface.getCore().getPost(postId, false
);
- if (
post == null
) {
+
Optional<Post> post = webInterface.getCore().getPost(postId
);
+ if (
!post.isPresent()
) {
return createErrorJsonObject("invalid-post-id");
}
return createErrorJsonObject("invalid-post-id");
}
- return createSuccessJsonObject().put("post", createJsonPost(request, post, getCurrentSone(request.getToadletContext())));
+ return createSuccessJsonObject().put("post", createJsonPost(request, post
.get()
, getCurrentSone(request.getToadletContext())));
}
/**
}
/**
@@
-81,20
+84,23
@@
public class GetPostAjaxPage extends JsonPage {
* Creates a JSON object from the given post. The JSON object will only
* contain the ID of the post, its time, and its rendered HTML code.
*
* Creates a JSON object from the given post. The JSON object will only
* contain the ID of the post, its time, and its rendered HTML code.
*
+ * @param request
+ * The request being processed
* @param post
* The post to create a JSON object from
* @param currentSone
* The currently logged in Sone (to store in the template)
* @return The JSON representation of the post
*/
* @param post
* The post to create a JSON object from
* @param currentSone
* The currently logged in Sone (to store in the template)
* @return The JSON representation of the post
*/
- private JsonObject createJsonPost(Request request, Post post, Sone currentSone) {
+ private JsonObject createJsonPost(
Freenet
Request request, Post post, Sone currentSone) {
JsonObject jsonPost = new JsonObject();
jsonPost.put("id", post.getId());
jsonPost.put("sone", post.getSone().getId());
JsonObject jsonPost = new JsonObject();
jsonPost.put("id", post.getId());
jsonPost.put("sone", post.getSone().getId());
- jsonPost.put("recipient",
(post.getRecipient() == null) ? null : post.getRecipient().getId
());
+ jsonPost.put("recipient",
post.getRecipientId().orNull
());
jsonPost.put("time", post.getTime());
StringWriter stringWriter = new StringWriter();
TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext();
jsonPost.put("time", post.getTime());
StringWriter stringWriter = new StringWriter();
TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext();
+ templateContext.set("core", webInterface.getCore());
templateContext.set("request", request);
templateContext.set("post", post);
templateContext.set("currentSone", currentSone);
templateContext.set("request", request);
templateContext.set("post", post);
templateContext.set("currentSone", currentSone);