@ -394,14 +394,6 @@
} ) ;
} ) ;
}
}
attributes . active _at = now ;
attributes . active _at = now ;
if ( type === 'incoming' ) {
// experimental
if ( Whisper . ReadReceipts . forMessage ( message ) || message . isExpirationTimerUpdate ( ) ) {
message . unset ( 'unread' ) ;
} else {
attributes . unreadCount = conversation . get ( 'unreadCount' ) + 1 ;
}
}
conversation . set ( attributes ) ;
conversation . set ( attributes ) ;
if ( message . isExpirationTimerUpdate ( ) ) {
if ( message . isExpirationTimerUpdate ( ) ) {
@ -428,6 +420,19 @@
message . get ( 'received_at' ) ) ;
message . get ( 'received_at' ) ) ;
}
}
}
}
if ( type === 'incoming' ) {
var readReceipt = Whisper . ReadReceipts . forMessage ( message ) ;
if ( readReceipt ) {
if ( message . get ( 'expireTimer' ) && ! message . get ( 'expirationStartTimestamp' ) ) {
message . set ( 'expirationStartTimestamp' , readReceipt . get ( 'read_at' ) ) ;
}
}
if ( readReceipt || message . isExpirationTimerUpdate ( ) ) {
message . unset ( 'unread' ) ;
} else {
conversation . set ( 'unreadCount' , conversation . get ( 'unreadCount' ) + 1 ) ;
}
}
var conversation _timestamp = conversation . get ( 'timestamp' ) ;
var conversation _timestamp = conversation . get ( 'timestamp' ) ;
if ( ! conversation _timestamp || message . get ( 'sent_at' ) > conversation _timestamp ) {
if ( ! conversation _timestamp || message . get ( 'sent_at' ) > conversation _timestamp ) {