Skip to content
Snippets Groups Projects
Commit 96edc0bb authored by Loren Burkholder's avatar Loren Burkholder
Browse files

Use correct form of roomId

parent 87bff349
No related branches found
No related tags found
No related merge requests found
......@@ -130,7 +130,7 @@ Page {
else
return "image://colorimage/" + model.avatarUrl + "?" + communityItem.unimportantText;
}
roomid: model.roomid
roomid: model.id
displayName: model.displayName
color: communityItem.background
}
......
......@@ -137,7 +137,7 @@ Item {
ColumnLayout {
id: preview
property string roomid: room ? room.roomid : (roomPreview ? roomPreview.roomid : "")
property string roomId: room ? room.roomId : (roomPreview ? roomPreview.roomId : "")
property string roomName: room ? room.roomName : (roomPreview ? roomPreview.roomName : "")
property string roomTopic: room ? room.roomTopic : (roomPreview ? roomPreview.roomTopic : "")
property string avatarUrl: room ? room.roomAvatarUrl : (roomPreview ? roomPreview.roomAvatarUrl : "")
......@@ -154,7 +154,7 @@ Item {
Avatar {
url: parent.avatarUrl.replace("mxc://", "image://MxcImage/")
roomid: parent.roomid
roomid: parent.roomId
displayName: parent.roomName
height: 130
width: 130
......
......@@ -13,10 +13,13 @@ Rectangle {
property bool showBackButton: false
property string roomName: room ? room.roomName : qsTr("No room selected")
property string roomId: room ? room.roomId : ""
property string avatarUrl: room ? room.roomAvatarUrl : ""
property string roomTopic: room ? room.roomTopic : ""
property bool isEncrypted: room ? room.isEncrypted : false
property int trustlevel: room ? room.trustlevel : Crypto.Unverified
property bool isDirect: room ? room.isDirect : false
property string directChatOtherUserId: room ? room.directChatOtherUserId : ""
Layout.fillWidth: true
implicitHeight: topLayout.height + Nheko.paddingMedium * 2
......@@ -65,12 +68,12 @@ Rectangle {
width: Nheko.avatarSize
height: Nheko.avatarSize
url: avatarUrl.replace("mxc://", "image://MxcImage/")
roomid: room.roomId
userid: room.isDirect ? room.directChatOtherUserId : ""
roomid: roomId
userid: isDirect ? directChatOtherUserId : ""
displayName: roomName
onClicked: {
if (room)
TimelineManager.openRoomSettings(room.roomId);
TimelineManager.openRoomSettings(roomId);
}
}
......@@ -137,7 +140,7 @@ Rectangle {
Platform.MenuItem {
visible: room ? room.permissions.canInvite() : false
text: qsTr("Invite users")
onTriggered: TimelineManager.openInviteUsers(room.roomId)
onTriggered: TimelineManager.openInviteUsers(roomId)
}
Platform.MenuItem {
......@@ -147,12 +150,12 @@ Rectangle {
Platform.MenuItem {
text: qsTr("Leave room")
onTriggered: TimelineManager.openLeaveRoomDialog(room.roomId)
onTriggered: TimelineManager.openLeaveRoomDialog(roomId)
}
Platform.MenuItem {
text: qsTr("Settings")
onTriggered: TimelineManager.openRoomSettings(room.roomId)
onTriggered: TimelineManager.openRoomSettings(roomId)
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment