Fixes

Create Message attached property to propagate parameters like room, timeline, index and maxContentWidth down to the message content avoiding lots of boilerplate

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "6.7",
+    "runtime-version": "6.8",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [
@@ -25,13 +25,23 @@
     "modules": [
         {
             "name": "kirigamiaddons",
-            "config-opts": [ "-DBUILD_TESTING=OFF" ],
+            "config-opts": [
+                "-DBUILD_TESTING=OFF"
+            ],
             "buildsystem": "cmake-ninja",
-            "sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/kirigami-addons.git", "commit": "34d311219e8b7209746a98b3a29b91ded05ff936" } ]
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://invent.kde.org/libraries/kirigami-addons.git"
+                }
+            ]
         },
         {
             "name": "kquickimageeditor",
-            "config-opts": [ "-DBUILD_WITH_QT6=ON" ],
+            "config-opts": [
+                "-DBUILD_WITH_QT6=ON",
+                "-DBUILD_TESTING=OFF"
+            ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
@@ -43,17 +53,19 @@
         {
             "name": "olm",
             "buildsystem": "cmake-ninja",
-            "config-opts": [ "-DOLM_TESTS=OFF" ],
+            "config-opts": [
+                "-DOLM_TESTS=OFF"
+            ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://gitlab.matrix.org/matrix-org/olm.git",
-                    "tag": "3.2.10",
+                    "tag": "3.2.16",
                     "x-checker-data": {
                         "type": "git",
                         "tag-pattern": "^([\\d.]+)$"
                     },
-                    "commit": "9908862979147a71dc6abaecd521be526ae77be1"
+                    "commit": "7e0c8277032e40308987257b711b38af8d77cc69"
                 }
             ]
         },
@@ -65,13 +77,13 @@
                 "-Dvapi=false",
                 "-Dgtk_doc=false",
                 "-Dintrospection=false",
-                "-Dgcrypt=false"
+                "-Dcrypto=disabled"
             ],
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.tar.xz",
-                    "sha256": "3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d",
+                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.6.tar.xz",
+                    "sha256": "747b8c175be108c880d3adfb9c3537ea66e520e4ad2dccf5dce58003aeeca090",
                     "x-checker-data": {
                         "type": "gnome",
                         "name": "libsecret",
@@ -86,13 +98,13 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/frankosterfeld/qtkeychain/archive/0.14.2.tar.gz",
-                    "sha256": "cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571",
+                    "url": "https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/0.15.0.tar.gz",
+                    "sha256": "f4254dc8f0933b06d90672d683eab08ef770acd8336e44dfa030ce041dc2ca22",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 4138,
                         "stable-only": true,
-                        "url-template": "https://github.com/frankosterfeld/qtkeychain/archive/v$version.tar.gz"
+                        "url-template": "https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/$version.tar.gz"
                     }
                 }
             ],
@@ -100,7 +112,8 @@
                 "-DBUILD_WITH_QT6=ON",
                 "-DCMAKE_INSTALL_LIBDIR=/app/lib",
                 "-DLIB_INSTALL_DIR=/app/lib",
-                "-DBUILD_TRANSLATIONS=NO"
+                "-DBUILD_TRANSLATIONS=NO",
+                "-DBUILD_TESTING=OFF"
             ]
         },
         {
@@ -123,29 +136,31 @@
         {
             "name": "cmark",
             "buildsystem": "cmake-ninja",
-            "config-opts": [ "-DCMARK_TESTS=OFF" ],
+            "config-opts": [
+                "-DCMARK_TESTS=OFF",
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DCMAKE_INSTALL_PREFIX=/app"
+            ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/commonmark/cmark.git"
                 }
             ],
-            "config-opts": [
-                "-DCMARK_TESTS=OFF",
-                "-DCMAKE_BUILD_TYPE=Release",
-                "-DCMAKE_INSTALL_PREFIX=/app"
-            ],
             "builddir": true
         },
         {
             "name": "qcoro",
             "buildsystem": "cmake-ninja",
-            "config-opts": [ "-DQCORO_BUILD_EXAMPLES=OFF", "-DBUILD_TESTING=OFF" ],
+            "config-opts": [
+                "-DQCORO_BUILD_EXAMPLES=OFF",
+                "-DBUILD_TESTING=OFF"
+            ],
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.7.0.tar.gz",
-                    "sha256": "23ef0217926e67c8d2eb861cf91617da2f7d8d5a9ae6c62321b21448b1669210",
+                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.11.0.tar.gz",
+                    "sha256": "9942c5b4c533192f6c5954dc6d10178b3829075e6a621b67df73f0a4b74d8297",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 236236,
@@ -158,14 +173,15 @@
         {
             "name": "neochat",
             "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DBUILD_TESTING=OFF",
+                "-DNEOCHAT_FLATPAK=ON"
+            ],
             "sources": [
                 {
                     "type": "dir",
                     "path": "."
                 }
-            ],
-            "config-opts": [
-                "-DNEOCHAT_FLATPAK=ON"
             ]
         }
     ]

.gitlab-ci.yml

@@ -5,10 +5,14 @@ include:
   - project: sysadmin/ci-utilities
     file:
       - /gitlab-templates/reuse-lint.yml
+      - /gitlab-templates/json-validation.yml
+      - /gitlab-templates/xml-lint.yml
+      - /gitlab-templates/yaml-lint.yml
       - /gitlab-templates/android-qt6.yml
       - /gitlab-templates/linux-qt6.yml
+      - /gitlab-templates/linux-qt6-next.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

.kde-ci.yml

@@ -2,42 +2,43 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 Dependencies:
-- 'on': ['Linux', 'Android', 'FreeBSD', 'Windows']
-  'require':
-    'frameworks/extra-cmake-modules': '@latest-kf6'
-    'frameworks/kcoreaddons': '@latest-kf6'
-    'frameworks/kirigami': '@latest-kf6'
-    'frameworks/ki18n': '@latest-kf6'
-    'frameworks/kconfig': '@latest-kf6'
-    'frameworks/syntax-highlighting': '@latest-kf6'
-    'frameworks/kitemmodels': '@latest-kf6'
-    'frameworks/kquickcharts': '@latest-kf6'
-    'frameworks/knotifications': '@latest-kf6'
-    'frameworks/kcolorscheme': '@latest-kf6'
-    'libraries/kquickimageeditor': '@latest-kf6'
-    'frameworks/sonnet': '@latest-kf6'
-    'frameworks/prison': '@latest-kf6'
-    'libraries/kirigami-addons': '@latest-kf6'
-    'third-party/libquotient': '@latest'
-    'third-party/qtkeychain': '@latest'
-    'third-party/cmark': '@latest'
-    'third-party/qcoro': '@latest'
-- 'on': ['Windows', 'Linux', 'FreeBSD']
-  'require':
-    'frameworks/qqc2-desktop-style': '@latest-kf6'
-    'frameworks/kio': '@latest-kf6'
-    'frameworks/kwindowsystem': '@latest-kf6'
-    'frameworks/kstatusnotifieritem': '@latest-kf6'
-    'frameworks/kcrash': '@latest-kf6'
-- 'on': ['Linux', 'FreeBSD']
-  'require':
-    'frameworks/kdbusaddons': '@latest-kf6'
-    'frameworks/purpose': '@latest-kf6'
+  - 'on': ['Linux', 'Android', 'FreeBSD', 'Windows']
+    'require':
+      'frameworks/extra-cmake-modules': '@latest-kf6'
+      'frameworks/kcoreaddons': '@latest-kf6'
+      'frameworks/kirigami': '@latest-kf6'
+      'frameworks/ki18n': '@latest-kf6'
+      'frameworks/kconfig': '@latest-kf6'
+      'frameworks/syntax-highlighting': '@latest-kf6'
+      'frameworks/kitemmodels': '@latest-kf6'
+      'frameworks/kquickcharts': '@latest-kf6'
+      'frameworks/knotifications': '@latest-kf6'
+      'frameworks/kcolorscheme': '@latest-kf6'
+      'frameworks/kiconthemes': '@latest-kf6'
+      'libraries/kquickimageeditor': '@latest-kf6'
+      'frameworks/sonnet': '@latest-kf6'
+      'frameworks/prison': '@latest-kf6'
+      'libraries/kirigami-addons': '@latest-kf6'
+      'third-party/libquotient': '@latest'
+      'third-party/qtkeychain': '@latest'
+      'third-party/cmark': '@latest'
+      'third-party/qcoro': '@latest'
+  - 'on': ['Windows', 'Linux', 'FreeBSD']
+    'require':
+      'frameworks/qqc2-desktop-style': '@latest-kf6'
+      'frameworks/kio': '@latest-kf6'
+      'frameworks/kwindowsystem': '@latest-kf6'
+      'frameworks/kstatusnotifieritem': '@latest-kf6'
+      'frameworks/kcrash': '@latest-kf6'
+  - 'on': ['Linux', 'FreeBSD']
+    'require':
+      'frameworks/kdbusaddons': '@latest-kf6'
+      'frameworks/purpose': '@latest-kf6'
 
-- 'on': ['Linux']
-  'require':
-    'sdk/selenium-webdriver-at-spi': '@latest-kf6'
+  - 'on': ['Linux']
+    'require':
+      'sdk/selenium-webdriver-at-spi': '@latest-kf6'
 
 Options:
   per-test-timeout: 90
-  require-passing-tests-on: [ 'Linux', 'Android', 'FreeBSD', 'Windows' ]
+  require-passing-tests-on: ['Linux', 'Android', 'FreeBSD', 'Windows']

CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "25")
-set(RELEASE_SERVICE_VERSION_MINOR "03")
+set(RELEASE_SERVICE_VERSION_MINOR "07")
 set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
@@ -56,7 +56,7 @@ ecm_setup_version(${PROJECT_VERSION}
     VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )
 
