X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FViewSonePage.java;h=5572bca16181877b3193bb6df0705d395a647101;hb=9e8b1de83b5791778788406edbba9ed6d256a63f;hp=5fe356d1832dac611adf1a09fffe4b02b606daf8;hpb=54e35873a9660bc51aae7cdb4c1e7d399e50986b;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 5fe356d..5572bca 100644
--- a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ViewSonePage.java - Copyright © 2010 David Roden
+ * Sone - ViewSonePage.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
@@ -17,6 +17,7 @@
 
 package net.pterodactylus.sone.web;
 
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -35,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.
  *
@@ -94,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>() {
@@ -115,4 +118,12 @@ public class ViewSonePage extends SoneTemplatePage {
 		templateContext.set("repliedPosts", repliedPostPagination.getItems());
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isLinkExcepted(URI link) {
+		return true;
+	}
+
 }