OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Fixed member newsletter filter when multiple filters applied (#17857)

Browse Source 
closes https://github.com/TryGhost/Product/issues/3735

The member newsletter filter was not working correctly when multiple
filters were applied due to the regex incorrectly extracting the
contents of a grouped filter. This commit splits the regex into two to
make it easier to reason about and fixes the underlying issue
This commit is contained in:
Michael Barrett 2023-08-29 14:20:55 +01:00 committed by GitHub
parent 3959c00e5e
commit 492c26c6ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ghost/admin/app/controllers/members.js
View File

@ -216,33 +216,18 @@ export default class MembersController extends Controller {
});
}
refineFilterParam(filterParam) {
// We have some crazy regex below, here's a breakdown of what it does:
// \\( - Matches an opening parenthesis "("
// [^)]* - Matches zero or more characters that are NOT a closing parenthesis ")"
// [,+\\-]? - Matches an optional comma, plus, or minus sign
// email_disabled - Matches the exact string "email_disabled"
// [^)]* - Matches zero or more characters that are NOT a closing parenthesis ")"
// \\) - Matches a closing parenthesis ")"
// (?!
// [+\\-] - Negative lookahead: Asserts what directly follows is neither a plus "+" nor a minus "-"
// | - OR
// :\\'[^']*\\' - Negative lookahead: Asserts what follows is not a colon ":" followed by a string in single quotes
// | - OR
// :\\"[^"]*\\" - Negative lookahead: Asserts what follows is not a colon ":" followed by a string in double quotes
// )
const regex = new RegExp(`\\(([^)]*[,+\\-]?email_disabled[^)]*)\\)(?![+\\-]|:\\'[^']*\\'|:\\"[^"]*\\")`, 'g');
return filterParam.replace(regex, '$1');
}
getApiQueryObject({params, extraFilters = []} = {}) {
let {label, paidParam, searchParam, filterParam} = params ? params : this;
// NOTE: this is a temporary fix to help where the API/NQL isn't handling the parentheses correctly
// It's potentially a deeper issue with NQL. This should be removed once the API is fixed.
// This could be related https://github.com/TryGhost/NQL/issues/16
if (filterParam) {
filterParam = this.refineFilterParam(filterParam);
// If the provided filter param is a single filter related to newsletter subscription status
// remove the surrounding brackets to prevent https://github.com/TryGhost/NQL/issues/16
const NEWSLETTER_SUBSCRIPTION_STATUS_RE = /^\(subscribed:(?:true|false)[+,]email_disabled:[01]\)$/;
const SPECIFIC_NEWSLETTER_SUBSCRIPTION_STATUS_RE = /^\(newsletters\.slug:[^()]+[+,]email_disabled:[01]\)$/;
if (NEWSLETTER_SUBSCRIPTION_STATUS_RE.test(filterParam) || SPECIFIC_NEWSLETTER_SUBSCRIPTION_STATUS_RE.test(filterParam)) {
filterParam = filterParam.slice(1, -1);
}
}
let filters = [];