message previews work
This commit is contained in:
@@ -516,7 +516,7 @@ class MessagesView extends React.Component {
|
|||||||
|
|
||||||
// Aknowledge messages except own messages. They are
|
// Aknowledge messages except own messages. They are
|
||||||
// automatically assumed to be read and recived.
|
// automatically assumed to be read and recived.
|
||||||
const status = topic.msgStatus(msg);
|
const status = topic.msgStatus(msg, true);
|
||||||
if (status >= Tinode.MESSAGE_STATUS_SENT && msg.from != this.props.myUserId) {
|
if (status >= Tinode.MESSAGE_STATUS_SENT && msg.from != this.props.myUserId) {
|
||||||
this.postReadNotification(msg.seq);
|
this.postReadNotification(msg.seq);
|
||||||
}
|
}
|
||||||
@@ -849,7 +849,7 @@ class MessagesView extends React.Component {
|
|||||||
previousFrom = thisFrom;
|
previousFrom = thisFrom;
|
||||||
|
|
||||||
const isReply = !(thisFrom == this.props.myUserId);
|
const isReply = !(thisFrom == this.props.myUserId);
|
||||||
const deliveryStatus = topic.msgStatus(msg);
|
const deliveryStatus = topic.msgStatus(msg, true);
|
||||||
|
|
||||||
let userName, userAvatar, userFrom;
|
let userName, userAvatar, userFrom;
|
||||||
if (groupTopic) {
|
if (groupTopic) {
|
||||||
|
|||||||
@@ -688,7 +688,7 @@ class TinodeWeb extends React.Component {
|
|||||||
// Sending "received" notifications
|
// Sending "received" notifications
|
||||||
tnData(data) {
|
tnData(data) {
|
||||||
const topic = this.tinode.getTopic(data.topic);
|
const topic = this.tinode.getTopic(data.topic);
|
||||||
if (topic.msgStatus(data) >= Tinode.MESSAGE_STATUS_SENT && data.from != this.state.myUserId) {
|
if (topic.msgStatus(data, true) >= Tinode.MESSAGE_STATUS_SENT && data.from != this.state.myUserId) {
|
||||||
clearTimeout(this.receivedTimer);
|
clearTimeout(this.receivedTimer);
|
||||||
this.receivedTimer = setTimeout(() => {
|
this.receivedTimer = setTimeout(() => {
|
||||||
this.receivedTimer = undefined;
|
this.receivedTimer = undefined;
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ class ContactList extends React.Component {
|
|||||||
if (!this.props.showMode) {
|
if (!this.props.showMode) {
|
||||||
const msg = c.latestMessage();
|
const msg = c.latestMessage();
|
||||||
if (msg) {
|
if (msg) {
|
||||||
deliveryStatus = c.msgStatus(msg);
|
deliveryStatus = msg._status || c.msgStatus(msg, true);
|
||||||
preview = typeof msg.content == 'string' ?
|
preview = typeof msg.content == 'string' ?
|
||||||
msg.content.substr(0, MESSAGE_PREVIEW_LENGTH) :
|
msg.content.substr(0, MESSAGE_PREVIEW_LENGTH) :
|
||||||
Drafty.preview(msg.content, MESSAGE_PREVIEW_LENGTH);
|
Drafty.preview(msg.content, MESSAGE_PREVIEW_LENGTH);
|
||||||
|
|||||||
+4
-4
@@ -3562,7 +3562,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
|
|||||||
newState.scrollPosition = 0;
|
newState.scrollPosition = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
const status = topic.msgStatus(msg);
|
const status = topic.msgStatus(msg, true);
|
||||||
|
|
||||||
if (status >= (tinode_sdk__WEBPACK_IMPORTED_MODULE_2___default().MESSAGE_STATUS_SENT) && msg.from != this.props.myUserId) {
|
if (status >= (tinode_sdk__WEBPACK_IMPORTED_MODULE_2___default().MESSAGE_STATUS_SENT) && msg.from != this.props.myUserId) {
|
||||||
this.postReadNotification(msg.seq);
|
this.postReadNotification(msg.seq);
|
||||||
@@ -3909,7 +3909,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
|
|||||||
|
|
||||||
previousFrom = thisFrom;
|
previousFrom = thisFrom;
|
||||||
const isReply = !(thisFrom == this.props.myUserId);
|
const isReply = !(thisFrom == this.props.myUserId);
|
||||||
const deliveryStatus = topic.msgStatus(msg);
|
const deliveryStatus = topic.msgStatus(msg, true);
|
||||||
let userName, userAvatar, userFrom;
|
let userName, userAvatar, userFrom;
|
||||||
|
|
||||||
if (groupTopic) {
|
if (groupTopic) {
|
||||||
@@ -5502,7 +5502,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
|
|||||||
tnData(data) {
|
tnData(data) {
|
||||||
const topic = this.tinode.getTopic(data.topic);
|
const topic = this.tinode.getTopic(data.topic);
|
||||||
|
|
||||||
if (topic.msgStatus(data) >= (tinode_sdk__WEBPACK_IMPORTED_MODULE_5___default().MESSAGE_STATUS_SENT) && data.from != this.state.myUserId) {
|
if (topic.msgStatus(data, true) >= (tinode_sdk__WEBPACK_IMPORTED_MODULE_5___default().MESSAGE_STATUS_SENT) && data.from != this.state.myUserId) {
|
||||||
clearTimeout(this.receivedTimer);
|
clearTimeout(this.receivedTimer);
|
||||||
this.receivedTimer = setTimeout(() => {
|
this.receivedTimer = setTimeout(() => {
|
||||||
this.receivedTimer = undefined;
|
this.receivedTimer = undefined;
|
||||||
@@ -7638,7 +7638,7 @@ class ContactList extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
|
|||||||
const msg = c.latestMessage();
|
const msg = c.latestMessage();
|
||||||
|
|
||||||
if (msg) {
|
if (msg) {
|
||||||
deliveryStatus = c.msgStatus(msg);
|
deliveryStatus = msg._status || c.msgStatus(msg, true);
|
||||||
preview = typeof msg.content == 'string' ? msg.content.substr(0, _config_js__WEBPACK_IMPORTED_MODULE_6__.MESSAGE_PREVIEW_LENGTH) : tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.preview(msg.content, _config_js__WEBPACK_IMPORTED_MODULE_6__.MESSAGE_PREVIEW_LENGTH);
|
preview = typeof msg.content == 'string' ? msg.content.substr(0, _config_js__WEBPACK_IMPORTED_MODULE_6__.MESSAGE_PREVIEW_LENGTH) : tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.preview(msg.content, _config_js__WEBPACK_IMPORTED_MODULE_6__.MESSAGE_PREVIEW_LENGTH);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+240
-103
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user