-find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg WebView)
+find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg Protobuf WebView)
 set_package_properties(Qt6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
@@ -66,7 +66,7 @@ if (QT_KNOWN_POLICY_QTP0004)
 qt_policy(SET QTP0004 NEW)
 endif ()
 
-find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels IconThemes ColorScheme)
 set_package_properties(KF6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
@@ -115,6 +115,8 @@ set_package_properties(QuotientQt6 PROPERTIES
     PURPOSE "Talk with matrix server"
 )
 
+find_package(LiveKit REQUIRED)
+
 find_package(cmark)
 set_package_properties(cmark PROPERTIES
     TYPE REQUIRED

README.md

@@ -51,6 +51,10 @@ is primarily aimed at Linux development.
 For Windows and Android [Craft](https://invent.kde.org/packaging/craft) is the primary choice. There are guides for setting up
 development environments for [Windows](https://community.kde.org/Get_Involved/development/Windows) and [Android](https://develop.kde.org/docs/packaging/android/building_applications/).
 
+### Building with support for voice / video calls
+
+[LiveKit](https://livekit.io) is needed for call support. Build the [Rust SDK](https://github.com/livekit/rust-sdks) and copy `liblivekit_ffi.so` to your usual library folder. Copy `livekit_ffi.h` to somewhere under your usual include folder. NeoChat should then automatically pick it up.
+
 ## Running
 
 Just start the executable in your preferred way - either from the build directory or from the installed location.

autotests/messagecontentmodeltest.cpp

@@ -12,6 +12,7 @@
 
 #include "models/messagecontentmodel.h"
 
+#include "neochatconnection.h"
 #include "testutils.h"
 
 using namespace Quotient;
@@ -32,7 +33,7 @@ private Q_SLOTS:
 
 void MessageContentModelTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
+    connection = new NeoChatConnection;
 }
 
 void MessageContentModelTest::missingEvent()

autotests/reactionmodeltest.cpp

@@ -20,11 +20,11 @@ class ReactionModelTest : public QObject
 private:
     Connection *connection = nullptr;
     TestUtils::TestRoom *room = nullptr;
+    MessageContentModel *parentModel;
 
 private Q_SLOTS:
     void initTestCase();
 
-    void nullModel();
     void basicReaction();
     void newReaction();
 };
@@ -33,20 +33,13 @@ void ReactionModelTest::initTestCase()
 {
     connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
     room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-reactionmodel-sync.json"_s);
-}
-
-void ReactionModelTest::nullModel()
-{
-    auto model = ReactionModel(nullptr, nullptr);
-
-    QCOMPARE(model.rowCount(), 0);
-    QCOMPARE(model.data(model.index(0), ReactionModel::TextContentRole), QVariant());
+    parentModel = new MessageContentModel(room, "123456"_L1);
 }
 
 void ReactionModelTest::basicReaction()
 {
     auto event = eventCast<const RoomMessageEvent>(room->messageEvents().at(0).get());
-    auto model = ReactionModel(event, room);
+    auto model = ReactionModel(parentModel, event->id(), room);
 
     QCOMPARE(model.rowCount(), 1);
     QCOMPARE(model.data(model.index(0), ReactionModel::TextContentRole), u"<span style=\"font-family: 'emoji';\">👍</span>"_s);
@@ -58,7 +51,7 @@ void ReactionModelTest::basicReaction()
 void ReactionModelTest::newReaction()
 {
     auto event = eventCast<const RoomMessageEvent>(room->messageEvents().at(0).get());
-    auto model = new ReactionModel(event, room);
+    auto model = new ReactionModel(parentModel, event->id(), room);
 
     QCOMPARE(model->rowCount(), 1);
     QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole), u"Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"_s);

autotests/timelinemessagemodeltest.cpp

@@ -137,7 +137,11 @@ void TimelineMessageModelTest::pendingEvent()
     model->setRoom(room);
     QCOMPARE(model->rowCount(), 0);
 
+#if Quotient_VERSION_MINOR > 9
+    auto txnId = room->postText("New plain message"_L1);
+#else
     auto txnId = room->postPlainText("New plain message"_L1);
+#endif
     QCOMPARE(model->rowCount(), 1);
     QCOMPARE(spyInsert.count(), 1);
 
@@ -145,7 +149,11 @@ void TimelineMessageModelTest::pendingEvent()
     QCOMPARE(model->rowCount(), 0);
     QCOMPARE(spyRemove.count(), 1);
 
+#if Quotient_VERSION_MINOR > 9
+    txnId = room->postText("New plain message"_L1);
+#else
     txnId = room->postPlainText("New plain message"_L1);
+#endif
     QCOMPARE(model->rowCount(), 1);
     QCOMPARE(spyInsert.count(), 2);
 

cmake/FindLiveKit.cmake

@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+# SPDX-License-Identifier: BSD-2-Clause
+
+find_library(LIVEKIT_LIB NAMES livekit_ffi)
+find_path(LIVEKIT_INCLUDE_DIR NAMES livekit_ffi.h)
+
+add_library(LiveKit UNKNOWN IMPORTED)
+set_target_properties(LiveKit PROPERTIES IMPORTED_LOCATION ${LIVEKIT_LIB})
+set_target_properties(LiveKit PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${LIVEKIT_INCLUDE_DIR})
+set(LiveKit_FOUND True)

org.kde.neochat.appdata.xml

@@ -473,6 +473,8 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.12.3" date="2025-03-06"/>
+    <release version="24.12.2" date="2025-02-06"/>
     <release version="24.12.1" date="2025-01-09"/>
     <release version="24.12.0" date="2024-12-12"/>
     <release version="24.08.3" date="2024-11-07"/>
@@ -649,6 +651,9 @@
       <url>https://carlschwan.eu/2020/12/23/announcing-neochat-1.0-the-kde-matrix-client/</url>
     </release>
   </releases>
+  <requires>
+    <display_length compare="ge">360</display_length>
+  </requires>
   <branding>
     <color type="primary" scheme_preference="light">#a6e4f3</color>
     <color type="primary" scheme_preference="dark">#235670</color>

org.kde.neochat.desktop

@@ -112,6 +112,7 @@ Comment[ka]=ჩატი Matrix-ზე
 Comment[lv]=Tērzējiet „Matrix“ tīklā
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie
+Comment[pt_BR]=Bate papo na Matrix
 Comment[sa]=Matrix इत्यत्र गपशपं कुर्वन्तु
 Comment[sl]=Klepet na Matrixu
 Comment[sv]=Chatta på Matrix
@@ -119,6 +120,7 @@ Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவு
 Comment[tr]=Matrix üzerinde sohbet edin
 Comment[uk]=Спілкування у Matrix
 Comment[x-test]=xxChat on Matrixxx
+Comment[zh_CN]=在 Matrix 上聊天
 Comment[zh_TW]=在 Matrix 上聊天
 MimeType=x-scheme-handler/matrix;
 Exec=neochat %u

snapcraft.yaml

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 ---
 name: neochat
-base: core22
+base: core24
 adopt-info: neochat
 grade: stable
 confinement: strict
@@ -28,8 +28,8 @@ apps:
 compression: lzo
 
 package-repositories:
- - type: apt
-   ppa: ubuntu-toolchain-r/test
+  - type: apt
+    ppa: ubuntu-toolchain-r/test
 
 slots:
   session-dbus-interface:
@@ -66,7 +66,7 @@ parts:
       - -Dcrypto=disabled
       - -Dgtk_doc=false
     build-packages:
-      - meson 
+      - meson
       - libglib2.0-dev
       - libgcrypt20-dev
     prime:
@@ -81,7 +81,8 @@ parts:
     plugin: cmake
     build-environment:
       - PATH: /snap/bin:${PATH}
-      - PKG_CONFIG_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig:$PKG_CONFIG_PATH
+      - PKG_CONFIG_PATH: "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET\
+      /pkgconfig:$PKG_CONFIG_PATH"
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DCMAKE_BUILD_TYPE=Release
@@ -105,8 +106,6 @@ parts:
     build-snaps:
       - cmake
     build-packages:
-      - gcc-13
-      - g++-13
       - libssl-dev
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr
@@ -114,9 +113,6 @@ parts:
       - -DBUILD_TESTING=OFF
       - -DQuotient_ENABLE_E2EE=ON
       - -DBUILD_WITH_QT6=ON
-    override-build: |
-      update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
-      craftctl default
     prime:
       - -usr/include
       - -usr/lib/*/pkgconfig
@@ -129,6 +125,8 @@ parts:
     plugin: cmake
     build-environment:
       - PATH: /snap/bin:${PATH}
+      - PYTHONPATH: ${CRAFT_STAGE}/lib/python3.12/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
+      - LD_LIBRARY_PATH: "/snap/mesa-2404/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$LD_LIBRARY_PATH"
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DCMAKE_BUILD_TYPE=Release
@@ -150,6 +148,8 @@ parts:
     plugin: cmake
     build-environment:
       - PATH: /snap/bin:${PATH}
+      - PYTHONPATH: ${CRAFT_STAGE}/lib/python3.12/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
+      - LD_LIBRARY_PATH: "/snap/mesa-2404/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$LD_LIBRARY_PATH"
     build-packages:
       - cmark
       - libcmark-dev
@@ -173,3 +173,12 @@ parts:
     prime:
       - usr/lib/*/libcmark.so*
 
+  gpu-2404:
+    after: [neochat]
+    source: https://github.com/canonical/gpu-snap.git
+    plugin: dump
+    override-prime: |
+      craftctl default
+      ${CRAFT_PART_SRC}/bin/gpu-2404-cleanup mesa-2404
+    prime:
+      - bin/gpu-2404-wrapper

src/CMakeLists.txt

@@ -107,8 +107,6 @@ add_library(neochat STATIC
     models/imagepacksmodel.h
     events/imagepackevent.cpp
     events/imagepackevent.h
-    events/joinrulesevent.cpp
-    events/joinrulesevent.h
     models/reactionmodel.cpp
     models/reactionmodel.h
     delegatesizehelper.cpp
@@ -126,8 +124,6 @@ add_library(neochat STATIC
     registration.cpp
     neochatconnection.cpp
     neochatconnection.h
-    jobs/neochatdeactivateaccountjob.cpp
-    jobs/neochatdeactivateaccountjob.h
     jobs/neochatgetcommonroomsjob.cpp
     jobs/neochatgetcommonroomsjob.h
     mediasizehelper.cpp
@@ -194,6 +190,21 @@ add_library(neochat STATIC
     models/roomsortparametermodel.h
     models/messagemodel.cpp
     models/messagemodel.h
+    models/messagecontentfiltermodel.cpp
+    models/messagecontentfiltermodel.h
+    models/pinnedmessagemodel.cpp
+    models/pinnedmessagemodel.h
+    models/commonroomsmodel.cpp
+    models/commonroomsmodel.h
+    events/callencryptionkeysevent.h
+    events/callmemberevent.h
+    events/callnotifyevent.h
+    calls/callcontroller.cpp
+    calls/callcontroller.h
+    livekitlogmodel.cpp
+    livekitlogmodel.h
+    events/callmemberevent.cpp
+    events/callmemberevent.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
@@ -213,7 +224,7 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/AccountMenu.qml
         qml/ExploreComponent.qml
         qml/ExploreComponentMobile.qml
-        qml/ContextMenu.qml
+        qml/RoomContextMenu.qml
         qml/CollapsedRoomDelegate.qml
         qml/RoomDelegate.qml
         qml/RoomListPage.qml
@@ -249,6 +260,7 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/MessageSourceSheet.qml
         qml/ConfirmEncryptionDialog.qml
         qml/RoomSearchPage.qml
+        qml/RoomPinnedMessagesPage.qml
         qml/LocationChooser.qml
         qml/TimelineView.qml
         qml/InvitationView.qml
@@ -293,6 +305,12 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/HoverLinkIndicator.qml
         qml/AvatarNotification.qml
         qml/ReasonDialog.qml
+        qml/LivekitLogViewer.qml
+        qml/CallPage.qml
+        qml/IncomingCallDialog.qml
+    SOURCES
+        messageattached.cpp
+        messageattached.h
     DEPENDENCIES
         QtCore
         QtQuick
@@ -401,7 +419,22 @@ else()
     target_compile_definitions(neochat PUBLIC -DHAVE_X11=0)
 endif()
 
-target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
+qt_add_protobuf(neochat
+        GENERATE_PACKAGE_SUBFOLDERS
+        PROTO_FILES
+        protocols/ffi.proto
+        protocols/room.proto
+        protocols/e2ee.proto
+        protocols/audio_frame.proto
+        protocols/video_frame.proto
+        protocols/handle.proto
+        protocols/participant.proto
+        protocols/stats.proto
+        protocols/track.proto
+        protocols/rpc.proto
+)
+
+target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums ${CMAKE_CURRENT_SOURCE_DIR}/calls)
 target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin loginplugin chatbarplugin)
 target_link_libraries(neochat PUBLIC
     Qt::Core
@@ -411,6 +444,7 @@ target_link_libraries(neochat PUBLIC
     Qt::Multimedia
     Qt::Network
     Qt::QuickControls2
+    Qt::Protobuf
     KF6::I18n
     KF6::Kirigami
     KF6::Notifications
@@ -418,12 +452,14 @@ target_link_libraries(neochat PUBLIC
     KF6::ConfigGui
     KF6::CoreAddons
     KF6::SonnetCore
+    KF6::IconThemes
     KF6::ColorScheme
     KF6::ItemModels
     QuotientQt6
     cmark::cmark
     QCoro::Core
     QCoro::Network
+    LiveKit
 )
 
 if (TARGET KF6::Crash)
@@ -491,6 +527,7 @@ if(ANDROID)
         "network-connect"
         "list-remove-user"
         "org.kde.neochat"
+        "org.kde.neochat.tray"
         "preferences-system-users"
         "preferences-desktop-theme-global"
         "notifications"
@@ -528,12 +565,16 @@ if(ANDROID)
         "object-rotate-left"
         "object-rotate-right"
         "add-subtitle"
+        "security-high"
         "security-low"
         "security-low-symbolic"
         "kde"
         "list-remove-symbolic"
         "edit-delete"
         "user-home-symbolic"
+        "pin-symbolic"
+        "kt-restore-defaults-symbolic"
+        "user-symbolic"
     )
     ecm_add_android_apk(neochat-app ANDROID_DIR ${CMAKE_SOURCE_DIR}/android)
 else()

src/calls/call.h

@@ -0,0 +1,74 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include <QAbstractListModel>
+#include <QObject>
+#include <QQmlEngine>
+
+#include "neochatroom.h"
+
+class Participant : public QObject
+{
+    Q_OBJECT
+
+    void setVolume(float volume);
+    void muteLocally();
+    void unmuteLocally();
+
+    void ring(); // See MSC4075
+
+    // TODO: if these are possible; check livekit api
+    void muteGlobally();
+    void forceDisableCamera();
+    void forceDisableScreenShare();
+
+    void setPermissions();
+    void kick();
+    void ban();
+
+Q_SIGNALS:
+    void muted();
+    void unmuted();
+
+    void cameraEnabled();
+    void cameraDisabled();
+
+    void screenShareEnabled();
+    void screenShareDisabled();
+};
+
+class Call : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+    Q_PROPERTY(bool cameraEnabled READ cameraEnabled WRITE setCameraEnabled NOTIFY cameraEnabledChanged)
+    Q_PROPERTY(bool microphoneMuted READ microphoneMuted WRITE setMicrophoneMuted NOTIFY microphoneMutedChanged)
+    Q_PROPERTY(bool screenshareEnabled READ screenshareEnabled NOTIFY screenshareEnabledChanged)
+
+    Q_PROPERTY(NeoChatRoom *room READ room CONSTANT)
+
+public:
+    explicit Call(NeoChatRoom *room, QObject *parent = nullptr);
+
+Q_SIGNALS:
+    void participantJoined(const Participant &participant);
+    void participantLeft(const Participant &participant);
+
+private:
+    QList<Participant *> m_participants;
+};
+
+class CallParticipantsModel : public QAbstractListModel
+{
+    Q_OBJECT
+public:
+    enum Roles {
+        NameRoleRole,
+        HasCameraRole,
+        HasScreenShareRole,
+        IsMutedRole,
+    };
+    Q_ENUM(Roles)
+};

src/calls/callcontroller.cpp

@@ -0,0 +1,447 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "callcontroller.h"
+
+#include <QAudioSink>
+#include <QMediaDevices>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QProtobufSerializer>
+#include <QVideoFrame>
+#include <QVideoFrameFormat>
+#include <QVideoSink>
+
+#include <livekit_ffi.h>
+
+#include <Quotient/csapi/openid.h>
+
+#include "audio_frame.qpb.h"
+#include "ffi.qpb.h"
+
+#include "livekitlogmodel.h"
+#include "neochatroom.h"
+#include "track.qpb.h"
+#include "video_frame.qpb.h"
+
+using namespace livekit::proto;
+using namespace Quotient;
+
+extern "C" {
+void livekit_ffi_initialize(void(ffiCallbackFn(const uint8_t *, size_t)), bool capture_logs, const char *, const char *);
+}
+
+void callback(const uint8_t *data, size_t length)
+{
+    auto byteArrayData = QByteArray::fromRawData((const char *)data, length);
+    QProtobufSerializer serializer;
+    FfiEvent event;
+    event.deserialize(&serializer, byteArrayData);
+    CallController::instance().handleEvent(std::move(event));
+}
+
+CallController::CallController()
+    : QObject()
+{
+    init();
+}
+
+void CallController::init()
+{
+    // qRegisterProtobufTypes();
+    livekit_ffi_initialize(callback, true, "test", "1.0");
+}
+
+static void handleLog(const LogRecordRepeated &&logs)
+{
+    for (const auto &log : logs) {
+        if (log.level() <= LogLevelGadget::LogLevel::LOG_WARN) {
+            qWarning() << log.message();
+        }
+    }
+    LivekitLogModel::instance().addMessages(logs);
+}
+
+void CallController::handleConnect(ConnectCallback &&callback)
+{
+    qWarning() << "Connecting to" << callback.result().room().info().name() << "with id" << callback.asyncId();
+    if (!m_connectingRooms.contains(callback.asyncId()) || !m_connectingRooms[callback.asyncId()]
+        || m_connectingRooms[callback.asyncId()]->id() != callback.result().room().info().name()) {
+        qWarning() << "Connecting to unexpected room";
+        return;
+    }
+    m_connectingRooms.remove(callback.asyncId());
+    m_rooms[callback.asyncId()] = callback.result().room();
+    localParticipant = callback.result().localParticipant().handle().id_proto();
+    Q_EMIT connected();
+}
+
+void CallController::handleDispose(DisposeCallback &&callback)
+{
+    qWarning() << "Disposing" << callback.asyncId();
+    if (m_rooms.contains(callback.asyncId())) {
+        qWarning() << "  room" << m_rooms[callback.asyncId()].info().name();
+        m_rooms.erase(callback.asyncId());
+    } else {
+        qWarning() << "  unknown object";
+    }
+}
+
+void CallController::handleRoomEvent(livekit::proto::RoomEvent &&event)
+{
+    if (event.hasParticipantConnected()) {
+        qWarning() << "Participant connected" << event.participantConnected().info().info().identity();
+    } else if (event.hasParticipantDisconnected()) {
+        qWarning() << "Participant connected" << event.participantDisconnected().participantIdentity();
+    } else if (event.hasLocalTrackPublished()) {
+        qWarning() << "Local track published";
+        m_localVideoTrackSid = event.localTrackPublished().trackSid();
+    } else if (event.hasLocalTrackUnpublished()) {
+        qWarning() << "Local track unpublished";
+    } else if (event.hasTrackPublished()) {
+        qWarning() << "Track published";
+    } else if (event.hasTrackUnpublished()) {
+        qWarning() << "Track unpublished";
+    } else if (event.hasTrackSubscribed()) {
+        qWarning() << "Track subscribed";
+
+        auto track = event.trackSubscribed().track();
+        if (track.info().kind() == TrackKindGadget::TrackKind::KIND_AUDIO) {
+            NewAudioStreamRequest audioStreamRequest;
+            audioStreamRequest.setTrackHandle(track.handle().id_proto());
+            FfiRequest request;
+            request.setNewAudioStream(audioStreamRequest);
+            QProtobufSerializer serializer;
+            auto data = request.serialize(&serializer);
+            const uint8_t *ret_data;
+            size_t size;
+            livekit_ffi_request((const uint8_t *)data.data(), data.length(), &ret_data, &size);
+            FfiResponse newResponse;
+            newResponse.deserialize(&serializer, QByteArray::fromRawData((const char *)ret_data, size));
+        } else if (track.info().kind() == TrackKindGadget::TrackKind::KIND_VIDEO) {
+            NewVideoStreamRequest videoStreamRequest;
+            videoStreamRequest.setTrackHandle((track.handle().id_proto()));
+            FfiRequest request;
+            request.setNewVideoStream(videoStreamRequest);
+            QProtobufSerializer serializer;
+            auto data = request.serialize(&serializer);
+            const uint8_t *ret_data;
+            size_t size;
+            livekit_ffi_request((const uint8_t *)data.data(), data.length(), &ret_data, &size);
+            FfiResponse newResponse;
+            newResponse.deserialize(&serializer, QByteArray::fromRawData((const char *)ret_data, size));
+        }
+    } else if (event.hasTrackUnsubscribed()) {
+        qWarning() << "Track unsubscribed";
+    } else if (event.hasTrackSubscriptionFailed()) {
+        qWarning() << "Track subscription failed";
+    } else if (event.hasTrackMuted()) {
+        qWarning() << "Track muted";
+    } else if (event.hasTrackUnmuted()) {
+        qWarning() << "Track unmuted";
+    } else if (event.hasActiveSpeakersChanged()) {
+        qWarning() << "Active speakers changed";
+    } else if (event.hasRoomMetadataChanged()) {
+        qWarning() << "room metadata changed";
+    } else if (event.hasParticipantMetadataChanged()) {
+        qWarning() << "participant metadata changed";
+    } else if (event.hasParticipantNameChanged()) {
+        qWarning() << "participant name changed";
+    } else if (event.hasConnectionQualityChanged()) {
+        qWarning() << "connection quality changed to" << event.connectionQualityChanged().quality();
+    } else if (event.hasDataPacketReceived()) {
+        qWarning() << "data received";
+    } else if (event.hasConnectionStateChanged()) {
+        qWarning() << "connection state changed";
+    } else if (event.hasDisconnected()) {
+        qWarning() << "disconnected";
+    } else if (event.hasReconnecting()) {
+        qWarning() << "reconnecting";
+    } else if (event.hasReconnected()) {
+        qWarning() << "Reconnected";
+    } else if (event.hasE2eeStateChanged()) {
+        qWarning() << "e2eeStateChanged";
+    } else if (event.hasEos()) {
+        qWarning() << "eos";
+    } else {
+        qWarning() << "Unknown room event";
+    }
+}
+
+void saveByteArray(const QByteArray &data, const QString &name)
+{
+    QFile file(u"/home/tobias/"_s + name);
+    file.open(QFile::WriteOnly);
+    file.write(data);
+    file.close();
+}
+
+void CallController::handleEvent(FfiEvent &&event)
+{
+    if (event.hasLogs()) {
+        handleLog(std::move(event.logs().records()));
+    } else if (event.hasRoomEvent()) {
+        handleRoomEvent(std::move(event.roomEvent()));
+    } else if (event.hasTrackEvent()) {
+        qWarning() << "track event";
+    } else if (event.hasVideoStreamEvent()) {
+        qWarning() << "video stream event";
+        auto video = event.videoStreamEvent();
+        auto info = video.frameReceived().buffer().info();
+        QByteArray data((const char *)info.dataPtr(), info.width() * info.height() * 1.5);
+        auto frame = QVideoFrame(QVideoFrameFormat(QSize(info.width(), info.height()), QVideoFrameFormat::Format_YUV420P));
+        frame.map(QVideoFrame::WriteOnly);
+        memcpy(frame.bits(0), data.constData(), data.size() / 3 * 2);
+        memcpy(frame.bits(1), data.constData() + data.size() / 3 * 2, data.size() / 6);
+        memcpy(frame.bits(2), data.constData() + data.size() / 3 * 2 + data.size() / 6, data.size() / 6);
+        qWarning() << frame.size() << data.toBase64();
+        frame.unmap();
+        m_sink->setVideoFrame(frame);
+        delete (char *)info.dataPtr();
+    } else if (event.hasAudioStreamEvent()) {
+        return; //TODO remove
+        static bool initialized = false;
+        if (!initialized) {
+            initialized = true;
+            QAudioFormat format;
+            format.setSampleRate(48000);
+            format.setChannelCount(2);
+            format.setSampleFormat(QAudioFormat::Int16);
+            QAudioDevice info(QMediaDevices::defaultAudioOutput());
+            if (!info.isFormatSupported(format)) {
+                qWarning() << "Audio format not supported";
+                Q_ASSERT(false);
+                return;
+            }
+            sink = new QAudioSink(format);
+            audioData = sink->start();
+            QProtobufSerializer serializer;
+            NewAudioResamplerRequest narr;
+            FfiRequest request;
+            request.setNewAudioResampler(narr);
+            auto data = request.serialize(&serializer);
+            const uint8_t *ret_data;
+            size_t size;
+            livekit_ffi_request((const uint8_t *)data.data(), data.length(), &ret_data, &size);
+            FfiResponse newResponse;
+            newResponse.deserialize(&serializer, QByteArray::fromRawData((const char *)ret_data, size));
+            resampler = newResponse.newAudioResampler().resampler().handle().id_proto();
+        }
+
+        if (event.audioStreamEvent().hasFrameReceived()) {
+            FfiRequest request;
+            RemixAndResampleRequest rarr;
+            rarr.setBuffer(event.audioStreamEvent().frameReceived().frame().info());
+            rarr.setNumChannels(2);
+            rarr.setSampleRate(48000);
+            rarr.setResamplerHandle(resampler);
+            request = FfiRequest();
+            request.setRemixAndResample(rarr);
+            static QProtobufSerializer serializer;
+            auto data = request.serialize(&serializer);
+            const uint8_t *ret_data;
+            size_t size;
+            livekit_ffi_request((const uint8_t *)data.data(), data.length(), &ret_data, &size);
+            FfiResponse response;
+            response.deserialize(&serializer, QByteArray::fromRawData((const char *)ret_data, size));
+            Q_ASSERT(response.hasRemixAndResample());
+
+            auto info = response.remixAndResample().buffer().info();
+            auto bytes = info.numChannels() * info.samplesPerChannel() * 2;
+            data = QByteArray::fromRawData((const char *)info.dataPtr(), bytes);
+            audioData->write(data);
+        }
+    } else if (event.hasConnect()) {
+        handleConnect(std::move(event.connect()));
+    } else if (event.hasDisconnect()) {
+        qWarning() << "disconnect";
+    } else if (event.hasDispose()) {
+        handleDispose(std::move(event.dispose()));
+    } else if (event.hasPublishTrack()) {
+        qWarning() << "publish track";
+    } else if (event.hasUnpublishTrack()) {
+        qWarning() << "unpublish track";
+    } else if (event.hasPublishData()) {
+        qWarning() << "publish data";
+    } else if (event.hasCaptureAudioFrame()) {
+        qWarning() << "audio frame";
+    } else if (event.hasGetStats()) {
+        qWarning() << "get stats";
+    } else if (event.hasGetSessionStats()) {
+        qWarning() << "get session stats";
+    } else if (event.hasPanic()) {
+        qWarning() << "panic";
+    } else {
+        qWarning() << event.messageField();
+    }
+}
+
+void CallController::handleCallMemberEvent(const Quotient::CallMemberEvent *event, NeoChatRoom *room)
+{
+    qWarning() << event->fullJson();
+    Q_EMIT callStarted();
+    const auto connection = room->connection();
+    auto job = connection->callApi<RequestOpenIdTokenJob>(connection->userId());
+    connect(job, &BaseJob::finished, this, [this, room, job, connection, event]() {
+        auto nam = new QNetworkAccessManager;
+        auto json = QJsonDocument(QJsonObject{
+                                      {"room"_L1, room->id()},
+                                      {"openid_token"_L1,
+                                       QJsonObject{{"access_token"_L1, job->tokenData().accessToken},
+                                                   {"token_type"_L1, job->tokenData().tokenType},
+                                                   {"matrix_server_name"_L1, job->tokenData().matrixServerName}}},
+                                      {"device_id"_L1, connection->deviceId()},
+                                  })
+                        .toJson();
+        // This is an old event!
+        if (!event->contentJson().contains("foci_preferred"_L1)) {
+            return;
+        }
+        QNetworkRequest request(QUrl((event->contentJson()["foci_preferred"_L1].toArray()[0]["livekit_service_url"_L1].toString() + "/sfu/get"_L1)));
+        request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"_L1);
+        auto reply = nam->post(request, json);
+        connect(reply, &QNetworkReply::finished, this, [reply, this, room]() {
+            auto json = QJsonDocument::fromJson(reply->readAll()).object();
+
+            FfiRequest message;
+            ConnectRequest connectRequest;
+            connectRequest.setUrl(json["url"_L1].toString());
+            connectRequest.setToken(json["jwt"_L1].toString());
+            message.setConnect(connectRequest);
+            QProtobufSerializer serializer;
+            auto data = message.serialize(&serializer);
+            size_t size;
+            const uint8_t *ret_data;
+            livekit_ffi_request((const uint8_t *)data.data(), data.length(), &ret_data, &size);
+            FfiResponse connectResponse;
+            connectResponse.deserialize(&serializer, QByteArray::fromRawData((const char *)ret_data, size));
+            if (!connectResponse.hasConnect()) {
+                qWarning() << "connectResponse has unexpected content" << connectResponse.messageField();
+                return;
+            }
+            m_connectingRooms[connectResponse.connect().asyncId()] = room;
+        });
+    });
+}
+
+FfiResponse request(FfiRequest &&request)
+{
+    static QProtobufSerializer serializer;
+    auto data = request.serialize(&serializer);
+    size_t responseLength;
+    const char *responseData;
+    livekit_ffi_request((const uint8_t *)data.constData(), data.size(), (const uint8_t **)&responseData, &responseLength);
+    auto response = QByteArray::fromRawData(responseData, responseLength);
+    FfiResponse ffiResponse;
+    ffiResponse.deserialize(&serializer, response);
+    return ffiResponse;
+}
+
+void CallController::setCameraVideoSink(QVideoSink *videoSink)
+{
+    m_cameraVideoSink = videoSink;
+    connect(videoSink, &QVideoSink::videoFrameChanged, this, [videoSink, this]() {
+        static bool initialized = false;
+        if (localParticipant == 100000) {
+            return; // TODO make less shitty
+        }
+        static QtProtobuf::uint64 handle;
+        if (!initialized) {
+            initialized = true;
+
+            NewVideoSourceRequest newVideoSourceRequest;
+            VideoSourceResolution resolution;
+            resolution.setHeight(videoSink->videoSize().height());
+            resolution.setWidth(videoSink->videoSize().width());
+            newVideoSourceRequest.setResolution(resolution);
+            newVideoSourceRequest.setType(VideoSourceTypeGadget::VideoSourceType::VIDEO_SOURCE_NATIVE);
+            FfiRequest ffiRequest;
+            ffiRequest.setNewVideoSource(newVideoSourceRequest);
+            auto response = request(std::move(ffiRequest));
+            handle = response.newVideoSource().source().handle().id_proto();
+            m_localVideoTrackHandle = handle;
+
+            CreateVideoTrackRequest createVideoTrackRequest;
+            createVideoTrackRequest.setName("Camera"_L1);
+            createVideoTrackRequest.setSourceHandle(handle);
+
+            FfiRequest request;
+            request.setCreateVideoTrack(createVideoTrackRequest);
+
+            auto createResponse = ::request(std::move(request));
+            m_localVideoTrackId = createResponse.createVideoTrack().track().handle().id_proto();
+            publishTrack(m_localVideoTrackId);
+        }
+
+        auto image = videoSink->videoFrame().toImage();
+        image.convertTo(QImage::Format_RGB888);
+        CaptureVideoFrameRequest request;
+        VideoBufferInfo buffer;
+        buffer.setType(VideoBufferTypeGadget::VideoBufferType::RGB24);
+        buffer.setWidth(image.width());
+        buffer.setHeight(image.height());
+        buffer.setDataPtr((QtProtobuf::uint64)image.bits());
+        buffer.setStride(image.bytesPerLine());
+        QList<VideoBufferInfo_QtProtobufNested::ComponentInfo> components;
+        VideoBufferInfo_QtProtobufNested::ComponentInfo componentInfo;
+        componentInfo.setStride(image.bytesPerLine());
+        componentInfo.setDataPtr((QtProtobuf::uint64)image.bits());
+        componentInfo.setSize(image.sizeInBytes());
+        components += componentInfo;
+        buffer.setComponents(components);
+        request.setBuffer(buffer);
+        request.setSourceHandle(handle);
+        request.setTimestampUs(QDateTime::currentMSecsSinceEpoch() * 1000);
+        request.setRotation(VideoRotationGadget::VideoRotation::VIDEO_ROTATION_0);
+        FfiRequest ffiRequest;
+        ffiRequest.setCaptureVideoFrame(request);
+        auto response = ::request(std::move(ffiRequest));
+    });
+}
+
+void CallController::setVideoSink(QObject *sink)
+{
+    m_sink = dynamic_cast<QVideoSink *>(sink);
+}
+
+void LivekitVideoSink::setVideoSink(QVideoSink *videoSink)
+{
+    m_videoSink = videoSink;
+    CallController::instance().setVideoSink(videoSink);
+    Q_EMIT videoSinkChanged();
+}
+QVideoSink *LivekitVideoSink::videoSink() const
+{
+    return m_videoSink;
+}
+
+void CallController::toggleCamera()
+{
+    if (m_localVideoTrackSid.isEmpty()) {
+        publishTrack(m_localVideoTrackId);
+    } else {
+        FfiRequest request;
+        UnpublishTrackRequest unpublishRequest;
+        unpublishRequest.setLocalParticipantHandle(localParticipant);
+        unpublishRequest.setTrackSid(m_localVideoTrackSid);
+        request.setUnpublishTrack(unpublishRequest);
+        auto response = ::request(std::move(request));
+        m_localVideoTrackSid = QString();
+    }
+}
+
+void CallController::publishTrack(uint64_t id)
+{
+
+    PublishTrackRequest publishTrackRequest;
+    publishTrackRequest.setTrackHandle(id);
+    publishTrackRequest.setLocalParticipantHandle(localParticipant);
+    TrackPublishOptions options;
+    options.setSource(TrackSourceGadget::TrackSource::SOURCE_CAMERA);
+    options.setVideoCodec(VideoCodecGadget::VideoCodec::VP8);
+    publishTrackRequest.setOptions(options);
+
+    auto request = FfiRequest();
+    request.setPublishTrack(publishTrackRequest);
+    auto publishResponse = ::request(std::move(request));
+}

src/calls/callcontroller.h

@@ -0,0 +1,97 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include <QObject>
+#include <QQmlEngine>
+#include <QVideoSink>
+
+#include "events/callmemberevent.h"
+
+#include "room.qpb.h"
+
+namespace livekit::proto
+{
+class FfiEvent;
+class ConnectCallback;
+class DisposeCallback;
+class RoomEvent;
+}
+
+class LivekitMediaPlayer;
+
+class NeoChatRoom;
+class QAudioSink;
+
+class CallController : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
+
+public:
+    static CallController &instance()
+    {
+        static CallController _instance;
+        return _instance;
+    }
+
+    static CallController *create(QQmlEngine *, QJSEngine *)
+    {
+        QQmlEngine::setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
+        return &instance();
+    }
+
+    void handleCallMemberEvent(const Quotient::CallMemberEvent *event, NeoChatRoom *room);
+
+    // Internal. Do not use.
+    void handleEvent(livekit::proto::FfiEvent &&event);
+    Q_INVOKABLE void setVideoSink(QObject *sink);
+    Q_INVOKABLE void setCameraVideoSink(QVideoSink *videoSink);
+
+    Q_INVOKABLE void toggleCamera();
+
+Q_SIGNALS:
+    void callStarted();
+    void connected();
+
+private:
+    CallController();
+    void init();
+
+    QMap<uint64_t, QPointer<NeoChatRoom>> m_connectingRooms;
+    std::map<uint64_t, livekit::proto::OwnedRoom> m_rooms;
+    void handleConnect(livekit::proto::ConnectCallback &&callback);
+    void handleDispose(livekit::proto::DisposeCallback &&callback);
+    void handleRoomEvent(livekit::proto::RoomEvent &&event);
+    void publishTrack(uint64_t id);
+
+    QIODevice *audioData = nullptr;
+    QAudioSink *sink;
+    QVideoSink *m_sink;
+    uint64_t resampler;
+    QVideoSink *m_cameraVideoSink = nullptr;
+    uint64_t localParticipant = 100000;
+    QString m_localVideoTrackSid;
+    uint64_t m_localVideoTrackId;
+    uint64_t m_localVideoTrackHandle;
+};
+
+class LivekitVideoSink : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+public:
+    Q_PROPERTY(QVideoSink *videoSink READ videoSink WRITE setVideoSink NOTIFY videoSinkChanged REQUIRED)
+    using QObject::QObject;
+
+    void setVideoSink(QVideoSink *videoSink);
+    QVideoSink *videoSink() const;
+
+Q_SIGNALS:
+    void videoSinkChanged();
+
+private:
+    QVideoSink *m_videoSink = nullptr;
+};

src/chatbar/ChatBar.qml

@@ -349,7 +349,7 @@ QQC2.Control {
                 replyEventId: _private.chatBarCache.replyId
                 replyAuthor: _private.chatBarCache.relationAuthor
                 replyContentModel: _private.chatBarCache.relationEventContentModel
-                maxContentWidth: paneLoader.item.width
+                Message.maxContentWidth: paneLoader.item.width
             }
             QQC2.Button {
                 id: cancelButton

src/chatdocumenthandler.cpp

@@ -222,11 +222,14 @@ void ChatDocumentHandler::complete(int index)
         return;
     }
 
+    // Ensure we only search for the beginning of the current completion identifier
+    const auto fromIndex = qMax(completionStartIndex(), 0);
+
     if (m_completionModel->autoCompletionType() == CompletionModel::User) {
         auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::DisplayNameRole).toString();
         auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::SubtitleRole).toString();
         auto text = getText();
-        auto at = text.lastIndexOf(QLatin1Char('@'), cursorPosition() - 1);
+        auto at = text.indexOf(QLatin1Char('@'), fromIndex);
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
         cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
@@ -239,7 +242,7 @@ void ChatDocumentHandler::complete(int index)
     } else if (m_completionModel->autoCompletionType() == CompletionModel::Command) {
         auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedTextRole).toString();
         auto text = getText();
