From 3e9f208dffa4d918b260c443a93b112a8b6905ae Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 24 Oct 2020 21:37:18 -0500 Subject: [PATCH] Getting the feed URL from the feed ID if it isn't supplied. --- .../Account/ReaderAPI/ReaderAPISubscription.swift | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Account/Sources/Account/ReaderAPI/ReaderAPISubscription.swift b/Account/Sources/Account/ReaderAPI/ReaderAPISubscription.swift index 8ac63a9e9..f4421cba8 100644 --- a/Account/Sources/Account/ReaderAPI/ReaderAPISubscription.swift +++ b/Account/Sources/Account/ReaderAPI/ReaderAPISubscription.swift @@ -47,7 +47,7 @@ struct ReaderAPISubscription: Codable { let feedID: String let name: String? let categories: [ReaderAPICategory] - let url: String + let feedURL: String? let homePageURL: String? let iconURL: String? @@ -55,11 +55,18 @@ struct ReaderAPISubscription: Codable { case feedID = "id" case name = "title" case categories = "categories" - case url = "url" + case feedURL = "url" case homePageURL = "htmlUrl" case iconURL = "iconUrl" } + var url: String { + if let feedURL = feedURL { + return feedURL + } else { + return feedID.stripping(prefix: "feed/") + } + } } struct ReaderAPICategory: Codable {