Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.iOS into feat/hw_keyboard_shortcuts

Author: cardoso

Podfile

@@ -13,6 +13,10 @@ def ui_pods
   pod 'MBProgressHUD', '~> 1.1.0'
 end
 
+def diff_pods
+  pod 'DifferenceKit'
+end
+
 def shared_pods
   # Analytics
   pod 'Firebase/Core'
@@ -28,6 +32,7 @@ def shared_pods
   pod 'SlackTextViewController', :git => 'https://github.com/rafaelks/SlackTextViewController.git'
   pod 'MobilePlayer', :git => 'https://github.com/RocketChat/RCiOSMobilePlayer'
   pod 'SimpleImageViewer', :git => 'https://github.com/cardoso/SimpleImageViewer.git'
+  pod 'SwipeCellKit'
   ui_pods
 
   # Text Processing
@@ -49,12 +54,16 @@ def shared_pods
   # Debugging
   pod 'SwiftLint', :configurations => ['Debug']
   pod 'FLEX', '~> 2.0', :configurations => ['Debug', 'Beta']
+
+  # Diffing
+  diff_pods
 end
 
 target 'Rocket.Chat.ShareExtension' do
   pod 'Nuke-FLAnimatedImage-Plugin'
   database_pods
   ui_pods
+  diff_pods
 end
 
 target 'Rocket.Chat' do
@@ -68,7 +77,7 @@ target 'Rocket.ChatTests' do
 end
 
 post_install do |installer|
-  swift4Targets = ['OAuthSwift', 'TagListView', 'SearchTextField', 'Nuke', 'Nuke-FLAnimatedImage-Plugin']
+  swift4Targets = ['OAuthSwift', 'TagListView', 'SearchTextField', 'Nuke', 'Nuke-FLAnimatedImage-Plugin', 'DifferenceKit', 'SwipeCellKit']
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['SWIFT_VERSION'] = '3.1'

Podfile.lock

@@ -2,6 +2,12 @@ PODS:
   - 1PasswordExtension (1.8.5)
   - Crashlytics (3.10.5):
     - Fabric (~> 1.7.9)
+  - DifferenceKit (0.5.2):
+    - DifferenceKit/Core (= 0.5.2)
+    - DifferenceKit/UIExtensions (= 0.5.2)
+  - DifferenceKit/Core (0.5.2)
+  - DifferenceKit/UIExtensions (0.5.2):
+    - DifferenceKit/Core
   - Fabric (1.7.9)
   - Firebase/Core (5.4.1):
     - Firebase/CoreOnly
@@ -48,10 +54,12 @@ PODS:
   - Starscream (2.1.1)
   - SwiftLint (0.26.0)
   - SwiftyJSON (4.1.0)
+  - SwipeCellKit (2.4.3)
 
 DEPENDENCIES:
   - 1PasswordExtension
   - Crashlytics
+  - DifferenceKit
   - Fabric
   - Firebase/Core
   - FLEX (~> 2.0)
@@ -69,11 +77,13 @@ DEPENDENCIES:
   - Starscream (~> 2)
   - SwiftLint
   - SwiftyJSON
+  - SwipeCellKit
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - 1PasswordExtension
     - Crashlytics
+    - DifferenceKit
     - Fabric
     - Firebase
     - FirebaseAnalytics
@@ -94,6 +104,7 @@ SPEC REPOS:
     - Starscream
     - SwiftLint
     - SwiftyJSON
+    - SwipeCellKit
 
 EXTERNAL SOURCES:
   MobilePlayer:
@@ -122,6 +133,7 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
   Crashlytics: 7f2e38d302d9da96475b3d64d86fb29e31a542b7
+  DifferenceKit: 3999ddee5146dbd12d7418e2b907c6f5e2673805
   Fabric: a2917d3895e4c1569b9c3170de7320ea1b1e6661
   Firebase: 355bd535bfdacaa82a7fe8d9784115edefd6fc03
   FirebaseAnalytics: b3628aea54c50464c32c393fb2ea032566e7ecc2