-        auto at = text.lastIndexOf(QLatin1Char('/'));
+        auto at = text.indexOf(QLatin1Char('/'), fromIndex);
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
         cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
@@ -247,7 +250,7 @@ void ChatDocumentHandler::complete(int index)
     } else if (m_completionModel->autoCompletionType() == CompletionModel::Room) {
         auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::SubtitleRole).toString();
         auto text = getText();
-        auto at = text.lastIndexOf(QLatin1Char('#'), cursorPosition() - 1);
+        auto at = text.indexOf(QLatin1Char('#'), fromIndex);
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
         cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
@@ -260,7 +263,7 @@ void ChatDocumentHandler::complete(int index)
     } else if (m_completionModel->autoCompletionType() == CompletionModel::Emoji) {
         auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedTextRole).toString();
         auto text = getText();
-        auto at = text.lastIndexOf(QLatin1Char(':'));
+        auto at = text.indexOf(QLatin1Char(':'), fromIndex);
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
         cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);

src/controller.cpp

@@ -45,6 +45,8 @@ bool testMode = false;
 
 using namespace Quotient;
 
+
+
 Controller::Controller(QObject *parent)
     : QObject(parent)
 {
@@ -132,6 +134,7 @@ Controller::Controller(QObject *parent)
 
     m_endpoint = connector->endpoint();
 #endif
+
 }
 
 Controller &Controller::instance()
@@ -168,7 +171,6 @@ void Controller::addConnection(NeoChatConnection *c)
     connect(c, &NeoChatConnection::syncDone, this, [this, c]() {
         m_notificationsManager.handleNotifications(c);
     });
-    connect(c, &NeoChatConnection::showInviteNotification, &m_notificationsManager, &NotificationsManager::postInviteNotification);
 
     c->sync();
 
@@ -295,7 +297,7 @@ bool Controller::supportSystemTray() const
 void Controller::setQuitOnLastWindowClosed()
 {
 #ifndef Q_OS_ANDROID
-    if (NeoChatConfig::self()->systemTray()) {
+    if (supportSystemTray() && NeoChatConfig::self()->systemTray()) {
         m_trayIcon = new TrayIcon(this);
         m_trayIcon->show();
     } else {

src/devtools/StateKeys.qml

@@ -3,6 +3,7 @@
 
 import QtQuick
 import QtQuick.Layouts
+import QtQuick.Window
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
@@ -37,7 +38,7 @@ FormCard.FormCardPage {
     }
 
     function openEventSource(stateKey: string): void {
-        pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+        root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
             model: stateKeysModel,
             allowEdit: true,
             room: root.room,

src/emojitones.cpp

@@ -7,5 +7,5 @@
 using namespace Qt::StringLiterals;
 
 QMultiHash<QString, QVariant> EmojiTones::_tones = {
-#include "emojitones_data.h"
+//#include "emojitones_data.h"
 };

src/enums/messagecomponenttype.h

@@ -50,12 +50,17 @@ public:
         LiveLocation, /**< The initial event of a shared live location (i.e., the place where this is supposed to be shown in the timeline). */
         Encrypted, /**< An encrypted message that cannot be decrypted. */
         Reply, /**< A component to show a replied-to message. */
+        Reaction, /**< A component to show the reactions to this message. */
         LinkPreview, /**< A preview of a URL in the message. */
         LinkPreviewLoad, /**< A loading dialog for a link preview. */
         ChatBar, /**< A text edit for editing a message. */
+        ThreadRoot, /**< The root message of the thread. */
+        ThreadBody, /**< The other messages in the thread. */
         ReplyButton, /**< A button to reply in the current thread. */
+        FetchButton, /**< A button to fetch more messages in the current thread. */
         Verification, /**< A user verification session start message. */
         Loading, /**< The component is loading. */
+        Separator, /**< A horizontal separator. */
         Other, /**< Anything that cannot be classified as another type. */
     };
     Q_ENUM(Type);

src/eventhandler.h

@@ -11,7 +11,7 @@ namespace Quotient
 {
 namespace EventContent
 {
-struct FileInfo;
+class FileInfo;
 }
 class RoomEvent;
 class RoomMember;

src/events/callencryptionkeysevent.h

@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+#include <Quotient/events/roomevent.h>
+
+namespace Quotient
+{
+
+class CallEncryptionKeysEvent : public RoomEvent
+{
+public:
+    QUO_EVENT(CallEncryptionKeysEvent, "io.element.call.encryption_keys");
+    explicit CallEncryptionKeysEvent(const QJsonObject &obj)
+        : RoomEvent(obj)
+    {
+    }
+};
+}

src/events/callmemberevent.cpp

@@ -0,0 +1,38 @@
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "callmemberevent.h"
+
+#include <QString>
+
+using namespace Quotient;
+using namespace Qt::Literals::StringLiterals;
+
+CallMemberEventContent::CallMemberEventContent(const QJsonObject &json)
+{
+    for (const auto &membership : json["memberships"_L1].toArray()) {
+        QList<Focus> foci;
+        for (const auto &focus : membership["foci_active"_L1].toArray()) {
+            foci.append(Focus{
+                .livekitAlias = focus["livekit_alias"_L1].toString(),
+                .livekitServiceUrl = focus["livekit_service_url"_L1].toString(),
+                .type = focus["livekit"_L1].toString(),
+            });
+        }
+        memberships.append(CallMembership{
+            .application = membership["application"_L1].toString(),
+            .callId = membership["call_id"_L1].toString(),
+            .deviceId = membership["device_id"_L1].toString(),
+            .expires = membership["expires"_L1].toInt(),
+            .expiresTs = membership["expires"_L1].toVariant().value<uint64_t>(),
+            .fociActive = foci,
+            .membershipId = membership["membershipID"_L1].toString(),
+            .scope = membership["scope"_L1].toString(),
+        });
+    }
+}
+
+QJsonObject CallMemberEventContent::toJson() const
+{
+    return {};
+}

src/events/callmemberevent.h

@@ -0,0 +1,59 @@
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+#include <Quotient/events/stateevent.h>
+
+namespace Quotient
+{
+
+struct Focus {
+    QString livekitAlias;
+    QString livekitServiceUrl;
+    QString type;
+};
+
+struct CallMembership {
+    QString application;
+    QString callId;
+    QString deviceId;
+    int expires;
+    uint64_t expiresTs;
+    QList<Focus> fociActive;
+    QString membershipId;
+    QString scope;
+};
+
+class CallMemberEventContent
+{
+public:
+    explicit CallMemberEventContent(const QJsonObject &json);
+    QJsonObject toJson() const;
+
+    QList<CallMembership> memberships;
+};
+
+/**
+ * @class CallMemberEvent
+ *
+ * Class to define a call member event.
+ *
+ * @sa Quotient::StateEvent
+ */
+class CallMemberEvent : public KeyedStateEventBase<CallMemberEvent, CallMemberEventContent>
+{
+public:
+    QUO_EVENT(CallMemberEvent, "org.matrix.msc3401.call.member")
+
+    explicit CallMemberEvent(const QJsonObject &obj)
+        : KeyedStateEventBase(obj)
+    {
+    }
+
+    QJsonArray memberships() const
+    {
+        return contentJson()[u"memberships"_s].toArray();
+    }
+};
+}

src/events/callnotifyevent.h

@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+#include <Quotient/events/roomevent.h>
+
+namespace Quotient
+{
+
+class CallNotifyEvent : public RoomEvent
+{
+public:
+    QUO_EVENT(CallNotifyEvent, "org.matrix.msc4075.call.notify");
+    explicit CallNotifyEvent(const QJsonObject &obj);
+};

src/events/joinrulesevent.cpp

@@ -1,16 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#include "joinrulesevent.h"
-
-using namespace Quotient;
-
-QString JoinRulesEvent::joinRule() const
-{
-    return fromJson<QString>(contentJson()["join_rule"_L1]);
-}
-
-QJsonArray JoinRulesEvent::allow() const
-{
-    return contentJson()["allow"_L1].toArray();
-}

src/events/joinrulesevent.h

@@ -1,43 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#pragma once
-
-#include <Quotient/events/stateevent.h>
-
-namespace Quotient
-{
-/**
- * @class JoinRulesEvent
- *
- * Class to define a join rule state event.
- *
- * @sa Quotient::StateEvent
- */
-class JoinRulesEvent : public StateEvent
-{
-public:
-    QUO_EVENT(JoinRulesEvent, "m.room.join_rules")
-
-    explicit JoinRulesEvent(const QJsonObject &obj)
-        : StateEvent(obj)
-    {
-    }
-
-    /**
-     * @brief The join rule for the room.
-     *
-     * see https://spec.matrix.org/latest/client-server-api/#mroomjoin_rules for
-     * the available join rules for a room.
-     */
-    QString joinRule() const;
-
-    /**
-     * @brief The allow rule for restricted rooms.
-     *
-     * see https://spec.matrix.org/latest/client-server-api/#mroomjoin_rules for
-     * full details on allow rules.
-     */
-    QJsonArray allow() const;
-};
-}

src/jobs/neochatdeactivateaccountjob.cpp

@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "neochatdeactivateaccountjob.h"
-
-using namespace Quotient;
-
-NeoChatDeactivateAccountJob::NeoChatDeactivateAccountJob(const std::optional<QJsonObject> &auth)
-    : BaseJob(HttpVerb::Post, u"DisableDeviceJob"_s, "_matrix/client/v3/account/deactivate")
-{
-    QJsonObject data;
-    addParam<IfNotEmpty>(data, u"auth"_s, auth);
-    setRequestData(data);
-}

src/jobs/neochatdeactivateaccountjob.h

@@ -1,12 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <Quotient/jobs/basejob.h>
-
-class NeoChatDeactivateAccountJob : public Quotient::BaseJob
-{
-public:
-    explicit NeoChatDeactivateAccountJob(const std::optional<QJsonObject> &auth = {});
-};

src/linkpreviewer.cpp

@@ -9,7 +9,6 @@
 
 #include <Quotient/events/roommessageevent.h>
 
-#include "neochatconfig.h"
 #include "utils.h"
 
 using namespace Quotient;
@@ -22,7 +21,6 @@ LinkPreviewer::LinkPreviewer(const QUrl &url, QObject *parent)
     Q_ASSERT(dynamic_cast<Connection *>(this->parent()));
 
     connect(this, &LinkPreviewer::urlChanged, this, &LinkPreviewer::emptyChanged);
-    connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, &LinkPreviewer::loadUrlPreview);
 
     loadUrlPreview();
 }

src/livekitlogmodel.cpp

@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "livekitlogmodel.h"
+
+using namespace livekit::proto;
+
+QVariant LivekitLogModel::data(const QModelIndex &index, int role) const
+{
+    const auto &message = m_messages[index.row()];
+    if (role == MessageRole) {
+        return message.message();
+    }
+    return {};
+}
+
+int LivekitLogModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return m_messages.size();
+}
+
+QHash<int, QByteArray> LivekitLogModel::roleNames() const
+{
+    return {
+        {MessageRole, "message"},
+    };
+}
+
+void LivekitLogModel::addMessages(livekit::proto::LogRecordRepeated messages)
+{
+    for (const auto &message : messages) {
+        // if (message.level() < 3) {
+        beginInsertRows({}, m_messages.size(), m_messages.size() + 1);
+        m_messages += message;
+        endInsertRows();
+        // }
+    }
+}

src/livekitlogmodel.h

@@ -0,0 +1,61 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include <QAbstractListModel>
+#include <QQmlEngine>
+#include <QList>
+
+#include "ffi.qpb.h"
+
+class LivekitLogModel : public QAbstractListModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
+public:
+    static LivekitLogModel &instance() {
+        static LivekitLogModel _instance;
+        return _instance;
+    }
+
+    static LivekitLogModel *create(QQmlEngine *, QJSEngine *) {
+        QQmlEngine::setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
+        return &instance();
+    }
+
+    /**
+     * @brief Defines the model roles.
+     */
+    enum Roles {
+        MessageRole = Qt::DisplayRole,
+    };
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QAbstractItemModel::data
+     */
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
+
+    /**
+     * @brief Number of rows in the model.
+     *
+     * @sa QAbstractItemModel::rowCount
+     */
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa Roles, QAbstractItemModel::roleNames()
+     */
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+    void addMessages(livekit::proto::LogRecordRepeated messages);
+
+private:
+    livekit::proto::LogRecordRepeated m_messages;
+    LivekitLogModel() = default;
+};

src/login/WelcomePage.qml

@@ -17,6 +17,7 @@ Kirigami.Page {
 
     property bool showExisting: false
     property bool _showExisting: showExisting && root.currentStepString === root.initialStep
+    property bool showSettings: true
     property alias currentStep: module.item
     property string currentStepString: initialStep
     property string initialStep: "LoginRegister"
@@ -265,6 +266,7 @@ Kirigami.Page {
             FormCard.FormCard {
                 Layout.topMargin: Kirigami.Units.largeSpacing * 2
                 maximumWidth: Kirigami.Units.gridUnit * 20
+                visible: root.showSettings
                 FormCard.FormButtonDelegate {
                     text: i18nc("@action:button", "Settings")
                     icon.name: "settings-configure"

src/main.cpp

@@ -37,6 +37,7 @@
 #include <KCrash>
 #endif
 
+#include <KIconTheme>
 #include <KLocalizedContext>
 #include <KLocalizedString>
 
@@ -101,6 +102,7 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
+    KIconTheme::initTheme();
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 
 #ifdef HAVE_WEBVIEW
@@ -237,6 +239,7 @@ int main(int argc, char *argv[])
     Q_IMPORT_QML_PLUGIN(org_kde_neochat_chatbarPlugin)
 
     qml_register_types_org_kde_neochat();
+    qmlRegisterUncreatableMetaObject(Quotient::staticMetaObject, "Quotient", 1, 0, "JoinRule", u"Access to JoinRule enum only"_s);
 
     QQmlApplicationEngine engine;
 

src/mediamanager.cpp

@@ -1,11 +1,141 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "mediamanager.h"
 
+#include <QDirIterator>
+#include <QMimeDatabase>
+
+#include <Quotient/qt_connection_util.h>
+
+#include "events/callmemberevent.h"
+#include "neochatroom.h"
+
+using namespace Qt::Literals::StringLiterals;
+using namespace Quotient;
+
 void MediaManager::startPlayback()
 {
     Q_EMIT playbackStarted();
 }
 
-#include "moc_mediamanager.cpp"
+void MediaManager::ring(const QJsonObject &json, NeoChatRoom *room)
+{
+    qWarning() << "start check ring";
+    // todo: check sender != us
+    if (json["content"_L1]["application"_L1].toString() != "m.call"_L1) {
+        qWarning() << "not m.call";
+        return;
+    }
+    qWarning() << json;
+    if (!json["content"_L1]["m.mentions"_L1]["room"_L1].toBool() || json[u"sender"_s].toString() == room->connection()->userId()) {
+        bool mentioned = false;
+        for (const auto &user : json["content"_L1]["m.mentions"_L1]["user_ids"_L1].toArray()) {
+            if (user.toString() == room->connection()->userId()) {
+                mentioned = true;
+                break;
+            }
+        }
+        if (!mentioned) {
+            qWarning() << "not mentioned";
+            return;
+        }
+    }
+    if (json["content"_L1]["notify_type"_L1].toString() != "ring"_L1) {
+        qWarning() << "not ring";
+        return;
+    }
+    if (room->pushNotificationState() == PushNotificationState::Mute) {
+        qWarning() << "mute";
+        return;
+    }
+    if (isRinging()) {
+        qWarning() << "already ringing";
+        return;
+    }
+    if (const auto &event = room->currentState().get<CallMemberEvent>(room->connection()->userId())) {
+        if (event) {
+            auto memberships = event->contentJson()["memberships"_L1].toArray();
+            for (const auto &m : memberships) {
+                const auto &membership = m.toObject();
+                if (membership["application"_L1] == "m.call"_L1 && membership["call_id"_L1].toString().isEmpty()) {
+                    qWarning() << "already in a call";
+                    return;
+                }
+            }
+        }
+    }
+    connectUntil(room, &NeoChatRoom::changed, this, [this, room]() {
+        if (const auto &event = room->currentState().get<CallMemberEvent>(room->connection()->userId())) {
+            if (event) {
+                auto memberships = event->contentJson()["memberships"_L1].toArray();
+                for (const auto &m : memberships) {
+                    const auto &membership = m.toObject();
+                    if (membership["application"_L1] == "m.call"_L1 && membership["call_id"_L1].toString().isEmpty()) {
+                        qWarning() << "stopping";
+                        stopRinging();
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    });
+    if (json["unsigned"_L1]["age"_L1].toInt() > 10000) {
+        qWarning() << "too old";
+        return;
+    }
+    ringUnchecked();
+}
+
+void MediaManager::ringUnchecked()
+{
+    qWarning() << "ring";
+    static QString path;
+    if (path.isEmpty()) {
+        for (const auto &dir : QString::fromUtf8(qgetenv("XDG_DATA_DIRS")).split(u':')) {
+            if (QFileInfo(dir + QStringLiteral("/sounds/freedesktop/stereo/phone-incoming-call.oga")).exists()) {
+                path = dir + QStringLiteral("/sounds/freedesktop/stereo/phone-incoming-call.oga");
+                break;
+            }
+        }
+    }
+    if (path.isEmpty()) {
+        return;
+    }
+    m_player->setSource(QUrl::fromLocalFile(path));
+    m_player->play();
+    Q_EMIT showIncomingCallDialog();
+}
+
+MediaManager::MediaManager(QObject *parent)
+    : QObject(parent)
+    , m_player(new QMediaPlayer())
+    , m_output(new QAudioOutput())
+    , m_timer(new QTimer())
+{
+    m_player->setAudioOutput(m_output);
+    m_timer->setInterval(1000);
+    m_timer->setSingleShot(true);
+    connect(m_timer, &QTimer::timeout, this, [this]() {
+        m_player->play();
+    });
+    connect(m_player, &QMediaPlayer::playbackStateChanged, this, [this]() {
+        if (m_player->playbackState() == QMediaPlayer::StoppedState) {
+            m_timer->start();
+        }
+    });
+}
+
+bool MediaManager::isRinging() const
+{
+    return m_ringing;
+}
+
+void MediaManager::stopRinging()
+{
+    m_ringing = false;
+    m_player->pause();
+    m_timer->stop();
+    //Q_EMIT stopRinging();
+}

src/mediamanager.h

@@ -3,8 +3,13 @@
 
 #pragma once
 
+#include <QAudioOutput>
+#include <QMediaPlayer>
 #include <QObject>
 #include <QQmlEngine>
+#include <QTimer>
+
+class NeoChatRoom;
 
 /**
  * @class MediaManager
@@ -34,9 +39,29 @@ public:
      */
     Q_INVOKABLE void startPlayback();
 
+    /**
+     * Starts ringing if the criteria (see MSC / spec) are met.
+     */
+    void ring(const QJsonObject &json, NeoChatRoom *room);
+
+    bool isRinging() const;
+
 Q_SIGNALS:
     /**
      * @brief Emitted when any media player starts playing. Other objects should stop / pause playback.
      */
     void playbackStarted();
+
+    void showIncomingCallDialog();
+    void closeIncomingCallDialog();
+
+private:
+    void ringUnchecked();
+    void stopRinging();
+    QMediaPlayer *m_player;
+    QAudioOutput *m_output;
+    QTimer *m_timer;
+    bool m_ringing = false;
+
+    explicit MediaManager(QObject *parent = nullptr);
 };

src/messageattached.cpp

@@ -0,0 +1,126 @@
+// SPDX-FileCopyrightText: 2025 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include "messageattached.h"
+
+MessageAttached::MessageAttached(QObject *parent)
+    : QQuickAttachedPropertyPropagator(parent)
+{
+    if (parent == nullptr) {
+        qWarning() << "Message must be attached to an Item" << parent;
+        return;
+    }
+    initialize();
+}
+
+MessageAttached *MessageAttached::qmlAttachedProperties(QObject *object)
+{
+    return new MessageAttached(object);
+}
+
+NeoChatRoom *MessageAttached::room() const
+{
+    return m_room;
+}
+
+void MessageAttached::setRoom(NeoChatRoom *room)
+{
+    m_explicitRoom = true;
+    if (m_room == room) {
+        return;
+    }
+    m_room = room;
+    propagateMessage(this);
+    Q_EMIT roomChanged();
+}
+
+QQuickItem *MessageAttached::timeline() const
+{
+    return m_timeline;
+}
+
+void MessageAttached::setTimeline(QQuickItem *timeline)
+{
+    m_explicitTimeline = true;
+    if (m_timeline == timeline) {
+        return;
+    }
+    m_timeline = timeline;
+    propagateMessage(this);
+    Q_EMIT timelineChanged();
+}
+
+int MessageAttached::index() const
+{
+    return m_index;
+}
+
+void MessageAttached::setIndex(int index)
+{
+    m_explicitIndex = true;
+    if (m_index == index) {
+        return;
+    }
+    m_index = index;
+    propagateMessage(this);
+    Q_EMIT indexChanged();
+}
+
+qreal MessageAttached::maxContentWidth() const
+{
+    return m_maxContentWidth;
+}
+
+void MessageAttached::setMaxContentWidth(qreal maxContentWidth)
+{
+    m_explicitMaxContentWidth = true;
+    if (m_maxContentWidth == maxContentWidth) {
+        return;
+    }
+    m_maxContentWidth = maxContentWidth;
+    propagateMessage(this);
+    Q_EMIT maxContentWidthChanged();
+}
+
+void MessageAttached::propagateMessage(MessageAttached *message)
+{
+    if (m_explicitRoom || m_room != message->room()) {
+        m_room = message->room();
+        Q_EMIT roomChanged();
+    }
+
+    if (m_explicitTimeline || m_timeline != message->timeline()) {
+        m_timeline = message->timeline();
+        Q_EMIT timelineChanged();
+    }
+
+    if (m_explicitIndex || m_index != message->index()) {
+        m_index = message->index();
+        Q_EMIT indexChanged();
+    }
+
+    if (m_explicitMaxContentWidth || m_maxContentWidth != message->maxContentWidth()) {
+        m_maxContentWidth = message->maxContentWidth();
+        Q_EMIT maxContentWidthChanged();
+    }
+
+    const auto styles = attachedChildren();
+    for (auto *child : attachedChildren()) {
+        MessageAttached *message = qobject_cast<MessageAttached *>(child);
+        if (message != nullptr) {
+            message->propagateMessage(this);
+        }
+    }
+}
+
+void MessageAttached::attachedParentChange(QQuickAttachedPropertyPropagator *newParent, QQuickAttachedPropertyPropagator *oldParent)
+{
+    Q_UNUSED(oldParent);
+
+    MessageAttached *attachedParent = qobject_cast<MessageAttached *>(newParent);
+    if (attachedParent) {
+        propagateMessage(attachedParent);
+    }
+}
+
+#include "moc_messageattached.cpp"

src/messageattached.h

@@ -0,0 +1,78 @@
+// SPDX-FileCopyrightText: 2025 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <QQmlEngine>
+#include <QQuickAttachedPropertyPropagator>
+#include <QQuickItem>
+
+#include "neochatroom.h"
+
+class MessageAttached : public QQuickAttachedPropertyPropagator
+{
+    Q_OBJECT
+    QML_NAMED_ELEMENT(Message)
+    QML_ATTACHED(MessageAttached)
+    QML_UNCREATABLE("")
+
+    /**
+     * @brief The room that the message comes from.
+     */
+    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged FINAL)
+
+    /**
+     * @brief The timeline for the current message.
+     */
+    Q_PROPERTY(QQuickItem *timeline READ timeline WRITE setTimeline NOTIFY timelineChanged FINAL)
+
+    /**
+     * @brief The index of the message in the timeline
+     */
+    Q_PROPERTY(int index READ index WRITE setIndex NOTIFY indexChanged FINAL)
+
+    /**
+     * @brief The width available to the message content.
+     */
+    Q_PROPERTY(qreal maxContentWidth READ maxContentWidth WRITE setMaxContentWidth NOTIFY maxContentWidthChanged FINAL)
+
+public:
+    explicit MessageAttached(QObject *parent = nullptr);
+
+    static MessageAttached *qmlAttachedProperties(QObject *object);
+
+    NeoChatRoom *room() const;
+    void setRoom(NeoChatRoom *room);
+
+    QQuickItem *timeline() const;
+    void setTimeline(QQuickItem *timeline);
+
+    int index() const;
+    void setIndex(int index);
+
+    qreal maxContentWidth() const;
+    void setMaxContentWidth(qreal maxContentWidth);
+
+Q_SIGNALS:
+    void roomChanged();
+    void timelineChanged();
+    void indexChanged();
+    void maxContentWidthChanged();
+
+protected:
+    void propagateMessage(MessageAttached *message);
+    void attachedParentChange(QQuickAttachedPropertyPropagator *newParent, QQuickAttachedPropertyPropagator *oldParent) override;
+
+private:
+    QPointer<NeoChatRoom> m_room;
+    bool m_explicitRoom = false;
+
+    QPointer<QQuickItem> m_timeline;
+    bool m_explicitTimeline = false;
+
+    int m_index;
+    bool m_explicitIndex = false;
+
+    qreal m_maxContentWidth = -1;
+    bool m_explicitMaxContentWidth = false;
+};

src/models/actionsmodel.cpp

@@ -136,7 +136,11 @@ QList<ActionsModel::Action> actions{
     Action{
         u"plain"_s,
         [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+#if Quotient_VERSION_MINOR > 9
+            room->postText(text.toHtmlEscaped());
+#else
             room->postPlainText(text.toHtmlEscaped());
+#endif
             return QString();
         },
         std::nullopt,
@@ -501,6 +505,19 @@ QList<ActionsModel::Action> actions{
         kli18n("<user id> [<reason>]"),
         kli18n("Removes the user from the room"),
     },
+    Action{
+        QStringLiteral("endcall"),
+        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+            auto events = room->currentState().eventsOfType(QStringLiteral("org.matrix.msc3401.call.member"));
+            for (auto event : events) {
+                room->setRoomState(QStringLiteral("org.matrix.msc3401.call.member"), event->stateKey(), {});
+            }
+            return QString();
+        },
+        std::nullopt,
+        kli18n(""),
+        kli18n("Forcibly end the call in this room"),
+    },
 };
 
 int ActionsModel::rowCount(const QModelIndex &parent) const

src/models/commonroomsmodel.cpp

@@ -0,0 +1,79 @@
+// SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "commonroomsmodel.h"
+#include "jobs/neochatgetcommonroomsjob.h"
+
+#include <QGuiApplication>
+
+using namespace Quotient;
+
+CommonRoomsModel::CommonRoomsModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+}
+
+NeoChatConnection *CommonRoomsModel::connection() const
+{
+    return m_connection;
+}
+
+void CommonRoomsModel::setConnection(NeoChatConnection *connection)
+{
+    m_connection = connection;
+    Q_EMIT connectionChanged();
+    reload();
+}
+
+QString CommonRoomsModel::userId() const
+{
+    return m_userId;
+}
+
+void CommonRoomsModel::setUserId(const QString &userId)
+{
+    m_userId = userId;
+    Q_EMIT userIdChanged();
+    reload();
+}
+
+QVariant CommonRoomsModel::data(const QModelIndex &index, int roleName) const
+{
+    Q_UNUSED(index)
+    Q_UNUSED(roleName)
+    return {};
+}
+
+int CommonRoomsModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+    return m_commonRooms.size();
+}
+
+void CommonRoomsModel::reload()
+{
+    if (!m_connection || m_userId.isEmpty()) {
+        return;
+    }
+
+    if (!m_connection->canCheckMutualRooms()) {
+        return;
+    }
+
+    // Checking if you have mutual rooms with yourself doesn't make sense and servers reject it too
+    if (m_connection->userId() == m_userId) {
+        return;
+    }
+
+    m_connection->callApi<NeochatGetCommonRoomsJob>(m_userId).then([this](const auto job) {
+        const auto &replyData = job->jsonData();
+        beginResetModel();
+        for (const auto &roomId : replyData[u"joined"_s].toArray()) {
+            m_commonRooms.push_back(roomId.toString());
+        }
+        endResetModel();
+        Q_EMIT countChanged();
+    });
+}
+
+#include "moc_commonroomsmodel.cpp"

src/models/commonroomsmodel.h

@@ -0,0 +1,58 @@
+// SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <QAbstractListModel>
+#include <QQmlEngine>
+
+#include "neochatconnection.h"
+#include "neochatroom.h"
+
+#include <Quotient/events/roommessageevent.h>
+#include <Quotient/roommember.h>
+
+/**
+ * @brief Model to show the common or mutual rooms between you and another user.
+ */
+class CommonRoomsModel : public QAbstractListModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+    Q_PROPERTY(NeoChatConnection *connection WRITE setConnection READ connection NOTIFY connectionChanged REQUIRED)
+    Q_PROPERTY(QString userId WRITE setUserId READ userId NOTIFY userIdChanged REQUIRED)
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+
+public:
+    enum Roles {
+        TextRole = Qt::DisplayRole,
+        LongitudeRole,
+        LatitudeRole,
+        AssetRole,
+        AuthorRole,
+    };
+    Q_ENUM(Roles)
+
+    explicit CommonRoomsModel(QObject *parent = nullptr);
+
+    [[nodiscard]] NeoChatConnection *connection() const;
+    void setConnection(NeoChatConnection *connection);
+
+    [[nodiscard]] QString userId() const;
+    void setUserId(const QString &userId);
+
+    [[nodiscard]] QVariant data(const QModelIndex &index, int roleName) const override;
+    [[nodiscard]] Q_INVOKABLE int rowCount(const QModelIndex &parent = {}) const override;
+
+Q_SIGNALS:
+    void connectionChanged();
+    void userIdChanged();
+    void countChanged();
+
+private:
+    void reload();
+
+    QPointer<NeoChatConnection> m_connection;
+    QString m_userId;
+    QList<QString> m_commonRooms;
+};

src/models/emojimodel.cpp

@@ -20,7 +20,7 @@ EmojiModel::EmojiModel(QObject *parent)
     , m_configGroup(KConfigGroup(m_config, u"Editor"_s))
 {
     if (_emojis.isEmpty()) {
-#include "emojis.h"
+//#include "emojis.h"
     }
 }
 

src/models/mediamessagefiltermodel.cpp

@@ -39,14 +39,6 @@ QVariant MediaMessageFilterModel::data(const QModelIndex &index, int role) const
         const auto previousEventDay = mapToSource(this->index(index.row() + 1, 0)).data(TimelineMessageModel::TimeRole).toDateTime().toLocalTime().date();
         return day != previousEventDay;
     }
-    // Catch and force the author to be shown for all rows
-    if (role == TimelineMessageModel::ContentModelRole) {
-        const auto model = qvariant_cast<MessageContentModel *>(mapToSource(index).data(TimelineMessageModel::ContentModelRole));
-        if (model != nullptr) {
-            model->setShowAuthor(true);
-        }
-        return QVariant::fromValue<MessageContentModel *>(model);
-    }
 
     QVariantMap mediaInfo = mapToSource(index).data(TimelineMessageModel::MediaInfoRole).toMap();
 

src/models/messagecontentfiltermodel.cpp

@@ -0,0 +1,37 @@
+// SPDX-FileCopyrightText: 2025 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include "messagecontentfiltermodel.h"
+#include "enums/messagecomponenttype.h"
+#include "models/messagecontentmodel.h"
+
+MessageContentFilterModel::MessageContentFilterModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+{
+}
+
+bool MessageContentFilterModel::showAuthor() const
+{
+    return m_showAuthor;
+}
+
+void MessageContentFilterModel::setShowAuthor(bool showAuthor)
+{
+    if (showAuthor == m_showAuthor) {
+        return;
+    }
+
+    m_showAuthor = showAuthor;
+    Q_EMIT showAuthorChanged();
+}
+
+bool MessageContentFilterModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    if (m_showAuthor) {
+        return true;
+    }
+
+    const auto index = sourceModel()->index(source_row, 0, source_parent);
+    auto contentType = static_cast<MessageComponentType::Type>(index.data(MessageContentModel::ComponentTypeRole).toInt());
+    return contentType != MessageComponentType::Author;
+}

src/models/messagecontentfiltermodel.h

@@ -0,0 +1,43 @@
+// SPDX-FileCopyrightText: 2025 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <QQmlEngine>
+#include <QSortFilterProxyModel>
+
+/**
+ * @class MessageContentFilterModel
+ *
+ * This model filters a message's contents.
+ */
+class MessageContentFilterModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+
+    /**
+     * @brief Whether the author component should be shown.
+     */
+    Q_PROPERTY(bool showAuthor READ showAuthor WRITE setShowAuthor NOTIFY showAuthorChanged)
+
+public:
+    explicit MessageContentFilterModel(QObject *parent = nullptr);
+
+    bool showAuthor() const;
+    void setShowAuthor(bool showAuthor);
+
+Q_SIGNALS:
+    void showAuthorChanged();
+
+protected:
+    /**
+     * @brief Whether a row should be shown out or not.
+     *
+     * @sa QSortFilterProxyModel::filterAcceptsRow
+     */
+    [[nodiscard]] bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
+
+private:
+    bool m_showAuthor = true;
+};

src/models/messagecontentmodel.cpp

@@ -3,6 +3,7 @@
 
 #include "messagecontentmodel.h"
 #include "eventhandler.h"
+#include "messagecomponenttype.h"
 #include "neochatconfig.h"
 
 #include <QImageReader>
@@ -27,6 +28,7 @@
 #include "chatbarcache.h"
 #include "filetype.h"
 #include "linkpreviewer.h"
+#include "models/reactionmodel.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
 #include "texthandler.h"
@@ -130,9 +132,6 @@ void MessageContentModel::initializeModel()
     connect(m_room, &NeoChatRoom::urlPreviewEnabledChanged, this, [this]() {
         resetContent();
     });
-    connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, [this]() {
-        resetContent();
-    });
     connect(m_room, &Room::memberNameUpdated, this, [this](RoomMember member) {
         if (m_room != nullptr) {
             if (senderId().isEmpty() || senderId() == member.id()) {
@@ -152,12 +151,18 @@ void MessageContentModel::initializeModel()
         updateReplyModel();
         resetModel();
     });
+    connect(m_room, &Room::updatedEvent, this, [this](const QString &eventId) {
+        if (eventId == m_eventId) {
+            updateReactionModel();
+        }
+    });
 
     initializeEvent();
     if (m_currentState == Available || m_currentState == Pending) {
         updateReplyModel();
     }
     resetModel();
+    updateReactionModel();
 }
 
 void MessageContentModel::initializeEvent()
@@ -233,32 +238,6 @@ NeochatRoomMember *MessageContentModel::senderObject() const
     return m_room->qmlSafeMember(eventResult.first->senderId());
 }
 
