fix: delete old notifications in CoreData

Mastodon.xcodeproj/project.pbxproj

@@ -110,6 +110,7 @@
 		2D8434F525FF465D00EECE90 /* HomeTimelineNavigationBarTitleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D8434F425FF465D00EECE90 /* HomeTimelineNavigationBarTitleViewModel.swift */; };
 		2D8434FB25FF46B300EECE90 /* HomeTimelineNavigationBarTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D8434FA25FF46B300EECE90 /* HomeTimelineNavigationBarTitleView.swift */; };
 		2D84350525FF858100EECE90 /* UIScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D84350425FF858100EECE90 /* UIScrollView.swift */; };
+		2D8FCA082637EABB00137F46 /* APIService+FollowRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D8FCA072637EABB00137F46 /* APIService+FollowRequest.swift */; };
 		2D927F0225C7E4F2004F19B8 /* Mention.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D927F0125C7E4F2004F19B8 /* Mention.swift */; };
 		2D927F0825C7E9A8004F19B8 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D927F0725C7E9A8004F19B8 /* Tag.swift */; };
 		2D927F0E25C7E9C9004F19B8 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D927F0D25C7E9C9004F19B8 /* History.swift */; };
@@ -528,6 +529,7 @@
 		2D8434F425FF465D00EECE90 /* HomeTimelineNavigationBarTitleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTimelineNavigationBarTitleViewModel.swift; sourceTree = "<group>"; };
 		2D8434FA25FF46B300EECE90 /* HomeTimelineNavigationBarTitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTimelineNavigationBarTitleView.swift; sourceTree = "<group>"; };
 		2D84350425FF858100EECE90 /* UIScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIScrollView.swift; sourceTree = "<group>"; };
+		2D8FCA072637EABB00137F46 /* APIService+FollowRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "APIService+FollowRequest.swift"; sourceTree = "<group>"; };
 		2D927F0125C7E4F2004F19B8 /* Mention.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mention.swift; sourceTree = "<group>"; };
 		2D927F0725C7E9A8004F19B8 /* Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
 		2D927F0D25C7E9C9004F19B8 /* History.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = History.swift; sourceTree = "<group>"; };
@@ -1477,6 +1479,7 @@
 				0F202212261351F5000C64BF /* APIService+HashtagTimeline.swift */,
 				DBCC3B9426157E6E0045B23D /* APIService+Relationship.swift */,
 				DBAE3F932616E28B004B8251 /* APIService+Follow.swift */,
+				2D8FCA072637EABB00137F46 /* APIService+FollowRequest.swift */,
 				DBAE3F8D2616E0B1004B8251 /* APIService+Block.swift */,
 				DBAE3F9D2616E308004B8251 /* APIService+Mute.swift */,
 				5B90C48426259BF10002E742 /* APIService+Subscriptions.swift */,
@@ -2406,6 +2409,7 @@
 				DBA0A10925FB3C2B0079C110 /* RoundedEdgesButton.swift in Sources */,
 				DBABE3EC25ECAC4B00879EE5 /* WelcomeIllustrationView.swift in Sources */,
 				DB71FD4625F8C6D200512AE1 /* StatusProvider+UITableViewDataSourcePrefetching.swift in Sources */,
+				2D8FCA082637EABB00137F46 /* APIService+FollowRequest.swift in Sources */,
 				2D152A8C25C295CC009AA50C /* StatusView.swift in Sources */,
 				2DE0FAC82615F5F000CDF649 /* SearchRecommendAccountsCollectionViewCell.swift in Sources */,
 				2DFAD5272616F9D300F9EE7C /* SearchViewController+Searching.swift in Sources */,

Mastodon/Protocol/UserProvider/UserProviderFacade.swift

