Enable redirected media by default (#12142)
* Enable redirected media by default See https://github.com/matrix-org/matrix-js-sdk/pull/4007 * Update the tests * Update tests * Update end-to-end tests too * Update linkifier to use Media customisation endpoint * Fix tests for new js-sdk behaviour * Fix unchanged file * Fix linkifier * Fix lintpull/28788/head^2
parent
d1928079cc
commit
86b3564b54
|
@ -49,7 +49,7 @@ const expectAvatar = async (cli: Client, e: Locator, avatarUrl: string): Promise
|
||||||
const url = await cli.evaluate(
|
const url = await cli.evaluate(
|
||||||
(client, { avatarUrl, size, resizeMethod }) => {
|
(client, { avatarUrl, size, resizeMethod }) => {
|
||||||
// eslint-disable-next-line no-restricted-properties
|
// eslint-disable-next-line no-restricted-properties
|
||||||
return client.mxcUrlToHttp(avatarUrl, size, size, resizeMethod);
|
return client.mxcUrlToHttp(avatarUrl, size, size, resizeMethod, false, true);
|
||||||
},
|
},
|
||||||
{ avatarUrl, size, resizeMethod: AVATAR_RESIZE_METHOD },
|
{ avatarUrl, size, resizeMethod: AVATAR_RESIZE_METHOD },
|
||||||
);
|
);
|
||||||
|
|
|
@ -80,7 +80,7 @@ export class Media {
|
||||||
*/
|
*/
|
||||||
public get srcHttp(): string | null {
|
public get srcHttp(): string | null {
|
||||||
// eslint-disable-next-line no-restricted-properties
|
// eslint-disable-next-line no-restricted-properties
|
||||||
return this.client.mxcUrlToHttp(this.srcMxc) || null;
|
return this.client.mxcUrlToHttp(this.srcMxc, undefined, undefined, undefined, false, true) || null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -90,7 +90,7 @@ export class Media {
|
||||||
public get thumbnailHttp(): string | null {
|
public get thumbnailHttp(): string | null {
|
||||||
if (!this.hasThumbnail) return null;
|
if (!this.hasThumbnail) return null;
|
||||||
// eslint-disable-next-line no-restricted-properties
|
// eslint-disable-next-line no-restricted-properties
|
||||||
return this.client.mxcUrlToHttp(this.thumbnailMxc!);
|
return this.client.mxcUrlToHttp(this.thumbnailMxc!, undefined, undefined, undefined, false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -107,7 +107,7 @@ export class Media {
|
||||||
width = Math.floor(width * window.devicePixelRatio);
|
width = Math.floor(width * window.devicePixelRatio);
|
||||||
height = Math.floor(height * window.devicePixelRatio);
|
height = Math.floor(height * window.devicePixelRatio);
|
||||||
// eslint-disable-next-line no-restricted-properties
|
// eslint-disable-next-line no-restricted-properties
|
||||||
return this.client.mxcUrlToHttp(this.thumbnailMxc!, width, height, mode);
|
return this.client.mxcUrlToHttp(this.thumbnailMxc!, width, height, mode, false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -122,7 +122,7 @@ export class Media {
|
||||||
width = Math.floor(width * window.devicePixelRatio);
|
width = Math.floor(width * window.devicePixelRatio);
|
||||||
height = Math.floor(height * window.devicePixelRatio);
|
height = Math.floor(height * window.devicePixelRatio);
|
||||||
// eslint-disable-next-line no-restricted-properties
|
// eslint-disable-next-line no-restricted-properties
|
||||||
return this.client.mxcUrlToHttp(this.srcMxc, width, height, mode);
|
return this.client.mxcUrlToHttp(this.srcMxc, width, height, mode, false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -184,7 +184,15 @@ export const options: Opts = {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case "url":
|
case "url":
|
||||||
if (href.startsWith("mxc://") && MatrixClientPeg.get()) {
|
if (href.startsWith("mxc://") && MatrixClientPeg.get()) {
|
||||||
return getHttpUriForMxc(MatrixClientPeg.get()!.baseUrl, href);
|
return getHttpUriForMxc(
|
||||||
|
MatrixClientPeg.get()!.baseUrl,
|
||||||
|
href,
|
||||||
|
undefined,
|
||||||
|
undefined,
|
||||||
|
undefined,
|
||||||
|
false,
|
||||||
|
true,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
// fallthrough
|
// fallthrough
|
||||||
case Type.RoomAlias:
|
case Type.RoomAlias:
|
||||||
|
|
Loading…
Reference in New Issue