X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=01a5ed07fc15400ff8f8ef59984d138c969c8a4c;hb=921177685a8622866750a3740f94786d88127d95;hp=e979a49d647fe714f641668dd8d03052452180a0;hpb=fdb4895ff440a569367a43d4316734c88c6ee6d3;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 e979a49..01a5ed0 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);
@@ -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) != null) ? soneId : null;
 	}
 
 	/**
@@ -464,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()));