ignore trailing deleted ranges for message previews

2021-05-19 15:11:06 -07:00
parent 034944877c
commit 92f7464477
7 changed files with 34 additions and 17 deletions
@@ -79,7 +79,7 @@ class ContactList extends React.Component {
          let preview;
          let deliveryStatus;
          if (!this.props.showMode && c.latestMessage) {
-            const msg = c.latestMessage();
+            const msg = c.latestMessage(true);
            if (msg) {
              deliveryStatus = msg._status || c.msgStatus(msg, true);
              preview = typeof msg.content == 'string' ?
@@ -3360,11 +3360,11 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
  }
  leave(oldTopicName) {
-    if (!oldTopicName) {
+    if (!oldTopicName || !this.props.tinode.isTopicCached(oldTopicName)) {
      return;
    }
-    let oldTopic = this.props.tinode.getTopic(oldTopicName);
+    const oldTopic = this.props.tinode.getTopic(oldTopicName);
    if (oldTopic && oldTopic.isSubscribed()) {
      oldTopic.leave(false).catch(() => {}).finally(() => {
@@ -7690,7 +7690,7 @@ class ContactList extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
          let deliveryStatus;
          if (!this.props.showMode && c.latestMessage) {
-            const msg = c.latestMessage();
+            const msg = c.latestMessage(true);
            if (msg) {
              deliveryStatus = msg._status || c.msgStatus(msg, true);