Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove all Backend "get_any_client"-using methods

Browse Source 
thumbnail() and download() were remaining.
Use a direct and carefully chosen MatrixClient's methods instead to
avoid problems mentioned in the previous commit 7502c1.
This commit is contained in:
miruka
2020-08-23 16:57:53 -04:00
parent 0f2efa9ba3
commit df3f1fb645
24 changed files with 117 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/Base/HAvatar.qml
View File

@@ -9,6 +9,7 @@ Rectangle {
property bool compact: false
property string name
property alias clientUserId: avatarImage.clientUserId
property alias mxc: avatarImage.mxc
property alias title: avatarImage.title
@@ -60,11 +61,11 @@ Rectangle {
HMxcImage {
id: avatarImage
anchors.fill: parent
showProgressBar: false
visible: Boolean(sourceOverride || mxc)
z: 2
sourceSize.width: parent.width
sourceSize.height: parent.height
showProgressBar: false
fillMode: Image.PreserveAspectCrop
animatedFillMode: AnimatedImage.PreserveAspectCrop
animate: false
@@ -95,6 +96,7 @@ Rectangle {
id: avatarToolTipImage
fillMode: Image.PreserveAspectCrop
animatedFillMode: AnimatedImage.PreserveAspectCrop
clientUserId: avatarImage.clientUserId
mxc: avatarImage.mxc
title: avatarImage.title

8
src/gui/Base/HMxcImage.qml
View File

@@ -6,6 +6,7 @@ import "../PythonBridge"
HImage {
id: image
property string clientUserId
property string mxc
property string title
property string sourceOverride: ""
@@ -38,9 +39,10 @@ HImage {
}
const method = image.thumbnail ? "get_thumbnail" : "get_media"
const args = image.thumbnail ?
[image.mxc, image.title, w, h, cryptDict] :
[image.mxc, image.title, cryptDict]
const args =
image.thumbnail ?
[clientUserId, image.mxc, image.title, w, h, cryptDict] :
[clientUserId, image.mxc, image.title, cryptDict]
getFuture = py.callCoro("media_cache." + method, args, path => {
if (! image) return

1
src/gui/MainPane/AccountDelegate.qml
View File

@@ -57,6 +57,7 @@ HTile {
HUserAvatar {
id: avatar
clientUserId: model.id
userId: model.id
displayName: model.display_name
mxc: model.avatar_url

1
src/gui/MainPane/RoomDelegate.qml
View File

@@ -48,6 +48,7 @@ HTile {
HRoomAvatar {
id: avatar
clientUserId: model.for_account
roomId: model.id
displayName: model.display_name
mxc: model.avatar_url

1
src/gui/Pages/AccountSettings/Account.qml
View File

@@ -93,6 +93,7 @@ HFlickableColumnPage {
property bool changed: Boolean(sourceOverride)
clientUserId: page.userId
userId: page.userId
displayName: nameField.item.text
mxc: account ? account.avatar_url : ""

1
src/gui/Pages/AddChat/CreateRoom.qml
View File

@@ -69,6 +69,7 @@ HFlickableColumnPage {
HRoomAvatar {
id: avatar
clientUserId: page.userId
roomId: ""
displayName: nameField.item.text

2
src/gui/Pages/AddChat/CurrentUserAvatar.qml
View File

@@ -8,7 +8,7 @@ HUserAvatar {
property QtObject account
// userId: (set me)
clientUserId: userId
displayName: account ? account.display_name : ""
mxc: account ? account.avatar_url : ""

1
src/gui/Pages/Chat/AutoCompletion/CompletableUserDelegate.qml
View File

@@ -16,6 +16,7 @@ HTile {
HUserAvatar {
id: avatar
clientUserId: chat.userId
userId: model.id
displayName: model.display_name
mxc: model.avatar_url

1
src/gui/Pages/Chat/Banners/Banner.qml
View File

@@ -40,6 +40,7 @@ Rectangle {
HUserAvatar {
id: bannerAvatar
clientUserId: chat.userId
anchors.centerIn: parent
radius: 0
}

1
src/gui/Pages/Chat/Composer/Composer.qml
View File

@@ -25,6 +25,7 @@ Rectangle {
HUserAvatar {
id: avatar
radius: 0
clientUserId: messageArea.writingUserId
userId: messageArea.writingUserId
mxc:

1
src/gui/Pages/Chat/RoomHeader.qml
View File

@@ -52,6 +52,7 @@ Rectangle {
HRoomAvatar {
id: avatar
clientUserId: chat.userId
roomId: chat.roomId
displayName: chat.roomInfo.display_name
mxc: chat.roomInfo.avatar_url

1
src/gui/Pages/Chat/RoomPane/MemberView/MemberDelegate.qml
View File

@@ -23,6 +23,7 @@ HTile {
HUserAvatar {
id: avatar
clientUserId: chat.userId
userId: model.id
displayName: model.display_name
mxc: model.avatar_url

1
src/gui/Pages/Chat/RoomPane/MemberView/MemberProfile.qml
View File

@@ -61,6 +61,7 @@ HListView {
root.currentIndex = 0
HUserAvatar {
clientUserId: chat.userId
userId: member.id
displayName: member.display_name
mxc: member.avatar_url

1
src/gui/Pages/Chat/RoomPane/SettingsView.qml
View File

@@ -82,6 +82,7 @@ HFlickableColumnPage {
HRoomAvatar {
id: avatar
clientUserId: chat.userId
roomId: chat.roomId
displayName: nameField.item.text || chat.roomInfo.display_name
mxc: chat.roomInfo.avatar_url

1
src/gui/Pages/Chat/Timeline/EventContent.qml
View File

@@ -94,6 +94,7 @@ HRowLayout {
HUserAvatar {
id: avatar
clientUserId: chat.userId
userId: model.sender_id
displayName: model.sender_name
mxc: model.sender_avatar

1
src/gui/Pages/Chat/Timeline/EventImage.qml
View File

@@ -60,6 +60,7 @@ HMxcImage {
height: fitSize.height
horizontalAlignment: Image.AlignLeft
clientUserId: chat.userId
title: thumbnail ? loader.thumbnailTitle : loader.title
animated: eventList.isAnimated(loader.singleMediaInfo)
thumbnail: ! animated && loader.thumbnailMxc

2
src/gui/Pages/Chat/Timeline/EventList.qml
View File

@@ -416,6 +416,7 @@ Rectangle {
window.makePopup(
"Popups/ImageViewerPopup/ImageViewerPopup.qml",
{
clientUserId: chat.userId,
thumbnailTitle: getThumbnailTitle(event),
thumbnailMxc: event.thumbnail_url,
thumbnailPath: eventList.thumbnailCachedPaths[event.id],
@@ -459,6 +460,7 @@ Rectangle {
print("Downloading " + event.media_url + " ...")
const args = [
chat.userId,
event.media_url,
event.media_title,
JSON.parse(event.media_crypt_dict),

4
src/gui/Popups/ImageViewerPopup/ImageViewerPopup.qml
View File

@@ -8,14 +8,18 @@ import "../../Base"
HPopup {
id: popup
property string clientUserId
property string thumbnailTitle
property string thumbnailMxc
property string thumbnailPath: ""
property var thumbnailCryptDict
property string fullTitle
property string fullMxc
property var fullCryptDict
property int fullFileSize
property size overallSize
property bool alternateScaling: false

2
src/gui/Popups/ImageViewerPopup/ViewerCanvas.qml
View File

@@ -107,6 +107,7 @@ HFlickable {
Math.min(window.height, viewer.overallSize.height)
clientUserId: viewer.clientUserId
showPauseButton: false
showProgressBar: false
pause: viewer.imagesPaused
@@ -152,6 +153,7 @@ HFlickable {
HMxcImage {
id: full
anchors.fill: parent
clientUserId: viewer.clientUserId
thumbnail: false
showPauseButton: false
pause: viewer.imagesPaused