Use system nickname or first name for incoming group calls
This commit is contained in:
parent
59b135ad7e
commit
4f97c8270c
5 changed files with 73 additions and 9 deletions
|
@ -39,11 +39,18 @@ export type PropsType = {
|
|||
| 'phoneNumber'
|
||||
| 'profileName'
|
||||
| 'sharedGroupNames'
|
||||
| 'systemGivenName'
|
||||
| 'systemNickname'
|
||||
| 'title'
|
||||
| 'type'
|
||||
| 'unblurredAvatarPath'
|
||||
>;
|
||||
groupMembers?: Array<Pick<ConversationType, 'id' | 'firstName' | 'title'>>;
|
||||
groupMembers?: Array<
|
||||
Pick<
|
||||
ConversationType,
|
||||
'id' | 'firstName' | 'systemGivenName' | 'systemNickname' | 'title'
|
||||
>
|
||||
>;
|
||||
hasLocalAudio: boolean;
|
||||
hasLocalVideo: boolean;
|
||||
i18n: LocalizerType;
|
||||
|
|
|
@ -25,6 +25,8 @@ export type PropsType = {
|
|||
| 'phoneNumber'
|
||||
| 'profileName'
|
||||
| 'sharedGroupNames'
|
||||
| 'systemGivenName'
|
||||
| 'systemNickname'
|
||||
| 'title'
|
||||
| 'type'
|
||||
| 'unblurredAvatarPath'
|
||||
|
@ -34,10 +36,18 @@ export type PropsType = {
|
|||
ringMode: RingMode;
|
||||
|
||||
// The following should only be set for group conversations.
|
||||
groupMembers?: Array<Pick<ConversationType, 'id' | 'firstName' | 'title'>>;
|
||||
groupMembers?: Array<
|
||||
Pick<
|
||||
ConversationType,
|
||||
'id' | 'firstName' | 'systemGivenName' | 'systemNickname' | 'title'
|
||||
>
|
||||
>;
|
||||
isCallFull?: boolean;
|
||||
peekedParticipants?: Array<
|
||||
Pick<ConversationType, 'firstName' | 'title' | 'serviceId'>
|
||||
Pick<
|
||||
ConversationType,
|
||||
'firstName' | 'systemGivenName' | 'systemNickname' | 'title' | 'serviceId'
|
||||
>
|
||||
>;
|
||||
};
|
||||
|
||||
|
|
|
@ -53,8 +53,16 @@ export type PropsType = {
|
|||
}
|
||||
| {
|
||||
callMode: CallMode.Group;
|
||||
otherMembersRung: Array<Pick<ConversationType, 'firstName' | 'title'>>;
|
||||
ringer: Pick<ConversationType, 'firstName' | 'title'>;
|
||||
otherMembersRung: Array<
|
||||
Pick<
|
||||
ConversationType,
|
||||
'firstName' | 'systemGivenName' | 'systemNickname' | 'title'
|
||||
>
|
||||
>;
|
||||
ringer: Pick<
|
||||
ConversationType,
|
||||
'firstName' | 'systemGivenName' | 'systemNickname' | 'title'
|
||||
>;
|
||||
}
|
||||
);
|
||||
|
||||
|
@ -96,8 +104,16 @@ function GroupCallMessage({
|
|||
ringer,
|
||||
}: Readonly<{
|
||||
i18n: LocalizerType;
|
||||
otherMembersRung: Array<Pick<ConversationType, 'firstName' | 'title'>>;
|
||||
ringer: Pick<ConversationType, 'firstName' | 'title'>;
|
||||
otherMembersRung: Array<
|
||||
Pick<
|
||||
ConversationType,
|
||||
'firstName' | 'systemGivenName' | 'systemNickname' | 'title'
|
||||
>
|
||||
>;
|
||||
ringer: Pick<
|
||||
ConversationType,
|
||||
'firstName' | 'systemGivenName' | 'systemNickname' | 'title'
|
||||
>;
|
||||
}>): JSX.Element {
|
||||
// As an optimization, we only process the first two names.
|
||||
const [first, second] = otherMembersRung
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue