From 153e2dd006c1a51a7b097ff89a39c038b3dde409 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 8 Nov 2020 12:17:21 -0600 Subject: [PATCH] Add special handling for plus sign when encoding URL query parameters. Fixes #2542 --- .../Sources/Account/NewsBlur/Models/NewsBlurFeedChange.swift | 2 +- .../Account/NewsBlur/Models/NewsBlurFolderChange.swift | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Account/Sources/Account/NewsBlur/Models/NewsBlurFeedChange.swift b/Account/Sources/Account/NewsBlur/Models/NewsBlurFeedChange.swift index 56f09a95c..62ae641d5 100644 --- a/Account/Sources/Account/NewsBlur/Models/NewsBlurFeedChange.swift +++ b/Account/Sources/Account/NewsBlur/Models/NewsBlurFeedChange.swift @@ -44,6 +44,6 @@ extension NewsBlurFeedChange: NewsBlurDataConvertible { } }() - return postData.percentEncodedQuery?.data(using: .utf8) + return postData.enhancedPercentEncodedQuery?.data(using: .utf8) } } diff --git a/Account/Sources/Account/NewsBlur/Models/NewsBlurFolderChange.swift b/Account/Sources/Account/NewsBlur/Models/NewsBlurFolderChange.swift index ed2df52cd..88fe53b34 100644 --- a/Account/Sources/Account/NewsBlur/Models/NewsBlurFolderChange.swift +++ b/Account/Sources/Account/NewsBlur/Models/NewsBlurFolderChange.swift @@ -42,6 +42,6 @@ extension NewsBlurFolderChange: NewsBlurDataConvertible { } }() - return postData.percentEncodedQuery?.data(using: .utf8) + return postData.enhancedPercentEncodedQuery?.data(using: .utf8) } } diff --git a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8e5c04af6..d7e790541 100644 --- a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -87,8 +87,8 @@ "repositoryURL": "https://github.com/Ranchero-Software/RSWeb.git", "state": { "branch": null, - "revision": "dd9e2a24bfc7f2fa5f59a443f543fc95191c9788", - "version": "1.0.0-beta7" + "revision": "f4a5788bc0d1e6e75dac08a338298f80edb9d29a", + "version": "1.0.0-beta8" } }, {