X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=6cbb11f61b9f4453c99e855ef77aaa23a0075aee;hb=8f02544d31f323ae9053dd9a11a99eacd8cf5bcd;hp=c037baffebc54237d7f5ad2802f186e85a76ead6;hpb=4acdae8d247379dedcc5d41c8aded9503fcbaf72;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/SearchPage.java b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
index c037baf..6cbb11f 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -44,6 +44,7 @@ import net.pterodactylus.util.text.StringEscaper;
 import net.pterodactylus.util.text.TextException;
 
 import com.google.common.base.Function;
+import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -322,7 +323,7 @@ public class SearchPage extends SoneTemplatePage {
 	 */
 	private String getPostId(String phrase) {
 		String postId = phrase.startsWith("post://") ? phrase.substring(7) : phrase;
-		return (webInterface.getCore().getPost(postId) != null) ? postId : null;
+		return (webInterface.getCore().getPost(postId).isPresent()) ? postId : null;
 	}
 
 	/**
@@ -336,7 +337,11 @@ public class SearchPage extends SoneTemplatePage {
 	 */
 	private String getReplyPostId(String phrase) {
 		String replyId = phrase.startsWith("reply://") ? phrase.substring(8) : phrase;
-		return (webInterface.getCore().getPostReply(replyId) != null) ? webInterface.getCore().getPostReply(replyId).getPost().getId() : null;
+		Optional<PostReply> postReply = webInterface.getCore().getPostReply(replyId);
+		if (!postReply.isPresent()) {
+			return null;
+		}
+		return postReply.get().getPostId();
 	}
 
 	/**