CI re-enable FreeBSD Qt6

Stop sending a pester message using showPassiveNotification every time there is a network error. There is already a proper handling with `isOnline` in `NeochatConnection`. This just causes issues overlapping content.

BUG: 488572

.gitlab-ci.yml

@@ -8,7 +8,7 @@ include:
       - /gitlab-templates/android-qt6.yml
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/windows-qt6.yml
-#      - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.yml
       - /gitlab-templates/snap-snapcraft-lxd.yml
       - /gitlab-templates/craft-android-qt6-apks.yml

org.kde.neochat.appdata.xml

@@ -50,38 +50,23 @@
   <name xml:lang="x-test">xxNeoChatxx</name>
   <name xml:lang="zh-CN">NeoChat</name>
   <name xml:lang="zh-TW">NeoChat</name>
-  <summary>Chat with your friends on matrix</summary>
-  <summary xml:lang="ar">دردش مع أصدقائك على ماتركس</summary>
-  <summary xml:lang="ca">Xategeu amb els vostres amics a Matrix</summary>
-  <summary xml:lang="ca-valencia">Xategeu amb els vostres amics a Matrix</summary>
-  <summary xml:lang="cs">Mluvte se svými přáteli na Matrixu</summary>
-  <summary xml:lang="de">Mit den Freunden auf Matrix unterhalten</summary>
-  <summary xml:lang="el">Συνομιλήστε με τους φίλους σας στο matrix</summary>
-  <summary xml:lang="en-GB">Chat with your friends on matrix</summary>
-  <summary xml:lang="eo">Babilu kun viaj amikoj sur matrix</summary>
-  <summary xml:lang="es">Charle con sus amigos en matrix</summary>
-  <summary xml:lang="eu">Berriketan jardun zure lagunekin «Matrix»en</summary>
-  <summary xml:lang="fi">Keskustelu ystäviesi kanssa Matrixissa</summary>
-  <summary xml:lang="fr">Discuter avec vos ami(e)s sur le réseau Matrix</summary>
-  <summary xml:lang="gl">Charle coas súas amizades en Matrix.</summary>
-  <summary xml:lang="he">התכתבות עם החברים שלך ב־matrix</summary>
-  <summary xml:lang="hu">Csevegjen barátaival a matrixon</summary>
-  <summary xml:lang="ia">Starta Conversation con tu amicos sur matrix</summary>
-  <summary xml:lang="it">Conversa con i tuoi contatti su matrix</summary>
-  <summary xml:lang="ka">ესაუბრეთ მეგობრებს Matrix-ზე</summary>
-  <summary xml:lang="ko">Matrix를 사용하여 친구들과 대화하기</summary>
-  <summary xml:lang="lv">Tērzējiet ar saviem draugiem „Matrix“ tīklā</summary>
-  <summary xml:lang="nl">Met uw vrienden chatten op matrix</summary>
-  <summary xml:lang="nn">Prat med vennar på Matrix</summary>
-  <summary xml:lang="pl">Rozmawiaj ze swoimi znajomymi w Matriksie</summary>
-  <summary xml:lang="sl">Klepet z vašimi prijatelji na matrixu</summary>
-  <summary xml:lang="sv">Chatta med dina vänner på Matrix</summary>
-  <summary xml:lang="ta">மேட்ரிக்ஸு மூலம் உங்கள் நண்பர்களிடம் பேசலாம்</summary>
-  <summary xml:lang="tr">Matrix’te arkadaşlarınızla sohbet edin</summary>
-  <summary xml:lang="uk">Спілкуйтеся з вашими друзями у matrix</summary>
-  <summary xml:lang="x-test">xxChat with your friends on matrixxx</summary>
-  <summary xml:lang="zh-CN">在 Matrix 上与朋友聊天</summary>
-  <summary xml:lang="zh-TW">在 Matrix 上與您的朋友聊天</summary>
+  <summary>Chat on Matrix</summary>
+  <summary xml:lang="ar">دردش على ماتركس</summary>
+  <summary xml:lang="ca">Xat a Matrix</summary>
+  <summary xml:lang="ca-valencia">Xat a Matrix</summary>
+  <summary xml:lang="es">Charle en Matrix</summary>
+  <summary xml:lang="eu">Berriketa Matrix-en</summary>
+  <summary xml:lang="fr">Discuter sur Matrix</summary>
+  <summary xml:lang="ia">Conversation en ditecto sur Matrix</summary>
+  <summary xml:lang="it">Chat su Matrix</summary>
+  <summary xml:lang="ka">ისაუბრეთ Matrix-ზე</summary>
+  <summary xml:lang="nl">Chat op Matrix</summary>
+  <summary xml:lang="pl">Rozmawiaj na Matriksie</summary>
+  <summary xml:lang="sl">Klepet na Matrixu</summary>
+  <summary xml:lang="tr">Matrix Üzerinde Sohbet</summary>
+  <summary xml:lang="uk">Спілкування у Matrix</summary>
+  <summary xml:lang="x-test">xxChat on Matrixxx</summary>
+  <summary xml:lang="zh-TW">在 Matrix 上聊天</summary>
   <description>
     <p>NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
     <p xml:lang="ar">نيوتشات هو تطبيق دردشة يتيح لك الاستفادة الكاملة من شبكة Matrix. فهو يوفر لك طريقة آمنة لإرسال الرسائل النصية ومقاطع الفيديو والملفات الصوتية إلى عائلتك وزملائك وأصدقائك.</p>

