feat(admin): enable admins to delete messages from other users

Fixes #8869
status-im · Jan 4, 2023 · 29450d3 · 29450d3
1 parent fe87cba
commit 29450d3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
@@ -57,7 +57,7 @@ Item {
                 return
             }
 
-            if (chatDetails.active && chatDetails.hasUnreadMessages && !messageStore.messageSearchOngoing) {
+            if (chatDetails && chatDetails.active && chatDetails.hasUnreadMessages && !messageStore.messageSearchOngoing) {
                 chatContentModule.markAllMessagesRead()
             }
         }

diff --git a/ui/imports/shared/views/chat/MessageContextMenuView.qml b/ui/imports/shared/views/chat/MessageContextMenuView.qml
@@ -431,7 +431,7 @@ StatusMenu {
 
     StatusAction {
         id: deleteMessageAction
-        enabled: root.isMyMessage &&
+        enabled: (root.isMyMessage || root.amIChatAdmin) &&
                  !root.isProfile &&
                  !root.isEmoji &&
                  !root.pinnedPopup &&

diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
@@ -46,6 +46,7 @@ Loader {
     property bool senderIsEnsVerified: false
     property string senderIcon: ""
     property bool amISender: false
+    property bool amIChatAdmin: messageStore && messageStore.amIChatAdmin()
     property bool senderIsAdded: false
     property int senderTrustStatus: Constants.trustStatus.unknown
     property string messageText: ""
@@ -133,7 +134,7 @@ Loader {
         }
 
         messageContextMenu.myPublicKey = userProfile.pubKey
-        messageContextMenu.amIChatAdmin = messageStore.amIChatAdmin()
+        messageContextMenu.amIChatAdmin = root.amIChatAdmin
         messageContextMenu.pinMessageAllowedForMembers = messageStore.pinMessageAllowedForMembers()
         messageContextMenu.chatType = messageStore.getChatType()
 
@@ -333,7 +334,7 @@ Loader {
             chatType: root.messageStore.getChatType()
             chatColor: root.messageStore.getChatColor()
             chatEmoji: root.channelEmoji
-            amIChatAdmin: root.messageStore.amIChatAdmin()
+            amIChatAdmin: root.amIChatAdmin
             chatIcon: {
                 if ((root.messageStore.getChatType() === Constants.chatType.privateGroupChat) &&
                      root.messageStore.getChatIcon() !== "") {
@@ -838,12 +839,11 @@ Loader {
                                 return false
 
                             const chatType = root.messageStore.getChatType();
-                            const amIChatAdmin = root.messageStore.amIChatAdmin();
                             const pinMessageAllowedForMembers = root.messageStore.pinMessageAllowedForMembers()
 
                             return chatType === Constants.chatType.oneToOne ||
-                                    chatType === Constants.chatType.privateGroupChat && amIChatAdmin ||
-                                    chatType === Constants.chatType.communityChat && (amIChatAdmin || pinMessageAllowedForMembers);
+                                    chatType === Constants.chatType.privateGroupChat && root.amIChatAdmin ||
+                                    chatType === Constants.chatType.communityChat && (root.amIChatAdmin || pinMessageAllowedForMembers);
 
                         }
                         sourceComponent: StatusFlatRoundButton {
@@ -884,9 +884,8 @@ Loader {
                                 return false;
                             if (!root.messageStore)
                                 return false;
-                            const isMyMessage = senderId !== "" && senderId === userProfile.pubKey;
                             const chatType = root.messageStore.getChatType();
-                            return isMyMessage &&
+                            return (root.amISender || root.amIChatAdmin) &&
                                     (messageContentType === Constants.messageContentType.messageType ||
                                      messageContentType === Constants.messageContentType.stickerType ||
                                      messageContentType === Constants.messageContentType.emojiType ||