X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=508d30b719e687a2b45615f28972860428d89c3c;hb=ec06ae64c86f0b06bb0cf9f8b289e7907e81dffa;hp=6cb2c0c0c2c69ffaccedb63f255ae76c0e5deca5;hpb=cf16e1fef9f9db74f50fb1d12dbc48a552ec2a1a;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 6cb2c0c..508d30b 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -131,7 +131,7 @@ public class SearchPage extends SoneTemplatePage {
 			redirectIfNotNull(getImageId(phrase), "imageBrowser.html?image=");
 		}
 
-		Set<Sone> sones = webInterface.getCore().getSones();
+		Collection<Sone> sones = webInterface.getCore().getSones();
 		Collection<Hit<Sone>> soneHits = getHits(sones, phrases, SoneStringGenerator.COMPLETE_GENERATOR);
 
 		Collection<Hit<Post>> postHits = hitCache.getUnchecked(phrases);
@@ -201,7 +201,7 @@ public class SearchPage extends SoneTemplatePage {
 	 * @return The parsed phrases
 	 */
 	private static List<Phrase> parseSearchPhrases(String query) {
-		List<String> parsedPhrases = null;
+		List<String> parsedPhrases;
 		try {
 			parsedPhrases = StringEscaper.parseLine(query);
 		} catch (TextException te1) {
@@ -310,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).isPresent()) ? soneId : null;
 	}
 
 	/**
@@ -323,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;
 	}
 
 	/**
@@ -354,7 +354,7 @@ public class SearchPage extends SoneTemplatePage {
 	 */
 	private String getAlbumId(String phrase) {
 		String albumId = phrase.startsWith("album://") ? phrase.substring(8) : phrase;
-		return (webInterface.getCore().getAlbum(albumId, false) != null) ? albumId : null;
+		return (webInterface.getCore().getAlbum(albumId) != null) ? albumId : null;
 	}
 
 	/**
@@ -464,10 +464,10 @@ 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)) {
+			for (PostReply reply : Collections2.filter(webInterface.getCore().getReplies(post.getId()), Reply.FUTURE_REPLY_FILTER)) {
 				postString.append(' ').append(SoneStringGenerator.NAME_GENERATOR.generateString(reply.getSone()));
 				postString.append(' ').append(reply.getText());
 			}
@@ -581,7 +581,7 @@ public class SearchPage extends SoneTemplatePage {
 
 			@Override
 			public boolean apply(Hit<?> hit) {
-				return hit.getScore() > 0;
+				return (hit != null) && (hit.getScore() > 0);
 			}
 
 		};