Merge nheko-im/master and fix conflicts

.ci/macos/notarize.sh

@@ -19,12 +19,23 @@ security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain
   # mkdir -p nheko.app/Contents/Frameworks
   # find "${ICU_LIB}" -type l -name "*.dylib" -exec cp -a -n {} nheko.app/Contents/Frameworks/ \; || true
 
-  macdeployqt nheko.app -dmg -always-overwrite -qmldir=../resources/qml/ -sign-for-notarization="${APPLE_DEV_IDENTITY}"
+  #macdeployqt nheko.app -dmg -always-overwrite -qmldir=../resources/qml/ -sign-for-notarization="${APPLE_DEV_IDENTITY}"
+  macdeployqt nheko.app -always-overwrite -qmldir=../resources/qml/
 
-  user=$(id -nu)
-  chown "${user}" nheko.dmg
+  # user=$(id -nu)
+  # chown "${user}" nheko.dmg
 )
 
+echo "[INFO] Signing app contents"
+find "build/nheko.app/Contents"|while read fname; do
+    if [[ -f $fname ]]; then
+        echo "[INFO] Signing $fname"
+        codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "$fname"
+    fi
+done
+
+codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "build/nheko.app"
+
 NOTARIZE_SUBMIT_LOG=$(mktemp -t notarize-submit)
 NOTARIZE_STATUS_LOG=$(mktemp -t notarize-status)
 
@@ -59,7 +70,7 @@ while sleep 60 && date; do
   if [ -n "${isFailure}" ]; then
       echo "Notarization failed"
       cat "$NOTARIZE_STATUS_LOG" 1>&2
-      return 1
+      exit 1
   fi
   echo "Notarization not finished yet, sleep 1m then check again..."
 done

.gitlab-ci.yml

@@ -4,41 +4,34 @@ variables:
   # prevent configure tzdata hanging apt install commands
   DEBIAN_FRONTEND: noninteractive
 
-build-gcc7:
+build-gcc9:
   stage: build
-  image: ubuntu:16.04
+  image: ubuntu:20.04
   tags: [docker]
   variables:
-    CXX: g++-7
-    CC: gcc-7
     QT_PKG: 515
     TRAVIS_OS_NAME: linux
   before_script:
     - apt-get update
     - apt-get install -y software-properties-common
     - add-apt-repository ppa:ubuntu-toolchain-r/test -y
-    - add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial -y
-    - apt-get update && apt-get -y install --no-install-recommends g++-7 build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libgl1-mesa-dev libssl-dev git ccache
+    - add-apt-repository ppa:beineri/opt-qt-5.15.2-focal -y
+    - apt-get update && apt-get -y install --no-install-recommends build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libgl1-mesa-dev libssl-dev git ccache pkg-config libsecret-1-dev cmake
     # need recommended deps for wget
     - apt-get -y install wget
-    - wget https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0-Linux-x86_64.sh && sh cmake-3.19.0-Linux-x86_64.sh  --skip-license  --prefix=/usr/local
     - /usr/sbin/update-ccache-symlinks
-    - update-alternatives --install /usr/bin/gcc gcc "/usr/bin/${CC}" 10
-    - update-alternatives --install /usr/bin/g++ g++ "/usr/bin/${CXX}" 10
-    - update-alternatives --set gcc "/usr/bin/${CC}"
-    - update-alternatives --set g++ "/usr/bin/${CXX}"
+    - wget https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0-Linux-x86_64.sh && sh cmake-3.19.0-Linux-x86_64.sh  --skip-license  --prefix=/usr/local
     - rm -rf ../.hunter &&  mv .hunter ../.hunter || true
   script:
-    - export PATH="/usr/lib/ccache:${PATH}"
+    - export PATH="/usr/local/bin/:/usr/lib/ccache:${PATH}"
     - export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l)
-    - export PATH="/usr/local/bin/:${PATH}"
     - . "/opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh" || true
     - cmake -GNinja -H. -Bbuild
         -DCMAKE_INSTALL_PREFIX=.deps/usr
         -DHUNTER_ROOT="../.hunter"
         -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=ON -DUSE_BUNDLED_LMDB=OFF
         -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release
-        -DCI_BUILD=ON
+        -DCI_BUILD=ON -DFETCHCONTENT_QUIET=OFF
     - cmake --build build
   after_script:
     - mv ../.hunter .hunter
