Merge pull request #2139 from RocketChat/fix/msg_actions_room_roles.2082

[FIX] Message actions not taking into account room roles
RocketChat · Aug 29, 2018 · f3a68ee · f3a68ee
2 parents 81d1c7d + e692fce
commit f3a68ee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Rocket.Chat/Models/Auth/AuthCanDeleteMessage.swift b/Rocket.Chat/Models/Auth/AuthCanDeleteMessage.swift
@@ -23,15 +23,15 @@ extension Auth {
             let createdAt = message.createdAt,
             let user = user,
             let settings = settings
-            else {
-                return .unknown
+        else {
+            return .unknown
         }
 
         if !message.type.actionable {
             return .notActionable
         }
 
-        if user.hasPermission(.forceDeleteMessage, realm: self.realm) {
+        if user.hasPermission(.forceDeleteMessage, subscription: message.subscription, realm: self.realm) {
             return .allowed
         }
 

diff --git a/Rocket.Chat/Models/Auth/AuthCanEditMessage.swift b/Rocket.Chat/Models/Auth/AuthCanEditMessage.swift
@@ -21,15 +21,15 @@ extension Auth {
             let createdAt = message.createdAt,
             let user = user,
             let settings = settings
-            else {
-                return .unknown
+        else {
+            return .unknown
         }
 
         if !message.type.actionable {
             return .notActionable
         }
 
-        if user.hasPermission(.editMessage, realm: self.realm) {
+        if user.hasPermission(.editMessage, subscription: message.subscription, realm: self.realm) {
             return .allowed
         }
 

diff --git a/Rocket.Chat/Models/Auth/AuthCanPinMessage.swift b/Rocket.Chat/Models/Auth/AuthCanPinMessage.swift
@@ -28,7 +28,7 @@ extension Auth {
             return .notActionable
         }
 
-        if !settings.messageAllowPinning || !user.hasPermission(.pinMessage, realm: self.realm) {
+        if !settings.messageAllowPinning || !user.hasPermission(.pinMessage, subscription: message.subscription, realm: self.realm) {
             return .notAllowed
         }