@@ -146,7 +158,8 @@ SPEC CHECKSUMS:
   Starscream: 142bd8ef24592d985daee9fa48c936070b85b15f
   SwiftLint: f6b83e8d95ee1e91e11932d843af4fdcbf3fc764
   SwiftyJSON: c29297daf073d2aa016295d5809cdd68045c39b3
+  SwipeCellKit: cee9906e6d3a36e22ad1a852fba7f8fa0839d113
 
-PODFILE CHECKSUM: e30b11fd34e7043eec6c9d2d0550e6e147670e19
+PODFILE CHECKSUM: 6702db159e15966472657eea05905247ba9622d9
 
 COCOAPODS: 1.5.3

Rocket.Chat.xcodeproj/project.pbxproj

@@ -171,6 +171,18 @@ struct MessagesClient: APIClient {
             return false
         }
 
+        // optimistic UI update
+
+        let message = Message(value: message)
+        try? realm?.write {
+            message.updatedAt = Date()
+            message.temporary = true
+            message.text = text
+            realm?.add(message, update: true)
+        }
+
+        // send request
+
         let request = UpdateMessageRequest(roomId: message.rid, msgId: id, text: text)
 
         api.fetch(request) { response in

Rocket.Chat/API/Clients/MessagesClient.swift

@@ -308,3 +308,42 @@ extension SubscriptionsClient {
         }
     }
 }
+
+// MARK: Subsctiption actions
+
+extension SubscriptionsClient {
+    func favoriteSubscription(subscription: Subscription) {
+        SubscriptionManager.toggleFavorite(subscription) { (response) in
+            DispatchQueue.main.async {
+                if response.isError() {
+                    subscription.updateFavorite(!subscription.favorite)
+                }
+            }
+        }
+
+        subscription.updateFavorite(!subscription.favorite)
+    }
+
+    func hideSubscription(subscription: Subscription) {
+        let hideRequest = SubscriptionHideRequest(rid: subscription.rid, subscriptionType: subscription.type)
+        api.fetch(hideRequest, completion: nil)
+
+        Realm.executeOnMainThread { realm in
+            realm.delete(subscription)
+        }
+    }
+
+    func markRead(subscription: Subscription) {
+        api.fetch(SubscriptionReadRequest(rid: subscription.rid), completion: nil)
+        Realm.executeOnMainThread { _ in
+            subscription.alert = false
+        }
+    }
+
+    func markUnread(subscription: Subscription) {
+        api.fetch(SubscriptionUnreadRequest(rid: subscription.rid), completion: nil)
+        Realm.executeOnMainThread { _ in
+            subscription.alert = true
+        }
+    }
+}

Rocket.Chat/API/Clients/SubscriptionsClient.swift

@@ -0,0 +1,56 @@
+//
+//  SubscriptionHideRequest.swift
+//  Rocket.Chat
+//
+//  Created by Filipe Alvarenga on 27/07/18.
+//  Copyright © 2018 Rocket.Chat. All rights reserved.
+//
+
+import Foundation
+import SwiftyJSON
+
+fileprivate extension SubscriptionType {
+    var path: String {
+        switch self {
+        case .channel:
+            return "/api/v1/channels.close"
+        case .group:
+            return "/api/v1/groups.close"
+        case .directMessage:
+            return "/api/v1/im.close"
+        }
+    }
+}
+
+final class SubscriptionHideRequest: APIRequest {
+    typealias APIResourceType = SubscriptionHideResource
+
+    let requiredVersion = Version(0, 48, 0)
+
+    let method: HTTPMethod = .post
+    var path: String {
+        return type.path
+    }
+
+    let rid: String
+    let type: SubscriptionType
+
+    init(rid: String, subscriptionType: SubscriptionType) {
+        self.rid = rid
+        self.type = subscriptionType
+    }
+
+    func body() -> Data? {
+        let body = JSON([
+            "roomId": rid
+        ])
+
+        return body.rawString()?.data(using: .utf8)
+    }
+}
+
+final class SubscriptionHideResource: APIResource {
+    var success: Bool? {
+        return raw?["success"].boolValue
+    }
+}

Rocket.Chat/API/Requests/Subscription/SubscriptionHideRequest.swift