@@ -69,6 +62,7 @@ build-macos:
         -DUSE_BUNDLED_BOOST=ON
         -DCI_BUILD=ON
     - cmake --build build
+    - (cd build && git clone https://github.com/Nheko-Reborn/qt-jdenticon.git && cd qt-jdenticon && qmake && make -j 4 && cp libqtjdenticon.dylib ../nheko.app/Contents/MacOS)
   after_script:
     - mv ../.hunter .hunter
   artifacts:

CHANGELOG.md

@@ -59,6 +59,7 @@
 - Right click -> copy address location.
 - Forward messages. (Jedi18)
 - Alt-F to forward messages.
+- A new video and audio player, that should look a bit nicer.
 
 ### Improvements
 
@@ -173,10 +174,13 @@
 - Fix rooms not showing, when groups endpoint is missing.
 - Don't use deprecated parameters in /login.
 - Fix encoding issues when translating matrix.to to matrix: URIs.
+- Prevent edits from stripping the whole message, if it had a quote.
 
 ### Packaging changes
 
 - Removed the AppImage
+- Removed dependency on boost
+- Now depends on [coeurl](https://nheko.im/nheko-reborn/coeurl), which depends on libevent and libcurl.
 
 ## [0.8.2] -- 2021-04-23
 

CMakeLists.txt

@@ -23,6 +23,23 @@ HunterGate(
 	LOCAL
 	)
 
+macro(hunter_add_package_safe)
+	set(pkg_temp_backup_libdir "$ENV{PKG_CONFIG_LIBDIR}")
+	set(pkg_temp_backup_path "$ENV{PKG_CONFIG_PATH}")
+	hunter_add_package(${ARGV})
+	if("${pkg_temp_backup_path}" STREQUAL "")
+		unset(ENV{PKG_CONFIG_PATH})
+	else()
+		set(ENV{PKG_CONFIG_PATH} "${pkg_temp_backup_path}")
+	endif()
+	if("${pkg_temp_backup_libdir}" STREQUAL "")
+		unset(ENV{PKG_CONFIG_LIBDIR})
+	else()
+		set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup_libdir}")
+	endif()
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endmacro()
+
 option(USE_BUNDLED_SPDLOG "Use the bundled version of spdlog." ${HUNTER_ENABLED})
 option(USE_BUNDLED_OLM "Use the bundled version of libolm." ${HUNTER_ENABLED})
 option(USE_BUNDLED_GTEST "Use the bundled version of Google Test." ${HUNTER_ENABLED})
@@ -120,10 +137,16 @@ endif()
 #
 ## Need to repeat all libevent deps?!?
 if (USE_BUNDLED_LIBEVENT)
-	hunter_add_package(Libevent)
+	hunter_add_package_safe(Libevent)
 	find_package(Libevent CONFIG REQUIRED)
 else()
 	find_package(PkgConfig REQUIRED) 
+if (HUNTER_ENABLED)
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+	set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_LIBDIR}")
+	set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup}")
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endif()
 	pkg_check_modules(libevent_core REQUIRED IMPORTED_TARGET libevent_core)
 	if (WIN32)
 		pkg_check_modules(libevent_windows REQUIRED IMPORTED_TARGET libevent_windows)
@@ -135,16 +158,22 @@ endif()
 
 # curl
 if (USE_BUNDLED_LIBCURL)
-	hunter_add_package(CURL)
+	hunter_add_package_safe(CURL)
 	find_package(CURL CONFIG REQUIRED)
 else()
 	find_package(PkgConfig REQUIRED) 
+if (HUNTER_ENABLED)
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+	set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_LIBDIR}")
+	set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup}")
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endif()
 	pkg_check_modules(libcurl REQUIRED IMPORTED_TARGET libcurl)
 endif()
 
 # spdlog
 if(USE_BUNDLED_SPDLOG)
-	hunter_add_package(spdlog)
+	hunter_add_package_safe(spdlog)
 endif()
 find_package(spdlog 1.0.0 CONFIG REQUIRED)
 
@@ -153,7 +182,7 @@ find_package(spdlog 1.0.0 CONFIG REQUIRED)
 #
 #include(LMDB)
 if(USE_BUNDLED_LMDB)
