prevent premature subscription

This commit is contained in:
or-else
2019-02-28 15:28:54 +03:00
parent 0f13f2edb9
commit d13b24263e
6 changed files with 26 additions and 8 deletions
+4 -3
View File
@@ -111,8 +111,8 @@ class MessagesView extends React.Component {
}
}
if (topic && !topic.isSubscribed() && this.props.tinode.isAuthenticated() &&
((!prevProps.connected && this.props.connected) || (this.state.topic != prevState.topic))) {
if (topic && !topic.isSubscribed() && this.props.ready &&
((this.state.topic != prevState.topic) || !prevProps.ready)) {
// Don't request the tags. They are useless unless the user
// is the owner and is editing the topic.
let getQuery = topic.startMetaQuery().withLaterDesc().withLaterSub();
@@ -356,7 +356,8 @@ class MessagesView extends React.Component {
newState.scrollPosition = 0;
}
// Aknowledge messages except own messages.
// Aknowledge messages except own messages. They are
// automatically assumed to be read and recived.
const status = topic.msgStatus(msg);
if (status >= Tinode.MESSAGE_STATUS_SENT && msg.from != this.props.myUserId) {
this.props.readTimerHandler(() => {