Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-03-02 02:53:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add null check on email body to prevent cheerio exception (#2298)

Browse source
This commit is contained in:
Janosch Maier 2021-03-26 16:02:08 +01:00 committed by GitHub
parent 187ba07206
commit f8b8bff5db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/internal_packages/list-unsubscribe/lib/main.tsx
View file

@ -66,24 +66,30 @@ interface UnsubscribeAction {
}
function bestUnsubscribeLink(message): string {
const dom = cheerio.load(message.body);
const links = _getLinks(dom);
let result = null;
for (const link of links) {
for (const re of regexps) {
if (re.test(link.href)) {
// If the URL contains e.g. "unsubscribe" we assume that we have correctly
// detected the unsubscribe link.
return link.href;
}
if (re.test(link.innerText)) {
// If the URL does not contain "unsubscribe", but the text around the link contains
// it, it is a possible candidate, we we still check all other links for a better match
result = link.href;
// Only check the body if it has been downloaded already
if (message.body) {
const dom = cheerio.load(message.body);
const links = _getLinks(dom);
for (const link of links) {
for (const re of regexps) {
if (re.test(link.href)) {
// If the URL contains e.g. "unsubscribe" we assume that we have correctly
// detected the unsubscribe link.
return link.href;
}
if (re.test(link.innerText)) {
// If the URL does not contain "unsubscribe", but the text around the link contains
// it, it is a possible candidate, we we still check all other links for a better match
result = link.href;
}
}
}
}
return result;