diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1dea74c..464d0f86 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -350,9 +350,13 @@ build-flatpak:
- git config --global protocol.file.allow always
script:
- export VERSION=$(git describe)
+ # workaround for https://github.com/flatpak/flatpak/issues/5076
+ - dbus-send --system /org/freedesktop/DBus org.freedesktop.DBus || dbus-daemon --system --fork
- mkdir -p build-flatpak
- cd build-flatpak
- flatpak-builder --arch=${AARCH} --install-deps-from=flathub --user --disable-rofiles-fuse --ccache --repo=repo --default-branch=${CI_COMMIT_REF_NAME//\//_} --subject="Build of Nheko ${VERSION} `date` for ${ARCH}" app ../im.nheko.Nheko.yaml --jobs=$JOBS
+ - flatpak install --user -y flathub org.flatpak.Builder
+ - flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream app/files/share/app-info/xmls/im.nheko.Nheko.xml.gz
- flatpak --arch=${AARCH} build-bundle repo nheko-${ARCH}.flatpak im.nheko.Nheko ${CI_COMMIT_REF_NAME//\//_}
after_script:
- bash ./.ci/upload-nightly-gitlab.sh build-flatpak/nheko-${ARCH}.flatpak
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e0b42f2..51b5c770 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 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..6100bb77 100644
--- a/im.nheko.Nheko.yaml
+++ b/im.nheko.Nheko.yaml
@@ -42,9 +42,9 @@ cleanup:
modules:
- name: lmdb
sources:
- - sha256: 8c5a93ac3cc97427c54571ad5a6140b7469389d01e6d2f43df39f96d3a4ccef7
+ - sha256: c0937223bba3c37c896809883a3c9b43049354578b239d6ed2476236a87f40c9
type: archive
- url: https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.30/openldap-LMDB_0.9.30.tar.gz
+ url: https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.32/openldap-LMDB_0.9.32.tar.gz
make-install-args:
- prefix=/app
no-autogen: true
@@ -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/resources/nheko.appdata.xml.in b/resources/nheko.appdata.xml.in
index e23c8d3a..69a632a1 100644
--- a/resources/nheko.appdata.xml.in
+++ b/resources/nheko.appdata.xml.in
@@ -5,6 +5,9 @@
<launchable type="desktop-id">@APPID@.desktop</launchable>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
+ <developer id="im.nheko">
+ <name>Nheko Reborn</name>
+ </developer>
<name>nheko</name>
<summary>Desktop client for the Matrix protocol</summary>
<description>
@@ -12,7 +15,6 @@
desktop app for Matrix that feels more like a mainstream
chat app.</p>
</description>
- <translation/>
<languages>
<lang>cs</lang>
<lang>de</lang>
@@ -37,10 +39,6 @@
<content_attribute id="social-chat">intense</content_attribute>
<content_attribute id="social-audio">intense</content_attribute>
</content_rating>
- <custom>
- <value key="Purism::form_factor">workstation</value>
- <value key="Purism::form_factor">mobile</value>
- </custom>
<screenshots>
<screenshot type="default">
<image>https://nheko-reborn.github.io/images/screenshots/chat.png</image>
@@ -94,5 +92,4 @@
<url type="translate">https://weblate.nheko.im/projects/nheko/</url>
<!--FIXME: where to donate to the application-->
- <url type="donation"/>
</component>
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)
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 3e3434b4..03606d90 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1162,12 +1162,12 @@ TimelineModel::syncState(const mtx::responses::State &s)
void
TimelineModel::addEvents(const mtx::responses::Timeline &timeline)
{
- if (timeline.events.empty())
- return;
-
if (timeline.limited)
setPaginationInProgress(false);
+ if (timeline.events.empty())
+ return;
+
events.handleSync(timeline);
using namespace mtx::events;
|
