From 2bd53f19b1b2434b60a89fe7ec5c85a66b2b3723 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Wed, 1 Jan 2020 15:40:49 +0800 Subject: [PATCH 1/6] Fix eventToString. --- src/spectralroom.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/spectralroom.cpp b/src/spectralroom.cpp index 4906ca0b4..ff2e3c6a4 100644 --- a/src/spectralroom.cpp +++ b/src/spectralroom.cpp @@ -236,6 +236,7 @@ QString SpectralRoom::eventToString(const RoomEvent& evt, [prettyPrint, removeReply](const RoomMessageEvent& e) { using namespace MessageEventContent; + // 1. prettyPrint/HTML if (prettyPrint && e.hasTextContent() && e.mimeType().name() != "text/plain") { auto htmlBody = static_cast(e.content())->body; @@ -260,10 +261,11 @@ QString SpectralRoom::eventToString(const RoomEvent& evt, return !fileCaption.isEmpty() ? fileCaption : tr("a file"); } + // 2. prettyPrint/text 3. plainText/HTML 4. plainText/text QString plainBody; - if (e.hasTextContent() && e.content()) { + if (e.hasTextContent() && e.content() && e.mimeType().name() == "text/plain") { // 2/4 plainBody = static_cast(e.content())->body; - } else { + } else { // 3 plainBody = e.plainBody(); } From 34da7cc321c9618c98aec61cdaa9bb089528fa02 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Wed, 1 Jan 2020 22:13:01 +0800 Subject: [PATCH 2/6] Tweak message bubble. --- imports/Spectral/Component/Timeline/MessageDelegate.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imports/Spectral/Component/Timeline/MessageDelegate.qml b/imports/Spectral/Component/Timeline/MessageDelegate.qml index ae141f529..dd6ebc9a7 100644 --- a/imports/Spectral/Component/Timeline/MessageDelegate.qml +++ b/imports/Spectral/Component/Timeline/MessageDelegate.qml @@ -75,7 +75,7 @@ ColumnLayout { padding: 0 background: AutoRectangle { - readonly property int minorRadius: 8 + readonly property int minorRadius: 2 id: bubbleBackground From abc72d607a7e25c43c579b941699ceec4924d83b Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 5 Jan 2020 16:54:47 +0000 Subject: [PATCH 3/6] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13580e343..c3bc868f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive build-appimage: - image: registry.gitlab.com/b0/qt-docker + image: registry.gitlab.com/spectral-im/qt-docker:latest stage: build script: - git clone https://gitlab.matrix.org/matrix-org/olm.git && cd olm @@ -32,7 +32,7 @@ build-appimage: - spectral.AppImage build-flatpak: - image: registry.gitlab.com/b0/flatpak-kde-docker + image: registry.gitlab.com/spectral-im/flatpak-kde-docker:latest stage: build script: - cd flatpak From 06dbbb338a16c6f145c992a245998ae7bc31cc5b Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 5 Jan 2020 17:06:30 +0000 Subject: [PATCH 4/6] Update org.eu.encom.spectral.yaml --- flatpak/org.eu.encom.spectral.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flatpak/org.eu.encom.spectral.yaml b/flatpak/org.eu.encom.spectral.yaml index e697e7b4e..f3d9d39cc 100644 --- a/flatpak/org.eu.encom.spectral.yaml +++ b/flatpak/org.eu.encom.spectral.yaml @@ -1,7 +1,7 @@ id: org.eu.encom.spectral rename-icon: spectral runtime: org.kde.Platform -runtime-version: "5.12" +runtime-version: "5.13" sdk: org.kde.Sdk command: spectral finish-args: @@ -18,8 +18,8 @@ modules: sources: - type: git url: https://gitlab.matrix.org/matrix-org/olm.git - tag: 3.1.3 - commit: ebd3ba6cc17862aefc9cb3299d60aeae953cc143 + tag: 3.1.4 + commit: 6753595300767dd70150831dbbe6f92d64e75038 disable-shallow-clone: true config-opts: - -DCMAKE_BUILD_TYPE=Release From a6e0823405c316526b4ef4ef33353e5d79d4c1c0 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 5 Jan 2020 17:20:44 +0000 Subject: [PATCH 5/6] Update org.eu.encom.spectral.yaml --- flatpak/org.eu.encom.spectral.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flatpak/org.eu.encom.spectral.yaml b/flatpak/org.eu.encom.spectral.yaml index f3d9d39cc..26bef1df7 100644 --- a/flatpak/org.eu.encom.spectral.yaml +++ b/flatpak/org.eu.encom.spectral.yaml @@ -35,9 +35,9 @@ modules: - -DCMARK_TESTS=OFF - name: libsecret sources: - - sha256: 33ee5dfd3556931b81d47111890c8b9c51093b4ced18e0e87f51c1769e24d43c + - sha256: 303c6e8cf3e12534e885b0682cd6130716c6834397b76d3829321b6d83b2389c type: archive - url: https://gitlab.gnome.org/GNOME/libsecret/-/archive/0.18.8/libsecret-0.18.8.tar.gz + url: https://gitlab.gnome.org/GNOME/libsecret/-/archive/0.19.1/libsecret-0.19.1.tar.gz config-opts: - --disable-static - --disable-gtk-doc From f7cfd0b6fa32acc13b646458440d53587b2ba873 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 5 Jan 2020 17:32:44 +0000 Subject: [PATCH 6/6] Update org.eu.encom.spectral.yaml --- flatpak/org.eu.encom.spectral.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flatpak/org.eu.encom.spectral.yaml b/flatpak/org.eu.encom.spectral.yaml index 26bef1df7..781ce4e8e 100644 --- a/flatpak/org.eu.encom.spectral.yaml +++ b/flatpak/org.eu.encom.spectral.yaml @@ -1,7 +1,7 @@ id: org.eu.encom.spectral rename-icon: spectral runtime: org.kde.Platform -runtime-version: "5.13" +runtime-version: "5.12" sdk: org.kde.Sdk command: spectral finish-args: @@ -26,9 +26,9 @@ modules: - name: cmark buildsystem: cmake-ninja sources: - - sha256: acc98685d3c1b515ff787ac7c994188dadaf28a2d700c10c1221da4199bae1fc + - sha256: 2558ace3cbeff85610de3bda32858f722b359acdadf0c4691851865bb84924a6 type: archive - url: https://github.com/commonmark/cmark/archive/0.28.3.tar.gz + url: https://github.com/commonmark/cmark/archive/0.29.0.tar.gz builddir: true config-opts: - -DCMAKE_BUILD_TYPE=Release @@ -45,9 +45,9 @@ modules: - name: qtkeychain buildsystem: cmake sources: - - sha256: 9c2762d9d0759a65cdb80106d547db83c6e9fdea66f1973c6e9014f867c6f28e + - sha256: 5f916cd97843de550467db32d2e10f218b904af5b21cfdfcc7c6425d7dfc3ec2 type: archive - url: https://github.com/frankosterfeld/qtkeychain/archive/v0.9.1.tar.gz + url: https://github.com/frankosterfeld/qtkeychain/archive/v0.10.0.tar.gz config-opts: - -DCMAKE_INSTALL_LIBDIR=/app/lib - -DLIB_INSTALL_DIR=/app/lib