-	hunter_add_package(lmdb)
+	hunter_add_package_safe(lmdb)
 	find_package(liblmdb CONFIG REQUIRED)
 
 	target_include_directories(liblmdb::lmdb INTERFACE
@@ -170,11 +199,17 @@ find_package(Qt5QuickCompiler)
 find_package(Qt5DBus)
 
 if (USE_BUNDLED_QTKEYCHAIN)
+if (HUNTER_ENABLED)
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+	set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_LIBDIR}")
+	set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup}")
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endif()
 	include(FetchContent)
 	FetchContent_Declare(
 		qt5keychain
 		GIT_REPOSITORY https://github.com/frankosterfeld/qtkeychain.git
-		GIT_TAG        v0.12.0
+		GIT_TAG        v0.13.1
 		)
 	if (BUILD_SHARED_LIBS)
 		set(QTKEYCHAIN_STATIC OFF CACHE INTERNAL "")
@@ -380,7 +415,7 @@ include(FeatureSummary)
 
 
 if(USE_BUNDLED_OPENSSL)
-	hunter_add_package(OpenSSL)
+	hunter_add_package_safe(OpenSSL)
 endif()
 find_package(OpenSSL 1.1.0 REQUIRED)
 if(USE_BUNDLED_MTXCLIENT)
@@ -388,7 +423,7 @@ if(USE_BUNDLED_MTXCLIENT)
 	FetchContent_Declare(
 		MatrixClient
 		GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-		GIT_TAG        bacb7e524ff0f38591b88b248d8d8409b7fd49a0
+		GIT_TAG        v0.6.0
 		)
 	set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
 	set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
@@ -401,7 +436,7 @@ if(USE_BUNDLED_OLM)
 	FetchContent_Declare(
 		Olm
 		GIT_REPOSITORY https://gitlab.matrix.org/matrix-org/olm.git
-		GIT_TAG        3.2.4
+		GIT_TAG        3.2.6
 		)
 	set(OLM_TESTS OFF CACHE INTERNAL "")
 	FetchContent_MakeAvailable(Olm)
@@ -414,7 +449,7 @@ else()
 		)
 endif()
 if(USE_BUNDLED_SPDLOG)
-	hunter_add_package(spdlog)
+	hunter_add_package_safe(spdlog)
 endif()
 find_package(spdlog 1.0.0 CONFIG REQUIRED)
 
@@ -423,21 +458,21 @@ if(USE_BUNDLED_CMARK)
 	FetchContent_Declare(
 		cmark
 		GIT_REPOSITORY https://github.com/commonmark/cmark.git
-		GIT_TAG        242e277a661ec7e51f34dcaf86c1925d550b1498 #0.29.0 << doesn't work with fetch content yet
+		GIT_TAG        0.30.2
 		CMAKE_ARGS     "CMARK_STATIC=ON CMARK_SHARED=OFF CMARK_TESTS=OFF CMARK_TESTS=OFF"
 		)
 	FetchContent_MakeAvailable(cmark)
 	if (MSVC)
-		add_library(cmark::cmark ALIAS libcmark)
+		add_library(cmark::cmark ALIAS cmark)
 	else()
-		add_library(cmark::cmark ALIAS libcmark_static)
+		add_library(cmark::cmark ALIAS cmark_static)
 	endif()
 else()
 	find_package(cmark REQUIRED 0.29.0)
 endif()
 
 if(USE_BUNDLED_JSON)
-	hunter_add_package(nlohmann_json)
+	hunter_add_package_safe(nlohmann_json)
 endif()
 find_package(nlohmann_json 3.2.0)
 set_package_properties(nlohmann_json PROPERTIES
@@ -452,10 +487,10 @@ if(USE_BUNDLED_LMDBXX)
 		lmdbxx
 		URL "https://raw.githubusercontent.com/hoytech/lmdbxx/1.0.0/lmdb++.h"
 		DOWNLOAD_NO_EXTRACT TRUE
+		CONFIGURE_COMMAND ""
+		BUILD_COMMAND ""
 		)
-	if(NOT lmdbxx_POPULATED)
-		FetchContent_Populate(lmdbxx)
-	endif()
+	FetchContent_Populate(lmdbxx)
 	add_library(lmdbxx INTERFACE)
 	target_include_directories(lmdbxx INTERFACE ${lmdbxx_SOURCE_DIR})
 	add_library(lmdbxx::lmdbxx ALIAS lmdbxx)
@@ -474,8 +509,15 @@ else()
 	add_library(lmdbxx::lmdbxx ALIAS lmdbxx)
 endif()
 
+if (HUNTER_ENABLED)
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+	set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_LIBDIR}")
+	set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup}")
+	unset(ENV{PKG_CONFIG_LIBDIR})
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endif()
 include(FindPkgConfig)
