Remove all Backend "get_any_client"-using methods

thumbnail() and download() were remaining.
Use a direct and carefully chosen MatrixClient's methods instead to
avoid problems mentioned in the previous commit 7502c1.

TODO.md

@@ -1,5 +1,6 @@
 # TODO
 
+- composer state.json writingUserId problem?
 - refresh server list button
 
 - global presence control

src/backend/backend.py

@@ -349,46 +349,7 @@ class Backend:
             failures += 1
 
 
-    async def get_any_client(self) -> MatrixClient:
+    # Multi-client Matrix functions
-        """Return any healthy syncing `MatrixClient` registered in model."""
-
-        failures = 0
-
-        while True:
-            for client in self.clients.values():
-                if client.healthy:
-                    return client
-
-            if failures and failures % 300 == 0:
-                log.warn(
-                    "No healthy client found after %ds, stack trace:\n%s",
-                    failures / 10, traceback.format_stack(),
-                )
-
-            await asyncio.sleep(0.1)
-            failures += 1
-
-
-    # Client functions that don't need authentification
-
-    async def thumbnail(
-        self, server_name: str, media_id: str, width: int, height: int,
-    ) -> nio.ThumbnailResponse:
-        """Return thumbnail for a matrix media."""
-
-        args   = (server_name, media_id, width, height)
-        client = await self.get_any_client()
-        return await client.thumbnail(*args)
-
-
-    async def download(
-        self, server_name: str, media_id: str,
-    ) -> nio.DownloadResponse:
-        """Return the content of a matrix media."""
-
-        client = await self.get_any_client()
-        return await client.download(server_name, media_id)
-
 
     async def update_room_read_marker(
         self, room_id: str, event_id: str,
@@ -416,6 +377,37 @@ class Backend:
         await asyncio.gather(*[update(c) for c in self.clients.values()])
 
 
+    async def verify_device(
+        self, user_id: str, device_id: str, ed25519_key: str,
+    ) -> None:
+        """Mark a device as verified on all our accounts."""
+
+        for client in self.clients.values():
+            try:
+                device = client.device_store[user_id][device_id]
+            except KeyError:
+                continue
+
+            if device.ed25519 == ed25519_key:
+                client.verify_device(device)
+
+
+    async def blacklist_device(
+        self, user_id: str, device_id: str, ed25519_key: str,
+    ) -> None:
+        """Mark a device as blacklisted on all our accounts."""
+
+        for client in self.clients.values():
+            try:
+                # This won't include the client's current device, as expected
+                device = client.device_store[user_id][device_id]
+            except KeyError:
+                continue
+
+            if device.ed25519 == ed25519_key:
+                client.blacklist_device(device)
+
+
     # General functions
 
     async def get_config_dir(self) -> Path:
@@ -463,37 +455,6 @@ class Backend:
         self.models["all_rooms"].set_account_collapse(user_id, collapse)
 
 
-    async def verify_device(
-        self, user_id: str, device_id: str, ed25519_key: str,
-    ) -> None:
-        """Mark a device as verified on all our accounts."""
-
-        for client in self.clients.values():
-            try:
-                device = client.device_store[user_id][device_id]
-            except KeyError:
-                continue
-
-            if device.ed25519 == ed25519_key:
-                client.verify_device(device)
-
-
-    async def blacklist_device(
-        self, user_id: str, device_id: str, ed25519_key: str,
-    ) -> None:
-        """Mark a device as blacklisted on all our accounts."""
-
-        for client in self.clients.values():
-            try:
-                # This won't include the client's current device, as expected
-                device = client.device_store[user_id][device_id]
-            except KeyError:
-                continue
-
-            if device.ed25519 == ed25519_key:
-                client.blacklist_device(device)
-
-
     async def _ping_homeserver(
         self, session: aiohttp.ClientSession, homeserver_url: str,
     ) -> None:

src/backend/matrix_client.py

@@ -210,18 +210,6 @@ class MatrixClient(nio.AsyncClient):
         )
 
 
-    @property
-    def healthy(self) -> bool:
-        """Return whether we're syncing and last sync was successful."""
-
-        task = self.sync_task
-
-        if not task or not self.first_sync_date or self.last_sync_error:
-            return False
-
-        return not task.done()
-
-
     @property
     def default_device_name(self) -> str:
         """Device name to set at login if the user hasn't set a custom one."""
