From a5d7dc396f6358ab1b9f10e5e777d3b1421695cb Mon Sep 17 00:00:00 2001
From: Black Hat <bhat@encom.eu.org>
Date: Fri, 12 Jul 2019 12:36:00 +0800
Subject: [PATCH] Clean up reply.

---
 imports/Spectral/Component/Timeline/FileDelegate.qml  |  4 +---
 imports/Spectral/Component/Timeline/ImageDelegate.qml |  4 +---
 .../Spectral/Component/Timeline/MessageDelegate.qml   |  4 +---
 imports/Spectral/Component/Timeline/VideoDelegate.qml |  4 +---
 imports/Spectral/Panel/RoomPanelInput.qml             | 11 +++++------
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/imports/Spectral/Component/Timeline/FileDelegate.qml b/imports/Spectral/Component/Timeline/FileDelegate.qml
index 1fa994ceb..c5d9bdd74 100644
--- a/imports/Spectral/Component/Timeline/FileDelegate.qml
+++ b/imports/Spectral/Component/Timeline/FileDelegate.qml
@@ -164,9 +164,7 @@ RowLayout {
                     contextMenu.downloadAndOpen.connect(downloadAndOpen)
                     contextMenu.saveFileAs.connect(saveFileAs)
                     contextMenu.reply.connect(function() {
-                        roomPanelInput.replyUser = author
-                        roomPanelInput.replyEventID = eventId
-                        roomPanelInput.replyContent = message
+                        roomPanelInput.replyModel = model
                         roomPanelInput.isReply = true
                         roomPanelInput.focus()
                     })
diff --git a/imports/Spectral/Component/Timeline/ImageDelegate.qml b/imports/Spectral/Component/Timeline/ImageDelegate.qml
index 4cb58531f..34912ccdc 100644
--- a/imports/Spectral/Component/Timeline/ImageDelegate.qml
+++ b/imports/Spectral/Component/Timeline/ImageDelegate.qml
@@ -158,9 +158,7 @@ RowLayout {
                 contextMenu.downloadAndOpen.connect(downloadAndOpen)
                 contextMenu.saveFileAs.connect(saveFileAs)
                 contextMenu.reply.connect(function() {
-                    roomPanelInput.replyUser = author
-                    roomPanelInput.replyEventID = eventId
-                    roomPanelInput.replyContent = message
+                    roomPanelInput.replyModel = model
                     roomPanelInput.isReply = true
                     roomPanelInput.focus()
                 })
diff --git a/imports/Spectral/Component/Timeline/MessageDelegate.qml b/imports/Spectral/Component/Timeline/MessageDelegate.qml
index dbf9e093c..597e46e77 100644
--- a/imports/Spectral/Component/Timeline/MessageDelegate.qml
+++ b/imports/Spectral/Component/Timeline/MessageDelegate.qml
@@ -98,9 +98,7 @@ ColumnLayout {
                             messageSourceDialog.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
                         })
                         contextMenu.reply.connect(function() {
-                            roomPanelInput.replyUser = author
-                            roomPanelInput.replyEventID = eventId
-                            roomPanelInput.replyContent = contentLabel.selectedText || message
+                            roomPanelInput.replyModel = model
                             roomPanelInput.isReply = true
                             roomPanelInput.focus()
                         })
diff --git a/imports/Spectral/Component/Timeline/VideoDelegate.qml b/imports/Spectral/Component/Timeline/VideoDelegate.qml
index 0dcc45655..b6c764243 100644
--- a/imports/Spectral/Component/Timeline/VideoDelegate.qml
+++ b/imports/Spectral/Component/Timeline/VideoDelegate.qml
@@ -173,9 +173,7 @@ RowLayout {
                 contextMenu.downloadAndOpen.connect(downloadAndOpen)
                 contextMenu.saveFileAs.connect(saveFileAs)
                 contextMenu.reply.connect(function() {
-                    roomPanelInput.replyUser = author
-                    roomPanelInput.replyEventID = eventId
-                    roomPanelInput.replyContent = message
+                    roomPanelInput.replyModel = model
                     roomPanelInput.isReply = true
                     roomPanelInput.focus()
                 })
diff --git a/imports/Spectral/Panel/RoomPanelInput.qml b/imports/Spectral/Panel/RoomPanelInput.qml
index 65139d88c..6c5799d81 100644
--- a/imports/Spectral/Panel/RoomPanelInput.qml
+++ b/imports/Spectral/Panel/RoomPanelInput.qml
@@ -13,9 +13,10 @@ import Spectral 0.1
 
 Control {
     property alias isReply: replyItem.visible
-    property var replyUser
-    property string replyEventID
-    property string replyContent
+    property var replyModel
+    readonly property var replyUser: replyModel ? replyModel.author : null
+    readonly property string replyEventID: replyModel ? replyModel.eventId : ""
+    readonly property string replyContent: replyModel ? replyModel.message : ""
 
     property alias isAutoCompleting: autoCompleteListView.visible
     property var autoCompleteModel
@@ -452,9 +453,7 @@ Control {
 
     function clearReply() {
         isReply = false
-        replyUser = null
-        replyEventID = ""
-        replyContent = ""
+        replyModel = null
     }
 
     function focus() {