summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2024-06-06 01:01:21 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2024-06-06 01:34:23 +0200
commit777c41daa17c72b3a201fb7ff7727e68a5ff51e2 (patch)
treef588c9cdb2db331b729c322d7505f5f8adf18e32
parentFix marking newly created rooms as DM automatically (diff)
downloadnheko-777c41daa17c72b3a201fb7ff7727e68a5ff51e2.tar.xz
Support authenticated media
-rw-r--r--CMakeLists.txt2
-rw-r--r--im.nheko.Nheko.yaml2
-rw-r--r--src/timeline/TimelineModel.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 667d7b88..28844070 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -606,7 +606,7 @@ if(USE_BUNDLED_MTXCLIENT)
     FetchContent_Declare(
         MatrixClient
             GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-            GIT_TAG        604a2ec95b03fbf8c856bc481e7582f5c6a64748
+            GIT_TAG        a70753812e3fb832df12b24ee0ee6c70d68060d5
     )
     set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
     set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
diff --git a/im.nheko.Nheko.yaml b/im.nheko.Nheko.yaml
index ca5c3a98..aa874c0e 100644
--- a/im.nheko.Nheko.yaml
+++ b/im.nheko.Nheko.yaml
@@ -223,7 +223,7 @@ modules:
     buildsystem: cmake-ninja
     name: mtxclient
     sources:
-      - commit: 604a2ec95b03fbf8c856bc481e7582f5c6a64748
+      - commit: a70753812e3fb832df12b24ee0ee6c70d68060d5
         #tag: v0.9.2
         type: git
         url: https://github.com/Nheko-Reborn/mtxclient.git
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 4aa9af00..14fd574b 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -3277,8 +3277,8 @@ TimelineModel::widgetLinks() const
     QStringList list;
 
     auto user = utils::localUser();
-    auto av   = QUrl::toPercentEncoding(
-      QString::fromStdString(http::client()->mxc_to_download_url(avatarUrl(user).toStdString())));
+    // auto av   = QUrl::toPercentEncoding(
+    //   QString::fromStdString(http::client()->mxc_to_download_url(avatarUrl(user).toStdString())));
     auto disp  = QUrl::toPercentEncoding(displayName(user));
     auto theme = UserSettings::instance()->theme();
     if (theme == QStringLiteral("system"))
@@ -3299,7 +3299,7 @@ TimelineModel::widgetLinks() const
         url.replace("$matrix_user_id", user);
         url.replace("$matrix_room_id", QUrl::toPercentEncoding(room_id_));
         url.replace("$matrix_display_name", disp);
-        url.replace("$matrix_avatar_url", av);
+        // url.replace("$matrix_avatar_url", av);
 
         url.replace("$matrix_widget_id",
                     QUrl::toPercentEncoding(QString::fromStdString(p.content.id)));