|
|
|
@@ -30,19 +30,25 @@ import SettingsStore from "../../../settings/SettingsStore";
|
|
|
|
|
import InlineSpinner from '../elements/InlineSpinner';
|
|
|
|
|
import { replaceableComponent } from "../../../utils/replaceableComponent";
|
|
|
|
|
import { Media, mediaFromContent } from "../../../customisations/Media";
|
|
|
|
|
import { BLURHASH_FIELD } from "../../../ContentMessages";
|
|
|
|
|
import { BLURHASH_FIELD, createThumbnail } from "../../../ContentMessages";
|
|
|
|
|
import { IMediaEventContent } from '../../../customisations/models/IMediaEventContent';
|
|
|
|
|
import ImageView from '../elements/ImageView';
|
|
|
|
|
import { IBodyProps } from "./IBodyProps";
|
|
|
|
|
import { ImageSize, suggestedSize as suggestedImageSize } from "../../../settings/enums/ImageSize";
|
|
|
|
|
import { MatrixClientPeg } from '../../../MatrixClientPeg';
|
|
|
|
|
import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
|
|
|
|
|
import { blobIsAnimated, mayBeAnimated } from '../../../utils/Image';
|
|
|
|
|
|
|
|
|
|
enum Placeholder {
|
|
|
|
|
NoImage,
|
|
|
|
|
Blurhash,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
interface IState {
|
|
|
|
|
decryptedUrl?: string;
|
|
|
|
|
decryptedThumbnailUrl?: string;
|
|
|
|
|
decryptedBlob?: Blob;
|
|
|
|
|
error;
|
|
|
|
|
contentUrl?: string;
|
|
|
|
|
thumbUrl?: string;
|
|
|
|
|
isAnimated?: boolean;
|
|
|
|
|
error?: Error;
|
|
|
|
|
imgError: boolean;
|
|
|
|
|
imgLoaded: boolean;
|
|
|
|
|
loadedImageDimensions?: {
|
|
|
|
@@ -51,7 +57,7 @@ interface IState {
|
|
|
|
|
};
|
|
|
|
|
hover: boolean;
|
|
|
|
|
showImage: boolean;
|
|
|
|
|
placeholder: 'no-image' | 'blurhash';
|
|
|
|
|
placeholder: Placeholder;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@replaceableComponent("views.messages.MImageBody")
|
|
|
|
@@ -68,16 +74,11 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
super(props);
|
|
|
|
|
|
|
|
|
|
this.state = {
|
|
|
|
|
decryptedUrl: null,
|
|
|
|
|
decryptedThumbnailUrl: null,
|
|
|
|
|
decryptedBlob: null,
|
|
|
|
|
error: null,
|
|
|
|
|
imgError: false,
|
|
|
|
|
imgLoaded: false,
|
|
|
|
|
loadedImageDimensions: null,
|
|
|
|
|
hover: false,
|
|
|
|
|
showImage: SettingsStore.getValue("showImages"),
|
|
|
|
|
placeholder: 'no-image',
|
|
|
|
|
placeholder: Placeholder.NoImage,
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -86,7 +87,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
if (this.unmounted) return;
|
|
|
|
|
// Consider the client reconnected if there is no error with syncing.
|
|
|
|
|
// This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
|
|
|
|
|
const reconnected = syncState !== "ERROR" && prevState !== syncState;
|
|
|
|
|
const reconnected = syncState !== SyncState.Error && prevState !== syncState;
|
|
|
|
|
if (reconnected && this.state.imgError) {
|
|
|
|
|
// Load the image again
|
|
|
|
|
this.setState({
|
|
|
|
@@ -110,7 +111,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const content = this.props.mxEvent.getContent<IMediaEventContent>();
|
|
|
|
|
const httpUrl = this.getContentUrl();
|
|
|
|
|
const httpUrl = this.state.contentUrl;
|
|
|
|
|
const params: Omit<ComponentProps<typeof ImageView>, "onFinished"> = {
|
|
|
|
|
src: httpUrl,
|
|
|
|
|
name: content.body?.length > 0 ? content.body : _t('Attachment'),
|
|
|
|
@@ -139,29 +140,24 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
private isGif = (): boolean => {
|
|
|
|
|
const content = this.props.mxEvent.getContent();
|
|
|
|
|
return content.info?.mimetype === "image/gif";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
private onImageEnter = (e: React.MouseEvent<HTMLImageElement>): void => {
|
|
|
|
|
this.setState({ hover: true });
|
|
|
|
|
|
|
|
|
|
if (!this.state.showImage || !this.isGif() || SettingsStore.getValue("autoplayGifs")) {
|
|
|
|
|
if (!this.state.showImage || !this.state.isAnimated || SettingsStore.getValue("autoplayGifs")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const imgElement = e.currentTarget;
|
|
|
|
|
imgElement.src = this.getContentUrl();
|
|
|
|
|
imgElement.src = this.state.contentUrl;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
private onImageLeave = (e: React.MouseEvent<HTMLImageElement>): void => {
|
|
|
|
|
this.setState({ hover: false });
|
|
|
|
|
|
|
|
|
|
if (!this.state.showImage || !this.isGif() || SettingsStore.getValue("autoplayGifs")) {
|
|
|
|
|
if (!this.state.showImage || !this.state.isAnimated || SettingsStore.getValue("autoplayGifs")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const imgElement = e.currentTarget;
|
|
|
|
|
imgElement.src = this.getThumbUrl();
|
|
|
|
|
imgElement.src = this.state.thumbUrl ?? this.state.contentUrl;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
private onImageError = (): void => {
|
|
|
|
@@ -175,7 +171,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
this.clearBlurhashTimeout();
|
|
|
|
|
this.props.onHeightChanged();
|
|
|
|
|
|
|
|
|
|
let loadedImageDimensions;
|
|
|
|
|
let loadedImageDimensions: IState["loadedImageDimensions"];
|
|
|
|
|
|
|
|
|
|
if (this.image.current) {
|
|
|
|
|
const { naturalWidth, naturalHeight } = this.image.current;
|
|
|
|
@@ -185,22 +181,17 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
this.setState({ imgLoaded: true, loadedImageDimensions });
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
protected getContentUrl(): string {
|
|
|
|
|
const content: IMediaEventContent = this.props.mxEvent.getContent();
|
|
|
|
|
private getContentUrl(): string {
|
|
|
|
|
// During export, the content url will point to the MSC, which will later point to a local url
|
|
|
|
|
if (this.props.forExport) return content.url || content.file?.url;
|
|
|
|
|
if (this.media.isEncrypted) {
|
|
|
|
|
return this.state.decryptedUrl;
|
|
|
|
|
} else {
|
|
|
|
|
return this.media.srcHttp;
|
|
|
|
|
}
|
|
|
|
|
if (this.props.forExport) return this.media.srcMxc;
|
|
|
|
|
return this.media.srcHttp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private get media(): Media {
|
|
|
|
|
return mediaFromContent(this.props.mxEvent.getContent());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
protected getThumbUrl(): string {
|
|
|
|
|
private getThumbUrl(): string {
|
|
|
|
|
// FIXME: we let images grow as wide as you like, rather than capped to 800x600.
|
|
|
|
|
// So either we need to support custom timeline widths here, or reimpose the cap, otherwise the
|
|
|
|
|
// thumbnail resolution will be unnecessarily reduced.
|
|
|
|
@@ -210,85 +201,112 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
|
|
|
|
|
const content = this.props.mxEvent.getContent<IMediaEventContent>();
|
|
|
|
|
const media = mediaFromContent(content);
|
|
|
|
|
const info = content.info;
|
|
|
|
|
|
|
|
|
|
if (media.isEncrypted) {
|
|
|
|
|
// Don't use the thumbnail for clients wishing to autoplay gifs.
|
|
|
|
|
if (this.state.decryptedThumbnailUrl) {
|
|
|
|
|
return this.state.decryptedThumbnailUrl;
|
|
|
|
|
}
|
|
|
|
|
return this.state.decryptedUrl;
|
|
|
|
|
} else if (content.info && content.info.mimetype === "image/svg+xml" && media.hasThumbnail) {
|
|
|
|
|
// special case to return clientside sender-generated thumbnails for SVGs, if any,
|
|
|
|
|
// given we deliberately don't thumbnail them serverside to prevent
|
|
|
|
|
// billion lol attacks and similar
|
|
|
|
|
if (info?.mimetype === "image/svg+xml" && media.hasThumbnail) {
|
|
|
|
|
// Special-case to return clientside sender-generated thumbnails for SVGs, if any,
|
|
|
|
|
// given we deliberately don't thumbnail them serverside to prevent billion lol attacks and similar.
|
|
|
|
|
return media.getThumbnailHttp(thumbWidth, thumbHeight, 'scale');
|
|
|
|
|
} else {
|
|
|
|
|
// we try to download the correct resolution
|
|
|
|
|
// for hi-res images (like retina screenshots).
|
|
|
|
|
// synapse only supports 800x600 thumbnails for now though,
|
|
|
|
|
// so we'll need to download the original image for this to work
|
|
|
|
|
// well for now. First, let's try a few cases that let us avoid
|
|
|
|
|
// downloading the original, including:
|
|
|
|
|
// - When displaying a GIF, we always want to thumbnail so that we can
|
|
|
|
|
// properly respect the user's GIF autoplay setting (which relies on
|
|
|
|
|
// thumbnailing to produce the static preview image)
|
|
|
|
|
// - On a low DPI device, always thumbnail to save bandwidth
|
|
|
|
|
// - If there's no sizing info in the event, default to thumbnail
|
|
|
|
|
const info = content.info;
|
|
|
|
|
if (
|
|
|
|
|
this.isGif() ||
|
|
|
|
|
window.devicePixelRatio === 1.0 ||
|
|
|
|
|
(!info || !info.w || !info.h || !info.size)
|
|
|
|
|
) {
|
|
|
|
|
return media.getThumbnailOfSourceHttp(thumbWidth, thumbHeight);
|
|
|
|
|
} else {
|
|
|
|
|
// we should only request thumbnails if the image is bigger than 800x600
|
|
|
|
|
// (or 1600x1200 on retina) otherwise the image in the timeline will just
|
|
|
|
|
// end up resampled and de-retina'd for no good reason.
|
|
|
|
|
// Ideally the server would pregen 1600x1200 thumbnails in order to provide retina
|
|
|
|
|
// thumbnails, but we don't do this currently in synapse for fear of disk space.
|
|
|
|
|
// As a compromise, let's switch to non-retina thumbnails only if the original
|
|
|
|
|
// image is both physically too large and going to be massive to load in the
|
|
|
|
|
// timeline (e.g. >1MB).
|
|
|
|
|
|
|
|
|
|
const isLargerThanThumbnail = (
|
|
|
|
|
info.w > thumbWidth ||
|
|
|
|
|
info.h > thumbHeight
|
|
|
|
|
);
|
|
|
|
|
const isLargeFileSize = info.size > 1 * 1024 * 1024; // 1mb
|
|
|
|
|
|
|
|
|
|
if (isLargeFileSize && isLargerThanThumbnail) {
|
|
|
|
|
// image is too large physically and bytewise to clutter our timeline so
|
|
|
|
|
// we ask for a thumbnail, despite knowing that it will be max 800x600
|
|
|
|
|
// despite us being retina (as synapse doesn't do 1600x1200 thumbs yet).
|
|
|
|
|
return media.getThumbnailOfSourceHttp(thumbWidth, thumbHeight);
|
|
|
|
|
} else {
|
|
|
|
|
// download the original image otherwise, so we can scale it client side
|
|
|
|
|
// to take pixelRatio into account.
|
|
|
|
|
return media.srcHttp;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// we try to download the correct resolution for hi-res images (like retina screenshots).
|
|
|
|
|
// Synapse only supports 800x600 thumbnails for now though,
|
|
|
|
|
// so we'll need to download the original image for this to work well for now.
|
|
|
|
|
// First, let's try a few cases that let us avoid downloading the original, including:
|
|
|
|
|
// - When displaying a GIF, we always want to thumbnail so that we can
|
|
|
|
|
// properly respect the user's GIF autoplay setting (which relies on
|
|
|
|
|
// thumbnailing to produce the static preview image)
|
|
|
|
|
// - On a low DPI device, always thumbnail to save bandwidth
|
|
|
|
|
// - If there's no sizing info in the event, default to thumbnail
|
|
|
|
|
if (
|
|
|
|
|
this.state.isAnimated ||
|
|
|
|
|
window.devicePixelRatio === 1.0 ||
|
|
|
|
|
(!info || !info.w || !info.h || !info.size)
|
|
|
|
|
) {
|
|
|
|
|
return media.getThumbnailOfSourceHttp(thumbWidth, thumbHeight);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// We should only request thumbnails if the image is bigger than 800x600 (or 1600x1200 on retina) otherwise
|
|
|
|
|
// the image in the timeline will just end up resampled and de-retina'd for no good reason.
|
|
|
|
|
// Ideally the server would pre-gen 1600x1200 thumbnails in order to provide retina thumbnails,
|
|
|
|
|
// but we don't do this currently in synapse for fear of disk space.
|
|
|
|
|
// As a compromise, let's switch to non-retina thumbnails only if the original image is both
|
|
|
|
|
// physically too large and going to be massive to load in the timeline (e.g. >1MB).
|
|
|
|
|
|
|
|
|
|
const isLargerThanThumbnail = (
|
|
|
|
|
info.w > thumbWidth ||
|
|
|
|
|
info.h > thumbHeight
|
|
|
|
|
);
|
|
|
|
|
const isLargeFileSize = info.size > 1 * 1024 * 1024; // 1mb
|
|
|
|
|
|
|
|
|
|
if (isLargeFileSize && isLargerThanThumbnail) {
|
|
|
|
|
// image is too large physically and byte-wise to clutter our timeline so,
|
|
|
|
|
// we ask for a thumbnail, despite knowing that it will be max 800x600
|
|
|
|
|
// despite us being retina (as synapse doesn't do 1600x1200 thumbs yet).
|
|
|
|
|
return media.getThumbnailOfSourceHttp(thumbWidth, thumbHeight);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// download the original image otherwise, so we can scale it client side to take pixelRatio into account.
|
|
|
|
|
return media.srcHttp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private async downloadImage() {
|
|
|
|
|
if (this.props.mediaEventHelper.media.isEncrypted && this.state.decryptedUrl === null) {
|
|
|
|
|
if (this.state.contentUrl) return; // already downloaded
|
|
|
|
|
|
|
|
|
|
let thumbUrl: string;
|
|
|
|
|
let contentUrl: string;
|
|
|
|
|
if (this.props.mediaEventHelper.media.isEncrypted) {
|
|
|
|
|
try {
|
|
|
|
|
const thumbnailUrl = await this.props.mediaEventHelper.thumbnailUrl.value;
|
|
|
|
|
this.setState({
|
|
|
|
|
decryptedUrl: await this.props.mediaEventHelper.sourceUrl.value,
|
|
|
|
|
decryptedThumbnailUrl: thumbnailUrl,
|
|
|
|
|
decryptedBlob: await this.props.mediaEventHelper.sourceBlob.value,
|
|
|
|
|
});
|
|
|
|
|
} catch (err) {
|
|
|
|
|
([contentUrl, thumbUrl] = await Promise.all([
|
|
|
|
|
this.props.mediaEventHelper.sourceUrl.value,
|
|
|
|
|
this.props.mediaEventHelper.thumbnailUrl.value,
|
|
|
|
|
]));
|
|
|
|
|
} catch (error) {
|
|
|
|
|
if (this.unmounted) return;
|
|
|
|
|
logger.warn("Unable to decrypt attachment: ", err);
|
|
|
|
|
logger.warn("Unable to decrypt attachment: ", error);
|
|
|
|
|
// Set a placeholder image when we can't decrypt the image.
|
|
|
|
|
this.setState({
|
|
|
|
|
error: err,
|
|
|
|
|
this.setState({ error });
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
thumbUrl = this.getThumbUrl();
|
|
|
|
|
contentUrl = this.getContentUrl();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const content = this.props.mxEvent.getContent<IMediaEventContent>();
|
|
|
|
|
let isAnimated = mayBeAnimated(content.info?.mimetype);
|
|
|
|
|
|
|
|
|
|
// If there is no included non-animated thumbnail then we will generate our own, we can't depend on the server
|
|
|
|
|
// because 1. encryption and 2. we can't ask the server specifically for a non-animated thumbnail.
|
|
|
|
|
if (isAnimated && !SettingsStore.getValue("autoplayGifs")) {
|
|
|
|
|
if (!thumbUrl || !content?.info.thumbnail_info || mayBeAnimated(content.info.thumbnail_info.mimetype)) {
|
|
|
|
|
const img = document.createElement("img");
|
|
|
|
|
const loadPromise = new Promise((resolve, reject) => {
|
|
|
|
|
img.onload = resolve;
|
|
|
|
|
img.onerror = reject;
|
|
|
|
|
});
|
|
|
|
|
img.crossOrigin = "Anonymous"; // CORS allow canvas access
|
|
|
|
|
img.src = contentUrl;
|
|
|
|
|
|
|
|
|
|
await loadPromise;
|
|
|
|
|
|
|
|
|
|
const blob = await this.props.mediaEventHelper.sourceBlob.value;
|
|
|
|
|
if (!await blobIsAnimated(content.info.mimetype, blob)) {
|
|
|
|
|
isAnimated = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (isAnimated) {
|
|
|
|
|
const thumb = await createThumbnail(img, img.width, img.height, content.info.mimetype, false);
|
|
|
|
|
thumbUrl = URL.createObjectURL(thumb.thumbnail);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (this.unmounted) return;
|
|
|
|
|
this.setState({
|
|
|
|
|
contentUrl,
|
|
|
|
|
thumbUrl,
|
|
|
|
|
isAnimated,
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private clearBlurhashTimeout() {
|
|
|
|
@@ -317,7 +335,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
this.timeout = setTimeout(() => {
|
|
|
|
|
if (!this.state.imgLoaded || !this.state.imgError) {
|
|
|
|
|
this.setState({
|
|
|
|
|
placeholder: 'blurhash',
|
|
|
|
|
placeholder: Placeholder.Blurhash,
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}, 150);
|
|
|
|
@@ -333,6 +351,9 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
MatrixClientPeg.get().removeListener(ClientEvent.Sync, this.onClientSync);
|
|
|
|
|
this.clearBlurhashTimeout();
|
|
|
|
|
SettingsStore.unwatchSetting(this.sizeWatcher);
|
|
|
|
|
if (this.state.isAnimated && this.state.thumbUrl) {
|
|
|
|
|
URL.revokeObjectURL(this.state.thumbUrl);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
protected messageContent(
|
|
|
|
@@ -341,10 +362,12 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
content: IMediaEventContent,
|
|
|
|
|
forcedHeight?: number,
|
|
|
|
|
): JSX.Element {
|
|
|
|
|
if (!thumbUrl) thumbUrl = contentUrl; // fallback
|
|
|
|
|
|
|
|
|
|
let infoWidth: number;
|
|
|
|
|
let infoHeight: number;
|
|
|
|
|
|
|
|
|
|
if (content && content.info && content.info.w && content.info.h) {
|
|
|
|
|
if (content.info?.w && content.info?.h) {
|
|
|
|
|
infoWidth = content.info.w;
|
|
|
|
|
infoHeight = content.info.h;
|
|
|
|
|
} else {
|
|
|
|
@@ -385,9 +408,9 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
forcedHeight ?? this.props.maxImageHeight,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let img = null;
|
|
|
|
|
let placeholder = null;
|
|
|
|
|
let gifLabel = null;
|
|
|
|
|
let img: JSX.Element;
|
|
|
|
|
let placeholder: JSX.Element;
|
|
|
|
|
let gifLabel: JSX.Element;
|
|
|
|
|
|
|
|
|
|
if (!this.props.forExport && !this.state.imgLoaded) {
|
|
|
|
|
placeholder = this.getPlaceholder(maxWidth, maxHeight);
|
|
|
|
@@ -427,7 +450,8 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
showPlaceholder = false; // because we're hiding the image, so don't show the placeholder.
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (this.isGif() && !SettingsStore.getValue("autoplayGifs") && !this.state.hover) {
|
|
|
|
|
if (this.state.isAnimated && !SettingsStore.getValue("autoplayGifs") && !this.state.hover) {
|
|
|
|
|
// XXX: Arguably we may want a different label when the animated image is WEBP and not GIF
|
|
|
|
|
gifLabel = <p className="mx_MImageBody_gifLabel">GIF</p>;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -489,9 +513,9 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
const blurhash = this.props.mxEvent.getContent().info?.[BLURHASH_FIELD];
|
|
|
|
|
|
|
|
|
|
if (blurhash) {
|
|
|
|
|
if (this.state.placeholder === 'no-image') {
|
|
|
|
|
if (this.state.placeholder === Placeholder.NoImage) {
|
|
|
|
|
return <div className="mx_no-image-placeholder" style={{ width: width, height: height }} />;
|
|
|
|
|
} else if (this.state.placeholder === 'blurhash') {
|
|
|
|
|
} else if (this.state.placeholder === Placeholder.Blurhash) {
|
|
|
|
|
return <Blurhash className="mx_Blurhash" hash={blurhash} width={width} height={height} />;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@@ -510,13 +534,15 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
if (this.props.forExport) return null;
|
|
|
|
|
/*
|
|
|
|
|
* In the room timeline or the thread context we don't need the download
|
|
|
|
|
* link as the message action bar will fullfil that
|
|
|
|
|
* link as the message action bar will fulfill that
|
|
|
|
|
*/
|
|
|
|
|
const hasMessageActionBar = this.context.timelineRenderingType === TimelineRenderingType.Room
|
|
|
|
|
|| this.context.timelineRenderingType === TimelineRenderingType.Pinned
|
|
|
|
|
|| this.context.timelineRenderingType === TimelineRenderingType.Search
|
|
|
|
|
|| this.context.timelineRenderingType === TimelineRenderingType.Thread
|
|
|
|
|
|| this.context.timelineRenderingType === TimelineRenderingType.ThreadsList;
|
|
|
|
|
const hasMessageActionBar = (
|
|
|
|
|
this.context.timelineRenderingType === TimelineRenderingType.Room ||
|
|
|
|
|
this.context.timelineRenderingType === TimelineRenderingType.Pinned ||
|
|
|
|
|
this.context.timelineRenderingType === TimelineRenderingType.Search ||
|
|
|
|
|
this.context.timelineRenderingType === TimelineRenderingType.Thread ||
|
|
|
|
|
this.context.timelineRenderingType === TimelineRenderingType.ThreadsList
|
|
|
|
|
);
|
|
|
|
|
if (!hasMessageActionBar) {
|
|
|
|
|
return <MFileBody {...this.props} showGenericPlaceholder={false} />;
|
|
|
|
|
}
|
|
|
|
@@ -525,7 +551,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
render() {
|
|
|
|
|
const content = this.props.mxEvent.getContent<IMediaEventContent>();
|
|
|
|
|
|
|
|
|
|
if (this.state.error !== null) {
|
|
|
|
|
if (this.state.error) {
|
|
|
|
|
return (
|
|
|
|
|
<div className="mx_MImageBody">
|
|
|
|
|
<img src={require("../../../../res/img/warning.svg").default} width="16" height="16" />
|
|
|
|
@@ -534,12 +560,12 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const contentUrl = this.getContentUrl();
|
|
|
|
|
let thumbUrl;
|
|
|
|
|
if (this.props.forExport || (this.isGif() && SettingsStore.getValue("autoplayGifs"))) {
|
|
|
|
|
const contentUrl = this.state.contentUrl;
|
|
|
|
|
let thumbUrl: string;
|
|
|
|
|
if (this.props.forExport || (this.state.isAnimated && SettingsStore.getValue("autoplayGifs"))) {
|
|
|
|
|
thumbUrl = contentUrl;
|
|
|
|
|
} else {
|
|
|
|
|
thumbUrl = this.getThumbUrl();
|
|
|
|
|
thumbUrl = this.state.thumbUrl ?? this.state.contentUrl;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const thumbnail = this.messageContent(contentUrl, thumbUrl, content);
|
|
|
|
|