ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ResolveResource

Browse Source 
Use ResolveResource rather than calling individual functions like visit user and room
This commit is contained in:
James Graham
2023-11-26 12:23:28 +00:00
parent bb8ffb02d1
commit 27c9c62564
21 changed files with 123 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qml/Bubble.qml
View File

@@ -149,7 +149,7 @@ QQC2.Control {
elide: Text.ElideRight
}
Accessible.name: contentItem.text
onClicked: RoomManager.visitUser(root.author.object, "mention")
onClicked: RoomManager.resolveResource(root.author.id, "mention")
}
QQC2.Label {
text: root.timeString

2
src/qml/DirectChatDrawerHeader.qml
View File

@@ -33,7 +33,7 @@ ColumnLayout {
Layout.alignment: Qt.AlignHCenter
onClicked: {
RoomManager.visitUser(root.room.getUser(root.room.directChatRemoteUser.id).object, "mention")
RoomManager.resolveResource(root.room.directChatRemoteUser.id, "mention")
}
contentItem: KirigamiComponents.Avatar {

2
src/qml/ExploreComponent.qml
View File

@@ -26,7 +26,7 @@ RowLayout {
if (isJoined) {
RoomManager.enterRoom(root.connection.room(roomId))
} else {
RoomManager.openResource(roomId.length > 0 ? roomId : alias, "join")
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, "join")
}
})
}

2
src/qml/ExploreComponentMobile.qml
View File

@@ -57,7 +57,7 @@ ColumnLayout {
if (isJoined) {
RoomManager.enterRoom(root.connection.room(roomId));
} else {
RoomManager.openResource(roomId.length > 0 ? roomId : alias, "join");
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, "join");
}
})
exploreTabBar.currentIndex = -1;

2
src/qml/GlobalMenu.qml
View File

@@ -66,7 +66,7 @@ Labs.MenuBar {
if (isJoined) {
RoomManager.enterRoom(root.connection.room(roomId))
} else {
RoomManager.openResource(roomId, "join")
RoomManager.resolveResource(roomId, "join")
}
})
}

2
src/qml/LinkPreviewDelegate.qml
View File

@@ -82,7 +82,7 @@ Loader {
}
</style>
<a href=\"" + root.linkPreviewer.url + "\">" + (maximizeButton.checked ? root.linkPreviewer.title : titleTextMetrics.elidedText).replace("&ndash;", "—") + "</a>"
onLinkActivated: RoomManager.openResource(link, "join")
onLinkActivated: RoomManager.resolveResource(link, "join")
TextMetrics {
id: titleTextMetrics

2
src/qml/MessageDelegate.qml
View File

@@ -355,7 +355,7 @@ TimelineDelegate {
source: root.author.avatarSource
color: root.author.color
onClicked: RoomManager.visitUser(root.author.object, "mention")
onClicked: RoomManager.resolveResource(root.author.id, "mention")
}
Bubble {
id: bubble

4
src/qml/MessageDelegateContextMenu.qml
View File

@@ -209,7 +209,7 @@ Loader {
model: WebShortcutModel {
id: webshortcutmodel
selectedText: root.selectedText.length > 0 ? root.selectedText : root.plainText
onOpenUrl: RoomManager.visitNonMatrix(url)
onOpenUrl: RoomManager.resolveResource(url)
}
delegate: QQC2.MenuItem {
text: model.display
@@ -315,7 +315,7 @@ Loader {
Layout.fillWidth: true
wrapMode: Text.WordWrap
onLinkActivated: RoomManager.openResource(link, "join");
onLinkActivated: RoomManager.resolveResource(link, "join");
}
}
}

2
src/qml/NotificationsView.qml
View File

@@ -43,7 +43,7 @@ Kirigami.ScrollablePage {
delegate: QQC2.ItemDelegate {
width: parent?.width ?? 0
onClicked: RoomManager.visitRoom(model.room, model.eventId)
onClicked: RoomManager.resolveResource(model.uri)
contentItem: RowLayout {
spacing: Kirigami.Units.largeSpacing

2
src/qml/RichLabel.qml
View File

@@ -112,7 +112,7 @@ a{
onLinkActivated: link => {
spoilerRevealed = true
RoomManager.openResource(link, "join")
RoomManager.resolveResource(link, "join")
}
onHoveredLinkChanged: if (hoveredLink.length > 0 && hoveredLink !== "1") {
applicationWindow().hoverLinkIndicator.text = hoveredLink;

2
src/qml/RoomInformation.qml
View File

@@ -206,7 +206,7 @@ QQC2.ScrollView {
onClicked: {
userDelegate.highlighted = true;
RoomManager.visitUser(room.getUser(userDelegate.userId).object, "mention")
RoomManager.resolveResource(userDelegate.userId, "mention")
}
contentItem: RowLayout {

2
src/qml/RoomListPage.qml
View File

@@ -191,7 +191,7 @@ Kirigami.Page {
if (isJoined) {
RoomManager.enterRoom(root.connection.room(roomId))
} else {
RoomManager.openResource(roomId, "join")
RoomManager.resolveResource(roomId, "join")
}
})
}

2
src/qml/SpaceHierarchyDelegate.qml
View File

@@ -149,7 +149,7 @@ Item {
if (root.isJoined) {
root.enterRoom()
} else {
RoomManager.openResource(root.roomId, "join")
RoomManager.resolveResource(root.roomId, "join")
}
}
}

4
src/qml/StateComponent.qml
View File

@@ -62,7 +62,7 @@ RowLayout {
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: RoomManager.openResource("https://matrix.to/#/" + root.author.id)
onClicked: RoomManager.resolveResource("https://matrix.to/#/" + root.author.id)
}
}
@@ -73,6 +73,6 @@ RowLayout {
text: `<style>a {text-decoration: none;}</style><a href="https://matrix.to/#/${root.author.id}" style="color: ${root.author.color}">${root.authorDisplayName}</a> ${root.text}`
wrapMode: Text.WordWrap
textFormat: Text.RichText
onLinkActivated: link => RoomManager.openResource(link)
onLinkActivated: link => RoomManager.resolveResource(link)
}
}

2
src/qml/StateDelegate.qml
View File

@@ -156,7 +156,7 @@ TimelineDelegate {
elide: Qt.ElideRight
textFormat: Text.RichText
wrapMode: Text.WordWrap
onLinkActivated: RoomManager.openResource(link)
onLinkActivated: RoomManager.resolveResource(link)
}
Item {
Layout.fillWidth: true