Merge c7e1c554bb into 1a00d91316

refactor: use fmt lib to avoid back-and-forth conversion

resources/qml/delegates/TextMessage.qml

@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+import QtQuick
 import ".."
 import im.nheko
 
@@ -15,6 +16,7 @@ MatrixText {
     property string copyText: selectedText ? getText(selectionStart, selectionEnd) : body
     property int metadataWidth: 100
     property bool fitsMetadata: false //positionAt(width,height-4) == positionAt(width-metadataWidth-10, height-4)
+    property bool showSpoilers: false
 
     // table border-collapse doesn't seem to work
     text: `
@@ -33,11 +35,12 @@ MatrixText {
         padding: ` + Math.ceil(fontMetrics.lineSpacing/2) + `px;
     }
     blockquote { margin-left: 1em; }
-    ` + (!Settings.mobileMode ? `span[data-mx-spoiler] {
+    span[data-mx-spoiler] {` + (!showSpoilers ? `
         color: transparent;
-        background-color: ` + palette.text + `;
+        background-color: ` + palette.text + `;` : `
-    }` : "") +  // TODO(Nico): Figure out how to support mobile
+        background-color: ` + palette.alternateBase + ';') + `
-    `</style>
+    }
+    </style>
     ` + formatted.replace(/<del>/g, "<s>").replace(/<\/del>/g, "</s>").replace(/<strike>/g, "<s>").replace(/<\/strike>/g, "</s>")
 
     enabled: !isReply
@@ -49,4 +52,7 @@ MatrixText {
         cursorShape: Qt.PointingHandCursor
     }
 
+    TapHandler {
+        onTapped: showSpoilers = !showSpoilers
+    }
 }

src/timeline/InputBar.cpp

@@ -20,6 +20,8 @@
 #include <QVideoFrame>
 #include <QVideoSink>
 
+#include <fmt/format.h>
+
 #include <nlohmann/json.hpp>
 
 #include <mtx/responses/common.hpp>
@@ -578,8 +580,7 @@ InputBar::message(const QString &msg, MarkdownOverride useMarkdown, bool rainbow
                 }
             }
 
-            text.body =
+            text.body = fmt::format("{}\n{}", body.toStdString(), text.body);
-              QStringLiteral("%1\n%2").arg(body, QString::fromStdString(text.body)).toStdString();
 
             // NOTE(Nico): rich replies always need a formatted_body!
             text.format = "org.matrix.custom.html";