@@ -734,7 +722,7 @@ class MatrixClient(nio.AsyncClient):
 
         upload_item.status = UploadStatus.Caching
         local_media        = await Media.from_existing_file(
-            self.backend.media_cache, url, path,
+            self.backend.media_cache, self.user_id, url, path,
         )
 
         kind = (mime or "").split("/")[0]
@@ -816,6 +804,7 @@ class MatrixClient(nio.AsyncClient):
 
                     await Thumbnail.from_bytes(
                         self.backend.media_cache,
+                        self.user_id,
                         thumb_url,
                         path.name,
                         thumb_data,

src/backend/media_cache.py

@@ -49,29 +49,31 @@ class MediaCache:
 
     async def get_media(
         self,
-        mxc:        str,
+        client_user_id: str,
-        title:      str,
+        mxc:            str,
-        crypt_dict: CryptDict = None,
+        title:          str,
+        crypt_dict:     CryptDict = None,
     ) -> Path:
         """Return `Media.get()`'s result. Intended for QML."""
 
-        return await Media(self, mxc, title, crypt_dict).get()
+        return await Media(self, client_user_id,  mxc, title, crypt_dict).get()
 
 
     async def get_thumbnail(
         self,
-        mxc:        str,
+        client_user_id: str,
-        title:      str,
+        mxc:            str,
-        width:      int,
+        title:          str,
-        height:     int,
+        width:          int,
-        crypt_dict: CryptDict = None,
+        height:         int,
+        crypt_dict:     CryptDict = None,
     ) -> Path:
         """Return `Thumbnail.get()`'s result. Intended for QML."""
 
-        thumb = Thumbnail(
+        # QML sometimes pass float sizes, which matrix API doesn't like.
-            # QML sometimes pass float sizes, which matrix API doesn't like.
+        size = (round(width), round(height))
-            self, mxc, title, crypt_dict, (round(width), round(height)),
+
-        )
+        thumb = Thumbnail(self, client_user_id, mxc, title, crypt_dict, size)
         return await thumb.get()
 
 
@@ -79,10 +81,11 @@ class MediaCache:
 class Media:
     """A matrix media file."""
 
-    cache:      "MediaCache" = field()
+    cache:          "MediaCache" = field()
-    mxc:        str          = field()
+    client_user_id: str          = field()
-    title:      str          = field()
+    mxc:            str          = field()
-    crypt_dict: CryptDict    = field(repr=False)
+    title:          str          = field()
+    crypt_dict:     CryptDict    = field(repr=False)
 
 
     def __post_init__(self) -> None:
@@ -154,7 +157,7 @@ class Media:
 
         parsed = urlparse(self.mxc)
 
-        resp = await self.cache.backend.download(
+        resp = await self.cache.backend.clients[self.client_user_id].download(
             server_name = parsed.netloc,
             media_id    = parsed.path.lstrip("/"),
         )
@@ -183,15 +186,18 @@ class Media:
     @classmethod
     async def from_existing_file(
         cls,
-        cache:     "MediaCache",
+        cache:          "MediaCache",
-        mxc:       str,
+        client_user_id: str,
-        existing:  Path,
+        mxc:            str,
-        overwrite: bool = False,
+        existing:       Path,
+        overwrite:      bool = False,
         **kwargs,
     ) -> "Media":
         """Copy an existing file to cache and return a `Media` for it."""
 
-        media = cls(cache, mxc, existing.name, {}, **kwargs)  # type: ignore
+        media = cls(
+            cache, client_user_id, mxc, existing.name, {}, **kwargs,
+        )  # type: ignore
         media.local_path.parent.mkdir(parents=True, exist_ok=True)
 
         if not media.local_path.exists() or overwrite:
@@ -204,16 +210,19 @@ class Media:
     @classmethod
     async def from_bytes(
         cls,
-        cache:     "MediaCache",
+        cache:          "MediaCache",
-        mxc:       str,
+        client_user_id: str,
-        filename:  str,
+        mxc:            str,
-        data:      bytes,
+        filename:       str,
-        overwrite: bool = False,
+        data:           bytes,
+        overwrite:      bool = False,
         **kwargs,
     ) -> "Media":
         """Create a cached file from bytes data and return a `Media` for it."""
 
-        media = cls(cache, mxc, filename, {}, **kwargs)  # type: ignore
+        media = cls(
+            cache, client_user_id, mxc, filename, {}, **kwargs,
+        )  # type: ignore
         media.local_path.parent.mkdir(parents=True, exist_ok=True)
 
         if not media.local_path.exists() or overwrite:
@@ -230,11 +239,12 @@ class Media:
 class Thumbnail(Media):
     """The thumbnail of a matrix media, which is a media itself."""
 
-    cache:       "MediaCache" = field()
+    cache:          "MediaCache" = field()
-    mxc:         str          = field()
+    client_user_id: str          = field()
-    title:       str          = field()
+    mxc:            str          = field()
-    crypt_dict:  CryptDict    = field(repr=False)
+    title:          str          = field()
-    wanted_size: Size         = field()
+    crypt_dict:     CryptDict    = field(repr=False)
+    wanted_size:    Size         = field()
 
     server_size: Optional[Size] = field(init=False, repr=False, default=None)
 
@@ -322,16 +332,17 @@ class Thumbnail(Media):
         """Return the (decrypted) media file's content from the server."""
 
         parsed = urlparse(self.mxc)
+        client = self.cache.backend.clients[self.client_user_id]
 
         if self.crypt_dict:
             # Matrix makes encrypted thumbs only available through the download
             # end-point, not the thumbnail one
-            resp = await self.cache.backend.download(
+            resp = await client.download(
                 server_name = parsed.netloc,
                 media_id    = parsed.path.lstrip("/"),
             )
         else:
-            resp = await self.cache.backend.thumbnail(
+            resp = await client.thumbnail(
                 server_name = parsed.netloc,
                 media_id    = parsed.path.lstrip("/"),
                 width       = self.wanted_size[0],

src/backend/nio_callbacks.py

@@ -192,10 +192,11 @@ class NioCallbacks:
 
         try:
             media_local_path: Union[Path, str] = await Media(
-                cache      = self.client.backend.media_cache,
+                cache          = self.client.backend.media_cache,
-                mxc        = ev.url,
+                client_user_id = self.user_id,
-                title      = ev.body,
+                mxc            = ev.url,
-                crypt_dict = media_crypt_dict,
+                title          = ev.body,
+                crypt_dict     = media_crypt_dict,
             ).get_local()
         except FileNotFoundError:
             media_local_path = ""

src/gui/Base/HAvatar.qml

@@ -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
 

src/gui/Base/HMxcImage.qml

@@ -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 ?
+        const args   =
-                       [image.mxc, image.title, w, h, cryptDict] :
+            image.thumbnail ?
-                       [image.mxc, image.title, cryptDict]
+            [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

src/gui/MainPane/AccountDelegate.qml

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

src/gui/MainPane/RoomDelegate.qml

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

src/gui/Pages/AccountSettings/Account.qml

@@ -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 : ""

src/gui/Pages/AddChat/CreateRoom.qml

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

src/gui/Pages/AddChat/CurrentUserAvatar.qml

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

src/gui/Pages/Chat/AutoCompletion/CompletableUserDelegate.qml

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

src/gui/Pages/Chat/Banners/Banner.qml

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

src/gui/Pages/Chat/Composer/Composer.qml

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

src/gui/Pages/Chat/RoomHeader.qml

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

src/gui/Pages/Chat/RoomPane/MemberView/MemberDelegate.qml

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

src/gui/Pages/Chat/RoomPane/MemberView/MemberProfile.qml

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

src/gui/Pages/Chat/RoomPane/SettingsView.qml

@@ -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

src/gui/Pages/Chat/Timeline/EventContent.qml

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

src/gui/Pages/Chat/Timeline/EventImage.qml

@@ -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

src/gui/Pages/Chat/Timeline/EventList.qml

@@ -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),

src/gui/Popups/ImageViewerPopup/ImageViewerPopup.qml

@@ -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

src/gui/Popups/ImageViewerPopup/ViewerCanvas.qml

@@ -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