diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b7f7ae54e227ca0b67e79d2c6fbc39c7998910e..787b143e525622cb1f5095ce7fa9f74ee86f0936 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -731,6 +731,7 @@ set(QML_SOURCES
resources/qml/components/MainWindowDialog.qml
resources/qml/components/NhekoTabButton.qml
resources/qml/components/NotificationBubble.qml
+ resources/qml/components/PowerlevelIndicator.qml
resources/qml/components/ReorderableListview.qml
resources/qml/components/SpaceMenuLevel.qml
resources/qml/components/TextButton.qml
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index af3a3371fe3a565575fa9053d14860d1b2296413..5768a7a69dd64c550c48462ca0ee6ec13f762000 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -100,6 +100,7 @@ Item {
required property string url
required property string userId
required property string userName
+ required property int userPowerlevel
ListView.delayRemove: true
anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
@@ -119,6 +120,7 @@ Item {
property date timestamp: wrapper.timestamp
property string userId: wrapper.userId
property string userName: wrapper.userName
+ property int userPowerlevel: wrapper.userPowerlevel
active: previousMessageUserId !== userId || previousMessageDay !== day || previousMessageIsStateEvent !== isStateEvent
//asynchronous: true
@@ -625,6 +627,13 @@ Item {
target: Presence
}
}
+
+ PowerlevelIndicator {
+ Layout.alignment: Qt.AlignVCenter
+ powerlevel: userPowerlevel
+ permissions: room ? room.permissions : null
+ visible: isAdmin || isModerator
+ }
}
}
}
diff --git a/resources/qml/components/PowerlevelIndicator.qml b/resources/qml/components/PowerlevelIndicator.qml
new file mode 100644
index 0000000000000000000000000000000000000000..4b82628491e5d816022d7e6f9bc14680c0afdd53
--- /dev/null
+++ b/resources/qml/components/PowerlevelIndicator.qml
@@ -0,0 +1,42 @@
+// SPDX-FileCopyrightText: Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import QtQuick
+import QtQuick.Controls
+import im.nheko
+
+Image {
+ required property int powerlevel
+ required property var permissions
+
+ readonly property bool isAdmin: permissions ? permissions.changeLevel(MtxEvent.PowerLevels) <= powerlevel : false
+ readonly property bool isModerator: permissions ? permissions.redactLevel() <= powerlevel : false
+ readonly property bool isDefault: permissions ? permissions.defaultLevel() <= powerlevel : false
+
+ readonly property string sourceUrl: {
+ if (isAdmin)
+ return "image://colorimage/:/icons/icons/ui/ribbon_star.svg?";
+ else if (isModerator)
+ return "image://colorimage/:/icons/icons/ui/ribbon.svg?";
+ else
+ return "image://colorimage/:/icons/icons/ui/person.svg?";
+ }
+
+ sourceSize.width: 16
+ sourceSize.height: 16
+ source: sourceUrl + (ma.hovered ? palette.highlight : palette.buttonText)
+ ToolTip.visible: ma.hovered
+ ToolTip.text: {
+ if (isAdmin)
+ return qsTr("Administrator: %1").arg(powerlevel);
+ else if (isModerator)
+ return qsTr("Moderator: %1").arg(powerlevel);
+ else
+ return qsTr("User: %1").arg(powerlevel);
+ }
+
+ HoverHandler {
+ id: ma
+ }
+}
diff --git a/resources/qml/dialogs/RoomMembers.qml b/resources/qml/dialogs/RoomMembers.qml
index bbf1605d2244f40ec87b9b5485974287bf2d8903..64f21381e488136bb2210eedd94c353891223d67 100644
--- a/resources/qml/dialogs/RoomMembers.qml
+++ b/resources/qml/dialogs/RoomMembers.qml
@@ -4,6 +4,7 @@
import ".."
import "../ui"
+import "../components"
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
@@ -159,39 +160,9 @@ ApplicationWindow {
}
- Image {
- property bool isAdmin: room.permissions.changeLevel(MtxEvent.PowerLevels) <= model.powerlevel
- property bool isModerator: room.permissions.redactLevel() <= model.powerlevel
- //property bool isDefault: room.permissions.defaultLevel() <= model.powerlevel
-
- property string sourceUrl: {
- if (isAdmin)
- return "image://colorimage/:/icons/icons/ui/ribbon_star.svg?";
- else if (isModerator)
- return "image://colorimage/:/icons/icons/ui/ribbon.svg?";
- else
- return "image://colorimage/:/icons/icons/ui/person.svg?";
- }
-
- Layout.preferredWidth: 16
- Layout.preferredHeight: 16
- sourceSize.width: width
- sourceSize.height: height
- source: sourceUrl + (ma.hovered ? palette.highlight : palette.buttonText)
- ToolTip.visible: ma.hovered
- ToolTip.text: {
- if (isAdmin)
- return qsTr("Administrator: %1").arg(model.powerlevel);
- else if (isModerator)
- return qsTr("Moderator: %1").arg(model.powerlevel);
- else
- return qsTr("User: %1").arg(model.powerlevel);
- }
-
- HoverHandler {
- id: ma
- }
-
+ PowerlevelIndicator {
+ powerlevel: model.powerlevel
+ permissions: room.permissions
}
EncryptionIndicator {
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index fddd570068234fa36ad42ec5be4cf831af1a1b09..b2a036c529341dda1c601db68c944c80ec2e539e 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -535,6 +535,7 @@ TimelineModel::roleNames() const
{IsSender, "isSender"},
{UserId, "userId"},
{UserName, "userName"},
+ {UserPowerlevel, "userPowerlevel"},
{Day, "day"},
{Timestamp, "timestamp"},
{Url, "url"},
@@ -597,6 +598,14 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
return QVariant(QString::fromStdString(acc::sender(event)));
case UserName:
return QVariant(displayName(QString::fromStdString(acc::sender(event))));
+ case UserPowerlevel: {
+ return static_cast<qlonglong>(mtx::events::state::PowerLevels{
+ cache::client()
+ ->getStateEvent<mtx::events::state::PowerLevels>(room_id_.toStdString())
+ .value_or(mtx::events::StateEvent<mtx::events::state::PowerLevels>{})
+ .content}
+ .user_level(acc::sender(event)));
+ }
case Day: {
QDateTime prevDate = origin_server_ts(event);
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index 6494192023fe26aa7f1c09e9741149cc4504205f..fccc99eb1e02ea1e4bedef20eddad1eb8e7454c9 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -241,6 +241,7 @@ public:
IsSender,
UserId,
UserName,
+ UserPowerlevel,
Day,
Timestamp,
Url,