X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=320e7cd3bf4034863dae1e92a669a153f4542feb;hb=45803a1c678d6811f7bbf85d50c79844031be0f0;hp=337918de2f3d5c3367911f6a22ef56b6bac2b7b4;hpb=d678616d36fce087fe89cdbc27f0169e7a612790;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 337918d..320e7cd 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;
@@ -309,7 +310,7 @@ public class SearchPage extends SoneTemplatePage {
 	 */
 	private String getSoneId(String phrase) {
 		String soneId = phrase.startsWith("sone://") ? phrase.substring(7) : phrase;
-		return (webInterface.getCore().getSone(soneId, false) != null) ? soneId : null;
+		return (webInterface.getCore().getSone(soneId) != null) ? soneId : null;
 	}
 
 	/**
@@ -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();
 	}
 
 	/**
@@ -459,8 +464,8 @@ public class SearchPage extends SoneTemplatePage {
 		public String generateString(Post post) {
 			StringBuilder postString = new StringBuilder();
 			postString.append(post.getText());
-			if (post.getRecipient() != null) {
-				postString.append(' ').append(SoneStringGenerator.NAME_GENERATOR.generateString(post.getRecipient()));
+			if (post.getRecipient().isPresent()) {
+				postString.append(' ').append(SoneStringGenerator.NAME_GENERATOR.generateString(post.getRecipient().get()));
 			}
 			for (PostReply reply : Collections2.filter(webInterface.getCore().getReplies(post), Reply.FUTURE_REPLY_FILTER)) {
 				postString.append(' ').append(SoneStringGenerator.NAME_GENERATOR.generateString(reply.getSone()));