From 4ac8107f27b52ed65c3230a65d6dbdf91b227d8f Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Sat, 8 Feb 2020 17:43:16 -0600 Subject: [PATCH] Don't unwrap now-non-optionals, and unwrap now-explicit optionals --- Frameworks/Account/FeedFinder/HTMLFeedFinder.swift | 6 ++---- Shared/Images/RSHTMLMetadata+Extension.swift | 7 +++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Frameworks/Account/FeedFinder/HTMLFeedFinder.swift b/Frameworks/Account/FeedFinder/HTMLFeedFinder.swift index e8f242a56..39c3a095b 100644 --- a/Frameworks/Account/FeedFinder/HTMLFeedFinder.swift +++ b/Frameworks/Account/FeedFinder/HTMLFeedFinder.swift @@ -29,16 +29,14 @@ class HTMLFeedFinder { } } - if let bodyLinks = RSHTMLLinkParser.htmlLinks(with: parserData) { + let bodyLinks = RSHTMLLinkParser.htmlLinks(with: parserData) for oneBodyLink in bodyLinks { - if linkMightBeFeed(oneBodyLink) { - let normalizedURL = oneBodyLink.urlString.normalizedURL + if linkMightBeFeed(oneBodyLink), let normalizedURL = oneBodyLink.urlString?.normalizedURL { let oneFeedSpecifier = FeedSpecifier(title: oneBodyLink.text, urlString: normalizedURL, source: .HTMLLink) addFeedSpecifier(oneFeedSpecifier) } } - } } } diff --git a/Shared/Images/RSHTMLMetadata+Extension.swift b/Shared/Images/RSHTMLMetadata+Extension.swift index cf5dd8ba7..82580ab37 100644 --- a/Shared/Images/RSHTMLMetadata+Extension.swift +++ b/Shared/Images/RSHTMLMetadata+Extension.swift @@ -12,8 +12,9 @@ import RSParser extension RSHTMLMetadata { func largestOpenGraphImageURL() -> String? { + let openGraphImages = openGraphProperties.images - guard let openGraphImages = openGraphProperties?.images, !openGraphImages.isEmpty else { + guard !openGraphImages.isEmpty else { return nil } @@ -47,7 +48,9 @@ extension RSHTMLMetadata { func largestAppleTouchIcon() -> String? { - guard let icons = appleTouchIcons, !icons.isEmpty else { + let icons = appleTouchIcons + + guard !icons.isEmpty else { return nil }