pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash on unknown fmt in drafty message (QQ in this case)

Browse Source
This commit is contained in:
or-else
2021-08-31 19:44:53 -07:00
parent 25bd8d2ada
commit ffca6573df
8 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/chat-message.jsx
+5 -7
View File
@@ -110,11 +110,9 @@ export default class ChatMessage extends React.Component {
defaultMessage="content deleted" description="Shown when messages are deleted" />
</i></>
} else if (typeof content != 'string') {
content = <>
<i className="material-icons gray">error_outline</i> <i className="gray">
<FormattedMessage id="invalid_content"
defaultMessage="invalid content" description="Shown when message is unreadable" /></i>
</>
content = <><i className="material-icons gray">error_outline</i> <i className="gray">
<FormattedMessage id="invalid_content"
defaultMessage="invalid content" description="Shown when message is unreadable" /></i></>
}
return (
@@ -240,8 +238,8 @@ function draftyFormatter(style, data, values, key) {
default:
if (el == '_UNKN') {
// Unknown element.
// TODO: make it prettier.
el = <><span className="material-icons">extension</span></>;
el = React.Fragment;
values = [<i className="material-icons gray">extension</i>, ' '].concat(values || []);
}
break;
}
src/widgets/contact.jsx
+1 -1
View File
@@ -177,7 +177,7 @@ function draftyFormatter(style, data, values, key) {
default:
if (el == '_UNKN') {
el = React.Fragment;
values = [<i key="unkn" className="material-icons">extension</i>];
values = [<i key="unkn" className="material-icons">extension</i>, ' '].concat(values || []);
}
break;
}