X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FViewSonePage.java;h=e120e926302cd3bd96e1818eb20574017f17469e;hp=592404f99f1fe361ac209ab805bc844832fc4020;hb=45803a1c678d6811f7bbf85d50c79844031be0f0;hpb=33cc85447797301e299e7ac444fe53538f09a69d

diff --git a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
index 592404f..e120e92 100644
--- a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
@@ -67,9 +67,9 @@ public class ViewSonePage extends SoneTemplatePage {
 	@Override
 	protected String getPageTitle(FreenetRequest request) {
 		String soneId = request.getHttpRequest().getParam("sone");
-		Sone sone = webInterface.getCore().getSone(soneId);
-		if ((sone != null) && (sone.getTime() > 0)) {
-			String soneName = SoneAccessor.getNiceName(sone);
+		Optional<Sone> sone = webInterface.getCore().getSone(soneId);
+		if (sone.isPresent()) {
+			String soneName = SoneAccessor.getNiceName(sone.get());
 			return soneName + " - " + webInterface.getL10n().getString("Page.ViewSone.Title");
 		}
 		return webInterface.getL10n().getString("Page.ViewSone.Page.TitleWithoutSone");
@@ -82,23 +82,23 @@ 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);
-		templateContext.set("sone", sone);
+		Optional<Sone> sone = webInterface.getCore().getSone(soneId);
+		templateContext.set("sone", sone.orNull());
 		templateContext.set("soneId", soneId);
-		if (sone == null) {
+		if (!sone.isPresent()) {
 			return;
 		}
-		List<Post> sonePosts = sone.getPosts();
-		sonePosts.addAll(webInterface.getCore().getDirectedPosts(sone.getId()));
+		List<Post> sonePosts = sone.get().getPosts();
+		sonePosts.addAll(webInterface.getCore().getDirectedPosts(sone.get().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);
 		templateContext.set("posts", postPagination.getItems());
-		Set<PostReply> replies = sone.getReplies();
+		Set<PostReply> replies = sone.get().getReplies();
 		final Map<Post, List<PostReply>> repliedPosts = new HashMap<Post, List<PostReply>>();
 		for (PostReply reply : replies) {
 			Optional<Post> post = reply.getPost();
-			if (!post.isPresent() || repliedPosts.containsKey(post.get()) || sone.equals(post.get().getSone()) || (sone.equals(post.get().getRecipient()))) {
+			if (!post.isPresent() || repliedPosts.containsKey(post.get()) || sone.get().equals(post.get().getSone()) || (sone.get().getId().equals(post.get().getRecipientId().orNull()))) {
 				continue;
 			}
 			repliedPosts.put(post.get(), webInterface.getCore().getReplies(post.get()));