Remove Conversation Message Preview After Message Has Expired
- [x] Skip timestamp update for `verified-change` and expiring messages to
prevent them to bump to the top of the conversation list.
- [x] Skip message preview (`lastMessage`) update for `verified-change` messages
since they don’t contain any message body.
- [x] Reset last message if conversation is empty.
Fixes https://github.com/signalapp/Signal-Desktop/issues/980.
pull/1/head
Daniel Gasienica
7 years ago
commit
1206b3c448
@ -0,0 +1,102 @@
|
||||
import 'mocha';
|
||||
import { assert } from 'chai';
|
||||
|
||||
import * as Conversation from '../../types/Conversation';
|
||||
import {
|
||||
IncomingMessage,
|
||||
OutgoingMessage,
|
||||
VerifiedChangeMessage,
|
||||
} from '../../types/Message';
|
||||
|
||||
describe('Conversation', () => {
|
||||
describe('createLastMessageUpdate', () => {
|
||||
it('should reset last message if conversation has no messages', () => {
|
||||
const input = {
|
||||
currentLastMessageText: null,
|
||||
currentTimestamp: null,
|
||||
lastMessage: null,
|
||||
lastMessageNotificationText: null,
|
||||
};
|
||||
const expected = {
|
||||
lastMessage: '',
|
||||
timestamp: null,
|
||||
};
|
||||
|
||||
const actual = Conversation.createLastMessageUpdate(input);
|
||||
assert.deepEqual(actual, expected);
|
||||
});
|
||||
|
||||
context('for regular message', () => {
|
||||
it('should update last message text and timestamp', () => {
|
||||
const input = {
|
||||
currentLastMessageText: 'Existing message',
|
||||
currentTimestamp: 555,
|
||||
lastMessage: {
|
||||
type: 'outgoing',
|
||||
conversationId: 'foo',
|
||||
sent_at: 666,
|
||||
timestamp: 666,
|
||||
} as OutgoingMessage,
|
||||
lastMessageNotificationText: 'New outgoing message',
|
||||
};
|
||||
const expected = {
|
||||
lastMessage: 'New outgoing message',
|
||||
timestamp: 666,
|
||||
};
|
||||
|
||||
const actual = Conversation.createLastMessageUpdate(input);
|
||||
assert.deepEqual(actual, expected);
|
||||
});
|
||||
});
|
||||
context('for verified change message', () => {
|
||||
it('should skip update', () => {
|
||||
const input = {
|
||||
currentLastMessageText: 'bingo',
|
||||
currentTimestamp: 555,
|
||||
lastMessage: {
|
||||
type: 'verified-change',
|
||||
conversationId: 'foo',
|
||||
sent_at: 666,
|
||||
timestamp: 666,
|
||||
} as VerifiedChangeMessage,
|
||||
lastMessageNotificationText: 'Verified Changed',
|
||||
};
|
||||
const expected = {
|
||||
lastMessage: 'bingo',
|
||||
timestamp: 555,
|
||||
};
|
||||
|
||||
const actual = Conversation.createLastMessageUpdate(input);
|
||||
assert.deepEqual(actual, expected);
|
||||
});
|
||||
});
|
||||
|
||||
context('for expired message', () => {
|
||||
it('should update message but not timestamp (to prevent bump to top)', () => {
|
||||
const input = {
|
||||
currentLastMessageText: 'I am expired',
|
||||
currentTimestamp: 555,
|
||||
lastMessage: {
|
||||
type: 'incoming',
|
||||
conversationId: 'foo',
|
||||
sent_at: 666,
|
||||
timestamp: 666,
|
||||
expirationTimerUpdate: {
|
||||
expireTimer: 111,
|
||||
fromSync: false,
|
||||
source: '+12223334455',
|
||||
},
|
||||
} as IncomingMessage,
|
||||
lastMessageNotificationText: 'Last message before expired',
|
||||
};
|
||||
const expected = {
|
||||
lastMessage: 'Last message before expired',
|
||||
timestamp: 555,
|
||||
};
|
||||
|
||||
const actual = Conversation.createLastMessageUpdate(input);
|
||||
assert.deepEqual(actual, expected);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,19 @@
|
||||
import { MIMEType } from './MIME';
|
||||
|
||||
|
||||
export interface Attachment {
|
||||
fileName?: string;
|
||||
contentType?: MIMEType;
|
||||
size?: number;
|
||||
data: ArrayBuffer;
|
||||
|
||||
// // Omit unused / deprecated keys:
|
||||
// schemaVersion?: number;
|
||||
// id?: string;
|
||||
// width?: number;
|
||||
// height?: number;
|
||||
// thumbnail?: ArrayBuffer;
|
||||
// key?: ArrayBuffer;
|
||||
// digest?: ArrayBuffer;
|
||||
// flags?: number;
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
import is from '@sindresorhus/is';
|
||||
import { Message } from './Message';
|
||||
|
||||
|
||||
interface ConversationLastMessageUpdate {
|
||||
lastMessage: string | null;
|
||||
timestamp: number | null;
|
||||
}
|
||||
|
||||
export const createLastMessageUpdate = ({
|
||||
currentLastMessageText,
|
||||
currentTimestamp,
|
||||
lastMessage,
|
||||
lastMessageNotificationText,
|
||||
}: {
|
||||
currentLastMessageText: string | null,
|
||||
currentTimestamp: number | null,
|
||||
lastMessage: Message | null,
|
||||
lastMessageNotificationText: string | null,
|
||||
}): ConversationLastMessageUpdate => {
|
||||
if (lastMessage === null) {
|
||||
return {
|
||||
lastMessage: '',
|
||||
timestamp: null,
|
||||
};
|
||||
}
|
||||
|
||||
const { type } = lastMessage;
|
||||
const isVerifiedChangeMessage = type === 'verified-change';
|
||||
const isExpiringMessage = is.object(lastMessage.expirationTimerUpdate);
|
||||
const shouldUpdateTimestamp = !isVerifiedChangeMessage && !isExpiringMessage;
|
||||
|
||||
const newTimestamp = shouldUpdateTimestamp ?
|
||||
lastMessage.sent_at :
|
||||
currentTimestamp;
|
||||
|
||||
const shouldUpdateLastMessageText = !isVerifiedChangeMessage;
|
||||
const newLastMessageText = shouldUpdateLastMessageText ?
|
||||
lastMessageNotificationText : currentLastMessageText;
|
||||
|
||||
return {
|
||||
lastMessage: newLastMessageText,
|
||||
timestamp: newTimestamp,
|
||||
};
|
||||
};
|
||||
@ -0,0 +1 @@
|
||||
export type MIMEType = string & { _mimeTypeBrand: any };
|
||||
@ -0,0 +1,62 @@
|
||||
import { Attachment } from './Attachment';
|
||||
|
||||
|
||||
export type Message
|
||||
= IncomingMessage
|
||||
| OutgoingMessage
|
||||
| VerifiedChangeMessage;
|
||||
|
||||
export type IncomingMessage = Readonly<{
|
||||
type: 'incoming';
|
||||
attachments: Array<Attachment>;
|
||||
body?: string;
|
||||
decrypted_at?: number;
|
||||
errors?: Array<any>;
|
||||
flags?: number;
|
||||
id: string;
|
||||
received_at: number;
|
||||
source?: string;
|
||||
sourceDevice?: number;
|
||||
} & SharedMessageProperties & Message4 & ExpirationTimerUpdate>;
|
||||
|
||||
export type OutgoingMessage = Readonly<{
|
||||
type: 'outgoing';
|
||||
attachments: Array<Attachment>;
|
||||
body?: string;
|
||||
delivered: number;
|
||||
delivered_to: Array<string>;
|
||||
destination: string; // PhoneNumber
|
||||
expirationStartTimestamp: number;
|
||||
expires_at?: number;
|
||||
expireTimer?: number;
|
||||
id: string;
|
||||
received_at: number;
|
||||
recipients?: Array<string>; // Array<PhoneNumber>
|
||||
sent: boolean;
|
||||
sent_to: Array<string>; // Array<PhoneNumber>
|
||||
synced: boolean;
|
||||
} & SharedMessageProperties & Message4 & ExpirationTimerUpdate>;
|
||||
|
||||
export type VerifiedChangeMessage = Readonly<{
|
||||
type: 'verified-change';
|
||||
} & SharedMessageProperties & Message4 & ExpirationTimerUpdate>;
|
||||
|
||||
type SharedMessageProperties = Readonly<{
|
||||
conversationId: string;
|
||||
sent_at: number;
|
||||
timestamp: number;
|
||||
}>;
|
||||
|
||||
type ExpirationTimerUpdate = Readonly<{
|
||||
expirationTimerUpdate?: Readonly<{
|
||||
expireTimer: number;
|
||||
fromSync: boolean;
|
||||
source: string; // PhoneNumber
|
||||
}>,
|
||||
}>;
|
||||
|
||||
type Message4 = Readonly<{
|
||||
numAttachments?: number;
|
||||
numVisualMediaAttachments?: number;
|
||||
numFileAttachments?: number;
|
||||
}>;
|
||||
Loading…
Reference in New Issue