check Drafty for validity

This commit is contained in:
or-else
2020-02-23 21:44:08 +03:00
parent fd4cb58f0c
commit 2fd8346dc5
7 changed files with 98 additions and 59 deletions
+6 -5
View File
@@ -81,7 +81,7 @@ export default class ChatMessage extends React.Component {
let content = this.props.content;
const attachments = [];
if (this.props.mimeType == Drafty.getContentType()) {
if (this.props.mimeType == Drafty.getContentType() && Drafty.isValid(content)) {
Drafty.attachments(content, function(att, i) {
if (att.mime == 'application/json') {
// Don't show json objects as attachments.
@@ -106,10 +106,11 @@ 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 (
+1 -1
View File
@@ -7093,7 +7093,7 @@ var ChatMessage = function (_React$Component) {
var content = this.props.content;
var attachments = [];
if (this.props.mimeType == tinode_sdk__WEBPACK_IMPORTED_MODULE_2__["Drafty"].getContentType()) {
if (this.props.mimeType == tinode_sdk__WEBPACK_IMPORTED_MODULE_2__["Drafty"].getContentType() && tinode_sdk__WEBPACK_IMPORTED_MODULE_2__["Drafty"].isValid(content)) {
tinode_sdk__WEBPACK_IMPORTED_MODULE_2__["Drafty"].attachments(content, function (att, i) {
if (att.mime == 'application/json') {
return;
+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
+87 -49
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