From 5d2a3e9142c0f60092aa7d3a3a4f19e0bd1571e9 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 2 Sep 2018 12:08:35 -0700 Subject: [PATCH] Normalize homePageURL on init-ing Feed. --- Frameworks/Account/Feed.swift | 4 +++- submodules/RSCore | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Frameworks/Account/Feed.swift b/Frameworks/Account/Feed.swift index c6d8c5454..43ed0cd25 100644 --- a/Frameworks/Account/Feed.swift +++ b/Frameworks/Account/Feed.swift @@ -86,7 +86,9 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable { let feedID = dictionary[Key.feedID] as? String ?? url self.init(accountID: accountID, url: url, feedID: feedID) - self.homePageURL = dictionary[Key.homePageURL] as? String + if let homePageURL = dictionary[Key.homePageURL] as? String { + self.homePageURL = homePageURL.rs_normalizedURL() + } self.iconURL = dictionary[Key.iconURL] as? String self.faviconURL = dictionary[Key.faviconURL] as? String self.name = dictionary[Key.name] as? String diff --git a/submodules/RSCore b/submodules/RSCore index d0a4a1e69..0e9c6b45f 160000 --- a/submodules/RSCore +++ b/submodules/RSCore @@ -1 +1 @@ -Subproject commit d0a4a1e69548137295f19b94d8dc41910619e020 +Subproject commit 0e9c6b45f561f9485e8f594c2c978f8a88f12b4f