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

Add unblocked timeline event

Browse source
This commit is contained in:
Jamie Kyle 2024-04-12 10:07:57 -07:00 • committed by GitHub
parent 92eb036196
commit ad8020848f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 333 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
ts/util/getNotificationDataForMessage.ts
View file

@ -25,7 +25,7 @@ import { getStringForConversationMerge } from './getStringForConversationMerge';
import { getStringForProfileChange } from './getStringForProfileChange';
import { getTitleNoDefault, getNumber } from './getTitle';
import { findAndFormatContact } from './findAndFormatContact';
import { isMe } from './whatTypeOfConversation';
import { isGroup, isMe } from './whatTypeOfConversation';
import { strictAssert } from './assert';
import {
getPropsForCallHistory,
@ -186,6 +186,14 @@ export function getNotificationDataForMessage(
event,
'getNotificationData: isMessageRequestResponse true, but no messageRequestResponseEvent!'
);
const conversation = window.ConversationController.get(
attributes.conversationId
);
strictAssert(
conversation,
'getNotificationData/isConversationMerge/conversation'
);
const isGroupConversation = isGroup(conversation.attributes);
let text: string;
if (event === MessageRequestResponseEvent.ACCEPT) {
text = window.i18n(
@ -196,9 +204,25 @@ export function getNotificationDataForMessage(
'icu:MessageRequestResponseNotification__Message--Reported'
);
} else if (event === MessageRequestResponseEvent.BLOCK) {
text = window.i18n(
'icu:MessageRequestResponseNotification__Message--Blocked'
);
if (isGroupConversation) {
text = window.i18n(
'icu:MessageRequestResponseNotification__Message--Blocked--Group'
);
} else {
text = window.i18n(
'icu:MessageRequestResponseNotification__Message--Blocked'
);
}
} else if (event === MessageRequestResponseEvent.UNBLOCK) {
if (isGroupConversation) {
text = window.i18n(
'icu:MessageRequestResponseNotification__Message--Unblocked--Group'
);
} else {
text = window.i18n(
'icu:MessageRequestResponseNotification__Message--Unblocked'
);
}
} else {
throw missingCaseError(event);
}