@@ -0,0 +1,56 @@
+//
+//  SubscriptionLeaveRequest.swift
+//  Rocket.Chat
+//
+//  Created by Filipe Alvarenga on 27/07/18.
+//  Copyright © 2018 Rocket.Chat. All rights reserved.
+//
+
+import Foundation
+import SwiftyJSON
+
+fileprivate extension SubscriptionType {
+    var path: String {
+        switch self {
+        case .channel:
+            return "/api/v1/channels.leave"
+        case .group:
+            return "/api/v1/groups.leave"
+        default:
+            return "/api/v1/channels.leave"
+        }
+    }
+}
+
+final class SubscriptionLeaveRequest: APIRequest {
+    typealias APIResourceType = SubscriptionLeaveResource
+
+    let requiredVersion = Version(0, 48, 0)
+
+    let method: HTTPMethod = .post
+    var path: String {
+        return type.path
+    }
+
+    let rid: String
+    let type: SubscriptionType
+
+    init(rid: String, subscriptionType: SubscriptionType) {
+        self.rid = rid
+        self.type = subscriptionType
+    }
+
+    func body() -> Data? {
+        let body = JSON([
+            "roomId": rid
+        ])
+
+        return body.rawString()?.data(using: .utf8)
+    }
+}
+
+final class SubscriptionLeaveResource: APIResource {
+    var success: Bool? {
+        return raw?["success"].boolValue
+    }
+}

Rocket.Chat/API/Requests/Subscription/SubscriptionLeaveRequest.swift

@@ -0,0 +1,39 @@
+//
+//  SubscriptionUnreadRequest.swift
+//  Rocket.Chat
+//
+//  Created by Filipe Alvarenga on 26/07/18.
+//  Copyright © 2018 Rocket.Chat. All rights reserved.
+//
+
+import Foundation
+import SwiftyJSON
+
+final class SubscriptionUnreadRequest: APIRequest {
+    typealias APIResourceType = SubscriptionUnreadResource
+
+    let requiredVersion = Version(0, 65, 0)
+
+    let method: HTTPMethod = .post
+    let path = "/api/v1/subscriptions.unread"
+
+    let rid: String
+
+    init(rid: String) {
+        self.rid = rid
+    }
+
+    func body() -> Data? {
+        let body = JSON([
+            "roomId": rid
+        ])
+
+        return body.rawString()?.data(using: .utf8)
+    }
+}
+
+final class SubscriptionUnreadResource: APIResource {
+    var success: Bool? {
+        return raw?["success"].boolValue
+    }
+}

Rocket.Chat/API/Requests/Subscription/SubscriptionUnreadRequest.swift

@@ -27,7 +27,7 @@ class ChannelActionsViewController: BaseViewController {
 
     var subscription: Subscription? {
         didSet {
-            guard let subscription = self.subscription else { return }
+            guard let subscription = self.subscription?.validated() else { return }
 
             let isDirectMessage = subscription.type == .directMessage
 
@@ -142,7 +142,7 @@ extension ChannelActionsViewController {
     }
 
     @objc func buttonFavoriteDidPressed(_ sender: Any) {
-        guard let subscription = self.subscription else { return }
+        guard let subscription = self.subscription?.validated() else { return }
 
         SubscriptionManager.toggleFavorite(subscription) { [unowned self] (response) in
             DispatchQueue.main.async {
@@ -223,7 +223,7 @@ extension ChannelActionsViewController {
     }
 
     func shareRoom() {
-        guard let url = subscription?.externalURL() else { return }
+        guard let url = subscription?.validated()?.externalURL() else { return }
         let controller = UIActivityViewController(activityItems: [url], applicationActivities: nil)
 
         if shareRoomCell != nil && UIDevice.current.userInterfaceIdiom == .pad {

Rocket.Chat/Controllers/Chat/ChannelActionsViewController.swift

@@ -40,7 +40,7 @@ final class ChatDataController {
     var data: [ChatData] = [] {
         didSet {
             messagesUsernames.removeAll()
-            messagesUsernames.formUnion(data.compactMap { $0.message?.user?.username })
+            messagesUsernames.formUnion(data.compactMap { $0.message?.validated()?.user?.validated()?.username })
         }
     }