summary refs log tree commit diff
diff options
context:
space:
mode:
authorLoren Burkholder <computersemiexpert@outlook.com>2023-04-08 19:08:11 -0400
committerNicolas Werner <nicolas.werner@hotmail.de>2023-04-11 01:01:22 +0200
commitbdee662bbd58544b36dab66963858c4fe6ae825d (patch)
treec5cb9c8eccb061747919ac9c4574f207c62a8b42
parentUse the new mtxclient special effects refactoring (diff)
downloadnheko-bdee662bbd58544b36dab66963858c4fe6ae825d.tar.xz
Update mtxclient commit hash
-rw-r--r--CMakeLists.txt2
-rw-r--r--io.github.NhekoReborn.Nheko.yaml2
-rw-r--r--src/timeline/TimelineModel.cpp3
3 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 146a3e25..20fcb029 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -602,7 +602,7 @@ if(USE_BUNDLED_MTXCLIENT) FetchContent_Declare( MatrixClient GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git - GIT_TAG f8a9cbbb25ea145a23506c2f9386f6c61401bed0 + GIT_TAG dd2bdbd104ae8f70f82da9ff7b4b60007fc105c3 ) set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "") set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml
index 26c2020f..97d0b770 100644 --- a/io.github.NhekoReborn.Nheko.yaml +++ b/io.github.NhekoReborn.Nheko.yaml
@@ -213,7 +213,7 @@ modules: buildsystem: cmake-ninja name: mtxclient sources: - - commit: f8a9cbbb25ea145a23506c2f9386f6c61401bed0 + - commit: dd2bdbd104ae8f70f82da9ff7b4b60007fc105c3 #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 9e667bce..918d1c0b 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp
@@ -2974,8 +2974,7 @@ TimelineModel::setEdit(const QString &newEdit) if (msgType == mtx::events::MessageType::Emote) input()->setText("/me " + editText); - else if (msgType == mtx::events::MessageType::ElementEffect) - { + else if (msgType == mtx::events::MessageType::ElementEffect) { auto u = std::get_if<mtx::events::RoomEvent<mtx::events::msg::ElementEffect>>(&e); auto msgtypeString = u ? u->content.msgtype : "";