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

Continue removing ExtensionPoint code. Start fixing build errors.

Browse Source
This commit is contained in:
Brent Simmons
2023-06-30 21:55:54 -07:00
parent d309c05cb0
commit 8a9c680cfc
17 changed files with 46 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Shared/Extensions/ArticleUtilities.swift
View File

@@ -46,15 +46,15 @@ extension Article {
}
var url: URL? {
return URL.reparingIfRequired(rawLink)
return URL.encodingSpacesIfNeeded(rawLink)
}
var externalURL: URL? {
return URL.reparingIfRequired(rawExternalLink)
return URL.encodingSpacesIfNeeded(rawExternalLink)
}
var imageURL: URL? {
return URL.reparingIfRequired(rawImageLink)
return URL.encodingSpacesIfNeeded(rawImageLink)
}
var link: String? {

26
Shared/Extensions/URL-Extensions.swift
View File

@@ -17,24 +17,18 @@ extension URL {
/// Percent encoded `mailto` URL for use with `canOpenUrl`. If the URL doesn't contain the `mailto` scheme, this is `nil`.
var percentEncodedEmailAddress: URL? {
scheme == "mailto" ? self.string.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)?.url : nil
guard scheme == "mailto" else {
return nil
}
guard let urlString = absoluteString.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) else {
return nil
}
return URL(string: urlString)
}
/// URL pointing to current app version release notes.
static var releaseNotes: URL {
var gitHub = "https://github.com/Ranchero-Software/NetNewsWire/releases/tag/"
#if os(macOS)
gitHub += "mac-"
#else
gitHub += "ios-"
#endif
gitHub += "\(Bundle.main.versionNumber)-\(Bundle.main.buildNumber)"
/// Reverse chronological list of release notes.
static var releaseNotes = URL(string: "https://github.com/Ranchero-Software/NetNewsWire/releases/")!
return URL(string: gitHub)!
}
func valueFor(_ parameter: String) -> String? {
guard let components = URLComponents(url: self, resolvingAgainstBaseURL: false),
let queryItems = components.queryItems,
@@ -45,7 +39,7 @@ extension URL {
}
static func reparingIfRequired(_ link: String?) -> URL? {
static func encodingSpacesIfNeeded(_ link: String?) -> URL? {
// If required, we replace any space characters to handle malformed links that are otherwise percent
// encoded but contain spaces. For performance reasons, only try this if initial URL init fails.
guard let link = link, !link.isEmpty else { return nil }