Fix missing escape sequence in /shrug command

Before the fix, the upper arm _ characters in the command's output would be parsed as Markdown italic formatting around the (ツ). (cherry picked from commit 706f1f7836)
Fix assumption about unstable feature reporting
2025-12-22 16:48:40 -05:00 · 2025-12-22 16:48:19 -05:00 · 2025-12-22 16:47:56 -05:00 · 2025-11-04 03:40:49 +00:00
5 changed files with 11 additions and 11 deletions
--- a/autotests/actionstest.cpp
+++ b/autotests/actionstest.cpp
@@ -63,7 +63,7 @@ void ActionsTest::testActions_data()
    QTest::addColumn<std::optional<QString>>("resultText");
    QTest::addColumn<std::optional<Quotient::RoomMessageEvent::MsgType>>("type");

-    QTest::newRow("shrug") << u"/shrug Hello"_s << std::make_optional(u"¯\\\\_(ツ)_/¯ Hello"_s)
+    QTest::newRow("shrug") << u"/shrug Hello"_s << std::make_optional(u"¯\\\\\\_(ツ)\\_/¯ Hello"_s)
                           << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
    QTest::newRow("lenny") << u"/lenny Hello"_s << std::make_optional(u"( ͡° ͜ʖ ͡°) Hello"_s) << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
    QTest::newRow("tableflip") << u"/tableflip Hello"_s << std::make_optional(u"(╯°□°）╯︵ ┻━┻ Hello"_s)
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2025-10-29 02:38+0000\n"
-"PO-Revision-Date: 2025-07-08 08:59+0200\n"
+"PO-Revision-Date: 2025-10-31 09:40+0100\n"
 "Last-Translator: Xavier Besnard <xavier.besnard@kde.org>\n"
 "Language-Team: French <French <kde-francophone@kde.org>>\n"
 "Language: fr\n"
@@ -13,7 +13,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 25.08.1\n"
+"X-Generator: Lokalize 25.08.2\n"

 #: src/app/controller.cpp:183
 #, kde-format
@@ -4774,7 +4774,7 @@ msgstr "Activer les notifications pour ce compte"
 #, kde-format
 msgid "Notifications can appear even when NeoChat isn't running."
 msgstr ""
-"Les notifications peuvent apparaître même lorsque NeoChat n'est pas en cours "
+"Les notifications peuvent apparaitre même lorsque NeoChat n'est pas en cours "
 "d'exécution."

 #: src/settings/GlobalNotificationsPage.qml:34
@@ -4788,7 +4788,7 @@ msgstr ""
 #, kde-format
 msgid "Notifications will only appear when NeoChat is running."
 msgstr ""
-"Les notifications n'apparaîtront que lorsque NeoChat est en cours "
+"Les notifications n'apparaitront que lorsque NeoChat est en cours "
 "d'exécution."

 #: src/settings/GlobalNotificationsPage.qml:49
@@ -5129,12 +5129,12 @@ msgstr "Configuration générale"
 #: src/settings/NeoChatGeneralPage.qml:29
 #, kde-format
 msgid "Show in System Tray"
-msgstr "Afficher dans la boîte à miniatures"
+msgstr "Afficher dans la boite à miniatures"

 #: src/settings/NeoChatGeneralPage.qml:46
 #, kde-format
 msgid "Minimize to system tray on startup"
-msgstr "Minimiser dans la boîte à miniatures au démarrage."
+msgstr "Minimiser dans la boite à miniatures au démarrage."

 #: src/settings/NeoChatGeneralPage.qml:64
 #, kde-format
--- a/src/chatbar/EmojiPicker.qml
+++ b/src/chatbar/EmojiPicker.qml
@@ -146,7 +146,7 @@ ColumnLayout {
            id: quickReactions
            Layout.fillWidth: true

-            model: ["👍", "👎", "😄", "🎉", "😕", "❤", "🚀", "👀"]
+            model: ["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀"]

            delegate: EmojiDelegate {
                emoji: modelData
--- a/src/libneochat/models/actionsmodel.cpp
+++ b/src/libneochat/models/actionsmodel.cpp
@@ -59,7 +59,7 @@ QList<ActionsModel::Action> actions{
    Action{
        u"shrug"_s,
        [](const QString &message, NeoChatRoom *, ChatBarCache *) {
-            return u"¯\\\\_(ツ)_/¯ %1"_s.arg(message);
+            return u"¯\\\\\\_(ツ)\\_/¯ %1"_s.arg(message);
        },
        Quotient::RoomMessageEvent::MsgType::Text,
        kli18n("<message>"),
--- a/src/libneochat/neochatconnection.cpp
+++ b/src/libneochat/neochatconnection.cpp
@@ -135,9 +135,9 @@ void NeoChatConnection::connectSignals()
        [this] {
            auto job = callApi<GetVersionsJob>(BackgroundRequest);
            connect(job, &GetVersionsJob::success, this, [this, job] {
-                m_canCheckMutualRooms = job->unstableFeatures().contains("uk.half-shot.msc2666.query_mutual_rooms"_L1);
+                m_canCheckMutualRooms = job->unstableFeatures().value("uk.half-shot.msc2666.query_mutual_rooms"_L1, false);
                Q_EMIT canCheckMutualRoomsChanged();
-                m_canEraseData = job->unstableFeatures().contains("org.matrix.msc4025"_L1) || job->versions().count("v1.10"_L1);
+                m_canEraseData = job->unstableFeatures().value("org.matrix.msc4025"_L1, false) || job->versions().count("v1.10"_L1);
                Q_EMIT canEraseDataChanged();
            });
        },
Author	SHA1	Message	Date
Veres Károly	58f5a4bbd3	Fix missing escape sequence in /shrug command Before the fix, the upper arm _ characters in the command's output would be parsed as Markdown italic formatting around the (ツ). (cherry picked from commit `706f1f7836`)	2025-12-22 16:48:40 -05:00
Joshua Goins	bceeef14de	Fix assumption about unstable feature reporting The key can be in the unstable features list, but it can be false. This stops some features showing up and hitting API that isn't actually implemented. (cherry picked from commit `6fcb1cc1e3`)	2025-12-22 16:48:19 -05:00
Joshua Goins	bae20aaf84	Send beautiful red ❤️'s when quick reacting I wondered for a while (and could tell) when people were using NeoChat because they would react with cold, monochrome hearts. Let's add more color to our world! (cherry picked from commit `531df7a3b2`)	2025-12-22 16:47:56 -05:00
l10n daemon script	135aa74209	GIT_SILENT Sync po/docbooks with svn	2025-11-04 03:40:49 +00:00