Merge pull request #1709 from RocketChat/beta

rafaelks · web-flow · commit 37bdd1eaf12a · 2018-05-23T10:34:39.000-03:00
[RELEASE] Merge beta into master
diff --git a/Rocket.Chat.ShareExtension/Info.plist b/Rocket.Chat.ShareExtension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.0</string>
+	<string>2.4.1</string>
 	<key>CFBundleVersion</key>
-	<string>171</string>
+	<string>176</string>
 	<key>ITSEncryptionExportComplianceCode</key>
 	<string></string>
 	<key>NSExtension</key>
diff --git a/Rocket.Chat/API/Clients/SubscriptionsClient.swift b/Rocket.Chat/API/Clients/SubscriptionsClient.swift
@@ -30,14 +30,17 @@ struct SubscriptionsClient: APIClient {
     }
 
     func fetchSubscriptions(updatedSince: Date?, realm: Realm? = Realm.current, completion: (() -> Void)? = nil) {
-        let req = SubscriptionsRequest(updatedSince: updatedSince)
+        let req = SubscriptionsRequest()
 
         let currentRealm = realm
 
         api.fetch(req, options: [.retryOnError(count: 3)]) { response in
             switch response {
             case .resource(let resource):
-                guard resource.success == true else { return }
+                guard resource.success == true else {
+                    completion?()
+                    return
+                }
 
                 let subscriptions = List<Subscription>()
 
@@ -67,21 +70,24 @@ struct SubscriptionsClient: APIClient {
                 case .version:
                     self.fetchSubscriptionsFallback(updatedSince: updatedSince, realm: realm, completion: completion)
                 default:
-                    break
+                    completion?()
                 }
             }
         }
     }
 
     func fetchRooms(updatedSince: Date?, realm: Realm? = Realm.current, completion: (() -> Void)? = nil) {
-        let req = RoomsRequest(updatedSince: updatedSince)
+        let req = RoomsRequest()
 
         let currentRealm = realm
 
         api.fetch(req, options: [.retryOnError(count: 3)]) { response in
             switch response {
             case .resource(let resource):
-                guard resource.success == true else { return }
+                guard resource.success == true else {
+                    completion?()
+                    return
+                }
 
                 currentRealm?.execute({ realm in
                     guard let auth = AuthManager.isAuthenticated(realm: realm) else { return }
@@ -113,7 +119,7 @@ struct SubscriptionsClient: APIClient {
                 case .version:
                     self.fetchRoomsFallback(updatedSince: updatedSince, realm: realm, completion: completion)
                 default:
-                    break
+                    completion?()
                 }
             }
         }
diff --git a/Rocket.Chat/API/Requests/Room/RoomsRequest.swift b/Rocket.Chat/API/Requests/Room/RoomsRequest.swift
@@ -12,22 +12,6 @@ struct RoomsRequest: APIRequest {
     typealias APIResourceType = RoomsResource
     let path = "/api/v1/rooms.get"
     let requiredVersion = Version(0, 62, 0)
-
-    var query: String? {
-        if let updatedSince = updatedSince {
-            let dateFormatter = DateFormatter()
-            dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
-            return "updatedSince=\(dateFormatter.string(from: updatedSince))"
-        }
-
-        return nil
-    }
-
-    let updatedSince: Date?
-
-    init(updatedSince: Date? = nil) {
-        self.updatedSince = updatedSince
-    }
 }
 
 final class RoomsResource: APIResource {
diff --git a/Rocket.Chat/API/Requests/Subscription/SubscriptionsRequest.swift b/Rocket.Chat/API/Requests/Subscription/SubscriptionsRequest.swift
@@ -13,22 +13,6 @@ struct SubscriptionsRequest: APIRequest {
     typealias APIResourceType = SubscriptionsResource
     let path = "/api/v1/subscriptions.get"
     let requiredVersion = Version(0, 60, 0)
-
-    var query: String? {
-        if let updatedSince = updatedSince {
-            let dateFormatter = DateFormatter()
-            dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
-            return "updatedSince=\(dateFormatter.string(from: updatedSince))"
-        }
-
-        return nil
-    }
-
-    let updatedSince: Date?
-
-    init(updatedSince: Date? = nil) {
-        self.updatedSince = updatedSince
-    }
 }
 
 final class SubscriptionsResource: APIResource {
diff --git a/Rocket.Chat/Controllers/Auth/AuthViewController.swift b/Rocket.Chat/Controllers/Auth/AuthViewController.swift
@@ -247,6 +247,12 @@ final class AuthViewController: BaseViewController {
             return
         }
 
+        if loginService.service == "gitlab", let url = serverPublicSettings?.gitlabUrl {
+            try? realm.write {
+                loginService.serverUrl = url
+            }
+        }
+
         switch loginService.type {
         case .cas:
             presentCASViewController(for: loginService)
diff --git a/Rocket.Chat/Controllers/Subscriptions/FilesListViewController.swift b/Rocket.Chat/Controllers/Subscriptions/FilesListViewController.swift
@@ -56,23 +56,23 @@ class FilesListViewData {
     }
 
     private func handle(result: SubscriptionFilesResource, completion: (() -> Void)? = nil) {
-            self.showing += result.count ?? 0
-            self.total = result.total ?? 0
-
-            if let files = result.files {
-                guard !files.isEmpty else {
-                    self.isLoadingMoreFiles = false
-                    completion?()
-                    return
-                }
-
-                self.cells.append(contentsOf: files)
+        self.showing += result.count ?? 0
+        self.total = result.total ?? 0
+
+        if let files = result.files {
+            guard !files.isEmpty else {
+                self.isLoadingMoreFiles = false
+                completion?()
+                return
             }
 
-            self.currentPage += 1
+            self.cells.append(contentsOf: files)
+        }
+
+        self.currentPage += 1
 
-            self.isLoadingMoreFiles = false
-            completion?()
+        self.isLoadingMoreFiles = false
+        completion?()
     }
 }
 
diff --git a/Rocket.Chat/Extensions/URLExtension.swift b/Rocket.Chat/Extensions/URLExtension.swift
@@ -26,6 +26,11 @@ extension URL {
     }
 
     init?(string: String, scheme: String) {
+        var string = string
+        if !string.contains("://") {
+            string = "https://\(string)"
+        }
+
         guard let url = URL(string: string) else {
             return nil
         }
diff --git a/Rocket.Chat/Info.plist b/Rocket.Chat/Info.plist
@@ -206,7 +206,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.0</string>
+	<string>2.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -222,7 +222,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>171</string>
+	<string>176</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
diff --git a/Rocket.Chat/Managers/NotificationManager.swift b/Rocket.Chat/Managers/NotificationManager.swift
@@ -32,9 +32,15 @@ final class NotificationManager {
             return
         }
 
+        let formattedBody = NSMutableAttributedString(string: notification.body)
+            .transformMarkdown().string
+            .components(separatedBy: .newlines)
+            .joined(separator: " ")
+            .replacingOccurrences(of: "^\\s+", with: "", options: .regularExpression)
+
         NotificationViewController.shared.displayNotification(
             title: notification.title,
-            body: notification.body.trimmingCharacters(in: .newlines),
+            body: formattedBody,
             username: notification.payload.sender.username
         )
 
diff --git a/Rocket.Chat/Managers/OAuthManager.swift b/Rocket.Chat/Managers/OAuthManager.swift
@@ -81,7 +81,12 @@ final class OAuthManager {
             return nil
         }
 
-        return URL(string: "https://\(host)/_oauth/\(callbackPath)")
+        var portString = ""
+        if let port = server.port {
+            portString = ":\(port)"
+        }
+
+        return URL(string: "https://\(host)\(portString)/_oauth/\(callbackPath)")
     }
 
     static func state() -> String? {
diff --git a/Rocket.Chat/Models/Mapping/SubscriptionModelMapping.swift b/Rocket.Chat/Models/Mapping/SubscriptionModelMapping.swift
@@ -29,8 +29,11 @@ extension Subscription: ModelMappeable {
         }
 
         if self.type == .directMessage {
-            let userId = values["u"]["_id"].stringValue
-            self.otherUserId = self.rid.replacingOccurrences(of: userId, with: "")
+            if let userId = values["u"]["_id"].string {
+                if let range = self.rid.ranges(of: userId).first {
+                    self.otherUserId = self.rid.replacingCharacters(in: range, with: "")
+                }
+            }
         }
 
         if let createdAt = values["ts"]["$date"].double {
diff --git a/Rocket.Chat/Models/User/UserQueries.swift b/Rocket.Chat/Models/User/UserQueries.swift
@@ -19,7 +19,7 @@ extension User {
             let realm = realm,
             let user = realm.objects(User.self).filter("username = %@", username).first
         else {
-                return nil
+            return nil
         }
 
         return user
diff --git a/Rocket.Chat/Views/Cells/Chat/ChatDirectMessageHeaderCell.swift b/Rocket.Chat/Views/Cells/Chat/ChatDirectMessageHeaderCell.swift
@@ -15,15 +15,11 @@ final class ChatDirectMessageHeaderCell: UICollectionViewCell {
 
     var subscription: Subscription? {
         didSet {
-            guard let user = subscription?.directMessageUser else {
+            guard subscription?.directMessageUser != nil else {
                 return fetchUser()
             }
 
-            labelUser.text = user.displayName()
-            avatarView.user = user
-
-            let startText = localized("chat.dm.start_conversation")
-            labelStartConversation.text = String(format: startText, user.displayName())
+            updateUser()
         }
     }
 
@@ -55,13 +51,31 @@ final class ChatDirectMessageHeaderCell: UICollectionViewCell {
         labelStartConversation.text = ""
     }
 
+    func updateUser() {
+        guard let user = subscription?.directMessageUser else {
+            labelUser.text = ""
+            labelStartConversation.text = ""
+            return
+        }
+
+        labelUser.text = user.displayName()
+        avatarView.user = user
+
+        let startText = localized("chat.dm.start_conversation")
+        labelStartConversation.text = String(format: startText, user.displayName())
+    }
+
     func fetchUser() {
-        guard let userId = subscription?.otherUserId else { return }
+        guard
+            let userId = subscription?.otherUserId,
+            !userId.isEmpty
+        else {
+            updateUser()
+            return
+        }
 
         User.fetch(by: .userId(userId), completion: { _ in
-            DispatchQueue.main.async { [weak self] in
-                self?.subscription = self?.subscription
-            }
+            self.updateUser()
         })
     }
 
diff --git a/Rocket.Chat/Views/Cells/Chat/Info/MemberCell.swift b/Rocket.Chat/Views/Cells/Chat/Info/MemberCell.swift
@@ -91,17 +91,16 @@ final class MemberCell: UITableViewCell {
 extension MemberCell: ReactorPresenter {
     var reactor: String {
         set {
+            guard !newValue.isEmpty else { return }
+
             if let user = User.find(username: newValue) {
                 data = MemberCellData(member: user)
                 return
             }
 
             User.fetch(by: .username(newValue), completion: { user in
                 guard let user = user else { return }
-
-                DispatchQueue.main.async {
-                    self.data = MemberCellData(member: user)
-                }
+                self.data = MemberCellData(member: user)
             })
         }
 
diff --git a/Rocket.ChatTests/API/Requests/Room/RoomsRequestSpec.swift b/Rocket.ChatTests/API/Requests/Room/RoomsRequestSpec.swift
@@ -26,16 +26,13 @@ class RoomsRequestSpec: APITestCase {
     }
 
     func testRequestWithUpdatedSince() {
-        let date = Date.dateFromString("2015-03-25T12:00:00.000+0000")
-
-        let roomsRequest = RoomsRequest(updatedSince: date)
+        let roomsRequest = RoomsRequest()
 
         guard let request = roomsRequest.request(for: api) else {
             return XCTFail("request is not nil")
         }
 
         XCTAssertEqual(request.url?.path, "/api/v1/rooms.get", "path is correct")
-        XCTAssert(request.url?.query?.contains("updatedSince=") == true, "has updatedSince query parameter")
         XCTAssertEqual(request.httpMethod, "GET", "http method is correct")
         XCTAssertEqual(request.value(forHTTPHeaderField: "Content-Type"), "application/json", "content type is correct")
     }
diff --git a/Rocket.ChatTests/API/Requests/Subscription/SubscriptionsRequestSpec.swift b/Rocket.ChatTests/API/Requests/Subscription/SubscriptionsRequestSpec.swift
@@ -26,16 +26,13 @@ class SubscriptionsRequestSpec: APITestCase {
     }
 
     func testRequestWithUpdatedSince() {
-        let date = Date.dateFromString("2015-03-25T12:00:00.000+0000")
-
-        let subscriptionsRequest = SubscriptionsRequest(updatedSince: date)
+        let subscriptionsRequest = SubscriptionsRequest()
 
         guard let request = subscriptionsRequest.request(for: api) else {
             return XCTFail("request is not nil")
         }
 
         XCTAssertEqual(request.url?.path, "/api/v1/subscriptions.get", "path is correct")
-        XCTAssert(request.url?.query?.contains("updatedSince=") == true, "has updatedSince query parameter")
         XCTAssertEqual(request.httpMethod, "GET", "http method is correct")
         XCTAssertEqual(request.value(forHTTPHeaderField: "Content-Type"), "application/json", "content type is correct")
     }
diff --git a/Rocket.ChatTests/Extensions/URLExtensionSpec.swift b/Rocket.ChatTests/Extensions/URLExtensionSpec.swift
@@ -33,7 +33,9 @@ class URLExtensionSpec: XCTestCase {
 
     func testInitWithStringAndScheme() {
         XCTAssertEqual(URL(string: "open.rocket.chat", scheme: "https")?.absoluteString, "https://open.rocket.chat", "will add scheme")
+        XCTAssertEqual(URL(string: "open.rocket.chat:3000", scheme: "https")?.absoluteString, "https://open.rocket.chat:3000", "will add scheme & keep port")
         XCTAssertEqual(URL(string: "https://open.rocket.chat", scheme: "https")?.absoluteString, "https://open.rocket.chat", "will return correct url")
+        XCTAssertEqual(URL(string: "https://open.rocket.chat:3000", scheme: "https")?.absoluteString, "https://open.rocket.chat:3000", "will return correct url & port")
         XCTAssertEqual(URL(string: "http://open.rocket.chat", scheme: "https")?.absoluteString, "https://open.rocket.chat", "will force https scheme")
         XCTAssertEqual(URL(string: "https://open.rocket.chat", scheme: "wss")?.absoluteString, "wss://open.rocket.chat", "will force wss scheme")
         XCTAssertEqual(URL(string: "http://open.rocket.chat/path", scheme: "https")?.absoluteString, "https://open.rocket.chat/path", "will keep path")

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,11 @@ extension URL {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`init?(string: String, scheme: String) {`
	`29`	`+ var string = string`
	`30`	`+ if !string.contains("://") {`
	`31`	`+ string = "https://\(string)"`
	`32`	`+ }`
	`33`	`+`
`29`	`34`	`guard let url = URL(string: string) else {`
`30`	`35`	`return nil`
`31`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,12 @@ final class OAuthManager {`
`81`	`81`	`return nil`
`82`	`82`	`}`
`83`	`83`
`84`		`- return URL(string: "https://\(host)/_oauth/\(callbackPath)")`
	`84`	`+ var portString = ""`
	`85`	`+ if let port = server.port {`
	`86`	`+ portString = ":\(port)"`
	`87`	`+ }`
	`88`	`+`
	`89`	`+ return URL(string: "https://\(host)\(portString)/_oauth/\(callbackPath)")`
`85`	`90`	`}`
`86`	`91`
`87`	`92`	`static func state() -> String? {`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,11 @@ extension Subscription: ModelMappeable {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`if self.type == .directMessage {`
`32`		`- let userId = values["u"]["_id"].stringValue`
`33`		`- self.otherUserId = self.rid.replacingOccurrences(of: userId, with: "")`
	`32`	`+ if let userId = values["u"]["_id"].string {`
	`33`	`+ if let range = self.rid.ranges(of: userId).first {`
	`34`	`+ self.otherUserId = self.rid.replacingCharacters(in: range, with: "")`
	`35`	`+ }`
	`36`	`+ }`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`if let createdAt = values["ts"]["$date"].double {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ extension User {`
`19`	`19`	`let realm = realm,`
`20`	`20`	`let user = realm.objects(User.self).filter("username = %@", username).first`
`21`	`21`	`else {`
`22`		`- return nil`
	`22`	`+ return nil`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`return user`
Original file line number	Diff line number	Diff line change
`@@ -26,16 +26,13 @@ class RoomsRequestSpec: APITestCase {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func testRequestWithUpdatedSince() {`
`29`		`- let date = Date.dateFromString("2015-03-25T12:00:00.000+0000")`
`30`		`-`
`31`		`- let roomsRequest = RoomsRequest(updatedSince: date)`
	`29`	`+ let roomsRequest = RoomsRequest()`
`32`	`30`
`33`	`31`	`guard let request = roomsRequest.request(for: api) else {`
`34`	`32`	`return XCTFail("request is not nil")`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`XCTAssertEqual(request.url?.path, "/api/v1/rooms.get", "path is correct")`
`38`		`- XCTAssert(request.url?.query?.contains("updatedSince=") == true, "has updatedSince query parameter")`
`39`	`36`	`XCTAssertEqual(request.httpMethod, "GET", "http method is correct")`
`40`	`37`	`XCTAssertEqual(request.value(forHTTPHeaderField: "Content-Type"), "application/json", "content type is correct")`
`41`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,16 +26,13 @@ class SubscriptionsRequestSpec: APITestCase {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func testRequestWithUpdatedSince() {`
`29`		`- let date = Date.dateFromString("2015-03-25T12:00:00.000+0000")`
`30`		`-`
`31`		`- let subscriptionsRequest = SubscriptionsRequest(updatedSince: date)`
	`29`	`+ let subscriptionsRequest = SubscriptionsRequest()`
`32`	`30`
`33`	`31`	`guard let request = subscriptionsRequest.request(for: api) else {`
`34`	`32`	`return XCTFail("request is not nil")`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`XCTAssertEqual(request.url?.path, "/api/v1/subscriptions.get", "path is correct")`
`38`		`- XCTAssert(request.url?.query?.contains("updatedSince=") == true, "has updatedSince query parameter")`
`39`	`36`	`XCTAssertEqual(request.httpMethod, "GET", "http method is correct")`
`40`	`37`	`XCTAssertEqual(request.value(forHTTPHeaderField: "Content-Type"), "application/json", "content type is correct")`
`41`	`38`	`}`