src/actionshandler.cpp

@@ -72,11 +72,15 @@ bool ActionsHandler::handleQuickEdit(NeoChatRoom *room, const QString &handledTe
 
             for (auto it = room->messageEvents().crbegin(); it != room->messageEvents().crend(); it++) {
                 if (const auto event = eventCast<const RoomMessageEvent>(&**it)) {
+#if Quotient_VERSION_MINOR > 8
+                    if (event->senderId() == room->localMember().id() && event->has<EventContent::TextContent>()) {
+#else
                     if (event->senderId() == room->localMember().id() && event->hasTextContent()) {
+#endif
                         QString originalString;
                         if (event->content()) {
 #if Quotient_VERSION_MINOR > 8
-                            originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content().get())->body;
+                            originalString = event->get<EventContent::TextContent>()->body;
 #else
                             originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
 #endif

src/controller.cpp

@@ -230,9 +230,6 @@ void Controller::invokeLogin()
                             Qt::SingleShotConnection);
                     }
                 });
-                connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
-                    Q_EMIT errorOccured(i18n("Network Error: %1", error));
-                });
 #if Quotient_VERSION_MINOR > 8
                 connection->assumeIdentity(account.userId(), account.deviceId(), accessToken);
 #else

src/eventhandler.cpp

