From 4adbd2cdeccf926404d7a557b241b640a6820473 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 26 Oct 2024 21:34:33 -0700 Subject: [PATCH] Ignore error from Feedbin and process removal locally regardless. Fix #3611. --- .../FeedbinAccountDelegate.swift | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Modules/Account/Sources/Account/AccountDelegates/FeedbinAccountDelegate.swift b/Modules/Account/Sources/Account/AccountDelegates/FeedbinAccountDelegate.swift index 8d264383d..530db8c89 100644 --- a/Modules/Account/Sources/Account/AccountDelegates/FeedbinAccountDelegate.swift +++ b/Modules/Account/Sources/Account/AccountDelegates/FeedbinAccountDelegate.swift @@ -989,20 +989,15 @@ private extension FeedbinAccountDelegate { refreshProgress.addTask() defer { refreshProgress.completeTask() } - do { - try await caller.deleteSubscription(subscriptionID: subscriptionID) - - account.clearFeedMetadata(feed) - account.removeFeed(feed) - if let folders = account.folders { - for folder in folders { - folder.removeFeed(feed) - } + try? await caller.deleteSubscription(subscriptionID: subscriptionID) + // Ignore any errors from the server and process locally + // https://github.com/Ranchero-Software/NetNewsWire/issues/3611 + account.clearFeedMetadata(feed) + account.removeFeed(feed) + if let folders = account.folders { + for folder in folders { + folder.removeFeed(feed) } - - } catch { - let wrappedError = AccountError.wrappedError(error: error, account: account) - throw wrappedError } } }