FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Discard the email address in the byline if it is a no reply. Issue #2351

Browse Source
This commit is contained in:
Maurice Parker 2020-08-18 17:44:28 -05:00
parent d98608fe3a
commit 1cda2ac3be
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Shared/Article Rendering/ArticleRenderer.swift
View File

@ -218,19 +218,24 @@ private extension ArticleRenderer {
} }
isFirstAuthor = false isFirstAuthor = false
if let emailAddress = author.emailAddress, emailAddress.contains(" ") { var authorEmailAddress: String? = nil
if let emailAddress = author.emailAddress, !(emailAddress.contains("noreply@") || emailAddress.contains("no-reply@")) {
authorEmailAddress = emailAddress
}
if let emailAddress = authorEmailAddress, emailAddress.contains(" ") {
byline += emailAddress // probably name plus email address byline += emailAddress // probably name plus email address
} }
else if let name = author.name, let url = author.url { else if let name = author.name, let url = author.url {
byline += name.htmlByAddingLink(url) byline += name.htmlByAddingLink(url)
} }
else if let name = author.name, let emailAddress = author.emailAddress { else if let name = author.name, let emailAddress = authorEmailAddress {
byline += "\(name) <\(emailAddress)>" byline += "\(name) <\(emailAddress)>"
} }
else if let name = author.name { else if let name = author.name {
byline += name byline += name
} }
else if let emailAddress = author.emailAddress { else if let emailAddress = authorEmailAddress {
byline += "<\(emailAddress)>" // TODO: mailto link byline += "<\(emailAddress)>" // TODO: mailto link
} }
else if let url = author.url { else if let url = author.url {

11
Shared/Extensions/ArticleUtilities.swift
View File

@ -134,17 +134,22 @@ extension Article {
byline += ", " byline += ", "
} }
isFirstAuthor = false isFirstAuthor = false
var authorEmailAddress: String? = nil
if let emailAddress = author.emailAddress, !(emailAddress.contains("noreply@") || emailAddress.contains("no-reply@")) {
authorEmailAddress = emailAddress
}
if let emailAddress = author.emailAddress, emailAddress.contains(" ") { if let emailAddress = authorEmailAddress, emailAddress.contains(" ") {
byline += emailAddress // probably name plus email address byline += emailAddress // probably name plus email address
} }
else if let name = author.name, let emailAddress = author.emailAddress { else if let name = author.name, let emailAddress = authorEmailAddress {
byline += "\(name) <\(emailAddress)>" byline += "\(name) <\(emailAddress)>"
} }
else if let name = author.name { else if let name = author.name {
byline += name byline += name
} }
else if let emailAddress = author.emailAddress { else if let emailAddress = authorEmailAddress {
byline += "<\(emailAddress)>" byline += "<\(emailAddress)>"
} }
else if let url = author.url { else if let url = author.url {