From 22e7a0edbb32f411d503fde1fba978448bf43585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kiel=20Gillard=20=F0=9F=A4=AA?= <kgillard@deputy.com>
Date: Mon, 5 Oct 2020 22:12:45 +1100
Subject: [PATCH] Encode the + in Feedly collection URIs. Fixes #2443.

---
 Frameworks/Account/Feedly/FeedlyAPICaller.swift | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Frameworks/Account/Feedly/FeedlyAPICaller.swift b/Frameworks/Account/Feedly/FeedlyAPICaller.swift
index 5ae2cbc2f..36f974835 100644
--- a/Frameworks/Account/Feedly/FeedlyAPICaller.swift
+++ b/Frameworks/Account/Feedly/FeedlyAPICaller.swift
@@ -48,10 +48,15 @@ final class FeedlyAPICaller {
 	
 	private let transport: Transport
 	private let baseUrlComponents: URLComponents
+	private let uriComponentAllowed: CharacterSet
 	
 	init(transport: Transport, api: API) {
 		self.transport = transport
 		self.baseUrlComponents = api.baseUrlComponents
+		
+		var urlHostAllowed = CharacterSet.urlHostAllowed
+		urlHostAllowed.remove("+")
+		uriComponentAllowed = urlHostAllowed
 	}
 	
 	weak var delegate: FeedlyAPICallerDelegate?
@@ -272,7 +277,7 @@ final class FeedlyAPICaller {
 	}
 	
 	private func encodeForURLPath(_ pathComponent: String) -> String? {
-		return pathComponent.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
+		return pathComponent.addingPercentEncoding(withAllowedCharacters: uriComponentAllowed)
 	}
 	
 	func deleteCollection(with id: String, completion: @escaping (Result<Void, Error>) -> ()) {