X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Ffilters%2FBlacklistFilter.java;h=5bac2a054009d43c53a3afd3fce69bfab7afcd65;hb=a861000ec60248ede82ee5137a7017098b616848;hp=848fd985b1ac853f4302d0aafaace50980cbe4ad;hpb=320a6c6e57144c9710735d32346d9c8086ea493b;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/rhynodge/filters/BlacklistFilter.java b/src/main/java/net/pterodactylus/rhynodge/filters/BlacklistFilter.java
index 848fd98..5bac2a0 100644
--- a/src/main/java/net/pterodactylus/rhynodge/filters/BlacklistFilter.java
+++ b/src/main/java/net/pterodactylus/rhynodge/filters/BlacklistFilter.java
@@ -30,6 +30,7 @@ import net.pterodactylus.rhynodge.states.TorrentState;
 import net.pterodactylus.rhynodge.states.TorrentState.TorrentFile;
 
 import com.google.common.base.Predicate;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Filter for {@link TorrentState}s that removes all {@link TorrentFile}s whose
@@ -45,8 +46,9 @@ public class BlacklistFilter implements Filter {
 		this.filterWords = filterWords;
 	}
 
+	@NotNull
 	@Override
-	public State filter(State state) {
+	public State filter(@NotNull State state) {
 		if (!state.success()) {
 			return FailedState.from(state);
 		}
@@ -56,7 +58,7 @@ public class BlacklistFilter implements Filter {
 		return new TorrentState(from(torrentState.torrentFiles()).filter(new Predicate<TorrentFile>() {
 			@Override
 			public boolean apply(TorrentFile torrentFile) {
-				return (torrentFile == null) ? false : nameDoesNotMatchAFilterWord(torrentFile.name());
+				return (torrentFile != null) && nameDoesNotMatchAFilterWord(torrentFile.name());
 			}
 
 			private boolean nameDoesNotMatchAFilterWord(final String name) {
@@ -72,31 +74,61 @@ public class BlacklistFilter implements Filter {
 
 	public static BlacklistFilter createDefaultBlacklistFilter() {
 		return new BlacklistFilter(asList(
+            "[G2G]",
             "-3LT0N",
             "-ADTRG",
             "-AMIABLE",
             "-AN0NYM0US",
+            "-ARROW",
             "-AQOS",
             "-AXED",
+            "-BeStDivX",
+            "-BiDA",
             "-CM",
+            "-COCAIN",
+            "-DASH",
+            "-DEPRiVED",
+            "-DiAMOND",
             "-DiRTYMARY",
+            "-DoNE",
             "-EDAW",
+            "-EVO",
+            "-EVOLVE",
+            "-EwDp",
+            "-Felony",
             "-FooKaS",
             "-Haggebulle",
             "-HELLRAZ0R",
+            "-iJUGGA",
+            "-IMAGiNE",
+            "-iMBT",
+            "-iND",
             "-juggs",
+            "-KILLERS",
+            "-Larceny",
             "-LEGi0N",
             "-MAX",
             "-MiLLENiUM",
+            "-NeDiVx",
+            "-NO1KNOWS",
             "-NoGRP",
+            "-NOiR",
             "-NYDIC",
             "-P2P",
             "-PLAYNOW",
+            "-PSYPHER",
+            "-PUKKA",
+            "-PrisM",
+            "-RARBG",
             "-S4A",
+            "-SANTi",
+            "-SHODAN",
             "-SPARKS",
             "-SUFFiCE",
             "-TAMILROCKERS",
+            "-TARGET",
             "-TASTE",
+            "-TiTAN",
             "-THC",
             "-UnKnOwN",
             "-UNiQUE",