-pkg_check_modules(GSTREAMER IMPORTED_TARGET gstreamer-sdp-1.0>=1.18 gstreamer-webrtc-1.0>=1.18)
+pkg_check_modules(GSTREAMER NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH IMPORTED_TARGET gstreamer-sdp-1.0>=1.18 gstreamer-webrtc-1.0>=1.18)
 if (TARGET PkgConfig::GSTREAMER)
 	add_feature_info(voip ON "GStreamer found. Call support is enabled automatically.")
 	pkg_check_modules(XCB IMPORTED_TARGET xcb xcb-ewmh)
@@ -691,7 +733,7 @@ if(USE_BUNDLED_COEURL)
 	FetchContent_Declare(
 		coeurl
 		GIT_REPOSITORY https://nheko.im/Nheko-Reborn/coeurl.git
-		GIT_TAG        3901507db25cf3f9364b58cd8c7880640900c992
+		GIT_TAG        v0.1.0
 		)
 	FetchContent_MakeAvailable(coeurl)
 	target_link_libraries(nheko PUBLIC coeurl::coeurl)
@@ -700,6 +742,12 @@ elseif(coeurl_DIR)
 	target_link_libraries(nheko PUBLIC coeurl::coeurl)
 else()
 	find_package(PkgConfig REQUIRED)
+if (HUNTER_ENABLED)
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+	set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_LIBDIR}")
+	set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup}")
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endif()
 	pkg_check_modules(coeurl REQUIRED IMPORTED_TARGET coeurl)
 	target_link_libraries(nheko PUBLIC PkgConfig::coeurl)
 endif()
@@ -720,7 +768,7 @@ if(NOT MSVC AND NOT HAIKU)
 	endif()
 endif()
 
