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

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
+5 -7
View File
@@ -110,11 +110,9 @@ export default class ChatMessage extends React.Component {
defaultMessage="content deleted" description="Shown when messages are deleted" /> defaultMessage="content deleted" description="Shown when messages are deleted" />
</i></> </i></>
} else if (typeof content != 'string') { } else if (typeof content != 'string') {
content = <> content = <><i className="material-icons gray">error_outline</i> <i className="gray">
<i className="material-icons gray">error_outline</i> <i className="gray"> <FormattedMessage id="invalid_content"
<FormattedMessage id="invalid_content" defaultMessage="invalid content" description="Shown when message is unreadable" /></i></>
defaultMessage="invalid content" description="Shown when message is unreadable" /></i>
</>
} }
return ( return (
@@ -240,8 +238,8 @@ function draftyFormatter(style, data, values, key) {
default: default:
if (el == '_UNKN') { if (el == '_UNKN') {
// Unknown element. // Unknown element.
// TODO: make it prettier. el = React.Fragment;
el = <><span className="material-icons">extension</span></>; values = [<i className="material-icons gray">extension</i>, ' '].concat(values || []);
} }
break; break;
} }
+1 -1
View File
@@ -177,7 +177,7 @@ function draftyFormatter(style, data, values, key) {
default: default:
if (el == '_UNKN') { if (el == '_UNKN') {
el = React.Fragment; el = React.Fragment;
values = [<i key="unkn" className="material-icons">extension</i>]; values = [<i key="unkn" className="material-icons">extension</i>, ' '].concat(values || []);
} }
break; break;
} }
+5 -4
View File
@@ -7265,9 +7265,10 @@ function draftyFormatter(style, data, values, key) {
default: default:
if (el == '_UNKN') { if (el == '_UNKN') {
el = react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", { el = (react__WEBPACK_IMPORTED_MODULE_0___default().Fragment);
className: "material-icons" values = [react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", {
}, "extension")); className: "material-icons gray"
}, "extension"), ' '].concat(values || []);
} }
break; break;
@@ -8070,7 +8071,7 @@ function draftyFormatter(style, data, values, key) {
values = [react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", { values = [react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", {
key: "unkn", key: "unkn",
className: "material-icons" className: "material-icons"
}, "extension")]; }, "extension"), ' '].concat(values || []);
} }
break; break;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -2
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long