X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=db29fd29257c83cd686834fa565a7a3180525422;hb=414ee1b03f7155ccb5049ede303dd01020ddcd94;hp=434843435d8e2cb4974baa3f62198e543479a6d0;hpb=60fda3f6fd8cd72151338c831f509dd8d9d0f9ff;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 4348434..db29fd2 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -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) != null) ? soneId : null;
+		return (webInterface.getCore().getSone(soneId).isPresent()) ? soneId : 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).isPresent() ? albumId : null;
 	}
 
 	/**
@@ -367,7 +367,7 @@ public class SearchPage extends SoneTemplatePage {
 	 */
 	private String getImageId(String phrase) {
 		String imageId = phrase.startsWith("image://") ? phrase.substring(8) : phrase;
-		return (webInterface.getCore().getImage(imageId, false) != null) ? imageId : null;
+		return webInterface.getCore().getImage(imageId).isPresent() ? imageId : null;
 	}
 
 	/**
@@ -581,7 +581,7 @@ public class SearchPage extends SoneTemplatePage {
 
 			@Override
 			public boolean apply(Hit<?> hit) {
-				return hit.getScore() > 0;
+				return (hit == null) ? false : hit.getScore() > 0;
 			}
 
 		};