Be able to redact our other account's events

2020-04-03 06:13:45 -04:00
parent 8af63a304f
commit 5cb013838b
4 changed files with 46 additions and 17 deletions
--- a/src/gui/Pages/Chat/Timeline/EventDelegate.qml
+++ b/src/gui/Pages/Chat/Timeline/EventDelegate.qml
@@ -222,14 +222,16 @@ HColumnLayout {
        HMenuItemPopupSpawner {
            icon.name: "remove-message"
            text: qsTr("Remove")
-            enabled: properties.eventIds.length
+            enabled: properties.eventSenderAndIds.length

            popup: "Popups/RedactPopup.qml"
            popupParent: chat
            properties: ({
-                userId: chat.userId,
+                preferUserId: chat.userId,
                roomId: chat.roomId,
-                eventIds: events.map(ev => ev.event_id),
+
+                eventSenderAndIds:
+                    events.map(ev => [ev.sender_id, ev.event_id]),

                onlyOwnMessageWarning:
                    ! chat.roomInfo.can_redact_all &&