X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=d83b822698ea1c01c07c6b42617d92d1235aef7c;hb=80064be52c34c9d691da252d2628aa1f39debd23;hp=6c9e15c3e1ee8766a45635f129a259e6f0f41226;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e;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 6c9e15c..d83b822 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -94,9 +94,6 @@ public class SearchPage extends SoneTemplatePage {
 	// SONETEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	@SuppressWarnings("synthetic-access")
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
@@ -354,7 +351,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 +364,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;
 	}
 
 	/**
@@ -421,9 +418,6 @@ public class SearchPage extends SoneTemplatePage {
 			this.complete = complete;
 		}
 
-		/**
-		 * {@inheritDoc}
-		 */
 		@Override
 		public String generateString(Sone sone) {
 			StringBuilder soneString = new StringBuilder();
@@ -457,9 +451,6 @@ public class SearchPage extends SoneTemplatePage {
 	 */
 	private class PostStringGenerator implements StringGenerator<Post> {
 
-		/**
-		 * {@inheritDoc}
-		 */
 		@Override
 		public String generateString(Post post) {
 			StringBuilder postString = new StringBuilder();
@@ -543,17 +534,11 @@ public class SearchPage extends SoneTemplatePage {
 		// OBJECT METHODS
 		//
 
-		/**
-		 * {@inheritDoc}
-		 */
 		@Override
 		public int hashCode() {
 			return phrase.hashCode() ^ ((optionality == Optionality.FORBIDDEN) ? (0xaaaaaaaa) : ((optionality == Optionality.REQUIRED) ? 0x55555555 : 0));
 		}
 
-		/**
-		 * {@inheritDoc}
-		 */
 		@Override
 		public boolean equals(Object object) {
 			if (!(object instanceof Phrase)) {
@@ -581,7 +566,7 @@ public class SearchPage extends SoneTemplatePage {
 
 			@Override
 			public boolean apply(Hit<?> hit) {
-				return hit.getScore() > 0;
+				return (hit == null) ? false : hit.getScore() > 0;
 			}
 
 		};
@@ -644,9 +629,6 @@ public class SearchPage extends SoneTemplatePage {
 	 */
 	private static class HitMapper<T> implements Function<Hit<T>, T> {
 
-		/**
-		 * {@inheritDoc}
-		 */
 		@Override
 		public T apply(Hit<T> input) {
 			return input.getObject();