Preserve mx-reply in the edited message if it exists

(cherry picked from commit fa57db8e83)

CMakeLists.txt

@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.16)
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "24")
 set(RELEASE_SERVICE_VERSION_MINOR "02")
-set(RELEASE_SERVICE_VERSION_MICRO "1")
+set(RELEASE_SERVICE_VERSION_MICRO "2")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})

org.kde.neochat.appdata.xml

@@ -366,6 +366,7 @@ to provide a convergent experience across multiple platforms.</p>
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.02.2" date="2024-04-11"/>
     <release version="24.02.1" date="2024-03-21"/>
     <release version="24.02.0" date="2024-02-28">
       <url>https://kde.org/announcements/megarelease/6/#neochat</url>

po/it/neochat.po

@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 24.02.0\n"
+"X-Generator: Lokalize 24.02.1\n"
 
 #: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format

po/ka/neochat.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2024-03-16 03:11+0000\n"
-"PO-Revision-Date: 2023-12-04 06:21+0100\n"
+"PO-Revision-Date: 2024-03-20 05:29+0100\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <kde-i18n-doc@kde.org>\n"
 "Language: ka\n"
@@ -468,11 +468,9 @@ msgid "Matrix client"
 msgstr "Matrix -ის კლიენტი"
 
 #: src/main.cpp:138
-#, fuzzy, kde-format
-#| msgid "© 2018-2020 Black Hat, 2020-2023 KDE Community"
+#, kde-format
 msgid "© 2018-2020 Black Hat, 2020-2024 KDE Community"
-msgstr ""
-"© 2018-2020 Black Hat, 2020-2023 KDE -ის საზოგადოება, ყველა უფლება დაცულია"
+msgstr "© 2018-2020 Black Hat, 2020-2024 KDE -ის საზოგადოება"
 
 #: src/main.cpp:139
 #, kde-format
@@ -4483,11 +4481,10 @@ msgid "%1 (loading)"
 msgstr "%1 (ჩატვირთვა)"
 
 #: src/qml/WelcomePage.qml:94
-#, fuzzy, kde-format
-#| msgid "Edit this account"
+#, kde-format
 msgctxt "@action:button"
 msgid "Remove this account"
-msgstr "ამ ანგარიშის ჩასწორება"
+msgstr "ამ ანგარიშის წაშლა"
 
 #: src/qml/WelcomePage.qml:123
 #, kde-format

po/tr/neochat.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2024-03-16 03:11+0000\n"
-"PO-Revision-Date: 2024-03-18 18:19+0300\n"
+"PO-Revision-Date: 2024-03-27 23:02+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
 "Language: tr\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 24.02.0\n"
+"X-Generator: Lokalize 24.02.1\n"
 
 #: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
@@ -883,7 +883,7 @@ msgstr "Geçmiş"
 #, kde-format
 msgctxt "'Smileys' is a category of emoji"
 msgid "Smileys"
-msgstr "Gülümsemeler"
+msgstr "Emojiler"
 
 #: src/models/emojimodel.cpp:163
 #, kde-format

po/zh_CN/neochat.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2024-03-16 03:11+0000\n"
-"PO-Revision-Date: 2024-01-06 03:32\n"
+"PO-Revision-Date: 2024-03-30 19:38\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
@@ -14,8 +14,8 @@ msgstr ""
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Project-ID: 269464\n"
 "X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf6-trunk/messages/neochat/neochat.pot\n"
-"X-Crowdin-File-ID: 44721\n"
+"X-Crowdin-File: /kf6-stable/messages/neochat/neochat.pot\n"
+"X-Crowdin-File-ID: 49732\n"
 
 #: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
@@ -4440,11 +4440,10 @@ msgid "%1 (loading)"
 msgstr "%1 (加载中)"
 
 #: src/qml/WelcomePage.qml:94
-#, fuzzy, kde-format
-#| msgid "Edit this account"
+#, kde-format
 msgctxt "@action:button"
 msgid "Remove this account"
-msgstr "编辑此账户"
+msgstr ""
 
 #: src/qml/WelcomePage.qml:123
 #, kde-format
@@ -4563,10 +4562,3 @@ msgstr "显示"
 #, kde-format
 msgid "Quit"
 msgstr "退出"
-
-#~ msgctxt "<username> is not a known user"
-#~ msgid "%1 is not a known user."
-#~ msgstr "%1 不是已知用户。"
-
-#~ msgid "Login Failed: Access Token invalid or revoked"
-#~ msgstr "登录失败：访问令牌无效或被吊销"

src/actionshandler.cpp

@@ -14,6 +14,7 @@
 #include "models/actionsmodel.h"
 #include "neochatconfig.h"
 #include "texthandler.h"
+#include "utils.h"
 
 using namespace Quotient;
 
@@ -144,6 +145,26 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
         return;
     }
 
+    // We want to add back the <mx-reply> if it's in the original message but not in the edit, to preserve the reply.
+    for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); it++) {
+        if (const auto event = eventCast<const RoomMessageEvent>(&**it)) {
+            if (event->senderId() == m_room->localUser()->id() && event->hasTextContent()) {
+                QString originalString;
+                if (event->content()) {
+                    originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
+                } else {
+                    originalString = event->plainBody();
+                }
+
+                const QRegularExpression exp(TextRegex::removeRichReply);
+                const auto match = exp.match(originalString);
+                if (match.hasCaptured(0) && !handledText.contains(TextRegex::removeRichReply)) {
+                    handledText.prepend(match.captured(0));
+                }
+            }
+        }
+    }
+
     m_room->postMessage(text, handledText, messageType, chatBarCache->replyId(), chatBarCache->editId(), chatBarCache->threadId());
 }
 

src/roommanager.cpp

@@ -88,7 +88,7 @@ void RoomManager::resolveResource(const QString &idOrUri, const QString &action)
         if (!m_connection) {
             return;
         }
-        if (!action.isEmpty()) {
+        if (!action.isEmpty() && (uri.type() != Uri::UserId || action != "join"_ls)) {
             uri.setAction(action);
         }
         // TODO we should allow the user to select a connection.