mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Clean up "can reply" logic, add tests

Browse source
This commit is contained in:
Evan Hahn 2021-07-01 18:57:10 -05:00 • committed by GitHub
parent 7dac480df5
commit 56933192ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 88 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ts/state/selectors/message.ts
View file

@ -1070,11 +1070,14 @@ function processQuoteAttachment(
}
export function canReply(
message: MessageAttributesType,
message: Pick<
MessageAttributesType,
'conversationId' | 'deletedForEveryone' | 'sent_to' | 'type'
>,
conversationSelector: GetConversationByIdType
): boolean {
const conversation = getConversation(message, conversationSelector);
const { delivered, errors } = message;
const { deletedForEveryone, sent_to: sentTo } = message;
if (!conversation) {
return false;
@ -1097,17 +1100,17 @@ export function canReply(
}
// We cannot reply if this message is deleted for everyone
if (message.deletedForEveryone) {
if (deletedForEveryone) {
return false;
}
// We can reply if this is outgoing and delivered to at least one recipient
if (isOutgoing(message) && delivered && delivered > 0) {
return true;
// We can reply if this is outgoing and sent to at least one recipient
if (isOutgoing(message)) {
return (sentTo || []).length > 0;
}
// We can reply if there are no errors
if (!errors || (errors && errors.length === 0)) {
// We can reply to incoming messages
if (isIncoming(message)) {
return true;
}