Merge pull request #2593 from RocketChat/chore/audio_message_events

[CHORE] Add events to Directory & Audio Messages

Author: rafaelks

Rocket.Chat.ShareExtension/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.4.0</string>
 	<key>CFBundleVersion</key>
-	<string>240</string>
+	<string>242</string>
 	<key>ITSEncryptionExportComplianceCode</key>
 	<string></string>
 	<key>NSExtension</key>

Rocket.Chat/Controllers/Chat/MessagesViewControllerComposerDelegate.swift

@@ -21,6 +21,12 @@ extension MessagesViewController: ComposerViewExpandedDelegate {
 
     func composerView(_ composerView: ComposerView, didFinishRecordingAudio url: URL) {
         upload(audioWithURL: url)
+
+        if let subscriptionType = viewModel.subscription?.type {
+            AnalyticsManager.log(
+                event: Event.audioMessage(subscriptionType: subscriptionType.rawValue
+            ))
+        }
     }
 
     func composerView(_ composerView: ComposerView, didConfigureOverlayView view: OverlayView) {

Rocket.Chat/Controllers/Directory/DirectoryViewController.swift

@@ -91,6 +91,11 @@ final class DirectoryViewController: BaseTableViewController {
             let buttonActivity = UIBarButtonItem(customView: activity)
             activity.startAnimating()
             navigationItem.rightBarButtonItem = buttonActivity
+
+            AnalyticsManager.log(event: Event.directory(
+                searchType: viewModel.type.rawValue,
+                workspace: viewModel.workspace.rawValue
+            ))
         }
 
         viewModel.loadMoreObjects { [weak self] in
@@ -226,18 +231,25 @@ extension DirectoryViewController: UISearchBarDelegate {
 
     func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
         if searchText == "" && !viewModel.query.isEmpty {
-            viewModel.query = searchBar.text ?? ""
-            tableView.reloadData()
-            loadMoreData(reload: true)
+            search()
         }
     }
 
-    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
-        viewModel.query = searchBar.text ?? ""
+    func search() {
+        viewModel.query = searchBar?.text ?? ""
         tableView.reloadData()
         loadMoreData(reload: true)
     }
 
+    func searchBarShouldEndEditing(_ searchBar: UISearchBar) -> Bool {
+        search()
+        return true
+    }
+
+    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
+        search()
+    }
+
     func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {
         searchBar.setShowsCancelButton(false, animated: true)
         searchBar.resignFirstResponder()

Rocket.Chat/Info.plist

@@ -222,7 +222,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>240</string>
+	<string>242</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

Rocket.Chat/Managers/AnalyticsManager.swift

@@ -22,6 +22,7 @@ enum Event {
     case updateStatus
     case replyNotification
     case openAdmin
+    case directory(searchType: String, workspace: String)
     case screenView(screenName: String)
     case messageSent(subscriptionType: String, server: String)
     case mediaUpload(mediaType: String, subscriptionType: String)
@@ -31,6 +32,7 @@ enum Event {
     case updatedWebBrowser(browser: String)
     case updatedTheme(theme: String)
     case jitsiVideoCall(subscriptionType: String, server: String)
+    case audioMessage(subscriptionType: String)
 }
 
 enum UserProperty {
@@ -115,11 +117,13 @@ extension Event {
         case .messageSent: return "message_sent"
         case .mediaUpload: return "media_upload"
         case .reaction: return "reaction"
+        case .directory: return "directory"
         case .serverSwitch: return "server_switch"
         case .updatedSubscriptionSorting: return "updated_subscriptions_sorting"
         case .updatedWebBrowser: return "updated_web_browser"
         case .updatedTheme: return "updated_theme"
         case .jitsiVideoCall: return "jitsi_video_call"
+        case .audioMessage: return "audio_message"
         }
     }
 
@@ -129,6 +133,8 @@ extension Event {
             return ["screen": screenName]
         case let .reaction(subscriptionType):
             return ["subscription_type": subscriptionType]
+        case let .directory(searchType, workspace):
+            return ["search_type": searchType, "workspace": workspace]
         case let .messageSent(subscriptionType, server):
             return ["subscription_type": subscriptionType, "server": server]
         case let .mediaUpload(mediaType, subscriptionType):
@@ -143,6 +149,8 @@ extension Event {
             return ["theme": theme]
         case let .jitsiVideoCall(subscriptionType, server):
             return ["subscription_type": subscriptionType, "server": server]
+        case let .audioMessage(subscriptionType):
+            return ["subscription_type": subscriptionType]
         default:
             return nil
         }

Rocket.ChatTests/Models/UserSpec.swift

@@ -126,20 +126,26 @@ class UserSpec: XCTestCase {
 
     func testAvatarURLValid() {
         let auth = Auth.testInstance()
+        auth.token = "token123"
+        auth.userId = "userId123"
+
         let user = User.testInstance()
         let avatarURL = user.avatarURL(auth)
         XCTAssertNotNil(avatarURL, "url is valid")
-        XCTAssertEqual(avatarURL?.absoluteString, "https://open.rocket.chat/avatar/user-username?format=jpeg", "avatar url is valid")
+        XCTAssertEqual(avatarURL?.absoluteString, "https://open.rocket.chat/avatar/user-username?format=jpeg&rc_uid=userId123&rc_token=token123", "avatar url is valid")
     }
 
     func testAvatarURLRandomUsername() {
         let auth = Auth.testInstance()
+        auth.token = "token123"
+        auth.userId = "userId123"
+
         let user = User.testInstance()
         user.username = String.random()
 
         let avatarURL = user.avatarURL(auth)
         XCTAssertNotNil(avatarURL, "url is valid")
-        XCTAssertEqual(avatarURL?.absoluteString, "https://open.rocket.chat/avatar/\(user.username ?? "")?format=jpeg", "avatar url is valid")
+        XCTAssertEqual(avatarURL?.absoluteString, "https://open.rocket.chat/avatar/\(user.username ?? "")?format=jpeg&rc_uid=userId123&rc_token=token123", "avatar url is valid")
     }
 
     func testAvatarURLInvalid() {