added subscription delete

Frameworks/Account/Account.swift

@@ -593,14 +593,22 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 		return _flattenedFeeds
 	}
 
-	func deleteFeeds(_ feeds: Set<Feed>) {
+	public func deleteFeed(_ feed: Feed, completion: @escaping (Result<Void, Error>) -> Void) {
-		topLevelFeeds.subtract(feeds)
+		delegate.deleteFeed(for: self, container: self, feed: feed, completion: completion)
+	}
+
+	func deleteFeed(_ feed: Feed, from container: Container, completion: @escaping (Result<Void, Error>) -> Void) {
+		delegate.deleteFeed(for: self, container: container, feed: feed, completion: completion)
+	}
+	
+	func deleteFeed(_ feed: Feed) {
+		topLevelFeeds.remove(feed)
 		structureDidChange()
 		postChildrenDidChangeNotification()
 	}
 	
-	public func deleteFeed(_ feed: Feed) {
+	func deleteFeeds(_ feeds: Set<Feed>) {
-		topLevelFeeds.remove(feed)
+		topLevelFeeds.subtract(feeds)
 		structureDidChange()
 		postChildrenDidChangeNotification()
 	}

Frameworks/Account/AccountDelegate.swift

@@ -26,6 +26,7 @@ protocol AccountDelegate {
 
 	func createFeed(for account: Account, with name: String?, url: String, completion: @escaping (Result<AccountCreateFeedResult, Error>) -> Void)
 	func renameFeed(for account: Account, with feed: Feed, to name: String, completion: @escaping (Result<Void, Error>) -> Void)
+	func deleteFeed(for account: Account, container: Container, feed: Feed, completion: @escaping (Result<Void, Error>) -> Void)
 	
 	// Called at the end of account’s init method.
 	func accountDidInitialize(_ account: Account)

Frameworks/Account/Container.swift

@@ -27,7 +27,7 @@ public protocol Container: class {
 	func hasChildFolder(with: String) -> Bool
 	func childFolder(with: String) -> Folder?
 
-    func deleteFeed(_ feed: Feed)
+    func deleteFeed(_ feed: Feed, completion: @escaping (Result<Void, Error>) -> Void)
     func deleteFolder(_ folder: Folder, completion: @escaping (Result<Void, Error>) -> Void)
 
 	func addFeed(_ feed: Feed)

Frameworks/Account/Feedbin/FeedbinAPICaller.swift

@@ -124,7 +124,6 @@ final class FeedbinAPICaller: NSObject {
 		
 		let callURL = feedbinBaseURL.appendingPathComponent("subscriptions.json")
 		var request = URLRequest(url: callURL, credentials: credentials)
-		request.httpMethod = HTTPMethod.post
 		request.addValue("application/json; charset=utf-8", forHTTPHeaderField: HTTPRequestHeader.contentType)
 		
 		let payload: Data
@@ -135,7 +134,7 @@ final class FeedbinAPICaller: NSObject {
 			return
 		}
 		
-		transport.send(request: request, payload: payload) { result in
+		transport.send(request: request, method: HTTPMethod.post, payload: payload) { result in
 			
 			switch result {
 			case .success(let (response, data)):
@@ -188,13 +187,19 @@ final class FeedbinAPICaller: NSObject {
 		
 	}
 	
-	func renameFeed(subscriptionID: String, newName: String, completion: @escaping (Result<Void, Error>) -> Void) {
+	func renameSubscription(subscriptionID: String, newName: String, completion: @escaping (Result<Void, Error>) -> Void) {
 		let callURL = feedbinBaseURL.appendingPathComponent("subscriptions/\(subscriptionID)/update.json")
 		let request = URLRequest(url: callURL, credentials: credentials)
 		let payload = FeedbinUpdateSubscription(title: newName)
 		transport.send(request: request, method: HTTPMethod.post, payload: payload, completion: completion)
 	}
 	
+	func deleteSubscription(subscriptionID: String, completion: @escaping (Result<Void, Error>) -> Void) {
+		let callURL = feedbinBaseURL.appendingPathComponent("subscriptions/\(subscriptionID).json")
+		let request = URLRequest(url: callURL, credentials: credentials)
+		transport.send(request: request, method: HTTPMethod.delete, completion: completion)
+	}
+	
 	func retrieveTaggings(completionHandler completion: @escaping (Result<[FeedbinTagging]?, Error>) -> Void) {
 		
 		let callURL = feedbinBaseURL.appendingPathComponent("taggings.json")

Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift

@@ -158,7 +158,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
 			return
 		}
 		
-		caller.renameFeed(subscriptionID: subscriptionID, newName: name) { result in
+		caller.renameSubscription(subscriptionID: subscriptionID, newName: name) { result in
 			switch result {
 			case .success:
 				DispatchQueue.main.async {
@@ -174,6 +174,35 @@ final class FeedbinAccountDelegate: AccountDelegate {
 		
 	}
 
+	func deleteFeed(for account: Account, container: Container, feed: Feed, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		// This error should never happen
+		guard let subscriptionID = feed.subscriptionID else {
+			completion(.failure(FeedbinAccountDelegateError.invalidParameter))
+			return
+		}
+		
+		caller.deleteSubscription(subscriptionID: subscriptionID) { result in
+			switch result {
+			case .success:
+				DispatchQueue.main.async {
+					if let account = container as? Account {
+						account.deleteFeed(feed)
+					}
+					if let folder = container as? Folder {
+						folder.deleteFeed(feed)
+					}
+					completion(.success(()))
+				}
+			case .failure(let error):
+				DispatchQueue.main.async {
+					completion(.failure(error))
+				}
+			}
+		}
+		
+	}
+	
 	func accountDidInitialize(_ account: Account) {
 		credentials = try? account.retrieveBasicCredentials()
 		accountMetadata = account.metadata

Frameworks/Account/Folder.swift

@@ -95,7 +95,11 @@ public final class Folder: DisplayNameProvider, Renamable, Container, UnreadCoun
 		return topLevelFeeds.contains(feed)
 	}
 
-	public func deleteFeed(_ feed: Feed) {
+	public func deleteFeed(_ feed: Feed, completion: @escaping (Result<Void, Error>) -> Void) {
+		// TODO: Something here...
+	}
+	
+	func deleteFeed(_ feed: Feed) {
 		topLevelFeeds.remove(feed)
 		postChildrenDidChangeNotification()
 	}

Frameworks/Account/LocalAccount/LocalAccountDelegate.swift

@@ -65,6 +65,19 @@ final class LocalAccountDelegate: AccountDelegate {
 		completion(.success(()))
 	}
 
+	func deleteFeed(for account: Account, container: Container, feed: Feed, completion: @escaping (Result<Void, Error>) -> Void) {
+		
+		if let account = container as? Account {
+			account.deleteFeed(feed)
+		}
+		if let folder = container as? Folder {
+			folder.deleteFeed(feed)
+		}
+		completion(.success(()))
+		
+	}
+	
+
 	func accountDidInitialize(_ account: Account) {
 	}
 

Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift

@@ -244,8 +244,14 @@ private extension SidebarOutlineDataSource {
 		}
 		let sourceContainer = node.parent?.representedObject as? Container
 		let destinationFolder = parentNode.representedObject as? Folder
-		sourceContainer?.deleteFeed(feed)
+		sourceContainer?.deleteFeed(feed) { result in
+			switch result {
+			case .success:
 				account.addFeed(feed, to: destinationFolder)
+			case .failure(let error):
+				NSApplication.shared.presentError(error)
+			}
+		}
 	}
 
 	func acceptLocalFeedsDrop(_ outlineView: NSOutlineView, _ draggedFeeds: Set<PasteboardFeed>, _ parentNode: Node, _ index: Int) -> Bool {

Mac/Scriptability/Account+Scriptability.swift

@@ -55,7 +55,8 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta
 			}
 		} else if let scriptableFeed = element as? ScriptableFeed {
 			BatchUpdate.shared.perform {
-				account.deleteFeed(scriptableFeed.feed)
+				account.deleteFeed(scriptableFeed.feed) { result in
+				}
 			}
 		}
 	}

Mac/Scriptability/Folder+Scriptability.swift

@@ -57,7 +57,7 @@ class ScriptableFolder: NSObject, UniqueIdScriptingObject, ScriptingObjectContai
             }
         } else if let scriptableFeed = element as? ScriptableFeed {
             BatchUpdate.shared.perform {
-                folder.deleteFeed(scriptableFeed.feed)
+				folder.deleteFeed(scriptableFeed.feed) { result in }
             }
         }
     }

Shared/Commands/DeleteCommand.swift

@@ -139,9 +139,19 @@ private struct SidebarItemSpecifier {
 		}
 
 		if let feed = feed {
-			container.deleteFeed(feed)
+			container.deleteFeed(feed) { result in
+				switch result {
+				case .success():
+					break
+				case .failure(let error):
+					#if os(macOS)
+					NSApplication.shared.presentError(error)
+					#else
+					UIApplication.shared.presentError(error)
+					#endif
 				}
-		else if let folder = folder {
+			}
+		} else if let folder = folder {
 			container.deleteFolder(folder) { result in
 				switch result {
 				case .success():

submodules/RSWeb

@@ -1 +1 @@
-Subproject commit bb6839d82ef733d473cdc09925cc70fb2de238aa
+Subproject commit 9e8ef66b5cba0316926f243d0465dfbb1fdc307e