@@ -44,8 +44,7 @@ extension UserProviderFacade {
                 
                 return context.apiService.toggleFollow(
                     for: mastodonUser,
-                    activeMastodonAuthenticationBox: activeMastodonAuthenticationBox,
+                    activeMastodonAuthenticationBox: activeMastodonAuthenticationBox
-                    needFeedback: true
                 )
             }
             .switchToLatest()

Mastodon/Scene/SuggestionAccount/SuggestionAccountViewModel.swift

@@ -188,8 +188,7 @@ final class SuggestionAccountViewModel: NSObject {
         let mastodonUser = context.managedObjectContext.object(with: objectID) as! MastodonUser
         return context.apiService.toggleFollow(
             for: mastodonUser,
-            activeMastodonAuthenticationBox: activeMastodonAuthenticationBox,
+            activeMastodonAuthenticationBox: activeMastodonAuthenticationBox
-            needFeedback: false
         )
     }
     

Mastodon/Service/APIService/APIService+Follow.swift

@@ -24,15 +24,12 @@ extension APIService {
     /// - Returns: publisher for `Relationship`
     func toggleFollow(
         for mastodonUser: MastodonUser,
-        activeMastodonAuthenticationBox: AuthenticationService.MastodonAuthenticationBox,
+        activeMastodonAuthenticationBox: AuthenticationService.MastodonAuthenticationBox
-        needFeedback: Bool
     ) -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.Relationship>, Error> {
-        var impactFeedbackGenerator: UIImpactFeedbackGenerator?
+        
-        var notificationFeedbackGenerator: UINotificationFeedbackGenerator?
+        let impactFeedbackGenerator = UIImpactFeedbackGenerator(style: .light)
-        if needFeedback {
+        let notificationFeedbackGenerator = UINotificationFeedbackGenerator()
-            impactFeedbackGenerator = UIImpactFeedbackGenerator(style: .light)
+        
-            notificationFeedbackGenerator = UINotificationFeedbackGenerator()
-        }
         
         return followUpdateLocal(
             mastodonUserObjectID: mastodonUser.objectID,
@@ -40,9 +37,9 @@ extension APIService {
         )
         .receive(on: DispatchQueue.main)
         .handleEvents { _ in
-            impactFeedbackGenerator?.prepare()
+            impactFeedbackGenerator.prepare()
         } receiveOutput: { _ in
-            impactFeedbackGenerator?.impactOccurred()
+            impactFeedbackGenerator.impactOccurred()
         } receiveCompletion: { completion in
             switch completion {
             case .failure(let error):
@@ -79,13 +76,13 @@ extension APIService {
                     os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: [Friendship] rollback finish", ((#file as NSString).lastPathComponent), #line, #function)
                 } receiveValue: { _ in
                     // do nothing
-                    notificationFeedbackGenerator?.prepare()
+                    notificationFeedbackGenerator.prepare()
-                    notificationFeedbackGenerator?.notificationOccurred(.error)
+                    notificationFeedbackGenerator.notificationOccurred(.error)
                 }
                 .store(in: &self.disposeBag)
 
             case .finished:
-                notificationFeedbackGenerator?.notificationOccurred(.success)
+                notificationFeedbackGenerator.notificationOccurred(.success)
                 os_log("%{public}s[%{public}ld], %{public}s: [Friendship] remote friendship update success", ((#file as NSString).lastPathComponent), #line, #function)
             }
         })

Mastodon/Service/APIService/APIService+FollowRequest.swift

@@ -0,0 +1,105 @@
+//
+//  APIService+FollowRequest.swift
+//  Mastodon
+//
+//  Created by sxiaojian on 2021/4/27.
+//
+
+import Foundation
+
+import UIKit
+import Combine
+import CoreData
+import CoreDataStack
+import CommonOSLog
+import MastodonSDK
+
+extension APIService {
+    func acceptFollowRequest(
+            mastodonUserID: MastodonUser.ID,
+            mastodonAuthenticationBox: AuthenticationService.MastodonAuthenticationBox
+        ) -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.Relationship>, Error> {
+            let domain = mastodonAuthenticationBox.domain
+            let authorization = mastodonAuthenticationBox.userAuthorization
+            let requestMastodonUserID = mastodonAuthenticationBox.userID
+            
+            return Mastodon.API.Account.acceptFollowRequest(
+                session: session,
+                domain: domain,
+                userID: mastodonUserID,
+                authorization: authorization)
+            .flatMap { response -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.Relationship>, Error> in
+                let managedObjectContext = self.backgroundManagedObjectContext
+                return managedObjectContext.performChanges {
+                    let requestMastodonUserRequest = MastodonUser.sortedFetchRequest
+                    requestMastodonUserRequest.predicate = MastodonUser.predicate(domain: domain, id: requestMastodonUserID)
+                    requestMastodonUserRequest.fetchLimit = 1
+                    guard let requestMastodonUser = managedObjectContext.safeFetch(requestMastodonUserRequest).first else { return }
+
+                    let lookUpMastodonUserRequest = MastodonUser.sortedFetchRequest
+                    lookUpMastodonUserRequest.predicate = MastodonUser.predicate(domain: domain, id: mastodonUserID)
+                    lookUpMastodonUserRequest.fetchLimit = 1
+                    let lookUpMastodonuser = managedObjectContext.safeFetch(lookUpMastodonUserRequest).first
+                    
+                    if let lookUpMastodonuser = lookUpMastodonuser {
+                        let entity = response.value
+                        APIService.CoreData.update(user: lookUpMastodonuser, entity: entity, requestMastodonUser: requestMastodonUser, domain: domain, networkDate: response.networkDate)
+                    }
+                }
+                .tryMap { result -> Mastodon.Response.Content<Mastodon.Entity.Relationship> in
+                    switch result {
+                    case .success:
+                        return response
+                    case .failure(let error):
+                        throw error
+                    }
+                }
+                .eraseToAnyPublisher()
+            }
+            .eraseToAnyPublisher()
+        }
+    
+    func rejectFollowRequest(
+            mastodonUserID: MastodonUser.ID,
+            mastodonAuthenticationBox: AuthenticationService.MastodonAuthenticationBox
+        ) -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.Relationship>, Error> {
+            let domain = mastodonAuthenticationBox.domain
+            let authorization = mastodonAuthenticationBox.userAuthorization
+            let requestMastodonUserID = mastodonAuthenticationBox.userID
+            
+            return Mastodon.API.Account.rejectFollowRequest(
+                session: session,
+                domain: domain,
+                userID: mastodonUserID,
+                authorization: authorization)
+            .flatMap { response -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.Relationship>, Error> in
+                let managedObjectContext = self.backgroundManagedObjectContext
+                return managedObjectContext.performChanges {
+                    let requestMastodonUserRequest = MastodonUser.sortedFetchRequest
+                    requestMastodonUserRequest.predicate = MastodonUser.predicate(domain: domain, id: requestMastodonUserID)
+                    requestMastodonUserRequest.fetchLimit = 1
+                    guard let requestMastodonUser = managedObjectContext.safeFetch(requestMastodonUserRequest).first else { return }
+
+                    let lookUpMastodonUserRequest = MastodonUser.sortedFetchRequest
+                    lookUpMastodonUserRequest.predicate = MastodonUser.predicate(domain: domain, id: mastodonUserID)
+                    lookUpMastodonUserRequest.fetchLimit = 1
+                    let lookUpMastodonuser = managedObjectContext.safeFetch(lookUpMastodonUserRequest).first
+                    
+                    if let lookUpMastodonuser = lookUpMastodonuser {
+                        let entity = response.value
+                        APIService.CoreData.update(user: lookUpMastodonuser, entity: entity, requestMastodonUser: requestMastodonUser, domain: domain, networkDate: response.networkDate)
+                    }
+                }
+                .tryMap { result -> Mastodon.Response.Content<Mastodon.Entity.Relationship> in
+                    switch result {
+                    case .success:
+                        return response
+                    case .failure(let error):
+                        throw error
+                    }
+                }
+                .eraseToAnyPublisher()
+            }
+            .eraseToAnyPublisher()
+        }
+}

Mastodon/Service/APIService/APIService+Notification.swift

@@ -28,6 +28,14 @@ extension APIService {
         )
         .flatMap { response -> AnyPublisher<Mastodon.Response.Content<[Mastodon.Entity.Notification]>, Error> in
             let log = OSLog.api
+            if query.maxID == nil {
+                let requestMastodonNotificationRequest = MastodonNotification.sortedFetchRequest
+                requestMastodonNotificationRequest.predicate = MastodonNotification.predicate(domain: domain, userID: userID)
+                let oldNotifications = self.backgroundManagedObjectContext.safeFetch(requestMastodonNotificationRequest)
+                oldNotifications.forEach { notification in
+                    self.backgroundManagedObjectContext.delete(notification)
+                }
+            }
             return self.backgroundManagedObjectContext.performChanges {
                 response.value.forEach { notification in
                     let (mastodonUser, _) = APIService.CoreData.createOrMergeMastodonUser(into: self.backgroundManagedObjectContext, for: nil, in: domain, entity: notification.account, userCache: nil, networkDate: Date(), log: log)

MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Account+FollowRequest.swift

@@ -35,13 +35,13 @@ extension Mastodon.API.Account {
     ///   - domain: Mastodon instance domain. e.g. "example.com"
     ///   - userID: ID of the account in the database
     ///   - authorization: App token
-    /// - Returns: `AnyPublisher` contains `Account` nested in the response
+    /// - Returns: `AnyPublisher` contains `Relationship` nested in the response
     public static func acceptFollowRequest(
         session: URLSession,
         domain: String,
         userID: String,
         authorization: Mastodon.API.OAuth.Authorization
-    ) -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.Account>, Error> {
+    ) -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.Relationship>, Error> {
         let request = Mastodon.API.post(
             url: acceptFollowRequestEndpointURL(domain: domain, userID: userID),
             query: nil,
@@ -49,7 +49,7 @@ extension Mastodon.API.Account {
         )
         return session.dataTaskPublisher(for: request)
             .tryMap { data, response in
-                let value = try Mastodon.API.decode(type: Mastodon.Entity.Account.self, from: data, response: response)
+                let value = try Mastodon.API.decode(type: Mastodon.Entity.Relationship.self, from: data, response: response)
                 return Mastodon.Response.Content(value: value, response: response)
             }
             .eraseToAnyPublisher()
@@ -67,13 +67,13 @@ extension Mastodon.API.Account {
     ///   - domain: Mastodon instance domain. e.g. "example.com"
     ///   - userID: ID of the account in the database
     ///   - authorization: App token
-    /// - Returns: `AnyPublisher` contains `Account` nested in the response
+    /// - Returns: `AnyPublisher` contains `Relationship` nested in the response
     public static func rejectFollowRequest(
         session: URLSession,
         domain: String,
         userID: String,
         authorization: Mastodon.API.OAuth.Authorization
-    ) -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.Account>, Error> {
+    ) -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.Relationship>, Error> {
         let request = Mastodon.API.post(
             url: rejectFollowRequestEndpointURL(domain: domain, userID: userID),
             query: nil,
@@ -81,7 +81,7 @@ extension Mastodon.API.Account {
         )
         return session.dataTaskPublisher(for: request)
             .tryMap { data, response in
-                let value = try Mastodon.API.decode(type: Mastodon.Entity.Account.self, from: data, response: response)
+                let value = try Mastodon.API.decode(type: Mastodon.Entity.Relationship.self, from: data, response: response)
                 return Mastodon.Response.Content(value: value, response: response)
             }
             .eraseToAnyPublisher()