Merge pull request #1298 from RocketChat/develop

[RELEASE] Merge develop into beta

Rocket.Chat/Controllers/Chat/ChatControllerMessageActions.swift

@@ -36,15 +36,16 @@ extension ChatViewController {
             self.report(message: message)
         }))
 
-        alert.addAction(UIAlertAction(title: localized("chat.message.actions.block"), style: .default, handler: { [weak self] (_) in
-            guard let user = message.user else { return }
-
-            DispatchQueue.main.async {
-                MessageManager.blockMessagesFrom(user, completion: {
-                    self?.updateSubscriptionInfo()
-                })
-            }
-        }))
+        if AuthManager.isAuthenticated()?.canBlockMessage(message) == .allowed {
+            alert.addAction(UIAlertAction(title: localized("chat.message.actions.block"), style: .default, handler: { [weak self] (_) in
+                guard let user = message.user else { return }
+                DispatchQueue.main.async {
+                    MessageManager.blockMessagesFrom(user, completion: {
+                        self?.updateSubscriptionInfo()
+                    })
+                }
+            }))
+        }
 
         alert.addAction(UIAlertAction(title: localized("chat.message.actions.copy"), style: .default, handler: { (_) in
             UIPasteboard.general.string = message.text

Rocket.Chat/Controllers/Chat/ChatViewController.swift

@@ -377,7 +377,11 @@ final class ChatViewController: SLKTextViewController {
     }
 
     override func didPressReturnKey(_ keyCommand: UIKeyCommand?) {
-        didPressRightButton(nil)
+        if messageToEdit != nil {
+            didCommitTextEditing(self)
+        } else {
+            didPressRightButton(self)
+        }
     }
 
     override func textViewDidBeginEditing(_ textView: UITextView) {

Rocket.Chat/Controllers/Settings/SettingsViewController.swift

@@ -9,7 +9,10 @@
 import UIKit
 import MessageUI
 import SafariServices
+
+#if BETA || DEBUG
 import FLEX
+#endif
 
 final class SettingsViewController: UITableViewController {
 
@@ -94,7 +97,9 @@ final class SettingsViewController: UITableViewController {
         }
 
         if indexPath.section == 1, indexPath.row == 0 {
+            #if BETA || DEBUG
             FLEXManager.shared().showExplorer()
+            #endif
         }
 
         tableView.deselectRow(at: indexPath, animated: true)

Rocket.Chat/External/RCEmojiKit/NSAttributedString+CustomEmojis.swift

@@ -16,7 +16,9 @@ extension NSAttributedString {
         return emojis.reduce(mutableSelf) { attributedString, emoji in
             guard case let .custom(imageUrl) = emoji.type else { return attributedString }
 
-            let regexPattern = ":\(emoji.shortname):|:\(emoji.alternates.joined(separator: ":|:")):"
+            let alternates = emoji.alternates.filter { !$0.isEmpty }
+
+            let regexPattern = ":\(emoji.shortname):" + (alternates.isEmpty ? "" : "|:\(alternates.joined(separator: ":|:")):")
 
             guard let regex = try? NSRegularExpression(pattern: regexPattern, options: []) else { return attributedString }