perf: Read number of pending invitations from header

Signed-off-by: Marcel Müller <[email protected]>
nextcloud · Jan 21, 2025 · d8c0d71 · d8c0d71
1 parent fc0001c
commit d8c0d71
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/NextcloudTalk/FederationInvitationTableViewController.swift b/NextcloudTalk/FederationInvitationTableViewController.swift
@@ -3,6 +3,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
+extension Notification.Name {
+    static let FederationInvitationDidAcceptNotification = Notification.Name(rawValue: "FederationInvitationDidAccept")
+}
+
+@objc extension NSNotification {
+    public static let FederationInvitationDidAcceptNotification = Notification.Name.FederationInvitationDidAcceptNotification
+}
+
 class FederationInvitationTableViewController: UITableViewController, FederationInvitationCellDelegate {
 
     private let federationInvitationCellIdentifier = "FederationInvitationCell"
@@ -120,6 +128,8 @@ class FederationInvitationTableViewController: UITableViewController, Federation
         NCAPIController.sharedInstance().acceptFederationInvitation(for: invitation.accountId, with: invitation.invitationId) { [weak self] success in
             if !success {
                 NotificationPresenter.shared().present(text: NSLocalizedString("Failed to accept invitation", comment: ""), dismissAfterDelay: 5.0, includedStyle: .error)
+            } else {
+                NotificationCenter.default.post(name: .FederationInvitationDidAcceptNotification, object: self, userInfo: nil)
             }
 
             self?.getData()

diff --git a/NextcloudTalk/NCAPIControllerExtensions.swift b/NextcloudTalk/NCAPIControllerExtensions.swift
@@ -609,7 +609,7 @@ import Foundation
 
         let urlString = "\(account.server)/ocs/v2.php/apps/notifications/api/v3/test/self"
 
-        apiSessionManager.postOcs(urlString, account: account) { ocsResponse, ocsError in
+        apiSessionManager.postOcs(urlString, account: account) { ocsResponse, _ in
             let message = ocsResponse?.dataDict?["message"] as? String
             completionBlock(message)
         }

diff --git a/NextcloudTalk/NCAPISessionManager.swift b/NextcloudTalk/NCAPISessionManager.swift
@@ -21,6 +21,14 @@ import Foundation
             NCDatabaseManager.sharedInstance().updateLastModifiedSince(forAccountId: account.accountId, with: modifiedSince)
         }
 
+        if let federationInvitesString = response.allHeaderFields["x-nextcloud-talk-federation-invites"] as? String,
+           let federatedInvites = Int(federationInvitesString) {
+
+            if account.pendingFederationInvitations != federatedInvites {
+                NCDatabaseManager.sharedInstance().setPendingFederationInvitationForAccountId(account.accountId, with: federatedInvites)
+            }
+        }
+
         if let configurationHash = response.allHeaderFields["x-nextcloud-talk-hash"] as? String, configurationHash != account.lastReceivedConfigurationHash {
             if account.lastReceivedConfigurationHash != nil {
                 // We previously stored a configuration hash which now changed -> Update settings and capabilities

diff --git a/NextcloudTalk/NCRoomsManagerExtensions.swift b/NextcloudTalk/NCRoomsManagerExtensions.swift
@@ -446,9 +446,9 @@ import Foundation
         guard NCDatabaseManager.sharedInstance().serverHasTalkCapability(kCapabilityFederationV1) else { return }
 
         let activeAccount = NCDatabaseManager.sharedInstance().activeAccount()
-        let tenMinutesAgo = Int(Date().timeIntervalSince1970 - (10 * 60))
+        let twoHoursAgo = Int(Date().timeIntervalSince1970 - (2 * 60 * 60))
 
-        if activeAccount.lastPendingFederationInvitationFetch == 0 || activeAccount.lastPendingFederationInvitationFetch < tenMinutesAgo {
+        if activeAccount.lastPendingFederationInvitationFetch == 0 || activeAccount.lastPendingFederationInvitationFetch < twoHoursAgo {
             self.updatePendingFederationInvitations()
         }
     }

diff --git a/NextcloudTalk/RoomsTableViewController.m b/NextcloudTalk/RoomsTableViewController.m
@@ -172,6 +172,7 @@ - (void)viewDidLoad
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(roomCreated:) name:NCRoomCreatedNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(activeAccountDidChange:) name:NCSettingsControllerDidChangeActiveAccountNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pendingInvitationsDidUpdate:) name:NCDatabaseManagerPendingFederationInvitationsDidChange object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(inviationDidAccept:) name:NSNotification.FederationInvitationDidAcceptNotification object:nil];
 }
 
 - (void)setupNavigationBar
@@ -329,7 +330,12 @@ - (void)roomsDidUpdate:(NSNotification *)notification
 
 - (void)pendingInvitationsDidUpdate:(NSNotification *)notification
 {
-    // Update the rooms: In case we accepted an invitation, we want to show the new room directly
+    [self refreshRoomList];
+}
+
+- (void)inviationDidAccept:(NSNotification *)notification
+{
+    // We accepted an invitation, so we refresh the rooms from the API to show it directly
     [self refreshRooms];
 }