imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle mxc urls for non-encrypted rooms

Browse source
This commit is contained in:
Jaiwanth 2021-06-29 12:54:44 +05:30
parent 747273cc9c
commit 497d8102e2
5 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/views/messages/MAudioBody.js
View file

@ -42,8 +42,9 @@ export default class MAudioBody extends React.Component {
}
_getContentUrl() {
if (this.props.forExport) return this.props.mxEvent.getContent().url;
const media = mediaFromContent(this.props.mxEvent.getContent());
const content = this.props.mxEvent.getContent();
if (this.props.forExport) return content.file?.url || content.url;
const media = mediaFromContent(content);
if (media.isEncrypted) {
return this.state.decryptedUrl;
} else {

3
src/components/views/messages/MFileBody.js
View file

@ -186,8 +186,9 @@ export default class MFileBody extends React.Component {
}
if (this.props.forExport) {
const content = this.props.mxEvent.getContent();
return <span className="mx_MFileBody">
<a href={this.props.mxEvent.getContent().url}>
<a href={content.file?.url || content.url}>
{ placeholder }
</a>
</span>;

5
src/components/views/messages/MImageBody.js
View file

@ -172,8 +172,9 @@ export default class MImageBody extends React.Component {
}
_getContentUrl() {
if (this.props.forExport) return this.props.mxEvent.getContent().url;
const media = mediaFromContent(this.props.mxEvent.getContent());
const content = this.props.mxEvent.getContent();
if (this.props.forExport) return content.url || content.file.url;
const media = mediaFromContent(content);
if (media.isEncrypted) {
return this.state.decryptedUrl;
} else {

5
src/components/views/messages/MVideoBody.tsx
View file

@ -78,8 +78,9 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
}
private getContentUrl(): string|null {
if (this.props.forExport) return this.props.mxEvent.getContent().url;
const media = mediaFromContent(this.props.mxEvent.getContent());
const content = this.props.mxEvent.getContent();
if (this.props.forExport) return content.file?.url || content.url;
const media = mediaFromContent(content);
if (media.isEncrypted) {
return this.state.decryptedUrl;
} else {