-set_target_properties(nheko PROPERTIES SKIP_BUILD_RPATH TRUE)
+set_target_properties(nheko PROPERTIES CMAKE_SKIP_INSTALL_RPATH TRUE)
 
 if(UNIX AND NOT APPLE)
 	install (TARGETS nheko RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

README.md

@@ -369,7 +369,8 @@ Here are some screen shots to get a feel for the UI, but things will probably ch
 
 ### Third party
 
-[Single Application for Qt](https://github.com/itay-grudev/SingleApplication)
+- [Single Application for Qt](https://github.com/itay-grudev/SingleApplication)
+- [Fluent Icons](https://github.com/microsoft/fluentui-system-icons)
 
 [Matrix]:https://matrix.org
 [Element]:https://element.io

appveyor.yml

@@ -54,12 +54,19 @@ build_script:
 
     - cmake --build build --config Release
 
+    - git clone https://github.com/Nheko-Reborn/qt-jdenticon.git
+    - cd qt-jdenticon
+    - qmake
+    - nmake
+    - cd ..
+
 after_build:
     # Variables
     - set BUILD=%APPVEYOR_BUILD_FOLDER%
     - echo %BUILD%
     - mkdir NhekoRelease
     - copy build\Release\nheko.exe NhekoRelease\nheko.exe
+    - copy qt-jdenticon\release\qtjdenticon0.dll NhekoRelease\qtjdenticon0.dll
     - copy build\_deps\cmark-build\src\Release\cmark.dll NhekoRelease\cmark.dll
     - windeployqt --qmldir resources\qml\ NhekoRelease\nheko.exe
 

io.github.NhekoReborn.Nheko.yaml

@@ -59,9 +59,9 @@ modules:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMARK_TESTS=OFF
     sources:
-      - sha256: 2558ace3cbeff85610de3bda32858f722b359acdadf0c4691851865bb84924a6
+      - sha256: 6c7d2bcaea1433d977d8fed0b55b71c9d045a7cdf616e3cd2dce9007da753db3
         type: archive
-        url: https://github.com/commonmark/cmark/archive/0.29.0.tar.gz
+        url: https://github.com/commonmark/cmark/archive/0.30.2.tar.gz
   - name: spdlog
     buildsystem: cmake-ninja
     config-opts:
@@ -78,11 +78,23 @@ modules:
     buildsystem: cmake-ninja
     name: olm
     sources:
-      - commit: 64afab93645957846d936a19b8501dbd3f2cc4a1
+      - commit: 8656f1463c4e16366335fb468453a9455a366c78
         disable-shallow-clone: true
-        tag: 3.2.4
+        tag: 3.2.6
         type: git
         url: https://gitlab.matrix.org/matrix-org/olm.git
+  - buildsystem: meson
+    name: libsecret
+    config-opts:
+      - -Dmanpage=false
+      - -Dvapi=false
+      - -Dgtk_doc=false
+      - -Dintrospection=false
+    sources:
+      - commit: 3fe635e64efd4b8dbc9ec3548b0bc8034c7665c4
+        tag: 0.20.4
+        type: git
+        url: https://gitlab.gnome.org/GNOME/libsecret.git
   - config-opts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DBUILD_TEST_APPLICATION=OFF
@@ -90,8 +102,8 @@ modules:
     buildsystem: cmake-ninja
     name: QtKeychain
     sources:
-      - commit: 815fe610353ff8ad7e2f1121c368a74df8db5eb7
-        tag: v0.12.0
+      - commit: f59ac26be709fd2d8d7a062fab1cf1e67a93806c
+        tag: v0.13.1
         type: git
         url: https://github.com/frankosterfeld/qtkeychain.git
   - config-opts:
@@ -99,14 +111,14 @@ modules:
     buildsystem: cmake
     name: nlohmann
     sources:
-      - sha256: d51a3a8d3efbb1139d7608e28782ea9efea7e7933157e8ff8184901efd8ee760
+      - sha256: 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3
         type: archive
-        url: https://github.com/nlohmann/json/archive/v3.7.0.tar.gz
+        url: https://github.com/nlohmann/json/archive/v3.10.4.tar.gz
   - buildsystem: meson
     name: gstreamer
     sources:
-      - commit: a42fe476d3ee5576921f67a331464065ec33b9a4
-        tag: 1.18.3
+      - commit: 71c213f99ad5c8fc8f36a26238483f2bdf7d846a
+        tag: 1.18.5
         type: git
         url: https://gitlab.freedesktop.org/gstreamer/gstreamer.git
   - config-opts:
@@ -115,8 +127,8 @@ modules:
     buildsystem: meson
     name: gstreamer-plugins-base
     sources:
-      - commit: 2cc319ee13f6b72df3d432b7c75aca81feb260e5
-        tag: 1.18.3
+      - commit: 57fb883b3f8c6d7a397afc0dfc4a7c2e5af05579
+        tag: 1.18.5
         type: git
         url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base.git
   - config-opts:
@@ -128,8 +140,8 @@ modules:
     buildsystem: meson
     name: gstreamer-plugins-good
     sources:
-      - commit: e816c6cd73c9e0676828c9e227a049ebad3d019f
-        tag: 1.18.3
+      - commit: 56dec037a80266add6853e4b06e2dc379de757d1
+        tag: 1.18.5
         type: git
         url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-good.git
   - config-opts:
@@ -143,16 +155,28 @@ modules:
     buildsystem: meson
     name: gstreamer-plugins-bad
     sources:
-      - commit: 382e373d9be363f1e21b12990a4d12f1ecb6df41
-        tag: 1.18.3
+      - commit: d3af58d5b31941caa26c3ded85d7a7b84a91f0cc
+        tag: 1.18.5
         type: git
         url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git
+  - buildsystem: qmake
+    name: qt-jdenticon
+    no-make-install: true
+    build-commands:
+      - mkdir -p /app/bin/
+      - cp libqtjdenticon.so /app/bin/
+    sources:
+      - commit: e58c14369dfbf008c63f43a4556b2e52232e0265
+        tag: v0.1.0
+        type: git
+        url: https://github.com/Nheko-Reborn/qt-jdenticon.git
   - buildsystem: meson
     config-opts:
       - -Ddefault_library=static
     name: coeurl
     sources:
-      - commit: 3901507db25cf3f9364b58cd8c7880640900c992
+      - commit: a08f619adaa1ccd34eb6315d6578eddae0d1cc9b
+        tag: v0.1.0
         type: git
         url: https://nheko.im/nheko-reborn/coeurl.git
   - config-opts:
@@ -163,7 +187,8 @@ modules:
     buildsystem: cmake-ninja
     name: mtxclient
     sources:
-      - commit: bacb7e524ff0f38591b88b248d8d8409b7fd49a0
+      - commit: eecc4e93f2137c658014f17cefd62ad569063769
+        tag: v0.6.0
         type: git
         url: https://github.com/Nheko-Reborn/mtxclient.git
   - config-opts:

resources/icons/emoji-categories/activity.svg

+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.08706 7.18785C6.02201 7.35088 5.96237 7.51555 5.90814 7.68161C6.37118 7.75292 6.87059 7.84964 7.39119 7.9808C7.63693 7.29058 7.99847 6.63236 8.47583 6.0363L12.6895 10.25L12.4375 10.5019C12.6247 10.6634 12.8083 10.8335 12.9875 11.0127C13.1667 11.1918 13.3368 11.3754 13.4982 11.5626L13.7501 11.3106L17.9635 15.5239C17.3675 16.0012 16.7094 16.3627 16.0193 16.6085C16.1504 17.1291 16.2472 17.6285 16.3185 18.0915C16.6436 17.9853 16.9635 17.8584 17.276 17.7107C18.1109 17.3162 18.8933 16.7737 19.5838 16.0833C19.7145 15.9526 19.8399 15.8186 19.96 15.6816C20.522 15.0395 20.9861 14.3094 21.3289 13.5148C21.7434 12.5518 21.966 11.5259 21.9965 10.4954C21.9989 10.4139 22.0001 10.3321 22.0001 10.25C22.0001 10.1458 21.9981 10.042 21.9943 9.93868C21.9725 9.35607 21.8892 8.77533 21.7446 8.207C21.0019 5.29266 18.7081 2.99781 15.7937 2.25509C15.398 2.15433 14.9959 2.0836 14.5916 2.0424C14.3149 2.01436 14.0342 2 13.7501 2C13.4726 2 13.1982 2.0137 12.9277 2.04047C12.2733 2.10565 11.6252 2.24882 10.9985 2.47C8.76014 3.26166 6.96533 4.99194 6.08706 7.18785ZM20.0475 7.81481C19.1674 8.50945 17.9608 8.58967 17.0053 8.05547L19.0245 6.0363C19.4634 6.58439 19.8044 7.18505 20.0475 7.81481ZM15.9181 9.14268C17.2639 10.0817 19.0318 10.1519 20.4407 9.35317C20.6778 11.1325 20.2056 12.9883 19.0242 14.4633L14.8108 10.25L15.9181 9.14268ZM14.8574 8.08201L13.7501 9.1893L9.53645 4.9756C11.0116 3.79404 12.8676 3.32188 14.6471 3.55914C13.8483 4.96806 13.9184 6.73612 14.8574 8.08201ZM15.9446 6.9948C15.4104 6.03922 15.4907 4.83257 16.1855 3.95245C16.8152 4.19559 17.4158 4.53664 17.9638 4.9756L15.9446 6.9948ZM6.96973 13.4697C7.26262 13.1768 7.7375 13.1768 8.03039 13.4697L10.5304 15.9697C10.8233 16.2626 10.8233 16.7374 10.5304 17.0303C10.2375 17.3232 9.76262 17.3232 9.46973 17.0303L6.96973 14.5303C6.67684 14.2374 6.67684 13.7626 6.96973 13.4697ZM2.02815 11.0186C1.9188 9.57689 3.07688 8.4188 4.5186 8.52815C6.49666 8.67819 9.85794 9.29728 12.2804 11.7197C14.7028 14.1422 15.3219 17.5035 15.472 19.4815C15.5813 20.9232 14.4232 22.0813 12.9815 21.972C11.0035 21.8219 7.64217 21.2028 5.21972 18.7804C2.79728 16.3579 2.17819 12.9967 2.02815 11.0186ZM4.40515 10.0239C3.87938 9.98398 3.48398 10.3794 3.52386 10.9051C3.66515 12.7678 4.24225 15.6816 6.28038 17.7197C8.31852 19.7579 11.2323 20.335 13.095 20.4763C13.6207 20.5161 14.0161 20.1207 13.9763 19.595C13.835 17.7323 13.2579 14.8185 11.2197 12.7804C9.18159 10.7423 6.26785 10.1651 4.40515 10.0239Z" fill="#212121"/>
+</svg>

resources/icons/emoji-categories/flags.svg

+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.5 16.5V4.5H21.8915L18.3653 10.1004C18.2116 10.3446 18.2116 10.6554 18.3653 10.8996L21.8915 16.5H5.5ZM5.5 18H23.25C23.8402 18 24.1991 17.3498 23.8847 16.8504L19.8863 10.5L23.8847 4.14961C24.1991 3.65017 23.8402 3 23.25 3H4.75C4.33579 3 4 3.33579 4 3.75V24.25C4 24.6642 4.33579 25 4.75 25C5.16421 25 5.5 24.6642 5.5 24.25V18Z" fill="#212121"/>
+</svg>

resources/icons/emoji-categories/foods.svg

+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.39837 11.2354C8.80455 11.1542 9.06797 10.7591 8.98674 10.3529C8.90552 9.94676 8.5104 9.68334 8.10423 9.76457C7.20083 9.94523 6.51873 10.5762 6.15571 11.4233C5.79648 12.2616 5.74317 13.3095 6.02353 14.4318C6.12392 14.8336 6.53108 15.078 6.93294 14.9776C7.33481 14.8773 7.5792 14.4701 7.47881 14.0682C7.25953 13.1905 7.33123 12.4884 7.53445 12.0142C7.73386 11.5488 8.05164 11.3048 8.39837 11.2354ZM5.47243 3.41992C5.39053 4.80601 5.86278 6.22149 6.88961 7.30235C5.01209 7.84197 3.51893 9.43972 3.22913 11.5183C2.90072 13.8738 3.38485 16.2709 4.60169 18.3143L4.95271 18.9037C4.96572 18.9256 4.97982 18.9468 4.99498 18.9672L6.41094 20.8739C7.68739 22.5927 10.2023 22.7527 11.6862 21.2094C11.858 21.0307 12.1439 21.0307 12.3157 21.2094C13.7996 22.7527 16.3145 22.5927 17.591 20.8739L19.0069 18.9672C19.0221 18.9468 19.0362 18.9256 19.0492 18.9037L19.4002 18.3143C20.6171 16.2709 21.1012 13.8738 20.7728 11.5183C20.3641 8.58694 17.5621 6.61189 14.6639 7.21235L12.7617 7.60645L12.7587 7.60709C12.789 6.82725 12.9107 5.98621 13.15 5.26843C13.4393 4.40047 13.8421 3.87869 14.2894 3.69232C14.6718 3.533 14.8526 3.0939 14.6933 2.71155C14.5339 2.3292 14.0948 2.14839 13.7125 2.3077C12.6598 2.74632 12.0626 3.78704 11.7269 4.79409C11.7113 4.84112 11.696 4.88844 11.6812 4.93604C11.4414 4.4716 11.1269 4.03573 10.7376 3.64645C9.64506 2.55389 8.18555 2.05016 6.75733 2.1348C6.06425 2.17588 5.51339 2.72683 5.47243 3.41992ZM6.96471 3.62704C7.94448 3.60028 8.93029 3.96044 9.67696 4.70711C10.4235 5.45363 10.7836 6.43917 10.7571 7.41874C10.5757 7.42369 10.3941 7.41539 10.2139 7.39383L9.59698 7.26601C9.02869 7.09656 8.49355 6.78742 8.0448 6.33866C7.29828 5.59215 6.93812 4.60661 6.96471 3.62704ZM9.03369 8.68116L9.23606 8.72309C9.47606 8.79107 9.71995 8.84146 9.96569 8.87426L10.9358 9.07526C11.6385 9.22083 12.3635 9.22083 13.0661 9.07526L14.9682 8.68116C17.0172 8.25664 18.9982 9.65298 19.2871 11.7254C19.5685 13.7431 19.1538 15.7965 18.1114 17.5468L17.7799 18.1035L16.3867 19.9796C15.6633 20.9537 14.2379 21.0444 13.3969 20.1697C12.635 19.3773 11.3669 19.3773 10.605 20.1697C9.76396 21.0444 8.33863 20.9537 7.61519 19.9796L6.22198 18.1035L5.89049 17.5468C4.84815 15.7965 4.43344 13.7431 4.71476 11.7254C5.00371 9.65298 6.98471 8.25663 9.03369 8.68116Z" fill="#212121"/>
+</svg>

resources/icons/emoji-categories/nature.svg

+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.2491 2.00002L16.4346 2C16.9438 2 17.442 2.14135 17.8752 2.40794L20.6431 4.11125C20.8649 4.24775 21 4.48955 21 4.75V6.25C21 7.49264 19.9926 8.5 18.75 8.5H18.5V17.5469C19.497 17.6807 20.1945 18.1015 20.5946 18.8224C20.8179 19.2247 20.9126 19.6625 20.9569 20.0651C21.0001 20.4561 21 20.8643 21 21.2247V21.25C21 21.6642 20.6642 22 20.25 22H16.2508H5.83333C3.71624 22 2 20.2838 2 18.1667C2 16.7686 2.74891 15.5462 3.86385 14.8774C4.21907 14.6644 4.67975 14.7796 4.89281 15.1348C5.10587 15.49 4.99062 15.9507 4.63541 16.1638C3.95359 16.5727 3.5 17.3171 3.5 18.1667C3.5 19.4553 4.54467 20.5 5.83333 20.5C6.15188 20.5 6.34997 20.4168 6.48162 20.3242C6.62082 20.2262 6.72963 20.0859 6.81348 19.9168C6.89798 19.7464 6.94675 19.5671 6.97352 19.4243C6.98658 19.3546 6.99358 19.2981 6.9972 19.2617C6.99876 19.246 6.99967 19.2343 7.00015 19.2273L7.00059 19.1925C7.00115 19.1586 7.00224 19.1104 7.00436 19.0493C7.00859 18.9273 7.01695 18.7535 7.03348 18.5397C7.06646 18.1132 7.13235 17.5223 7.26464 16.8627C7.52372 15.5707 8.06051 13.8945 9.21612 12.7232C10.0641 11.8638 10.525 10.6045 10.7634 9.35923C10.9991 8.12815 11 7.00801 11 6.5V4.25002C11 3.00796 12.0059 2.00003 13.2491 2.00002ZM7.75 19.25C8.49958 19.275 8.49956 19.2757 8.49956 19.2757L8.49948 19.2781L8.49932 19.2819L8.49888 19.2919L8.49726 19.3205C8.4958 19.3433 8.49348 19.3735 8.48984 19.4101C8.48259 19.4831 8.46993 19.5829 8.44783 19.7007C8.40796 19.9134 8.33458 20.2001 8.19703 20.5H15.4473C15.3561 20.0064 15.1078 19.4939 14.4335 19.1799C14.4224 19.1748 14.4115 19.1694 14.4008 19.1637C14.3486 19.1363 14.1994 19.0871 13.9516 19.0479C13.7216 19.0116 13.4674 18.9931 13.25 18.9931C13.1964 18.9931 13.0783 18.9947 12.9672 18.9965L12.8256 18.9988L12.7665 18.9999L12.7655 18.9999C12.3513 19.0075 12.0095 18.6779 12.0019 18.2637C11.9943 17.8496 12.3239 17.5077 12.738 17.5001L12.7995 17.499L12.9435 17.4966C13.0511 17.4949 13.1822 17.4931 13.25 17.4931C13.4846 17.4931 13.7453 17.5086 14 17.5402V15.2528C14 14.8386 14.3358 14.5028 14.75 14.5028C15.1642 14.5028 15.5 14.8386 15.5 15.2528V18.0573C16.5648 18.7386 16.8739 19.7599 16.9635 20.5H19.4875C19.4825 20.407 19.4756 20.317 19.466 20.2294C19.4328 19.9286 19.3719 19.7103 19.2831 19.5504C19.153 19.3159 18.8498 19 17.75 19C17.3358 19 17 18.6642 17 18.25V7.75C17 7.33579 17.3358 7 17.75 7H18.75C19.1642 7 19.5 6.66421 19.5 6.25V5.16909L17.089 3.68543C16.8918 3.56405 16.6657 3.5 16.4346 3.5L13.2491 3.50002C12.8355 3.50002 12.5 3.83523 12.5 4.25002V6.48171C12.5128 6.71048 12.592 6.90709 12.7051 7.03567C12.8062 7.15046 12.9658 7.25 13.25 7.25C13.5368 7.25 13.7027 7.14866 13.8057 7.031C13.9206 6.89967 14 6.69587 14 6.45C14 6.03579 14.3358 5.7 14.75 5.7C15.1642 5.7 15.5 6.03579 15.5 6.45C15.5 7.00412 15.3227 7.57533 14.9343 8.01899C14.534 8.47634 13.9499 8.75 13.25 8.75C12.938 8.75 12.6513 8.69566 12.3945 8.59601C12.3568 8.92795 12.3058 9.27987 12.2366 9.64132C11.975 11.0074 11.4359 12.6092 10.2839 13.7768C9.43949 14.6326 8.97628 15.9563 8.73536 17.1576C8.61765 17.7446 8.55854 18.2736 8.52902 18.6554C8.5143 18.8458 8.50703 18.9982 8.50346 19.1013C8.50167 19.1529 8.5008 19.192 8.50039 19.2173L8.50004 19.2446L8.5 19.25C8.5 19.2582 8.49983 19.2675 8.49956 19.2757L7.75 19.25Z" fill="#212121"/>
+</svg>