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

Update call strings

Browse source
This commit is contained in:
ayumi-signal 2024-07-30 16:21:33 -07:00 • committed by GitHub
parent a634792be7
commit 26140ee3d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 289 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ts/components/CallsList.tsx
View file

@ -758,14 +758,18 @@ export function CallsList({
item.direction === CallDirection.Incoming &&
(item.status === DirectCallStatus.Missed ||
item.status === GroupCallStatus.Missed);
const wasDeclined =
item.direction === CallDirection.Incoming &&
(item.status === DirectCallStatus.Declined ||
item.status === GroupCallStatus.Declined);
let statusText;
if (wasMissed) {
statusText = i18n('icu:CallsList__ItemCallInfo--Missed');
} else if (wasDeclined) {
statusText = i18n('icu:CallsList__ItemCallInfo--Declined');
} else if (isAdhoc) {
statusText = i18n('icu:CallsList__ItemCallInfo--CallLink');
} else if (item.type === CallType.Group) {
statusText = i18n('icu:CallsList__ItemCallInfo--GroupCall');
} else if (item.direction === CallDirection.Outgoing) {
statusText = i18n('icu:CallsList__ItemCallInfo--Outgoing');
} else if (item.direction === CallDirection.Incoming) {
@ -819,6 +823,7 @@ export function CallsList({
className={classNames('CallsList__Item', {
'CallsList__Item--selected': isSelected,
'CallsList__Item--missed': wasMissed,
'CallsList__Item--declined': wasDeclined,
})}
>
<ListTile

24
ts/components/conversation/CallingNotification.tsx
View file

@ -35,6 +35,8 @@ import {
useKeyboardShortcutsConditionally,
useOpenContextMenu,
} from '../../hooks/useKeyboardShortcuts';
import { MINUTE } from '../../util/durations';
import { isMoreRecentThan } from '../../util/timestamp';
export type PropsActionsType = {
onOutgoingAudioCallInConversation: (conversationId: string) => void;
@ -105,7 +107,9 @@ export const CallingNotification: React.FC<PropsType> = React.memo(
icon={icon}
kind={
status === DirectCallStatus.Missed ||
status === GroupCallStatus.Missed
status === GroupCallStatus.Missed ||
status === DirectCallStatus.Declined ||
status === GroupCallStatus.Declined
? SystemMessageKind.Danger
: SystemMessageKind.Normal
}
@ -188,9 +192,21 @@ function renderCallingNotificationButton(
}
case CallMode.Group: {
if (props.groupCallEnded) {
return null;
}
if (props.activeConversationId != null) {
const { direction, status, timestamp } = props.callHistory;
if (
(direction === CallDirection.Incoming &&
(status === GroupCallStatus.Declined ||
status === GroupCallStatus.Missed)) ||
isMoreRecentThan(timestamp, 5 * MINUTE)
) {
buttonText = i18n('icu:calling__call-back');
onClick = () => {
onOutgoingVideoCallInConversation(conversationId);
};
} else {
return null;
}
} else if (props.activeConversationId != null) {
if (props.activeConversationId === conversationId) {
buttonText = i18n('icu:calling__return');
onClick = returnToActiveCall;

29
ts/components/conversation/conversation-details/CallHistoryGroupPanelSection.tsx
View file

@ -13,6 +13,7 @@ import {
import type { LocalizerType } from '../../../types/I18N';
import { formatDate, formatTime } from '../../../util/timestamp';
import { PanelSection } from './PanelSection';
import { getDirectCallNotificationText } from '../../../util/callingNotification';
function describeCallHistory(
i18n: LocalizerType,
@ -24,19 +25,27 @@ function describeCallHistory(
return i18n('icu:CallHistory__Description--Adhoc');
}
if (status === DirectCallStatus.Missed || status === GroupCallStatus.Missed) {
if (direction === CallDirection.Incoming) {
return i18n('icu:CallHistory__Description--Missed', { type });
}
return i18n('icu:CallHistory__Description--Unanswered', { type });
}
if (
status === DirectCallStatus.Declined ||
status === GroupCallStatus.Declined
(type === CallType.Audio || type === CallType.Video) &&
(status === DirectCallStatus.Accepted ||
status === DirectCallStatus.Declined ||
status === DirectCallStatus.Deleted ||
status === DirectCallStatus.Missed ||
status === DirectCallStatus.Pending)
) {
return i18n('icu:CallHistory__Description--Declined', { type });
return getDirectCallNotificationText(direction, type, status, i18n);
}
return i18n('icu:CallHistory__Description--Default', { type, direction });
if (status === GroupCallStatus.Missed) {
if (direction === CallDirection.Incoming) {
return i18n('icu:CallHistory__DescriptionVideoCall--Missed');
}
return i18n('icu:CallHistory__DescriptionVideoCall--Unanswered');
}
if (status === GroupCallStatus.Declined) {
return i18n('icu:CallHistory__DescriptionVideoCall--Declined');
}
return i18n('icu:CallHistory__DescriptionVideoCall--Default', { direction });
}
export type CallHistoryPanelSectionProps = Readonly<{

158
ts/test-both/util/callingNotification_test.ts
View file

@ -16,6 +16,7 @@ import {
GroupCallStatus,
} from '../../types/CallDisposition';
import { getPeerIdFromConversation } from '../../util/callDisposition';
import { HOUR } from '../../util/durations';
describe('calling notification helpers', () => {
const i18n = setupI18n('en', enMessages);
@ -23,7 +24,7 @@ describe('calling notification helpers', () => {
describe('getCallingNotificationText', () => {
// Direct call behavior is not tested here.
it('says that the call has ended', () => {
it('says that the incoming call has ended', () => {
const callCreator = getDefaultConversation();
assert.strictEqual(
getCallingNotificationText(
@ -36,6 +37,122 @@ describe('calling notification helpers', () => {
type: CallType.Group,
direction: CallDirection.Incoming,
timestamp: Date.now(),
status: GroupCallStatus.Joined,
},
callCreator,
activeConversationId: null,
groupCallEnded: true,
deviceCount: 1,
maxDevices: 23,
isSelectMode: false,
isTargeted: false,
},
i18n
),
'The video call has ended'
);
});
it('says that the outgoing call has ended', () => {
const callCreator = getDefaultConversation();
assert.strictEqual(
getCallingNotificationText(
{
callHistory: {
callId: '123',
peerId: getPeerIdFromConversation(getDefaultGroup()),
ringerId: callCreator.serviceId ?? null,
mode: CallMode.Group,
type: CallType.Group,
direction: CallDirection.Outgoing,
timestamp: Date.now(),
status: GroupCallStatus.Joined,
},
callCreator,
activeConversationId: null,
groupCallEnded: true,
deviceCount: 1,
maxDevices: 23,
isSelectMode: false,
isTargeted: false,
},
i18n
),
'The video call has ended'
);
});
it('says declined incoming calls', () => {
const callCreator = getDefaultConversation();
assert.strictEqual(
getCallingNotificationText(
{
callHistory: {
callId: '123',
peerId: getPeerIdFromConversation(getDefaultGroup()),
ringerId: callCreator.serviceId ?? null,
mode: CallMode.Group,
type: CallType.Group,
direction: CallDirection.Incoming,
timestamp: Date.now(),
status: GroupCallStatus.Declined,
},
callCreator,
activeConversationId: null,
groupCallEnded: true,
deviceCount: 1,
maxDevices: 23,
isSelectMode: false,
isTargeted: false,
},
i18n
),
'Declined video call'
);
});
it('says older ended incoming calls', () => {
const callCreator = getDefaultConversation();
assert.strictEqual(
getCallingNotificationText(
{
callHistory: {
callId: '123',
peerId: getPeerIdFromConversation(getDefaultGroup()),
ringerId: callCreator.serviceId ?? null,
mode: CallMode.Group,
type: CallType.Group,
direction: CallDirection.Incoming,
timestamp: Date.now() - HOUR,
status: GroupCallStatus.Joined,
},
callCreator,
activeConversationId: null,
groupCallEnded: true,
deviceCount: 1,
maxDevices: 23,
isSelectMode: false,
isTargeted: false,
},
i18n
),
'Incoming video call'
);
});
it('says older ended incoming missed calls', () => {
const callCreator = getDefaultConversation();
assert.strictEqual(
getCallingNotificationText(
{
callHistory: {
callId: '123',
peerId: getPeerIdFromConversation(getDefaultGroup()),
ringerId: callCreator.serviceId ?? null,
mode: CallMode.Group,
type: CallType.Group,
direction: CallDirection.Incoming,
timestamp: Date.now() - HOUR,
status: GroupCallStatus.Missed,
},
callCreator,
@ -48,7 +165,36 @@ describe('calling notification helpers', () => {
},
i18n
),
'The group call has ended'
'Missed video call'
);
});
it('says older ended outgoing calls', () => {
const callCreator = getDefaultConversation();
assert.strictEqual(
getCallingNotificationText(
{
callHistory: {
callId: '123',
peerId: getPeerIdFromConversation(getDefaultGroup()),
ringerId: callCreator.serviceId ?? null,
mode: CallMode.Group,
type: CallType.Group,
direction: CallDirection.Outgoing,
timestamp: Date.now() - HOUR,
status: GroupCallStatus.Joined,
},
callCreator,
activeConversationId: null,
groupCallEnded: true,
deviceCount: 1,
maxDevices: 23,
isSelectMode: false,
isTargeted: false,
},
i18n
),
'Outgoing video call'
);
});
@ -79,7 +225,7 @@ describe('calling notification helpers', () => {
},
i18n
),
'Luigi started a group call'
'Luigi started a video call'
);
});
@ -111,7 +257,7 @@ describe('calling notification helpers', () => {
},
i18n
),
'Luigi Mario started a group call'
'Luigi Mario started a video call'
);
});
@ -142,7 +288,7 @@ describe('calling notification helpers', () => {
},
i18n
),
'You started a group call'
'You started a video call'
);
});
@ -170,7 +316,7 @@ describe('calling notification helpers', () => {
},
i18n
),
'A group call was started'
'A video call was started'
);
});
});

57
ts/util/callingNotification.ts
View file

@ -10,9 +10,12 @@ import {
DirectCallStatus,
type CallHistoryDetails,
CallType,
GroupCallStatus,
} from '../types/CallDisposition';
import type { ConversationType } from '../state/ducks/conversations';
import { strictAssert } from './assert';
import { isMoreRecentThan } from './timestamp';
import { MINUTE } from './durations';
export type CallingNotificationType = Readonly<{
// In some older calls, we don't have a call id, this hardens against that.
@ -26,7 +29,7 @@ export type CallingNotificationType = Readonly<{
isTargeted: boolean;
}>;
function getDirectCallNotificationText(
export function getDirectCallNotificationText(
callDirection: CallDirection,
callType: CallType,
callStatus: DirectCallStatus,
@ -85,14 +88,41 @@ function getDirectCallNotificationText(
throw missingCaseError(callStatus);
}
function getGroupCallNotificationText(
groupCallEnded: boolean,
creator: ConversationType | null,
i18n: LocalizerType
): string {
function getGroupCallNotificationText({
groupCallEnded,
creator,
callHistory,
i18n,
}: {
groupCallEnded: boolean;
creator: ConversationType | null;
callHistory: CallHistoryDetails;
i18n: LocalizerType;
}): string {
if (groupCallEnded) {
return i18n('icu:calling__call-notification__ended');
const { direction, status, timestamp } = callHistory;
if (direction === CallDirection.Incoming) {
if (status === GroupCallStatus.Declined) {
return i18n('icu:CallHistory__DescriptionVideoCall--Declined');
}
if (status === GroupCallStatus.Missed) {
return i18n('icu:CallHistory__DescriptionVideoCall--Missed');
}
if (isMoreRecentThan(timestamp, 5 * MINUTE)) {
return i18n('icu:calling__call-notification__ended');
}
return i18n('icu:acceptedIncomingVideoCall');
}
// Outgoing ended group calls
if (isMoreRecentThan(timestamp, 5 * MINUTE)) {
return i18n('icu:calling__call-notification__ended');
}
return i18n('icu:acceptedOutgoingVideoCall');
}
// TODO: Active call with participants DESKTOP-7439
if (creator == null) {
return i18n('icu:calling__call-notification__started-by-someone');
}
@ -108,7 +138,11 @@ export function getCallingNotificationText(
callingNotification: CallingNotificationType,
i18n: LocalizerType
): string | null {
const { callHistory, callCreator, groupCallEnded } = callingNotification;
const {
callHistory,
callCreator: creator,
groupCallEnded,
} = callingNotification;
if (callHistory == null) {
return null;
}
@ -126,7 +160,12 @@ export function getCallingNotificationText(
groupCallEnded != null,
'getCallingNotificationText: groupCallEnded shouldnt be null for a group call'
);
return getGroupCallNotificationText(groupCallEnded, callCreator, i18n);
return getGroupCallNotificationText({
groupCallEnded,
creator,
callHistory,
i18n,
});
}
if (callHistory.mode === CallMode.Adhoc) {
return null;