From 1fdecdcc213fe91711649243a315ebd11809f0f9 Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Fri, 13 Aug 2021 20:05:26 -0400 Subject: Get direct chat jdenticons to line up --- src/timeline/TimelineModel.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/timeline/TimelineModel.h') diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 417fbb7f..8c34fc1d 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -176,6 +176,8 @@ class TimelineModel : public QAbstractListModel Q_PROPERTY(bool isEncrypted READ isEncrypted NOTIFY encryptionChanged) Q_PROPERTY(bool isSpace READ isSpace CONSTANT) Q_PROPERTY(int trustlevel READ trustlevel NOTIFY trustlevelChanged) + Q_PROPERTY( + QString directChatAvatarMxid READ directChatAvatarMxid NOTIFY directChatAvatarMxidChanged) Q_PROPERTY(InputBar *input READ input CONSTANT) Q_PROPERTY(Permissions *permissions READ permissions NOTIFY permissionsChanged) @@ -292,6 +294,7 @@ public: bool isEncrypted() const { return isEncrypted_; } crypto::Trust trustlevel() const; int roomMemberCount() const; + QString directChatAvatarMxid() const; std::optional eventById(const QString &id) { @@ -391,6 +394,7 @@ signals: void roomTopicChanged(); void roomAvatarUrlChanged(); void roomMemberCountChanged(); + void directChatAvatarMxidChanged(); void permissionsChanged(); void forwardToRoom(mtx::events::collections::TimelineEvents *e, QString roomId); -- cgit 1.5.1 From 350fc593ed0a6b36f63a2fabc3918d346597c7c5 Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Mon, 30 Aug 2021 20:08:47 -0400 Subject: Use better id loading methodology --- resources/qml/Avatar.qml | 3 ++- resources/qml/RoomList.qml | 5 +++-- resources/qml/TopBar.qml | 3 ++- src/timeline/RoomlistModel.cpp | 6 +++--- src/timeline/RoomlistModel.h | 2 +- src/timeline/TimelineModel.cpp | 6 ++++++ src/timeline/TimelineModel.h | 3 +++ 7 files changed, 20 insertions(+), 8 deletions(-) (limited to 'src/timeline/TimelineModel.h') diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml index 1b7497c1..bf936bff 100644 --- a/resources/qml/Avatar.qml +++ b/resources/qml/Avatar.qml @@ -12,6 +12,7 @@ Rectangle { property string url property string userid + property string roomid property string displayName property alias textColor: label.color property bool crop: true @@ -43,7 +44,7 @@ Rectangle { id: identicon anchors.fill: parent visible: img.status != Image.Ready && Settings.useIdenticon - source: Settings.useIdenticon ? "image://jdenticon/" + userid + "?radius=" + radius : "" + source: Settings.useIdenticon ? ("image://jdenticon/" + (userid !== "" ? userid : roomid) + "?radius=" + (Settings.avatarCircles ? 100 : 25) + ((avatar.crop) ? "" : "&scale")) : "" layer.enabled: true MouseArea { diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml index fcb2644e..3b7fa84e 100644 --- a/resources/qml/RoomList.qml +++ b/resources/qml/RoomList.qml @@ -143,7 +143,7 @@ Page { required property int notificationCount required property bool hasLoudNotification required property bool hasUnreadMessages - required property int roomMemberCount + required property bool isDirect required property string directChatAvatarMxid color: background @@ -239,7 +239,8 @@ Page { width: avatarSize url: avatarUrl.replace("mxc://", "image://MxcImage/") displayName: roomName - userid: roomMemberCount < 3 ? directChatAvatarMxid : roomId + userid: isDirect ? directChatAvatarMxid : undefined + roomid: roomId Rectangle { id: collapsedNotificationBubble diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml index 0b50f7c6..78f81b7f 100644 --- a/resources/qml/TopBar.qml +++ b/resources/qml/TopBar.qml @@ -65,7 +65,8 @@ Rectangle { width: Nheko.avatarSize height: Nheko.avatarSize url: avatarUrl.replace("mxc://", "image://MxcImage/") - userid: room.roomMemberCount < 3 ? room.directChatAvatarMxid : room.roomId + roomid: room.roomId + userid: room.isDirect ? room.directChatAvatarMxid : undefined displayName: roomName onClicked: { if (room) diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp index 88411236..d12fb426 100644 --- a/src/timeline/RoomlistModel.cpp +++ b/src/timeline/RoomlistModel.cpp @@ -76,7 +76,7 @@ RoomlistModel::roleNames() const {IsSpace, "isSpace"}, {Tags, "tags"}, {ParentSpaces, "parentSpaces"}, - {RoomMemberCount, "roomMemberCount"}, + {IsDirect, "isDirect"}, {DirectChatAvatarMxid, "directChatAvatarMxid"}, }; } @@ -131,8 +131,8 @@ RoomlistModel::data(const QModelIndex &index, int role) const list.push_back(QString::fromStdString(t)); return list; } - case Roles::RoomMemberCount: - return room->roomMemberCount(); + case Roles::IsDirect: + return room->isDirect(); case Roles::DirectChatAvatarMxid: return room->directChatAvatarMxid(); default: diff --git a/src/timeline/RoomlistModel.h b/src/timeline/RoomlistModel.h index aca74ea1..57669087 100644 --- a/src/timeline/RoomlistModel.h +++ b/src/timeline/RoomlistModel.h @@ -65,7 +65,7 @@ public: IsPreviewFetched, Tags, ParentSpaces, - RoomMemberCount, + IsDirect, DirectChatAvatarMxid, }; diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 4daf44f3..0e1e8f5d 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -817,6 +817,12 @@ TimelineModel::syncState(const mtx::responses::State &s) emit roomAvatarUrlChanged(); emit roomNameChanged(); emit roomMemberCountChanged(); + + if (roomMemberCount() <= 2) + { + emit isDirectChanged(); + emit directChatAvatarMxidChanged(); + } } else if (std::holds_alternative>(e)) { this->isEncrypted_ = cache::isRoomEncrypted(room_id_.toStdString()); emit encryptionChanged(); diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 8c34fc1d..03e33066 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -176,6 +176,7 @@ class TimelineModel : public QAbstractListModel Q_PROPERTY(bool isEncrypted READ isEncrypted NOTIFY encryptionChanged) Q_PROPERTY(bool isSpace READ isSpace CONSTANT) Q_PROPERTY(int trustlevel READ trustlevel NOTIFY trustlevelChanged) + Q_PROPERTY(bool isDirect READ isDirect NOTIFY isDirectChanged) Q_PROPERTY( QString directChatAvatarMxid READ directChatAvatarMxid NOTIFY directChatAvatarMxidChanged) Q_PROPERTY(InputBar *input READ input CONSTANT) @@ -294,6 +295,7 @@ public: bool isEncrypted() const { return isEncrypted_; } crypto::Trust trustlevel() const; int roomMemberCount() const; + bool isDirect() const { return roomMemberCount() <= 2; } // TODO: handle invites QString directChatAvatarMxid() const; std::optional eventById(const QString &id) @@ -394,6 +396,7 @@ signals: void roomTopicChanged(); void roomAvatarUrlChanged(); void roomMemberCountChanged(); + void isDirectChanged(); void directChatAvatarMxidChanged(); void permissionsChanged(); void forwardToRoom(mtx::events::collections::TimelineEvents *e, QString roomId); -- cgit 1.5.1 From 356723fe0644f6e05f934262ea80dca2d33330c3 Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Sat, 4 Sep 2021 20:53:33 -0400 Subject: Use more descriptive property name --- resources/qml/RoomList.qml | 4 ++-- resources/qml/TopBar.qml | 2 +- src/timeline/RoomlistModel.cpp | 6 +++--- src/timeline/RoomlistModel.h | 2 +- src/timeline/TimelineModel.cpp | 4 ++-- src/timeline/TimelineModel.h | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/timeline/TimelineModel.h') diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml index 3b7fa84e..addbf571 100644 --- a/resources/qml/RoomList.qml +++ b/resources/qml/RoomList.qml @@ -144,7 +144,7 @@ Page { required property bool hasLoudNotification required property bool hasUnreadMessages required property bool isDirect - required property string directChatAvatarMxid + required property string directChatOtherUserId color: background height: avatarSize + 2 * Nheko.paddingMedium @@ -239,7 +239,7 @@ Page { width: avatarSize url: avatarUrl.replace("mxc://", "image://MxcImage/") displayName: roomName - userid: isDirect ? directChatAvatarMxid : undefined + userid: isDirect ? directChatOtherUserId : "" roomid: roomId Rectangle { diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml index 78f81b7f..a8a53a24 100644 --- a/resources/qml/TopBar.qml +++ b/resources/qml/TopBar.qml @@ -66,7 +66,7 @@ Rectangle { height: Nheko.avatarSize url: avatarUrl.replace("mxc://", "image://MxcImage/") roomid: room.roomId - userid: room.isDirect ? room.directChatAvatarMxid : undefined + userid: room.isDirect ? room.directChatOtherUserId : "" displayName: roomName onClicked: { if (room) diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp index d12fb426..094b0df6 100644 --- a/src/timeline/RoomlistModel.cpp +++ b/src/timeline/RoomlistModel.cpp @@ -77,7 +77,7 @@ RoomlistModel::roleNames() const {Tags, "tags"}, {ParentSpaces, "parentSpaces"}, {IsDirect, "isDirect"}, - {DirectChatAvatarMxid, "directChatAvatarMxid"}, + {DirectChatOtherUserId, "directChatOtherUserId"}, }; } @@ -133,8 +133,8 @@ RoomlistModel::data(const QModelIndex &index, int role) const } case Roles::IsDirect: return room->isDirect(); - case Roles::DirectChatAvatarMxid: - return room->directChatAvatarMxid(); + case Roles::DirectChatOtherUserId: + return room->directChatOtherUserId(); default: return {}; } diff --git a/src/timeline/RoomlistModel.h b/src/timeline/RoomlistModel.h index 57669087..c0a87aee 100644 --- a/src/timeline/RoomlistModel.h +++ b/src/timeline/RoomlistModel.h @@ -66,7 +66,7 @@ public: Tags, ParentSpaces, IsDirect, - DirectChatAvatarMxid, + DirectChatOtherUserId, }; RoomlistModel(TimelineViewManager *parent = nullptr); diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index d5c39bbe..ca303040 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -820,7 +820,7 @@ TimelineModel::syncState(const mtx::responses::State &s) if (roomMemberCount() <= 2) { emit isDirectChanged(); - emit directChatAvatarMxidChanged(); + emit directChatOtherUserIdChanged(); } } else if (std::holds_alternative>(e)) { this->isEncrypted_ = cache::isRoomEncrypted(room_id_.toStdString()); @@ -2080,7 +2080,7 @@ TimelineModel::roomMemberCount() const } QString -TimelineModel::directChatAvatarMxid() const +TimelineModel::directChatOtherUserId() const { if (roomMemberCount() < 3) { QString id; diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 03e33066..582c6b28 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -178,7 +178,7 @@ class TimelineModel : public QAbstractListModel Q_PROPERTY(int trustlevel READ trustlevel NOTIFY trustlevelChanged) Q_PROPERTY(bool isDirect READ isDirect NOTIFY isDirectChanged) Q_PROPERTY( - QString directChatAvatarMxid READ directChatAvatarMxid NOTIFY directChatAvatarMxidChanged) + QString directChatOtherUserId READ directChatOtherUserId NOTIFY directChatOtherUserIdChanged) Q_PROPERTY(InputBar *input READ input CONSTANT) Q_PROPERTY(Permissions *permissions READ permissions NOTIFY permissionsChanged) @@ -296,7 +296,7 @@ public: crypto::Trust trustlevel() const; int roomMemberCount() const; bool isDirect() const { return roomMemberCount() <= 2; } // TODO: handle invites - QString directChatAvatarMxid() const; + QString directChatOtherUserId() const; std::optional eventById(const QString &id) { @@ -397,7 +397,7 @@ signals: void roomAvatarUrlChanged(); void roomMemberCountChanged(); void isDirectChanged(); - void directChatAvatarMxidChanged(); + void directChatOtherUserIdChanged(); void permissionsChanged(); void forwardToRoom(mtx::events::collections::TimelineEvents *e, QString roomId); -- cgit 1.5.1 From 0e3f3f2b2014aa47a1075aac8075290ee5ed7ec5 Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Sat, 4 Sep 2021 21:51:06 -0400 Subject: make lint --- src/timeline/TimelineModel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/timeline/TimelineModel.h') diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 582c6b28..46e146b3 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -177,8 +177,8 @@ class TimelineModel : public QAbstractListModel Q_PROPERTY(bool isSpace READ isSpace CONSTANT) Q_PROPERTY(int trustlevel READ trustlevel NOTIFY trustlevelChanged) Q_PROPERTY(bool isDirect READ isDirect NOTIFY isDirectChanged) - Q_PROPERTY( - QString directChatOtherUserId READ directChatOtherUserId NOTIFY directChatOtherUserIdChanged) + Q_PROPERTY(QString directChatOtherUserId READ directChatOtherUserId NOTIFY + directChatOtherUserIdChanged) Q_PROPERTY(InputBar *input READ input CONSTANT) Q_PROPERTY(Permissions *permissions READ permissions NOTIFY permissionsChanged) -- cgit 1.5.1 From 87bff3493d9c884eff09d5653e5df29b3489616d Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Mon, 6 Sep 2021 21:45:55 -0400 Subject: Add direct chat handling for previews and invites --- src/timeline/RoomlistModel.cpp | 12 ++++++++++++ src/timeline/TimelineModel.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src/timeline/TimelineModel.h') diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp index 094b0df6..a423090c 100644 --- a/src/timeline/RoomlistModel.cpp +++ b/src/timeline/RoomlistModel.cpp @@ -164,6 +164,13 @@ RoomlistModel::data(const QModelIndex &index, int role) const return false; case Roles::Tags: return QStringList(); + case Roles::IsDirect: + return room.member_count == 1; + case Roles::DirectChatOtherUserId: + // if this is a direct chat, the front member is correct; otherwise, + // it won't be used anyway + return QString::fromStdString( + cache::roomMembers(roomid.toStdString()).front()); default: return {}; } @@ -196,6 +203,11 @@ RoomlistModel::data(const QModelIndex &index, int role) const return true; case Roles::Tags: return QStringList(); + case Roles::IsDirect: + return room.member_count == 1; + case Roles::DirectChatOtherUserId: + return QString::fromStdString( + cache::roomMembers(roomid.toStdString()).front()); default: return {}; } diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 46e146b3..66e0622e 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -295,7 +295,7 @@ public: bool isEncrypted() const { return isEncrypted_; } crypto::Trust trustlevel() const; int roomMemberCount() const; - bool isDirect() const { return roomMemberCount() <= 2; } // TODO: handle invites + bool isDirect() const { return roomMemberCount() <= 2; } QString directChatOtherUserId() const; std::optional eventById(const QString &id) -- cgit 1.5.1