Show read/viewed even after read receipts disabled
This commit is contained in:
parent
8bcf3addc7
commit
2c59c71872
6 changed files with 20 additions and 70 deletions
|
@ -3850,11 +3850,7 @@ export class ConversationModel extends window.Backbone
|
|||
(previewMessage ? previewMessage.getNotificationText() : '') || '',
|
||||
lastMessageStatus:
|
||||
(previewMessage
|
||||
? getMessagePropStatus(
|
||||
previewMessage.attributes,
|
||||
ourConversationId,
|
||||
window.storage.get('read-receipt-setting', false)
|
||||
)
|
||||
? getMessagePropStatus(previewMessage.attributes, ourConversationId)
|
||||
: null) || null,
|
||||
timestamp,
|
||||
lastMessageDeletedForEveryone: previewMessage
|
||||
|
|
|
@ -367,7 +367,6 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
|
|||
this.OUR_UUID,
|
||||
undefined,
|
||||
undefined,
|
||||
window.storage.get('read-receipt-setting', false),
|
||||
window.storage.get('regionCode', 'ZZ'),
|
||||
(identifier?: string) => {
|
||||
const state = window.reduxStore.getState();
|
||||
|
@ -3336,8 +3335,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
|
|||
(isIncoming(attributes) ||
|
||||
getMessagePropStatus(
|
||||
attributes,
|
||||
window.ConversationController.getOurConversationIdOrThrow(),
|
||||
window.storage.get('read-receipt-setting', false)
|
||||
window.ConversationController.getOurConversationIdOrThrow()
|
||||
) !== 'partial-sent')
|
||||
) {
|
||||
return undefined;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue