X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FIndexPage.java;h=a3db2268fb0c60865c47f7d0481b6c6157f85db7;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=baa56099ef552b12fd4acdb92fb9a6fd177f0899;hpb=26dbc1f7ba2c4243d8cc07986b0e943a2238ea08;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/IndexPage.java b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
index baa5609..a3db226 100644
--- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - IndexPage.java - Copyright © 2010–2012 David Roden
+ * Sone - IndexPage.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
@@ -31,6 +31,7 @@ import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 
@@ -56,9 +57,6 @@ public class IndexPage extends SoneTemplatePage {
 	// TEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
@@ -66,14 +64,15 @@ public class IndexPage extends SoneTemplatePage {
 		Collection<Post> allPosts = new ArrayList<Post>();
 		allPosts.addAll(currentSone.getPosts());
 		for (String friendSoneId : currentSone.getFriends()) {
-			if (!webInterface.getCore().hasSone(friendSoneId)) {
+			Optional<Sone> friendSone = webInterface.getCore().getSone(friendSoneId);
+			if (!friendSone.isPresent()) {
 				continue;
 			}
-			allPosts.addAll(webInterface.getCore().getSone(friendSoneId).getPosts());
+			allPosts.addAll(friendSone.get().getPosts());
 		}
 		for (Sone sone : webInterface.getCore().getSones()) {
 			for (Post post : sone.getPosts()) {
-				if (currentSone.equals(post.getRecipient()) && !allPosts.contains(post)) {
+				if (currentSone.equals(post.getRecipient().orNull()) && !allPosts.contains(post)) {
 					allPosts.add(post);
 				}
 			}