mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 07:20:02 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add try catch for event tile errors

Browse source
This commit is contained in:
Jaiwanth 2021-07-23 10:47:40 +05:30
parent 6dd3631a17
commit c81bac1a4c
2 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/messages/CallEvent.tsx
View file

@ -46,7 +46,7 @@ export default class CallEvent extends React.Component<IProps, IState> {
super(props); super(props);
this.state = { this.state = {
callState: this.props.callEventGrouper.state, callState: this.props.callEventGrouper?.state,
silenced: false, silenced: false,
}; };
} }
@ -184,7 +184,7 @@ export default class CallEvent extends React.Component<IProps, IState> {
render() { render() {
const event = this.props.mxEvent; const event = this.props.mxEvent;
const sender = event.sender ? event.sender.name : event.getSender(); const sender = event.sender ? event.sender.name : event.getSender();
const isVoice = this.props.callEventGrouper.isVoice; const isVoice = this.props.callEventGrouper?.isVoice;
const callType = isVoice ? _t("Voice call") : _t("Video call"); const callType = isVoice ? _t("Voice call") : _t("Video call");
const content = this.renderContent(this.state.callState); const content = this.renderContent(this.state.callState);
const className = classNames({ const className = classNames({

56
src/utils/exportUtils/HtmlExport.tsx
View file

@ -301,33 +301,41 @@ export default class HTMLExporter extends Exporter {
protected async createMessageBody(mxEv: MatrixEvent, joined = false) { protected async createMessageBody(mxEv: MatrixEvent, joined = false) {
let eventTile: string; let eventTile: string;
try {
if (this.isAttachment(mxEv)) { if (this.isAttachment(mxEv)) {
if (this.exportOptions.attachmentsIncluded) { if (this.exportOptions.attachmentsIncluded) {
try { try {
const blob = await this.getMediaBlob(mxEv); const blob = await this.getMediaBlob(mxEv);
if (this.totalSize + blob.size > this.exportOptions.maxSize) { if (this.totalSize + blob.size > this.exportOptions.maxSize) {
eventTile = await this.getEventTile(this.createModifiedEvent(this.mediaOmitText, mxEv), joined); eventTile = await this.getEventTile(
} else { this.createModifiedEvent(this.mediaOmitText, mxEv),
this.totalSize += blob.size; joined,
const filePath = this.getFilePath(mxEv); );
eventTile = await this.getEventTile(mxEv, joined, filePath); } else {
if (this.totalSize == this.exportOptions.maxSize) { this.totalSize += blob.size;
this.exportOptions.attachmentsIncluded = false; const filePath = this.getFilePath(mxEv);
eventTile = await this.getEventTile(mxEv, joined, filePath);
if (this.totalSize == this.exportOptions.maxSize) {
this.exportOptions.attachmentsIncluded = false;
}
this.addFile(filePath, blob);
} }
this.addFile(filePath, blob); } catch (e) {
console.log("Error while fetching file" + e);
eventTile = await this.getEventTile(
this.createModifiedEvent(_t("Error fetching file"), mxEv),
joined,
);
} }
} catch (e) { } else {
console.log("Error while fetching file" + e); eventTile = await this.getEventTile(this.createModifiedEvent(this.mediaOmitText, mxEv), joined);
eventTile = await this.getEventTile(
this.createModifiedEvent(_t("Error fetching file"), mxEv),
joined,
);
} }
} else { } else eventTile = await this.getEventTile(mxEv, joined);
eventTile = await this.getEventTile(this.createModifiedEvent(this.mediaOmitText, mxEv), joined); } catch (e) {
} // TODO: Handle callEvent errors
} else eventTile = await this.getEventTile(mxEv, joined); console.error(e);
eventTile = await this.getEventTile(this.createModifiedEvent("Error parsing HTML", mxEv), joined);
}
return eventTile; return eventTile;
} }