Use new nio AsyncClient.mxc_to_http()

Has the correct behavior for all servers,
e.g. mxc://privacytoosl.io/id → https://chat.privacytools.io/...
This commit is contained in:
miruka 2019-12-02 06:42:48 -04:00
parent 3919b964ca
commit 26e63e4ab2
4 changed files with 6 additions and 14 deletions

View File

@ -1,8 +1,9 @@
- Media - Media
- Verify things work with chat.privacytools.io (subdomain weirdness) - Upload progression and pausing
- Confirmation box after picking file to upload - Confirmation box after picking file to upload
- Handle upload/set avatar errors: bad path, is a dir, file too big, etc - Handle set avatar upload errors
- Show real progression for mxc thumbnail loadings, uploads and downloads - Show real progression for mxc thumbnail loadings
- Support encrypted m.file
- Show reason under broken thumbnail icons - Show reason under broken thumbnail icons
- Support m.file thumbnails - Support m.file thumbnails

View File

@ -136,11 +136,6 @@ class Backend:
return hsluv.hsluv_to_rgb([hue, saturation, lightness]) return hsluv.hsluv_to_rgb([hue, saturation, lightness])
@staticmethod
async def mxc_to_http(mxc: str) -> Optional[str]:
return nio.Api.mxc_to_http(mxc)
async def load_settings(self) -> tuple: async def load_settings(self) -> tuple:
from .config_files import Theme from .config_files import Theme
settings = await self.ui_settings.read() settings = await self.ui_settings.read()

View File

@ -40,11 +40,6 @@ class Media:
raise ValueError(f"Invalid mxc URI: {self.mxc}") raise ValueError(f"Invalid mxc URI: {self.mxc}")
@property
def http(self) -> str:
return nio.Api.mxc_to_http(self.mxc)
@property @property
def local_path(self) -> Path: def local_path(self) -> Path:
parsed = urlparse(self.mxc) parsed = urlparse(self.mxc)

View File

@ -57,7 +57,8 @@ HMxcImage {
let isMxc = toOpen.startsWith("mxc://") let isMxc = toOpen.startsWith("mxc://")
isMxc ? isMxc ?
py.callCoro("mxc_to_http", [toOpen], callback) : callback(toOpen) py.callClientCoro(chatPage.userId, "mxc_to_http", [toOpen], callback) :
callback(toOpen)
} }