removed support for display of deleted message ranges

This commit is contained in:
or-else
2022-12-08 12:32:30 -08:00
parent 7731c6700b
commit b8e9ca8d0a
47 changed files with 42 additions and 239 deletions
+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
+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
+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
+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 -1
View File
File diff suppressed because one or more lines are too long
-7
View File
@@ -307,13 +307,6 @@
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"deleted_content": {
"translation": "Inhalt gelöscht",
"defaultMessage": "content deleted",
"description": "Shown when messages are deleted",
"missing": false,
"obsolete": false
},
"download_action": { "download_action": {
"translation": "herunterladen", "translation": "herunterladen",
"defaultMessage": "download", "defaultMessage": "download",
-7
View File
@@ -307,13 +307,6 @@
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"deleted_content": {
"translation": "content deleted",
"defaultMessage": "content deleted",
"description": "Shown when messages are deleted",
"missing": false,
"obsolete": false
},
"download_action": { "download_action": {
"translation": "download", "translation": "download",
"defaultMessage": "download", "defaultMessage": "download",
-7
View File
@@ -307,13 +307,6 @@
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"deleted_content": {
"translation": "este mensaje fue eliminado",
"defaultMessage": "content deleted",
"description": "Shown when messages are deleted",
"missing": false,
"obsolete": false
},
"download_action": { "download_action": {
"translation": "descargar", "translation": "descargar",
"defaultMessage": "download", "defaultMessage": "download",
-4
View File
@@ -215,10 +215,6 @@
"defaultMessage": "Are you sure you want to delete all messages for everyone? It cannot be undone.", "defaultMessage": "Are you sure you want to delete all messages for everyone? It cannot be undone.",
"description": "Alert dialog warning when hard-deleting all messages." "description": "Alert dialog warning when hard-deleting all messages."
}, },
"deleted_content": {
"defaultMessage": "content deleted",
"description": "Shown when messages are deleted"
},
"description_editing_placeholder": { "description_editing_placeholder": {
"defaultMessage": "Description (optional)", "defaultMessage": "Description (optional)",
"description": "Placeholder for editing topic description" "description": "Placeholder for editing topic description"
-7
View File
@@ -307,13 +307,6 @@
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"deleted_content": {
"translation": "contenu supprimé",
"defaultMessage": "content deleted",
"description": "Shown when messages are deleted",
"missing": false,
"obsolete": false
},
"download_action": { "download_action": {
"translation": "télécharger", "translation": "télécharger",
"defaultMessage": "download", "defaultMessage": "download",
-7
View File
@@ -307,13 +307,6 @@
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"deleted_content": {
"translation": "내용이 삭제되었습니다",
"defaultMessage": "content deleted",
"description": "Shown when messages are deleted",
"missing": false,
"obsolete": false
},
"download_action": { "download_action": {
"translation": "다운로드", "translation": "다운로드",
"defaultMessage": "download", "defaultMessage": "download",
-7
View File
@@ -307,13 +307,6 @@
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"deleted_content": {
"translation": "conținut șters",
"defaultMessage": "content deleted",
"description": "Shown when messages are deleted",
"missing": false,
"obsolete": false
},
"download_action": { "download_action": {
"translation": "download", "translation": "download",
"defaultMessage": "download", "defaultMessage": "download",
-7
View File
@@ -307,13 +307,6 @@
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"deleted_content": {
"translation": "удалено",
"defaultMessage": "content deleted",
"description": "Shown when messages are deleted",
"missing": false,
"obsolete": false
},
"download_action": { "download_action": {
"translation": "скачать", "translation": "скачать",
"defaultMessage": "download", "defaultMessage": "download",
-7
View File
@@ -307,13 +307,6 @@
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"deleted_content": {
"translation": "內容已被刪除",
"defaultMessage": "content deleted",
"description": "Shown when messages are deleted",
"missing": false,
"obsolete": false
},
"download_action": { "download_action": {
"translation": "下載", "translation": "下載",
"defaultMessage": "download", "defaultMessage": "download",
-7
View File
@@ -307,13 +307,6 @@
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"deleted_content": {
"translation": "内容已删除",
"defaultMessage": "content deleted",
"description": "Shown when messages are deleted",
"missing": false,
"obsolete": false
},
"download_action": { "download_action": {
"translation": "下载", "translation": "下载",
"defaultMessage": "download", "defaultMessage": "download",
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -9
View File
@@ -76,9 +76,7 @@ class BaseChatMessage extends React.PureComponent {
if (this.props.received == Tinode.MESSAGE_STATUS_FAILED) { if (this.props.received == Tinode.MESSAGE_STATUS_FAILED) {
menuItems.push('menu_item_send_retry'); menuItems.push('menu_item_send_retry');
} }
if (this.props.userIsWriter && if (this.props.userIsWriter && this.props.received > Tinode.MESSAGE_STATUS_FAILED) {
this.props.received > Tinode.MESSAGE_STATUS_FAILED &&
this.props.received < Tinode.MESSAGE_STATUS_DEL_RANGE) {
menuItems.push('menu_item_reply'); menuItems.push('menu_item_reply');
if (!this.props.response) { if (!this.props.response) {
menuItems.push('menu_item_edit'); menuItems.push('menu_item_edit');
@@ -146,12 +144,6 @@ class BaseChatMessage extends React.PureComponent {
}, this); }, this);
const tree = Drafty.format(content, fullFormatter, this.formatterContext); const tree = Drafty.format(content, fullFormatter, this.formatterContext);
content = React.createElement(React.Fragment, null, tree); content = React.createElement(React.Fragment, null, tree);
} else if (this.props.deleted) {
// Message represents a range of deleted messages.
content = <><i className="material-icons gray">block</i> <i className="gray">
<FormattedMessage id="deleted_content"
defaultMessage="content deleted" description="Shown when messages are deleted" />
</i></>
} else if (typeof content != 'string') { } else if (typeof content != 'string') {
content = <><i className="material-icons gray">warning_amber</i> <i className="gray"> content = <><i className="material-icons gray">warning_amber</i> <i className="gray">
<FormattedMessage id="invalid_content" <FormattedMessage id="invalid_content"
+1 -1
View File
@@ -80,7 +80,7 @@ class ContactList extends React.Component {
let previewIsResponse; let previewIsResponse;
let deliveryStatus; let deliveryStatus;
if (!this.props.showMode && c.latestMessage) { if (!this.props.showMode && c.latestMessage) {
const msg = c.latestMessage(true); const msg = c.latestMessage();
if (msg) { if (msg) {
forwarded = msg.head ? msg.head.forwarded : null; forwarded = msg.head ? msg.head.forwarded : null;
deliveryStatus = msg._status || c.msgStatus(msg, true); deliveryStatus = msg._status || c.msgStatus(msg, true);
+1 -9
View File
@@ -1,7 +1,6 @@
// Message bubble with non-payload content, such as an indicator of deleted content or a date stamp. // Message bubble with non-payload content, such as an indicator of deleted content or a date stamp.
import React from 'react'; import React from 'react';
import { FormattedMessage } from 'react-intl';
export default class MetaMessage extends React.PureComponent { export default class MetaMessage extends React.PureComponent {
constructor(props) { constructor(props) {
@@ -11,14 +10,7 @@ export default class MetaMessage extends React.PureComponent {
render() { render() {
let content = null; let content = null;
let bubbleClass = 'bubble'; let bubbleClass = 'bubble';
if (this.props.deleted) { if (this.props.date) {
// Message represents a range of deleted messages.
content = <><i className="material-icons gray">block</i> <i className="gray">
<FormattedMessage id="deleted_content"
defaultMessage="content deleted" description="Shown when messages are deleted" />
</i></>
bubbleClass += ' deleted';
} else if (this.props.date) {
// A date badge. // A date badge.
content = <>{this.props.date}</> content = <>{this.props.date}</>
bubbleClass += ' date'; bubbleClass += ' date';
+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
+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
+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
+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
+1 -1
View File
File diff suppressed because one or more lines are too long
+4 -32
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
+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
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+3 -89
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