X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=1d1aa36fb000af61694efca75475a1f83acc4914;hb=e3395d9dd51f56240e4cb9509ccd403bf5f9e343;hp=b10162e0f446ba8571d77d835a36eca75097a149;hpb=445675e50d824e5899007fe7afccd769dfcf0d10;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 b10162e..1d1aa36 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -86,7 +86,7 @@ public class SearchPage extends SoneTemplatePage {
 			posts.addAll(sone.getPosts());
 		}
 		@SuppressWarnings("synthetic-access")
-		Set<Hit<Post>> postHits = getHits(posts, phrases, new PostStringGenerator());
+		Set<Hit<Post>> postHits = getHits(Filters.filteredSet(posts, Post.FUTURE_POSTS_FILTER), phrases, new PostStringGenerator());
 
 		/* now filter. */
 		soneHits = Filters.filteredSet(soneHits, Hit.POSITIVE_FILTER);
@@ -103,8 +103,8 @@ public class SearchPage extends SoneTemplatePage {
 		List<Post> resultPosts = Converters.convertList(sortedPostHits, new HitConverter<Post>());
 
 		/* pagination. */
-		Pagination<Sone> sonePagination = new Pagination<Sone>(resultSones, 10).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("sonePage"), 0));
-		Pagination<Post> postPagination = new Pagination<Post>(resultPosts, 10).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("postPage"), 0));
+		Pagination<Sone> sonePagination = new Pagination<Sone>(resultSones, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("sonePage"), 0));
+		Pagination<Post> postPagination = new Pagination<Post>(resultPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("postPage"), 0));
 
 		templateContext.set("sonePagination", sonePagination);
 		templateContext.set("soneHits", sonePagination.getItems());
@@ -191,21 +191,31 @@ public class SearchPage extends SoneTemplatePage {
 		int forbiddenHits = 0;
 		int requiredPhrases = 0;
 		for (Phrase phrase : phrases) {
+			String phraseString = phrase.getPhrase().toLowerCase();
 			if (phrase.getOptionality() == Phrase.Optionality.REQUIRED) {
 				++requiredPhrases;
 			}
-			boolean matches = expression.toLowerCase().contains(phrase.getPhrase().toLowerCase());
-			if (!matches) {
+			int matches = 0;
+			int index = 0;
+			while (index < expression.length()) {
+				int position = expression.toLowerCase().indexOf(phraseString, index);
+				if (position == -1) {
+					break;
+				}
+				index = position + phraseString.length();
+				++matches;
+			}
+			if (matches == 0) {
 				continue;
 			}
 			if (phrase.getOptionality() == Phrase.Optionality.REQUIRED) {
-				++requiredHits;
+				requiredHits += matches;
 			}
 			if (phrase.getOptionality() == Phrase.Optionality.OPTIONAL) {
-				++optionalHits;
+				optionalHits += matches;
 			}
 			if (phrase.getOptionality() == Phrase.Optionality.FORBIDDEN) {
-				++forbiddenHits;
+				forbiddenHits += matches;
 			}
 		}
 		return requiredHits * 3 + optionalHits + (requiredHits - requiredPhrases) * 5 - (forbiddenHits * 2);
@@ -308,7 +318,7 @@ public class SearchPage extends SoneTemplatePage {
 			if (post.getRecipient() != null) {
 				postString.append(' ').append(SoneStringGenerator.NAME_GENERATOR.generateString(post.getRecipient()));
 			}
-			for (Reply reply : webInterface.getCore().getReplies(post)) {
+			for (Reply reply : Filters.filteredList(webInterface.getCore().getReplies(post), Reply.FUTURE_REPLIES_FILTER)) {
 				postString.append(' ').append(SoneStringGenerator.NAME_GENERATOR.generateString(reply.getSone()));
 				postString.append(' ').append(reply.getText());
 			}