X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FViewSonePage.java;h=592404f99f1fe361ac209ab805bc844832fc4020;hb=8f02544d31f323ae9053dd9a11a99eacd8cf5bcd;hp=dec4fe28988b24f6a86cd73f579a46f4f9a25192;hpb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
index dec4fe2..592404f 100644
--- a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
@@ -36,6 +36,8 @@ import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
+import com.google.common.base.Optional;
+
 /**
  * Lets the user browser another Sone.
  *
@@ -65,7 +67,7 @@ public class ViewSonePage extends SoneTemplatePage {
 	@Override
 	protected String getPageTitle(FreenetRequest request) {
 		String soneId = request.getHttpRequest().getParam("sone");
-		Sone sone = webInterface.getCore().getSone(soneId, false);
+		Sone sone = webInterface.getCore().getSone(soneId);
 		if ((sone != null) && (sone.getTime() > 0)) {
 			String soneName = SoneAccessor.getNiceName(sone);
 			return soneName + " - " + webInterface.getL10n().getString("Page.ViewSone.Title");
@@ -80,14 +82,14 @@ public class ViewSonePage extends SoneTemplatePage {
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		String soneId = request.getHttpRequest().getParam("sone");
-		Sone sone = webInterface.getCore().getSone(soneId, false);
+		Sone sone = webInterface.getCore().getSone(soneId);
 		templateContext.set("sone", sone);
 		templateContext.set("soneId", soneId);
 		if (sone == null) {
 			return;
 		}
 		List<Post> sonePosts = sone.getPosts();
-		sonePosts.addAll(webInterface.getCore().getDirectedPosts(sone));
+		sonePosts.addAll(webInterface.getCore().getDirectedPosts(sone.getId()));
 		Collections.sort(sonePosts, Post.TIME_COMPARATOR);
 		Pagination<Post> postPagination = new Pagination<Post>(sonePosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("postPage"), 0));
 		templateContext.set("postPagination", postPagination);
@@ -95,11 +97,11 @@ public class ViewSonePage extends SoneTemplatePage {
 		Set<PostReply> replies = sone.getReplies();
 		final Map<Post, List<PostReply>> repliedPosts = new HashMap<Post, List<PostReply>>();
 		for (PostReply reply : replies) {
-			Post post = reply.getPost();
-			if (repliedPosts.containsKey(post) || sone.equals(post.getSone()) || (sone.equals(post.getRecipient()))) {
+			Optional<Post> post = reply.getPost();
+			if (!post.isPresent() || repliedPosts.containsKey(post.get()) || sone.equals(post.get().getSone()) || (sone.equals(post.get().getRecipient()))) {
 				continue;
 			}
-			repliedPosts.put(post, webInterface.getCore().getReplies(post));
+			repliedPosts.put(post.get(), webInterface.getCore().getReplies(post.get()));
 		}
 		List<Post> posts = new ArrayList<Post>(repliedPosts.keySet());
 		Collections.sort(posts, new Comparator<Post>() {