renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mac-candidate' into main

Browse Source
This commit is contained in:
Maurice Parker
2020-08-19 21:03:55 -05:00
parent 34247f6d89 d3cebfaccb
commit b0e7ae0324
21 changed files with 125 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Shared/Extensions/ArticleUtilities.swift
View File

@@ -134,17 +134,22 @@ extension Article {
byline += ", "
}
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
}
else if let name = author.name, let emailAddress = author.emailAddress {
else if let name = author.name, let emailAddress = authorEmailAddress {
byline += "\(name) <\(emailAddress)>"
}
else if let name = author.name {
byline += name
}
else if let emailAddress = author.emailAddress {
else if let emailAddress = authorEmailAddress {
byline += "<\(emailAddress)>"
}
else if let url = author.url {