-bool MessageContentModel::showAuthor() const
-{
-    return m_showAuthor;
-}
-
-void MessageContentModel::setShowAuthor(bool showAuthor)
-{
-    if (showAuthor == m_showAuthor) {
-        return;
-    }
-    m_showAuthor = showAuthor;
-
-    if (m_room->connection()->isIgnored(senderId())) {
-        if (showAuthor) {
-            beginInsertRows({}, 0, 0);
-            m_components.prepend(MessageComponent{MessageComponentType::Author, QString(), {}});
-            endInsertRows();
-        } else {
-            beginRemoveRows({}, 0, 0);
-            m_components.remove(0, 1);
-            endRemoveRows();
-        }
-    }
-    Q_EMIT showAuthorChanged();
-}
-
 static LinkPreviewer *emptyLinkPreview = new LinkPreviewer;
 
 QVariant MessageContentModel::data(const QModelIndex &index, int role) const
@@ -366,6 +345,21 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
     if (role == ReplyContentModelRole) {
         return QVariant::fromValue<MessageContentModel *>(m_replyModel);
     }
+    if (role == ReactionModelRole) {
+        return QVariant::fromValue<ReactionModel *>(m_reactionModel);
+        ;
+    }
+    if (role == ThreadRootRole) {
+        auto roomMessageEvent = eventCast<const RoomMessageEvent>(event.first);
+#if Quotient_VERSION_MINOR > 9 || (Quotient_VERSION_MINOR == 9 && Quotient_VERSION_PATCH > 1)
+        if (roomMessageEvent && (roomMessageEvent->isThreaded() || m_room->threads().contains(roomMessageEvent->id()))) {
+#else
+        if (roomMessageEvent && roomMessageEvent->isThreaded()) {
+#endif
+            return roomMessageEvent->threadRootEventId();
+        }
+        return {};
+    }
     if (role == LinkPreviewerRole) {
         if (component.type == MessageComponentType::LinkPreview) {
             return QVariant::fromValue<LinkPreviewer *>(
@@ -392,27 +386,33 @@ int MessageContentModel::rowCount(const QModelIndex &parent) const
 
 QHash<int, QByteArray> MessageContentModel::roleNames() const
 {
-    QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
-    roles[DisplayRole] = "display";
-    roles[ComponentTypeRole] = "componentType";
-    roles[ComponentAttributesRole] = "componentAttributes";
-    roles[EventIdRole] = "eventId";
-    roles[TimeRole] = "time";
-    roles[TimeStringRole] = "timeString";
-    roles[AuthorRole] = "author";
-    roles[MediaInfoRole] = "mediaInfo";
-    roles[FileTransferInfoRole] = "fileTransferInfo";
-    roles[ItineraryModelRole] = "itineraryModel";
-    roles[LatitudeRole] = "latitude";
-    roles[LongitudeRole] = "longitude";
-    roles[AssetRole] = "asset";
-    roles[PollHandlerRole] = "pollHandler";
-    roles[ReplyEventIdRole] = "replyEventId";
-    roles[ReplyAuthorRole] = "replyAuthor";
-    roles[ReplyContentModelRole] = "replyContentModel";
-    roles[ThreadRootRole] = "threadRoot";
-    roles[LinkPreviewerRole] = "linkPreviewer";
-    roles[ChatBarCacheRole] = "chatBarCache";
+    return roleNamesStatic();
+}
+
+QHash<int, QByteArray> MessageContentModel::roleNamesStatic()
+{
+    QHash<int, QByteArray> roles;
+    roles[MessageContentModel::DisplayRole] = "display";
+    roles[MessageContentModel::ComponentTypeRole] = "componentType";
+    roles[MessageContentModel::ComponentAttributesRole] = "componentAttributes";
+    roles[MessageContentModel::EventIdRole] = "eventId";
+    roles[MessageContentModel::TimeRole] = "time";
+    roles[MessageContentModel::TimeStringRole] = "timeString";
+    roles[MessageContentModel::AuthorRole] = "author";
+    roles[MessageContentModel::MediaInfoRole] = "mediaInfo";
+    roles[MessageContentModel::FileTransferInfoRole] = "fileTransferInfo";
+    roles[MessageContentModel::ItineraryModelRole] = "itineraryModel";
+    roles[MessageContentModel::LatitudeRole] = "latitude";
+    roles[MessageContentModel::LongitudeRole] = "longitude";
+    roles[MessageContentModel::AssetRole] = "asset";
+    roles[MessageContentModel::PollHandlerRole] = "pollHandler";
+    roles[MessageContentModel::ReplyEventIdRole] = "replyEventId";
+    roles[MessageContentModel::ReplyAuthorRole] = "replyAuthor";
+    roles[MessageContentModel::ReplyContentModelRole] = "replyContentModel";
+    roles[MessageContentModel::ReactionModelRole] = "reactionModel";
+    roles[MessageContentModel::ThreadRootRole] = "threadRoot";
+    roles[MessageContentModel::LinkPreviewerRole] = "linkPreviewer";
+    roles[MessageContentModel::ChatBarCacheRole] = "chatBarCache";
     return roles;
 }
 
@@ -434,9 +434,7 @@ void MessageContentModel::resetModel()
         return;
     }
 
-    if (m_showAuthor) {
-        m_components += MessageComponent{MessageComponentType::Author, QString(), {}};
-    }
+    m_components += MessageComponent{MessageComponentType::Author, QString(), {}};
 
     m_components += messageContentComponents();
     endResetModel();
@@ -492,6 +490,21 @@ QList<MessageComponent> MessageContentModel::messageContentComponents(bool isEdi
         newComponents = addLinkPreviews(newComponents);
     }
 
+    if ((m_reactionModel && m_reactionModel->rowCount() > 0)) {
+        newComponents += MessageComponent{MessageComponentType::Reaction, QString(), {}};
+    }
+
+#if Quotient_VERSION_MINOR > 9 || (Quotient_VERSION_MINOR == 9 && Quotient_VERSION_PATCH > 1)
+    if (NeoChatConfig::self()->threads() && roomMessageEvent && (roomMessageEvent->isThreaded() || m_room->threads().contains(roomMessageEvent->id()))
+        && roomMessageEvent->id() == roomMessageEvent->threadRootEventId()) {
+#else
+    if (NeoChatConfig::self()->threads() && roomMessageEvent && roomMessageEvent->isThreaded()
+        && roomMessageEvent->id() == roomMessageEvent->threadRootEventId()) {
+#endif
+        newComponents += MessageComponent{MessageComponentType::Separator, {}, {}};
+        newComponents += MessageComponent{MessageComponentType::ThreadBody, u"Thread Body"_s, {}};
+    }
+
     // If the event is already threaded the ThreadModel will handle displaying a chat bar.
 #if Quotient_VERSION_MINOR > 9 || (Quotient_VERSION_MINOR == 9 && Quotient_VERSION_PATCH > 1)
     if (isThreading && roomMessageEvent && !(roomMessageEvent->isThreaded() || m_room->threads().contains(roomMessageEvent->id()))) {
@@ -515,7 +528,7 @@ void MessageContentModel::updateReplyModel()
     if (roomMessageEvent == nullptr) {
         return;
     }
-    if (!roomMessageEvent->isReply() || (roomMessageEvent->isThreaded() && NeoChatConfig::self()->threads())) {
+    if (!roomMessageEvent->isReply(!NeoChatConfig::self()->threads()) || (roomMessageEvent->isThreaded() && NeoChatConfig::self()->threads())) {
         if (m_replyModel) {
             delete m_replyModel;
         }
@@ -526,7 +539,7 @@ void MessageContentModel::updateReplyModel()
         return;
     }
 
-    m_replyModel = new MessageContentModel(m_room, roomMessageEvent->replyEventId(), true, false, this);
+    m_replyModel = new MessageContentModel(m_room, roomMessageEvent->replyEventId(!NeoChatConfig::self()->threads()), true, false, this);
 
     connect(m_replyModel, &MessageContentModel::eventUpdated, this, [this]() {
         Q_EMIT dataChanged(index(0), index(0), {ReplyAuthorRole});
@@ -733,4 +746,25 @@ void MessageContentModel::updateItineraryModel()
     }
 }
 
+void MessageContentModel::updateReactionModel()
+{
+    if (m_reactionModel != nullptr && m_reactionModel->rowCount() > 0) {
+        return;
+    }
+
+    if (m_reactionModel == nullptr) {
+        m_reactionModel = new ReactionModel(this, m_eventId, m_room);
+        connect(m_reactionModel, &ReactionModel::reactionsUpdated, this, &MessageContentModel::updateReactionModel);
+    }
+
+    if (m_reactionModel->rowCount() <= 0) {
+        m_reactionModel->disconnect(this);
+        delete m_reactionModel;
+        m_reactionModel = nullptr;
+        return;
+    }
+
+    resetContent();
+}
+
 #include "moc_messagecontentmodel.cpp"

src/models/messagecontentmodel.h

@@ -7,11 +7,11 @@
 #include <QQmlEngine>
 
 #include <Quotient/events/roomevent.h>
-#include <Quotient/room.h>
 
 #include "enums/messagecomponenttype.h"
 #include "itinerarymodel.h"
 #include "messagecomponent.h"
+#include "models/reactionmodel.h"
 #include "neochatroommember.h"
 
 /**
@@ -25,11 +25,6 @@ class MessageContentModel : public QAbstractListModel
     QML_ELEMENT
     QML_UNCREATABLE("")
 
-    /**
-     * @brief Whether the author component is being shown.
-     */
-    Q_PROPERTY(bool showAuthor READ showAuthor WRITE setShowAuthor NOTIFY showAuthorChanged)
-
 public:
     enum MessageState {
         Unknown, /**< The message state is unknown. */
@@ -62,6 +57,8 @@ public:
         ReplyAuthorRole, /**< The author of the event that was replied to. */
         ReplyContentModelRole, /**< The MessageContentModel for the reply event. */
 
+        ReactionModelRole, /**< Reaction model for this event. */
+
         ThreadRootRole, /**< The thread root event ID for the event. */
 
         LinkPreviewerRole, /**< The link preview details. */
@@ -75,9 +72,6 @@ public:
                                  bool isPending = false,
                                  MessageContentModel *parent = nullptr);
 
-    bool showAuthor() const;
-    void setShowAuthor(bool showAuthor);
-
     /**
      * @brief Get the given role value at the given index.
      *
@@ -99,6 +93,8 @@ public:
      */
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
+    static QHash<int, QByteArray> roleNamesStatic();
+
     /**
      * @brief Close the link preview at the given index.
      *
@@ -117,7 +113,6 @@ private:
     NeochatRoomMember *senderObject() const;
 
     MessageState m_currentState = Unknown;
-    bool m_showAuthor = true;
     bool m_isReply;
 
     void initializeModel();
@@ -132,6 +127,7 @@ private:
     QPointer<MessageContentModel> m_replyModel;
     void updateReplyModel();
 
+    ReactionModel *m_reactionModel = nullptr;
     ItineraryModel *m_itineraryModel = nullptr;
 
     QList<MessageComponent> componentsForType(MessageComponentType::Type type);
@@ -142,4 +138,6 @@ private:
 
     void updateItineraryModel();
     bool m_emptyItinerary = false;
+
+    void updateReactionModel();
 };

src/models/messagefiltermodel.cpp

@@ -92,12 +92,8 @@ QVariant MessageFilterModel::data(const QModelIndex &index, int role) const
         return authorList(mapToSource(index).row());
     } else if (role == ExcessAuthorsRole) {
         return excessAuthors(mapToSource(index).row());
-    } else if (role == TimelineMessageModel::ContentModelRole) {
-        const auto model = qvariant_cast<MessageContentModel *>(mapToSource(index).data(TimelineMessageModel::ContentModelRole));
-        if (model != nullptr && !showAuthor(index)) {
-            model->setShowAuthor(false);
-        }
-        return QVariant::fromValue<MessageContentModel *>(model);
+    } else if (role == MessageModel::ShowAuthorRole) {
+        return showAuthor(index);
     }
     return QSortFilterProxyModel::data(index, role);
 }

src/models/messagemodel.cpp

@@ -5,9 +5,10 @@
 
 #include "neochatconfig.h"
 
+#include <Quotient/events/encryptedevent.h>
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/stickerevent.h>
-#if Quotient_VERSION_MINOR > 9
+#if Quotient_VERSION_MINOR > 9 || (Quotient_VERSION_MINOR == 9 && Quotient_VERSION_PATCH > 1)
 #include <Quotient/thread.h>
 #endif
 
@@ -120,16 +121,15 @@ QVariant MessageModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == ContentModelRole) {
-        QString modelId;
-        if (!event->get().id().isEmpty() && m_contentModels.contains(event->get().id())) {
-            modelId = event.value().get().id();
-        } else if (!event.value().get().transactionId().isEmpty() && m_contentModels.contains(event.value().get().transactionId())) {
-            modelId = event.value().get().transactionId();
+        if (event->get().is<EncryptedEvent>()) {
+            return QVariant::fromValue<MessageContentModel *>(m_room->contentModelForEvent(event->get().id()));
         }
-        if (!modelId.isEmpty()) {
-            return QVariant::fromValue<MessageContentModel *>(m_contentModels.at(modelId).get());
+
+        auto roomMessageEvent = eventCast<const RoomMessageEvent>(&event.value().get());
+        if (NeoChatConfig::self()->threads() && roomMessageEvent && roomMessageEvent->isThreaded()) {
+            return QVariant::fromValue<MessageContentModel *>(m_room->contentModelForEvent(roomMessageEvent->threadRootEventId()));
         }
-        return {};
+        return QVariant::fromValue<MessageContentModel *>(m_room->contentModelForEvent(&event->get()));
     }
 
     if (role == GenericDisplayRole) {
@@ -178,7 +178,7 @@ QVariant MessageModel::data(const QModelIndex &idx, int role) const
         }
 
         auto roomMessageEvent = eventCast<const RoomMessageEvent>(&event.value().get());
-#if Quotient_VERSION_MINOR > 9
+#if Quotient_VERSION_MINOR > 9 || (Quotient_VERSION_MINOR == 9 && Quotient_VERSION_PATCH > 1)
         if (roomMessageEvent && (roomMessageEvent->isThreaded() || m_room->threads().contains(event.value().get().id()))) {
             const auto &thread = m_room->threads().value(roomMessageEvent->isThreaded() ? roomMessageEvent->threadRootEventId() : event.value().get().id());
             if (thread.latestEventId != event.value().get().id()) {
@@ -201,13 +201,15 @@ QVariant MessageModel::data(const QModelIndex &idx, int role) const
 
     if (role == ProgressInfoRole) {
         if (auto e = eventCast<const RoomMessageEvent>(&event.value().get())) {
-            if (e->has<EventContent::FileContent>()) {
+            if (e->has<EventContent::FileContent>() || e->has<EventContent::ImageContent>() || e->has<EventContent::VideoContent>()
+                || e->has<EventContent::AudioContent>()) {
                 return QVariant::fromValue(m_room->cachedFileTransferInfo(&event.value().get()));
             }
         }
         if (eventCast<const StickerEvent>(&event.value().get())) {
             return QVariant::fromValue(m_room->cachedFileTransferInfo(&event.value().get()));
         }
+        return {};
     }
 
     if (role == TimeRole) {
@@ -219,6 +221,9 @@ QVariant MessageModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == IsThreadedRole) {
+        if (!NeoChatConfig::self()->threads()) {
+            return false;
+        }
         if (auto roomMessageEvent = eventCast<const RoomMessageEvent>(&event.value().get())) {
             return roomMessageEvent->isThreaded();
         }
@@ -261,18 +266,6 @@ QVariant MessageModel::data(const QModelIndex &idx, int role) const
         return m_readMarkerModels.contains(event.value().get().id());
     }
 
-    if (role == ReactionRole) {
-        if (m_reactionModels.contains(event.value().get().id())) {
-            return QVariant::fromValue<ReactionModel *>(m_reactionModels[event.value().get().id()].data());
-        } else {
-            return QVariantList();
-        }
-    }
-
-    if (role == ShowReactionsRole) {
-        return m_reactionModels.contains(event.value().get().id());
-    }
-
     if (role == VerifiedRole) {
         if (event.value().get().originalEvent()) {
             auto encrypted = dynamic_cast<const EncryptedEvent *>(event.value().get().originalEvent());
@@ -303,6 +296,10 @@ QVariant MessageModel::data(const QModelIndex &idx, int role) const
             && event.value().get().senderId() == m_room->localMember().id();
     }
 
+    if (role == ShowAuthorRole) {
+        return true;
+    }
+
     return {};
 }
 
@@ -322,8 +319,6 @@ QHash<int, QByteArray> MessageModel::roleNames() const
     roles[ShowSectionRole] = "showSection";
     roles[ReadMarkersRole] = "readMarkers";
     roles[ShowReadMarkersRole] = "showReadMarkers";
-    roles[ReactionRole] = "reaction";
-    roles[ShowReactionsRole] = "showReactions";
     roles[VerifiedRole] = "verified";
     roles[AuthorDisplayNameRole] = "authorDisplayName";
     roles[IsRedactedRole] = "isRedacted";
@@ -332,6 +327,7 @@ QHash<int, QByteArray> MessageModel::roleNames() const
     roles[ContentModelRole] = "contentModel";
     roles[MediaInfoRole] = "mediaInfo";
     roles[IsEditableRole] = "isEditable";
+    roles[ShowAuthorRole] = "showAuthor";
     return roles;
 }
 
@@ -428,17 +424,6 @@ void MessageModel::createEventObjects(const Quotient::RoomEvent *event, bool isP
         senderId = m_room->localMember().id();
     }
 
-    if (!m_contentModels.contains(eventId) && !m_contentModels.contains(event->transactionId())) {
-        if (!event->isStateEvent() || event->matrixType() == u"org.matrix.msc3672.beacon_info"_s) {
-            m_contentModels[eventId] = std::unique_ptr<MessageContentModel>(new MessageContentModel(m_room, eventId, false, isPending));
-        }
-    }
-
-    const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
-    if (roomMessageEvent && roomMessageEvent->isThreaded() && !m_threadModels.contains(roomMessageEvent->threadRootEventId())) {
-        m_threadModels[roomMessageEvent->threadRootEventId()] = QSharedPointer<ThreadModel>(new ThreadModel(roomMessageEvent->threadRootEventId(), m_room));
-    }
-
     // ReadMarkerModel handles updates to add and remove markers, we only need to
     // handle adding and removing whole models here.
     if (m_readMarkerModels.contains(eventId)) {
@@ -463,31 +448,6 @@ void MessageModel::createEventObjects(const Quotient::RoomEvent *event, bool isP
             }
         }
     }
-
-    if (const auto roomEvent = eventCast<const RoomMessageEvent>(event)) {
-        // ReactionModel handles updates to add and remove reactions, we only need to
-        // handle adding and removing whole models here.
-        if (m_reactionModels.contains(eventId)) {
-            // If a model already exists but now has no reactions remove it
-            if (m_reactionModels[eventId]->rowCount() <= 0) {
-                m_reactionModels.remove(eventId);
-                if (!resetting) {
-                    refreshEventRoles(eventId, {ReactionRole, ShowReactionsRole});
-                }
-            }
-        } else {
-            if (m_room->relatedEvents(*event, Quotient::EventRelation::AnnotationType).count() > 0) {
-                // If a model doesn't exist and there are reactions add it.
-                auto reactionModel = QSharedPointer<ReactionModel>(new ReactionModel(roomEvent, m_room));
-                if (reactionModel->rowCount() > 0) {
-                    m_reactionModels[eventId] = reactionModel;
-                    if (!resetting) {
-                        refreshEventRoles(eventId, {ReactionRole, ShowReactionsRole});
-                    }
-                }
-            }
-        }
-    }
 }
 
 void MessageModel::clearModel()
@@ -513,8 +473,6 @@ void MessageModel::clearModel()
 
 void MessageModel::clearEventObjects()
 {
-    m_contentModels.clear();
-    m_reactionModels.clear();
     m_readMarkerModels.clear();
 }
 
@@ -528,7 +486,7 @@ bool MessageModel::event(QEvent *event)
 
 ThreadModel *MessageModel::threadModelForRootId(const QString &threadRootId) const
 {
-    return m_threadModels[threadRootId].data();
+    return m_room->modelForThread(threadRootId);
 }
 
 #include "moc_messagemodel.cpp"