From f355db6788cb6ed684fc71010ca8f25866e72638 Mon Sep 17 00:00:00 2001
From: krt- <6348015+krt-@users.noreply.github.com>
Date: Sat, 11 Apr 2020 15:02:00 -0400
Subject: [PATCH] CardigannIndexer: Fix andmatch filter to respect
 keywordsfilters resolves #7988 (#8007)

---
 src/Jackett.Common/Indexers/CardigannIndexer.cs | 4 +++-
 src/Jackett.Common/Models/TorznabQuery.cs       | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs
index 04425e458..21722bd18 100644
--- a/src/Jackett.Common/Indexers/CardigannIndexer.cs
+++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs
@@ -1603,7 +1603,9 @@ namespace Jackett.Common.Indexers
                                             if (query.ImdbID != null && TorznabCaps.SupportsImdbMovieSearch)
                                                 break; // skip andmatch filter for imdb searches
 
-                                            if (!query.MatchQueryStringAND(release.Title, CharacterLimit))
+                                            var queryKeywords = variables[".Keywords"] as string;
+
+                                            if (!query.MatchQueryStringAND(release.Title, CharacterLimit, queryKeywords))
                                             {
                                                 logger.Debug(string.Format("CardigannIndexer ({0}): skipping {1} (andmatch filter)", ID, release.Title));
                                                 SkipRelease = true;
diff --git a/src/Jackett.Common/Models/TorznabQuery.cs b/src/Jackett.Common/Models/TorznabQuery.cs
index c890ead60..487259497 100644
--- a/src/Jackett.Common/Models/TorznabQuery.cs
+++ b/src/Jackett.Common/Models/TorznabQuery.cs
@@ -148,9 +148,8 @@ namespace Jackett.Common.Models
             // We cache the regex split results so we have to do it only once for each query.
             if (QueryStringParts == null)
             {
-                var queryString = GetQueryString();
-                if (queryStringOverride != null)
-                    queryString = queryStringOverride;
+                var queryString = !string.IsNullOrWhiteSpace(queryStringOverride) ? queryStringOverride : GetQueryString();
+
                 if (limit != null && limit > 0)
                 {
                     if (limit > queryString.Length)