@@ -225,11 +225,15 @@ QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
 {
     QString body;
 
+#if Quotient_VERSION_MINOR > 8
+    if (event.has<EventContent::FileContent>()) {
+#else
     if (event.hasFileContent()) {
+#endif
         // if filename is given or body is equal to filename,
         // then body is a caption
 #if Quotient_VERSION_MINOR > 8
-        QString filename = event.fileContent()->originalName;
+        QString filename = event.get<EventContent::FileContent>()->originalName;
 #else
         QString filename = event.content()->fileInfo()->originalName;
 #endif
@@ -240,10 +244,11 @@ QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
         return body;
     }
 
-    if (event.hasTextContent() && event.content()) {
 #if Quotient_VERSION_MINOR > 8
-        body = event.richTextContent()->body;
+    if (event.has<EventContent::TextContent>() && event.content()) {
+        body = event.get<EventContent::TextContent>()->body;
 #else
+    if (event.hasTextContent() && event.content()) {
         body = static_cast<const EventContent::TextContent *>(event.content())->body;
 #endif
     } else {
@@ -472,10 +477,11 @@ QString EventHandler::getMessageBody(const NeoChatRoom *room, const RoomMessageE
 {
     TextHandler textHandler;
 
-    if (event.hasFileContent()) {
 #if Quotient_VERSION_MINOR > 8
-        QString fileCaption = event.fileContent()->originalName;
+    if (event.has<EventContent::FileContent>()) {
+        QString fileCaption = event.get<EventContent::FileContent>()->originalName;
 #else
+    if (event.hasFileContent()) {
         QString fileCaption = event.content()->fileInfo()->originalName;
 #endif
         if (fileCaption.isEmpty()) {
@@ -488,10 +494,11 @@ QString EventHandler::getMessageBody(const NeoChatRoom *room, const RoomMessageE
     }
 
     QString body;
-    if (event.hasTextContent() && event.content()) {
 #if Quotient_VERSION_MINOR > 8
-        body = event.richTextContent()->body;
+    if (event.has<EventContent::TextContent>() && event.content()) {
+        body = event.get<EventContent::TextContent>()->body;
 #else
+    if (event.hasTextContent() && event.content()) {
         body = static_cast<const EventContent::TextContent *>(event.content())->body;
 #endif
     } else {
@@ -708,13 +715,17 @@ QVariantMap EventHandler::getMediaInfoForEvent(const NeoChatRoom *room, const Qu
     // Get the file info for the event.
     if (event->is<RoomMessageEvent>()) {
         auto roomMessageEvent = eventCast<const RoomMessageEvent>(event);
+#if Quotient_VERSION_MINOR > 8
+        if (!roomMessageEvent->has<EventContent::FileContentBase>()) {
+#else
         if (!roomMessageEvent->hasFileContent()) {
+#endif
             return {};
         }
 
 #if Quotient_VERSION_MINOR > 8
-        const auto content = roomMessageEvent->content();
-        QVariantMap mediaInfo = getMediaInfoFromFileInfo(room, static_cast<EventContent::FileContent *>(content.get()), eventId, false, false);
+        const auto content = roomMessageEvent->get<EventContent::FileContentBase>();
+        QVariantMap mediaInfo = getMediaInfoFromFileInfo(room, content.get(), eventId, false, false);
 #else
         const auto content = static_cast<const EventContent::FileContent *>(roomMessageEvent->content());
         QVariantMap mediaInfo = getMediaInfoFromFileInfo(room, content, eventId, false, false);
@@ -722,8 +733,7 @@ QVariantMap EventHandler::getMediaInfoForEvent(const NeoChatRoom *room, const Qu
         // if filename isn't specifically given, it is in body
         // https://spec.matrix.org/latest/client-server-api/#mfile
 #if Quotient_VERSION_MINOR > 8
-        mediaInfo["filename"_ls] =
-            (roomMessageEvent->fileContent()->originalName.isEmpty()) ? roomMessageEvent->plainBody() : roomMessageEvent->fileContent()->originalName;
+        mediaInfo["filename"_ls] = content->commonInfo().originalName.isEmpty() ? roomMessageEvent->plainBody() : content->commonInfo().originalName;
 #else
         mediaInfo["filename"_ls] = (content->fileInfo()->originalName.isEmpty()) ? roomMessageEvent->plainBody() : content->fileInfo()->originalName;
 #endif
@@ -781,7 +791,7 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const NeoChatRoom *room,
 
     // Add media size if available.
 #if Quotient_VERSION_MINOR > 8
-    mediaInfo["size"_ls] = static_cast<const EventContent::FileContent *>(fileContent)->payloadSize;
+    mediaInfo["size"_ls] = fileContent->commonInfo().payloadSize;
 #else
     mediaInfo["size"_ls] = static_cast<const EventContent::FileContent *>(fileContent)->fileInfo()->payloadSize;
 #endif

src/models/actionsmodel.cpp

@@ -8,6 +8,7 @@
 #include "neochatconnection.h"
 #include "neochatroom.h"
 #include "roommanager.h"
+#include <Quotient/events/eventcontent.h>
 #include <Quotient/events/roommemberevent.h>
 #include <Quotient/events/roompowerlevelsevent.h>
 #include <Quotient/user.h>

src/models/messagecontentmodel.cpp

@@ -7,6 +7,7 @@
 
 #include <QImageReader>
 
+#include <Quotient/events/eventcontent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/stickerevent.h>
@@ -521,15 +522,16 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
                 auto fileTransferInfo = m_room->cachedFileTransferInfo(event);
 
 #ifndef Q_OS_ANDROID
-                Q_ASSERT(roomMessageEvent->content() != nullptr && roomMessageEvent->hasFileContent());
 #if Quotient_VERSION_MINOR > 8
-                const QMimeType mimeType = roomMessageEvent->fileContent()->mimeType;
+                Q_ASSERT(roomMessageEvent->content() != nullptr && roomMessageEvent->has<EventContent::FileContent>());
+                const QMimeType mimeType = roomMessageEvent->get<EventContent::FileContent>()->mimeType;
 #else
+                Q_ASSERT(roomMessageEvent->content() != nullptr && roomMessageEvent->hasFileContent());
                 const QMimeType mimeType = roomMessageEvent->content()->fileInfo()->mimeType;
 #endif
                 if (mimeType.name() == QStringLiteral("text/plain") || mimeType.parentMimeTypes().contains(QStringLiteral("text/plain"))) {
 #if Quotient_VERSION_MINOR > 8
-                    QString originalName = roomMessageEvent->fileContent()->originalName;
+                    QString originalName = roomMessageEvent->get<EventContent::FileContent>()->originalName;
 #else
                     QString originalName = roomMessageEvent->content()->fileInfo()->originalName;
 #endif
@@ -664,7 +666,11 @@ void MessageContentModel::updateItineraryModel()
     }
 
     if (auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event)) {
+#if Quotient_VERSION_MINOR > 8
+        if (roomMessageEvent->has<EventContent::FileContent>()) {
+#else
         if (roomMessageEvent->hasFileContent()) {
+#endif
             auto filePath = m_room->cachedFileTransferInfo(event).localPath;
             if (filePath.isEmpty() && m_itineraryModel != nullptr) {
                 delete m_itineraryModel;

src/models/messageeventmodel.cpp

@@ -8,6 +8,7 @@
 #include "neochatconfig.h"
 
 #include <Quotient/csapi/rooms.h>
+#include <Quotient/events/eventcontent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/stickerevent.h>
@@ -504,7 +505,11 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
 
     if (role == ProgressInfoRole) {
         if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
+#if Quotient_VERSION_MINOR > 8
+            if (e->has<EventContent::FileContent>()) {
+#else
             if (e->hasFileContent()) {
+#endif
                 return QVariant::fromValue(m_currentRoom->cachedFileTransferInfo(&evt));
             }
         }

src/neochatroom.cpp

@@ -74,10 +74,11 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
             const auto m_event = evtIt->viewAs<RoomEvent>();
             QString mxcUrl;
             if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
-                if (event->hasFileContent()) {
 #if Quotient_VERSION_MINOR > 8
-                    mxcUrl = event->fileContent()->url().toString();
+                if (event->has<EventContent::FileContentBase>()) {
+                    mxcUrl = event->get<EventContent::FileContentBase>()->url().toString();
 #else
+                if (event->hasFileContent()) {
                     mxcUrl = event->content()->fileInfo()->url().toString();
 #endif
                 }
@@ -221,7 +222,7 @@ QCoro::Task<void> NeoChatRoom::doUploadFile(QUrl url, QString body)
     url.setScheme("file"_ls);
     QFileInfo fileInfo(url.isLocalFile() ? url.toLocalFile() : url.toString());
 #if Quotient_VERSION_MINOR > 8
-    EventContent::Base *content;
+    EventContent::FileContentBase *content;
 #else
     EventContent::TypedBase *content;
 #endif
@@ -240,8 +241,7 @@ QCoro::Task<void> NeoChatRoom::doUploadFile(QUrl url, QString body)
         content = new EventContent::FileContent(url, fileInfo.size(), mime, fileInfo.fileName());
     }
 #if Quotient_VERSION_MINOR > 8
-    QString txnId =
-        postFile(body.isEmpty() ? url.fileName() : body, std::unique_ptr<EventContent::FileContent>(static_cast<EventContent::FileContent *>(content)));
+    QString txnId = postFile(body.isEmpty() ? url.fileName() : body, std::unique_ptr<EventContent::FileContentBase>(content));
 #else
     QString txnId = postFile(body.isEmpty() ? url.fileName() : body, content);
 #endif
@@ -376,10 +376,11 @@ bool NeoChatRoom::lastEventIsSpoiler() const
 {
     if (auto event = lastEvent()) {
         if (auto e = eventCast<const RoomMessageEvent>(event)) {
-            if (e->hasTextContent() && e->content() && e->mimeType().name() == "text/html"_ls) {
 #if Quotient_VERSION_MINOR > 8
-                auto htmlBody = static_cast<const Quotient::EventContent::TextContent *>(e->content().get())->body;
+            if (e->has<EventContent::TextContent>() && e->content() && e->mimeType().name() == "text/html"_ls) {
+                auto htmlBody = e->get<EventContent::TextContent>()->body;
 #else
+            if (e->hasTextContent() && e->content() && e->mimeType().name() == "text/html"_ls) {
                 auto htmlBody = static_cast<const Quotient::EventContent::TextContent *>(e->content())->body;
 #endif
                 return htmlBody.contains("data-mx-spoiler"_ls);
@@ -1445,7 +1446,11 @@ void NeoChatRoom::openEventMediaExternally(const QString &eventId)
     const auto evtIt = findInTimeline(eventId);
     if (evtIt != messageEvents().rend() && is<RoomMessageEvent>(**evtIt)) {
         const auto event = evtIt->viewAs<RoomMessageEvent>();
+#if Quotient_VERSION_MINOR > 8
+        if (event->has<EventContent::FileContent>()) {
+#else
         if (event->hasFileContent()) {
+#endif
             const auto transferInfo = cachedFileTransferInfo(event);
             if (transferInfo.completed()) {
                 UrlHelper helper;
@@ -1478,7 +1483,11 @@ void NeoChatRoom::copyEventMedia(const QString &eventId)
     const auto evtIt = findInTimeline(eventId);
     if (evtIt != messageEvents().rend() && is<RoomMessageEvent>(**evtIt)) {
         const auto event = evtIt->viewAs<RoomMessageEvent>();
+#if Quotient_VERSION_MINOR > 8
+        if (event->has<EventContent::FileContent>()) {
+#else
         if (event->hasFileContent()) {
+#endif
             const auto transferInfo = fileTransferInfo(eventId);
             if (transferInfo.completed()) {
                 Clipboard clipboard;
@@ -1511,10 +1520,11 @@ FileTransferInfo NeoChatRoom::cachedFileTransferInfo(const Quotient::RoomEvent *
     QString mxcUrl;
     int total = 0;
     if (auto evt = eventCast<const Quotient::RoomMessageEvent>(event)) {
-        if (evt->hasFileContent()) {
 #if Quotient_VERSION_MINOR > 8
-            const auto fileContent = evt->fileContent();
+        if (evt->has<EventContent::FileContent>()) {
+            const auto fileContent = evt->get<EventContent::FileContent>();
 #else
+        if (evt->hasFileContent()) {
             const auto fileContent = evt->content()->fileInfo();
 #endif