diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2024-05-07 23:26:01 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2024-05-07 23:26:29 +0200 |
| commit | 82d9e57b6a3988696f207859e1f96211875c08ba (patch) | |
| tree | 591b9068cecaa1ad2bf990e7d2ec4bae9d11c4af | |
| parent | 821390c7d655a52a94a409b77dc79e3125892cd1 (diff) | |
Fix room mentions warning being displayed even without permissions
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | im.nheko.Nheko.yaml | 2 | ||||
| -rw-r--r-- | src/timeline/InputBar.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 99fb2ab1..f4dc639e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -604,7 +604,7 @@ if(USE_BUNDLED_MTXCLIENT) FetchContent_Declare( MatrixClient GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git - GIT_TAG 4fb7d678aeea197d16b52bfb1dc35b506673bb52 + GIT_TAG 58af2030c22e2dae7d6156c70572714c6363acee ) 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 ad879e7a..cead580f 100644 --- a/im.nheko.Nheko.yaml +++ b/im.nheko.Nheko.yaml @@ -223,7 +223,7 @@ modules: buildsystem: cmake-ninja name: mtxclient sources: - - commit: 4fb7d678aeea197d16b52bfb1dc35b506673bb52 + - commit: 58af2030c22e2dae7d6156c70572714c6363acee #tag: v0.9.2 type: git url: https://github.com/Nheko-Reborn/mtxclient.git diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp index 1a086c2b..1636bcd1 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp @@ -241,7 +241,7 @@ InputBar::updateTextContentProperties(const QString &t, bool charDeleted) } } - auto roomMention = containsRoomMention(t); + auto roomMention = containsRoomMention(t) && this->room->permissions()->canPingRoom(); if (roomMention != this->containsAtRoom_) { if (roomMention) |