X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=2b854f3a3f5aa4ff002892942b019f0f3c469730;hb=29ae7ad7e5f47a7020278173c1aa6d3b54021e81;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..2b854f3 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -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);