Merge branch 'master' into kirigami2

.appveyor.yml

@@ -1,10 +1,10 @@
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 environment:
   DEPLOY_DIR: Spectral-%APPVEYOR_BUILD_VERSION%
   matrix:
-  - QTDIR: C:\Qt\5.12\msvc2017_64
+  - QTDIR: C:\Qt\5.15\msvc2019_64
-    VCVARS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
+    VCVARS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
     PLATFORM:
 
 init:

.gitlab-ci.yml

@@ -19,7 +19,7 @@ build-appimage:
     - sudo cmake --build build --target install
     - cd ..
     - git clone https://github.com/commonmark/cmark.git && cd cmark
-    - git checkout tags/0.29.0
+    - git reset --hard tags/0.29.0
     - cmake . -Bbuild -LA -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install -DCMARK_SHARED=ON -DCMARK_STATIC=ON -DCMARK_TESTS=OFF
     - cmake --build build --target install --parallel $(nproc)
     - cd ..

imports/Spectral/Component/AutoTextField.qml

@@ -26,7 +26,7 @@ TextField {
             states: [
                 State {
                     name: "shown"
-                    when: textField.text.length !== 0 || textField.activeFocus
+                    when: textField.text.length != 0 || textField.activeFocus
                     PropertyChanges { target: floatingPlaceholder; scale: 0.8 }
                     PropertyChanges { target: floatingPlaceholder; anchors.topMargin: -floatingPlaceholder.height * 0.4 }
                 }

imports/Spectral/Component/Timeline/AudioDelegate.qml

@@ -96,7 +96,7 @@ RowLayout {
                 }
 
                 Label {
-                    readonly property int duration: content.info.duration || audio.duration || 0
+                    readonly property int duration: content.info.duration ?? audio.duration ?? 0
 
                     Layout.fillWidth: true
 
@@ -193,14 +193,12 @@ RowLayout {
         }
     }
 
-    function openSavedFile()
+    function openSavedFile() {
-    {
         if (Qt.openUrlExternally(progressInfo.localPath)) return;
         if (Qt.openUrlExternally(progressInfo.localDir)) return;
     }
 
-    function humanSize(duration)
+    function humanSize(duration) {
-    {
         if (!duration)
             return qsTr("Unknown", "Unknown duration")
         if (duration < 1000)

imports/Spectral/Component/Timeline/MessageDelegate.qml

@@ -12,8 +12,14 @@ RowLayout {
     default property alias innerObject : column.children
 
     readonly property bool sentByMe: author.isLocalUser
-    readonly property bool replyVisible: reply || false
+    readonly property bool darkBackground: !sentByMe
-    readonly property bool failed: marks === EventStatus.SendingFailed
+    readonly property bool replyVisible: reply ?? false
+    readonly property bool failed: marks == EventStatus.SendingFailed
+    readonly property color authorColor: eventType == "notice" ? MPalette.primary : author.color
+    readonly property color replyAuthorColor: replyVisible ? reply.author.color : MPalette.accent
+
+    signal saveFileAs()
+    signal openExternally()
 
     id: root
 

imports/Spectral/Component/Timeline/ReactionDelegate.qml

@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.12
 import Spectral.Setting 0.1
 
 Flow {
-    visible: (reaction && reaction.length > 0) || false
+    visible: (reaction && reaction.length > 0) ?? false
 
     spacing: 8
 

imports/Spectral/Component/Timeline/VideoDelegate.qml

@@ -120,7 +120,7 @@ RowLayout {
         }
 
         Image {
-            readonly property bool isThumbnail: !(content.info.thumbnail_info == null || content.thumbnailMediaId == null)
+            readonly property bool isThumbnail: content.info.thumbnail_info && content.thumbnailMediaId
             readonly property var info: isThumbnail ? content.info.thumbnail_info : content.info
 
             anchors.fill: parent

imports/Spectral/Dialog/AccountDetailDialog.qml

@@ -39,7 +39,7 @@ Dialog {
                 height: 48
 
                 source: user.avatarMediaId
-                hint: user.displayName || "No Name"
+                hint: user.displayName ?? ""
 
                 Menu {
                     id: contextMenu

imports/Spectral/Dialog/RoomSettingsDialog.qml

@@ -232,7 +232,7 @@ Dialog {
                         Layout.preferredWidth: 100
 
                         wrapMode: Label.Wrap
-                        text: "Main Alias"
+                        text: "Canonical Alias"
                         color: MPalette.lighter
                     }
 
@@ -243,12 +243,12 @@ Dialog {
 
                         enabled: canChangeCanonicalAlias
 
-                        model: room.remoteAliases
+                        model: room.aliases
 
-                        currentIndex: room.remoteAliases.indexOf(room.canonicalAlias)
+                        currentIndex: room.aliases.indexOf(room.canonicalAlias)
                         onCurrentIndexChanged: {
-                            if (room.canonicalAlias != room.remoteAliases[currentIndex]) {
+                            if (room.canonicalAlias != room.aliases[currentIndex]) {
-                                room.setCanonicalAlias(room.remoteAliases[currentIndex])
+                                room.setCanonicalAlias(room.aliases[currentIndex])
                             }
                         }
                     }
@@ -257,12 +257,14 @@ Dialog {
                 RowLayout {
                     Layout.fillWidth: true
 
+                    visible: room.altAliases && room.altAliases.length
+
                     Label {
                         Layout.preferredWidth: 100
                         Layout.alignment: Qt.AlignTop
 
                         wrapMode: Label.Wrap
-                        text: "Local Aliases"
+                        text: "Alt Aliases"
                         color: MPalette.lighter
                     }
 
@@ -272,7 +274,7 @@ Dialog {
                         spacing: 0
 
                         Repeater {
-                            model: room.localAliases
+                            model: room.altAliases
 
                             delegate: RowLayout {
                                 Layout.maximumWidth: parent.width
@@ -302,42 +304,6 @@ Dialog {
                         }
                     }
                 }
-
-                RowLayout {
-                    Layout.fillWidth: true
-
-                    Label {
-                        Layout.preferredWidth: 100
-                        Layout.alignment: Qt.AlignTop
-
-                        wrapMode: Label.Wrap
-                        text: "Remote Aliases"
-                        color: MPalette.lighter
-                    }
-
-                    ColumnLayout {
-                        Layout.fillWidth: true
-
-                        spacing: 0
-
-                        Repeater {
-                            model: {
-                                var localAliases = room.localAliases
-                                var remoteAliases = room.remoteAliases
-                                return remoteAliases.filter(n => !localAliases.includes(n))
-                            }
-
-                            delegate: Label {
-                                width: parent.width
-
-                                text: modelData
-
-                                font.pixelSize: 12
-                                color: MPalette.lighter
-                            }
-                        }
-                    }
-                }
             }
         }
     }

imports/Spectral/Effect/ElevationEffect.qml

@@ -135,7 +135,7 @@ Item {
             glowRadius: modelData.blur/2
             spread: 0.05
             color: _shadowColors[index]
-            cornerRadius: modelData.blur + (effect.sourceItem.radius || 0)
+            cornerRadius: modelData.blur + (effect.sourceItem.radius ?? 0)
         }
     }
 

imports/Spectral/Panel/RoomListPanel.qml

@@ -108,11 +108,6 @@ Kirigami.ScrollablePage {
                         Layout.fillWidth: true
                         Layout.fillHeight: true
 
-                        text: name || "No Name"
-                        font.pixelSize: 16
-                        font.bold: unreadCount >= 0
-                        elide: Text.ElideRight
-                        wrapMode: Text.NoWrap
                     }
 
                     Controls.Label {

imports/Spectral/Panel/RoomPanelInput.qml

@@ -130,9 +130,9 @@ Control {
             keyNavigationWraps: true
 
             delegate: Control {
-                property string autoCompleteText: modelData.displayName || modelData.unicode
+                property string autoCompleteText: modelData.displayName ?? modelData.unicode
                 property bool isEmoji: modelData.unicode != null
-                readonly property bool highlighted: autoCompleteListView.currentIndex === index
+                readonly property bool highlighted: autoCompleteListView.currentIndex == index
 
                 height: 36
                 padding: 6
@@ -140,7 +140,7 @@ Control {
                 background: Rectangle {
                     visible: !isEmoji
                     color: highlighted ? border.color : "transparent"
-                    border.color: isEmoji ? Material.accent : modelData.color
+                    border.color: isEmoji ? MPalette.accent : modelData.color
                     border.width: 2
                     radius: height / 2
                 }
@@ -164,7 +164,7 @@ Control {
                         Layout.preferredHeight: 24
 
                         visible: !isEmoji
-                        source: modelData.avatarMediaId || null
+                        source: modelData.avatarMediaId ?? null
                         color: modelData.color ? Qt.darker(modelData.color, 1.1) : MPalette.accent
                     }
 

src/matriximageprovider.h

@@ -56,7 +56,7 @@ class MatrixImageProvider : public QObject, public QQuickAsyncImageProvider {
 
   Quotient::Connection* connection() { return m_connection; }
   void setConnection(Quotient::Connection* connection) {
-    m_connection.store(connection);
+    m_connection.storeRelaxed(connection);
     emit connectionChanged();
   }
 

src/messageeventmodel.cpp

@@ -203,13 +203,13 @@ int MessageEventModel::refreshEventRoles(const QString& id,
 }
 
 inline bool hasValidTimestamp(const Quotient::TimelineItem& ti) {
-  return ti->timestamp().isValid();
+  return ti->originTimestamp().isValid();
 }
 
 QDateTime MessageEventModel::makeMessageTimestamp(
     const Quotient::Room::rev_iter_t& baseIt) const {
   const auto& timeline = m_currentRoom->messageEvents();
-  auto ts = baseIt->event()->timestamp();
+  auto ts = baseIt->event()->originTimestamp();
   if (ts.isValid())
     return ts;
 
@@ -218,10 +218,10 @@ QDateTime MessageEventModel::makeMessageTimestamp(
   using Quotient::TimelineItem;
   auto rit = std::find_if(baseIt, timeline.rend(), hasValidTimestamp);
   if (rit != timeline.rend())
-    return {rit->event()->timestamp().date(), {0, 0}, Qt::LocalTime};
+    return {rit->event()->originTimestamp().date(), {0, 0}, Qt::LocalTime};
   auto it = std::find_if(baseIt.base(), timeline.end(), hasValidTimestamp);
   if (it != timeline.end())
-    return {it->event()->timestamp().date(), {0, 0}, Qt::LocalTime};
+    return {it->event()->originTimestamp().date(), {0, 0}, Qt::LocalTime};
 
   // What kind of room is that?..
   qCritical() << "No valid timestamps in the room timeline!";
@@ -238,7 +238,8 @@ QString MessageEventModel::renderDate(QDateTime timestamp) const {
     return tr("The day before yesterday");
   if (date > QDate::currentDate().addDays(-7))
     return date.toString("dddd");
-  return date.toString(Qt::DefaultLocaleShortDate);
+
+  return QLocale::system().toString(date, QLocale::ShortFormat);
 }
 
 void MessageEventModel::refreshLastUserEvents(int baseTimelineRow) {

src/notifications/manager.h

@@ -6,7 +6,7 @@
 #include <QString>
 #include <QUrl>
 
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
 #include <QtDBus/QDBusArgument>
 #include <QtDBus/QDBusInterface>
 #endif
@@ -25,8 +25,9 @@ class NotificationsManager : public QObject {
   void notificationClicked(const QString roomId, const QString eventId);
 
  private:
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
   QDBusInterface dbus;
+  bool serverSupportsHtml = false;
   uint showNotification(const QString summary,
                         const QString text,
                         const QImage image);
@@ -49,7 +50,7 @@ class NotificationsManager : public QObject {
                         const QImage& icon);
 };
 
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
 QDBusArgument& operator<<(QDBusArgument& arg, const QImage& image);
 const QDBusArgument& operator>>(const QDBusArgument& arg, QImage&);
 #endif

src/notifications/managerlinux.cpp

@@ -5,6 +5,7 @@
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusMessage>
 #include <QtDBus/QDBusMetaType>
+#include <QtDBus/QDBusReply>
 
 NotificationsManager::NotificationsManager(QObject *parent)
     : QObject(parent),
@@ -13,6 +14,15 @@ NotificationsManager::NotificationsManager(QObject *parent)
            this) {
   qDBusRegisterMetaType<QImage>();
 
+  const QDBusReply<QStringList> capabilitiesReply = dbus.call("GetCapabilities");
+
+  if (capabilitiesReply.isValid()) {
+      const QStringList capabilities = capabilitiesReply.value();
+      serverSupportsHtml = capabilities.contains("body-markup");
+  } else {
+      qWarning() << "Could not get notification server capabilities" << capabilitiesReply.error();
+  }
+
   QDBusConnection::sessionBus().connect(
       "org.freedesktop.Notifications", "/org/freedesktop/Notifications",
       "org.freedesktop.Notifications", "ActionInvoked", this,
@@ -54,14 +64,17 @@ uint NotificationsManager::showNotification(const QString summary,
     croppedImage = image;
   }
 
+  const QString body = serverSupportsHtml ? text.toHtmlEscaped() : text;
+
   QVariantMap hints;
   hints["image-data"] = croppedImage;
+  hints["desktop-entry"] = "org.eu.encom.spectral";
   QList<QVariant> argumentList;
   argumentList << "Spectral";                           // app_name
   argumentList << uint(0);                              // replace_id
   argumentList << "";                                   // app_icon
   argumentList << summary;                              // summary
-  argumentList << text;                                 // body
+  argumentList << body;                                 // body
   argumentList << (QStringList("default") << "reply");  // actions
   argumentList << hints;                                // hints
   argumentList << int(-1);                              // timeout in ms

src/publicroomlistmodel.cpp

@@ -110,15 +110,14 @@ void PublicRoomListModel::next(int count) {
     attempted = true;
 
     if (job->status() == BaseJob::Success) {
-      auto resp = job->data();
+      nextBatch = job->nextBatch();
-      nextBatch = resp.nextBatch;
 
       this->beginInsertRows({}, rooms.count(),
-                            rooms.count() + resp.chunk.count() - 1);
+                            rooms.count() + job->chunk().count() - 1);
-      rooms.append(resp.chunk);
+      rooms.append(job->chunk());
       this->endInsertRows();
 
-      if (resp.nextBatch.isEmpty()) {
+      if (job->nextBatch().isEmpty()) {
         emit hasMoreChanged();
       }
     }

src/spectralroom.cpp

@@ -167,7 +167,7 @@ void SpectralRoom::countChanged() {
 QDateTime SpectralRoom::lastActiveTime() const {
   if (timelineSize() == 0)
     return QDateTime();
-  return messageEvents().rbegin()->get()->timestamp();
+  return messageEvents().rbegin()->get()->originTimestamp();
 }
 
 int SpectralRoom::savedTopVisibleIndex() const {
@@ -397,30 +397,30 @@ void SpectralRoom::changeAvatar(QUrl localFile) {
   const auto job = connection()->uploadFile(localFile.toLocalFile());
   if (isJobRunning(job)) {
     connect(job, &BaseJob::success, this, [this, job] {
-      connection()->callApi<SetRoomStateJob>(
+      connection()->callApi<SetRoomStateWithKeyJob>(
-          id(), "m.room.avatar", QJsonObject{{"url", job->contentUri()}});
+          id(), "m.room.avatar", localUser()->id(), QJsonObject{{"url", job->contentUri()}});
     });
   }
 }
 
 void SpectralRoom::addLocalAlias(const QString& alias) {
-  auto aliases = localAliases();
+  auto a = aliases();
-  if (aliases.contains(alias))
+  if (a.contains(alias))
     return;
 
-  aliases += alias;
+  a += alias;
 
-  setLocalAliases(aliases);
+  setLocalAliases(a);
 }
 
 void SpectralRoom::removeLocalAlias(const QString& alias) {
-  auto aliases = localAliases();
+  auto a = aliases();
-  if (!aliases.contains(alias))
+  if (!a.contains(alias))
     return;
 
-  aliases.removeAll(alias);
+  a.removeAll(alias);
 
-  setLocalAliases(aliases);
+  setLocalAliases(a);
 }
 
 QString SpectralRoom::markdownToHTML(const QString& markdown) {