Merge pull request #2621 from RocketChat/develop

[CHORE] Merge DEVELOP into BETA
RocketChat · Apr 1, 2019 · 066dfba · 066dfba
2 parents 42fda31 + ac1a172
commit 066dfba
Show file tree

Hide file tree

Showing 16 changed files with 174 additions and 143 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -157,7 +157,7 @@ CHECKOUT OPTIONS:
     :commit: c34d9ccef689c55b9eae69f3c65283da8d8b0c6c
     :git: https://github.com/RocketChat/RCMarkdownParser.git
   RocketChatViewController:
-    :commit: 93164faa2437e9a24dfbc4bc603cff2268e87a0b
+    :commit: ff8b2f080e05e10286f1d84304f0713375c3f952
     :git: https://github.com/RocketChat/RocketChatViewController
   SimpleImageViewer:
     :commit: 8222c338de0f285ca0c2d556c5d8dedd4a365b52

diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/RocketChatViewController/Composer/Classes/Library/AudioRecorder.swift b/Pods/RocketChatViewController/Composer/Classes/Library/AudioRecorder.swift
diff --git a/Pods/RocketChatViewController/Composer/Classes/Overlays/PreviewAudioView.swift b/Pods/RocketChatViewController/Composer/Classes/Overlays/PreviewAudioView.swift
diff --git a/Pods/RocketChatViewController/Composer/Classes/Overlays/RecordAudioView.swift b/Pods/RocketChatViewController/Composer/Classes/Overlays/RecordAudioView.swift
diff --git a/Rocket.Chat.ShareExtension/Info.plist b/Rocket.Chat.ShareExtension/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.4.0</string>
 	<key>CFBundleVersion</key>
-	<string>245</string>
+	<string>247</string>
 	<key>ITSEncryptionExportComplianceCode</key>
 	<string></string>
 	<key>NSExtension</key>

diff --git a/Rocket.Chat/Info.plist b/Rocket.Chat/Info.plist
@@ -222,7 +222,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>245</string>
+	<string>247</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/Rocket.Chat/Models/Mapping/SubscriptionModelMapping.swift b/Rocket.Chat/Models/Mapping/SubscriptionModelMapping.swift
@@ -135,9 +135,18 @@ extension Subscription: ModelMappeable {
         }
 
         if values["lastMessage"].dictionary != nil {
-            let user = User()
-            user.map(values["lastMessage"]["u"], realm: realm)
-            realm?.add(user, update: true)
+            if let userIdentifier = values["lastMessage"]["u"]["_id"].string {
+                if let realm = realm {
+                    if let user = realm.object(ofType: User.self, forPrimaryKey: userIdentifier as AnyObject) {
+                        user.map(values["u"], realm: realm)
+                        realm.add(user, update: true)
+                    } else {
+                        let user = User()
+                        user.map(values["u"], realm: realm)
+                        realm.add(user, update: true)
+                    }
+                }
+            }
 
             let message = Message()
             message.map(values["lastMessage"], realm: realm)

diff --git a/Rocket.Chat/Models/Subscription/Subscription.swift b/Rocket.Chat/Models/Subscription/Subscription.swift
@@ -151,12 +151,14 @@ extension Subscription {
         guard
             let auth = auth ?? AuthManager.isAuthenticated(),
             let baseURL = auth.baseURL(),
+            let userId = auth.userId,
+            let token = auth.token,
             let encodedName = name.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)
         else {
             return nil
         }
 
-        return URL(string: "\(baseURL)/avatar/%22\(encodedName)?format=jpeg")
+        return URL(string: "\(baseURL)/avatar/%22\(encodedName)?format=jpeg&rc_uid=\(userId)&rc_token=\(token)")
     }
 }