ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow redaction of message only by admins and authors of the message

Browse Source 
Previously you could click on the button but it would do nothing
This commit is contained in:
Carl Schwan
2020-12-05 11:29:37 +01:00
parent 064bc5adbe
commit 29584aec23
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
imports/NeoChat/Component/Timeline/AudioDelegate.qml
View File

@@ -21,6 +21,7 @@ import NeoChat.Effect 1.0
Control {
id: root
Layout.fillWidth: true
Audio {
@@ -32,7 +33,7 @@ Control {
Kirigami.Action {
id: saveFileAction
onTriggered: {
let contextMenu = fileDelegateContextMenu.createObject(root)
let contextMenu = fileDelegateContextMenu.createObject(root, {'room': currentRoom, 'author': author});
contextMenu.viewSource.connect(function() {
messagerSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
})

2
imports/NeoChat/Component/Timeline/FileDelegate.qml
View File

@@ -61,7 +61,7 @@ RowLayout {
anchors.fill: parent
acceptedButtons: Qt.RightButton
onClicked: {
var contextMenu = fileDelegateContextMenu.createObject(root)
var contextMenu = fileDelegateContextMenu.createObject(root, {'room': currentRoom, 'author': author});
contextMenu.viewSource.connect(function() {
messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
})

2
imports/NeoChat/Component/Timeline/ImageDelegate.qml
View File

@@ -93,7 +93,7 @@ Image {
onPrimaryClicked: fullScreenImage.createObject(parent, {"filename": eventId, "localPath": currentRoom.urlToDownload(eventId)}).showFullScreen()
onSecondaryClicked: {
var contextMenu = imageDelegateContextMenu.createObject(root)
var contextMenu = imageDelegateContextMenu.createObject(root, {'room': currentRoom});
contextMenu.viewSource.connect(function() {
messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
})

2
imports/NeoChat/Component/Timeline/VideoDelegate.qml
View File

@@ -172,7 +172,7 @@ Video {
}
onSecondaryClicked: {
var contextMenu = imageDelegateContextMenu.createObject(vid)
var contextMenu = imageDelegateContextMenu.createObject(vid, {'room': currentRoom, 'author': author})
contextMenu.viewSource.connect(function() {
messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
})

9
imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml
View File

@@ -9,14 +9,17 @@ import QtQuick.Controls 2.12
import NeoChat.Dialog 1.0
Menu {
id: root
required property var room
required property var author
signal viewSource()
signal downloadAndOpen()
signal saveFileAs()
signal reply()
signal redact()
id: root
MenuItem {
text: i18n("View Source")
@@ -42,8 +45,8 @@ Menu {
}
MenuItem {
visible: room.canSendState("redact") || room.localUser.id === author.id
text: i18n("Redact")
onTriggered: redact()
}

1
imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
View File

@@ -91,6 +91,7 @@ Kirigami.OverlaySheet {
}
}
Kirigami.BasicListItem {
visible: author.id === currentRoom.localUser.id || currentRoom.canSendState("redact")
action: Kirigami.Action {
text: i18n("Remove")
icon.name: "edit-delete-remove"