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

Migrate schema to service ids

Browse source
This commit is contained in:
Fedor Indutny 2023-08-16 22:54:39 +02:00 • committed by Jamie Kyle
parent 71958f8a01
commit 8b0da36caa
258 changed files with 4795 additions and 2613 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ts/components/conversation/AtMentionify.stories.tsx
View file

@ -40,21 +40,21 @@ export function MultipleMentions(): JSX.Element {
{
start: 4,
length: 1,
mentionUuid: SERVICE_ID_1,
mentionAci: SERVICE_ID_1,
replacementText: 'Professor Farnsworth',
conversationID: 'x',
},
{
start: 2,
length: 1,
mentionUuid: SERVICE_ID_2,
mentionAci: SERVICE_ID_2,
replacementText: 'Philip J Fry',
conversationID: 'x',
},
{
start: 0,
length: 1,
mentionUuid: SERVICE_ID_3,
mentionAci: SERVICE_ID_3,
replacementText: 'Yancy Fry',
conversationID: 'x',
},
@ -73,21 +73,21 @@ export function ComplexMentions(): JSX.Element {
{
start: 80,
length: 1,
mentionUuid: SERVICE_ID_4,
mentionAci: SERVICE_ID_4,
replacementText: 'Cereal Killer',
conversationID: 'x',
},
{
start: 78,
length: 1,
mentionUuid: SERVICE_ID_5,
mentionAci: SERVICE_ID_5,
replacementText: 'Acid Burn',
conversationID: 'x',
},
{
start: 4,
length: 1,
mentionUuid: SERVICE_ID_6,
mentionAci: SERVICE_ID_6,
replacementText: 'Zero Cool',
conversationID: 'x',
},
@ -109,7 +109,7 @@ export function WithOddCharacter(): JSX.Element {
{
start: 4,
length: 1,
mentionUuid: SERVICE_ID_6,
mentionAci: SERVICE_ID_6,
replacementText: 'Zero Cool',
conversationID: 'x',
},

4
ts/components/conversation/CallingNotification.stories.tsx
View file

@ -45,7 +45,7 @@ const getCommonProps = (options: {
? GroupCallStatus.GenericGroupCall
: DirectCallStatus.Pending,
callCreator = getDefaultConversation({
uuid: generateAci(),
serviceId: generateAci(),
isMe: direction === CallDirection.Outgoing,
}),
callExternalState = CallExternalState.Active,
@ -63,7 +63,7 @@ const getCommonProps = (options: {
callHistory: {
callId: '123',
peerId: conversation.id,
ringerId: callCreator?.uuid ?? null,
ringerId: callCreator?.serviceId ?? null,
mode,
type,
direction,

156
ts/components/conversation/GroupV2Change.stories.tsx
View file

@ -44,7 +44,7 @@ const renderChange = (
areWeAdmin = true,
}: {
groupMemberships?: ReadonlyArray<{
uuid: AciString;
aci: AciString;
isAdmin: boolean;
}>;
groupBannedMemberships?: ReadonlyArray<ServiceIdString>;
@ -92,7 +92,7 @@ export function Multiple(): JSX.Element {
},
{
type: 'member-add',
uuid: OUR_ACI,
aci: OUR_ACI,
},
{
type: 'description',
@ -100,7 +100,7 @@ export function Multiple(): JSX.Element {
},
{
type: 'member-privilege',
uuid: OUR_ACI,
aci: OUR_ACI,
newPrivilege: RoleEnum.ADMINISTRATOR,
},
],
@ -451,7 +451,7 @@ export function MemberAdd(): JSX.Element {
details: [
{
type: 'member-add',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -460,7 +460,7 @@ export function MemberAdd(): JSX.Element {
details: [
{
type: 'member-add',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -468,7 +468,7 @@ export function MemberAdd(): JSX.Element {
details: [
{
type: 'member-add',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -477,7 +477,7 @@ export function MemberAdd(): JSX.Element {
details: [
{
type: 'member-add',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -486,7 +486,7 @@ export function MemberAdd(): JSX.Element {
details: [
{
type: 'member-add',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -494,7 +494,7 @@ export function MemberAdd(): JSX.Element {
details: [
{
type: 'member-add',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -511,7 +511,7 @@ export function MemberAddFromInvited(): JSX.Element {
details: [
{
type: 'member-add-from-invite',
uuid: OUR_ACI,
aci: OUR_ACI,
inviter: CONTACT_B,
},
],
@ -520,7 +520,7 @@ export function MemberAddFromInvited(): JSX.Element {
details: [
{
type: 'member-add-from-invite',
uuid: OUR_ACI,
aci: OUR_ACI,
inviter: CONTACT_A,
},
],
@ -531,7 +531,7 @@ export function MemberAddFromInvited(): JSX.Element {
details: [
{
type: 'member-add-from-invite',
uuid: CONTACT_A,
aci: CONTACT_A,
inviter: CONTACT_B,
},
],
@ -541,7 +541,7 @@ export function MemberAddFromInvited(): JSX.Element {
details: [
{
type: 'member-add-from-invite',
uuid: CONTACT_B,
aci: CONTACT_B,
inviter: CONTACT_C,
},
],
@ -550,7 +550,7 @@ export function MemberAddFromInvited(): JSX.Element {
details: [
{
type: 'member-add-from-invite',
uuid: CONTACT_A,
aci: CONTACT_A,
inviter: CONTACT_B,
},
],
@ -561,7 +561,7 @@ export function MemberAddFromInvited(): JSX.Element {
details: [
{
type: 'member-add-from-invite',
uuid: OUR_ACI,
aci: OUR_ACI,
inviter: CONTACT_A,
},
],
@ -571,7 +571,7 @@ export function MemberAddFromInvited(): JSX.Element {
details: [
{
type: 'member-add-from-invite',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -580,7 +580,7 @@ export function MemberAddFromInvited(): JSX.Element {
details: [
{
type: 'member-add-from-invite',
uuid: CONTACT_A,
aci: CONTACT_A,
inviter: OUR_ACI,
},
],
@ -590,7 +590,7 @@ export function MemberAddFromInvited(): JSX.Element {
details: [
{
type: 'member-add-from-invite',
uuid: CONTACT_A,
aci: CONTACT_A,
inviter: CONTACT_B,
},
],
@ -600,7 +600,7 @@ export function MemberAddFromInvited(): JSX.Element {
details: [
{
type: 'member-add-from-invite',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -610,7 +610,7 @@ export function MemberAddFromInvited(): JSX.Element {
details: [
{
type: 'member-add-from-invite',
uuid: OUR_ACI,
aci: OUR_ACI,
inviter: CONTACT_B,
},
],
@ -631,7 +631,7 @@ export function MemberAddFromLink(): JSX.Element {
details: [
{
type: 'member-add-from-link',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -640,7 +640,7 @@ export function MemberAddFromLink(): JSX.Element {
details: [
{
type: 'member-add-from-link',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -648,7 +648,7 @@ export function MemberAddFromLink(): JSX.Element {
details: [
{
type: 'member-add-from-link',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -668,7 +668,7 @@ export function MemberAddFromAdminApproval(): JSX.Element {
details: [
{
type: 'member-add-from-admin-approval',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -676,7 +676,7 @@ export function MemberAddFromAdminApproval(): JSX.Element {
details: [
{
type: 'member-add-from-admin-approval',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -685,7 +685,7 @@ export function MemberAddFromAdminApproval(): JSX.Element {
details: [
{
type: 'member-add-from-admin-approval',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -694,7 +694,7 @@ export function MemberAddFromAdminApproval(): JSX.Element {
details: [
{
type: 'member-add-from-admin-approval',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -702,7 +702,7 @@ export function MemberAddFromAdminApproval(): JSX.Element {
details: [
{
type: 'member-add-from-admin-approval',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -722,7 +722,7 @@ export function MemberRemove(): JSX.Element {
details: [
{
type: 'member-remove',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -731,7 +731,7 @@ export function MemberRemove(): JSX.Element {
details: [
{
type: 'member-remove',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -739,7 +739,7 @@ export function MemberRemove(): JSX.Element {
details: [
{
type: 'member-remove',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -748,7 +748,7 @@ export function MemberRemove(): JSX.Element {
details: [
{
type: 'member-remove',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -757,7 +757,7 @@ export function MemberRemove(): JSX.Element {
details: [
{
type: 'member-remove',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -766,7 +766,7 @@ export function MemberRemove(): JSX.Element {
details: [
{
type: 'member-remove',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -774,7 +774,7 @@ export function MemberRemove(): JSX.Element {
details: [
{
type: 'member-remove',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -790,7 +790,7 @@ export function MemberPrivilege(): JSX.Element {
details: [
{
type: 'member-privilege',
uuid: OUR_ACI,
aci: OUR_ACI,
newPrivilege: RoleEnum.ADMINISTRATOR,
},
],
@ -799,7 +799,7 @@ export function MemberPrivilege(): JSX.Element {
details: [
{
type: 'member-privilege',
uuid: OUR_ACI,
aci: OUR_ACI,
newPrivilege: RoleEnum.ADMINISTRATOR,
},
],
@ -809,7 +809,7 @@ export function MemberPrivilege(): JSX.Element {
details: [
{
type: 'member-privilege',
uuid: CONTACT_A,
aci: CONTACT_A,
newPrivilege: RoleEnum.ADMINISTRATOR,
},
],
@ -819,7 +819,7 @@ export function MemberPrivilege(): JSX.Element {
details: [
{
type: 'member-privilege',
uuid: CONTACT_A,
aci: CONTACT_A,
newPrivilege: RoleEnum.ADMINISTRATOR,
},
],
@ -828,7 +828,7 @@ export function MemberPrivilege(): JSX.Element {
details: [
{
type: 'member-privilege',
uuid: CONTACT_A,
aci: CONTACT_A,
newPrivilege: RoleEnum.ADMINISTRATOR,
},
],
@ -838,7 +838,7 @@ export function MemberPrivilege(): JSX.Element {
details: [
{
type: 'member-privilege',
uuid: OUR_ACI,
aci: OUR_ACI,
newPrivilege: RoleEnum.DEFAULT,
},
],
@ -847,7 +847,7 @@ export function MemberPrivilege(): JSX.Element {
details: [
{
type: 'member-privilege',
uuid: OUR_ACI,
aci: OUR_ACI,
newPrivilege: RoleEnum.DEFAULT,
},
],
@ -857,7 +857,7 @@ export function MemberPrivilege(): JSX.Element {
details: [
{
type: 'member-privilege',
uuid: CONTACT_A,
aci: CONTACT_A,
newPrivilege: RoleEnum.DEFAULT,
},
],
@ -867,7 +867,7 @@ export function MemberPrivilege(): JSX.Element {
details: [
{
type: 'member-privilege',
uuid: CONTACT_A,
aci: CONTACT_A,
newPrivilege: RoleEnum.DEFAULT,
},
],
@ -876,7 +876,7 @@ export function MemberPrivilege(): JSX.Element {
details: [
{
type: 'member-privilege',
uuid: CONTACT_A,
aci: CONTACT_A,
newPrivilege: RoleEnum.DEFAULT,
},
],
@ -893,7 +893,7 @@ export function PendingAddOne(): JSX.Element {
details: [
{
type: 'pending-add-one',
uuid: OUR_ACI,
serviceId: OUR_ACI,
},
],
})}
@ -901,7 +901,7 @@ export function PendingAddOne(): JSX.Element {
details: [
{
type: 'pending-add-one',
uuid: OUR_ACI,
serviceId: OUR_ACI,
},
],
})}
@ -910,7 +910,7 @@ export function PendingAddOne(): JSX.Element {
details: [
{
type: 'pending-add-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
},
],
})}
@ -919,7 +919,7 @@ export function PendingAddOne(): JSX.Element {
details: [
{
type: 'pending-add-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
},
],
})}
@ -927,7 +927,7 @@ export function PendingAddOne(): JSX.Element {
details: [
{
type: 'pending-add-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
},
],
})}
@ -984,7 +984,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
inviter: OUR_ACI,
},
],
@ -994,7 +994,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
inviter: OUR_ACI,
},
],
@ -1004,7 +1004,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
inviter: OUR_ACI,
},
],
@ -1013,7 +1013,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
inviter: OUR_ACI,
},
],
@ -1023,7 +1023,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
},
],
})}
@ -1032,7 +1032,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
inviter: CONTACT_B,
},
],
@ -1043,7 +1043,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: OUR_ACI,
serviceId: OUR_ACI,
inviter: CONTACT_B,
},
],
@ -1053,7 +1053,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: CONTACT_B,
serviceId: CONTACT_B,
inviter: CONTACT_A,
},
],
@ -1064,7 +1064,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
inviter: CONTACT_B,
},
],
@ -1074,7 +1074,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
inviter: CONTACT_B,
},
],
@ -1083,7 +1083,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
inviter: CONTACT_B,
},
],
@ -1094,7 +1094,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
},
],
})}
@ -1103,7 +1103,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
},
],
})}
@ -1111,7 +1111,7 @@ export function PendingRemoveOne(): JSX.Element {
details: [
{
type: 'pending-remove-one',
uuid: INVITEE_A,
serviceId: INVITEE_A,
},
],
})}
@ -1226,7 +1226,7 @@ export function AdminApprovalAdd(): JSX.Element {
details: [
{
type: 'admin-approval-add-one',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -1234,7 +1234,7 @@ export function AdminApprovalAdd(): JSX.Element {
details: [
{
type: 'admin-approval-add-one',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -1254,7 +1254,7 @@ export function AdminApprovalRemove(): JSX.Element {
details: [
{
type: 'admin-approval-remove-one',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -1262,7 +1262,7 @@ export function AdminApprovalRemove(): JSX.Element {
details: [
{
type: 'admin-approval-remove-one',
uuid: OUR_ACI,
aci: OUR_ACI,
},
],
})}
@ -1271,7 +1271,7 @@ export function AdminApprovalRemove(): JSX.Element {
details: [
{
type: 'admin-approval-remove-one',
uuid: CONTACT_A,
aci: CONTACT_A,
},
],
})}
@ -1294,14 +1294,14 @@ export function AdminApprovalBounce(): JSX.Element {
details: [
{
type: 'admin-approval-bounce',
uuid: CONTACT_A,
aci: CONTACT_A,
times: 1,
isApprovalPending: false,
},
],
},
{
groupMemberships: [{ uuid: CONTACT_C, isAdmin: false }],
groupMemberships: [{ aci: CONTACT_C, isAdmin: false }],
groupBannedMemberships: [CONTACT_B],
}
)}
@ -1311,14 +1311,14 @@ export function AdminApprovalBounce(): JSX.Element {
details: [
{
type: 'admin-approval-bounce',
uuid: CONTACT_A,
aci: CONTACT_A,
times: 1,
isApprovalPending: false,
},
],
},
{
groupMemberships: [{ uuid: CONTACT_C, isAdmin: false }],
groupMemberships: [{ aci: CONTACT_C, isAdmin: false }],
groupBannedMemberships: [CONTACT_B],
}
)}
@ -1326,7 +1326,7 @@ export function AdminApprovalBounce(): JSX.Element {
details: [
{
type: 'admin-approval-bounce',
uuid: CONTACT_A,
aci: CONTACT_A,
times: 1,
isApprovalPending: false,
},
@ -1340,7 +1340,7 @@ export function AdminApprovalBounce(): JSX.Element {
details: [
{
type: 'admin-approval-bounce',
uuid: CONTACT_A,
aci: CONTACT_A,
times: 1,
isApprovalPending: false,
},
@ -1356,13 +1356,13 @@ export function AdminApprovalBounce(): JSX.Element {
details: [
{
type: 'admin-approval-bounce',
uuid: CONTACT_A,
aci: CONTACT_A,
times: 1,
isApprovalPending: false,
},
],
},
{ groupMemberships: [{ uuid: CONTACT_A, isAdmin: false }] }
{ groupMemberships: [{ aci: CONTACT_A, isAdmin: false }] }
)}
Would show button, but user is already banned:
{renderChange(
@ -1371,7 +1371,7 @@ export function AdminApprovalBounce(): JSX.Element {
details: [
{
type: 'admin-approval-bounce',
uuid: CONTACT_A,
aci: CONTACT_A,
times: 1,
isApprovalPending: false,
},

26
ts/components/conversation/GroupV2Change.tsx
View file

@ -30,7 +30,7 @@ export type PropsDataType = {
areWeAdmin: boolean;
conversationId: string;
groupMemberships?: ReadonlyArray<{
uuid: AciString;
aci: AciString;
isAdmin: boolean;
}>;
groupBannedMemberships?: ReadonlyArray<ServiceIdString>;
@ -116,7 +116,7 @@ function getIcon(
): GroupIconType {
const changeType = detail.type;
let possibleIcon = changeToIconMap.get(changeType);
const isSameId = fromId === get(detail, 'uuid', null);
const isSameId = fromId === get(detail, 'aci', null);
if (isSameId) {
if (changeType === 'member-remove') {
possibleIcon = 'group-leave';
@ -154,13 +154,13 @@ function GroupV2Detail({
areWeAdmin: boolean;
blockGroupLinkRequests: (
conversationId: string,
uuid: ServiceIdString
serviceId: ServiceIdString
) => unknown;
conversationId: string;
detail: GroupV2ChangeDetailType;
isLastText: boolean;
groupMemberships?: ReadonlyArray<{
uuid: AciString;
aci: AciString;
isAdmin: boolean;
}>;
groupBannedMemberships?: ReadonlyArray<ServiceIdString>;
@ -206,10 +206,10 @@ function GroupV2Detail({
if (
!isLastText ||
detail.type !== 'admin-approval-bounce' ||
!detail.uuid
!detail.aci
) {
log.warn(
'GroupV2Detail: ConfirmingblockGroupLinkRequests but missing uuid or wrong change type'
'GroupV2Detail: ConfirmingblockGroupLinkRequests but missing aci or wrong change type'
);
modalNode = undefined;
break;
@ -221,7 +221,7 @@ function GroupV2Detail({
title={i18n('icu:PendingRequests--block--title')}
actions={[
{
action: () => blockGroupLinkRequests(conversationId, detail.uuid),
action: () => blockGroupLinkRequests(conversationId, detail.aci),
text: i18n('icu:PendingRequests--block--confirm'),
style: 'affirmative',
},
@ -233,7 +233,7 @@ function GroupV2Detail({
id="icu:PendingRequests--block--contents"
i18n={i18n}
components={{
name: renderContact(detail.uuid),
name: renderContact(detail.aci),
}}
/>
</ConfirmationDialog>
@ -261,11 +261,11 @@ function GroupV2Detail({
isLastText &&
detail.type === 'admin-approval-bounce' &&
areWeAdmin &&
detail.uuid &&
detail.uuid !== ourAci &&
(!fromId || fromId === detail.uuid) &&
!groupMemberships?.some(item => item.uuid === detail.uuid) &&
!groupBannedMemberships?.some(uuid => uuid === detail.uuid)
detail.aci &&
detail.aci !== ourAci &&
(!fromId || fromId === detail.aci) &&
!groupMemberships?.some(item => item.aci === detail.aci) &&
!groupBannedMemberships?.some(serviceId => serviceId === detail.aci)
) {
buttonNode = (
<Button

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

@ -319,7 +319,7 @@ export type PropsActions = {
messageExpanded: (id: string, displayLimit: number) => unknown;
checkForAccount: (phoneNumber: string) => unknown;
startConversation: (e164: string, uuid: ServiceIdString) => void;
startConversation: (e164: string, serviceId: ServiceIdString) => void;
showConversation: ShowConversationType;
openGiftBadge: (messageId: string) => void;
pushPanelForConversation: PushPanelForConversationActionType;
@ -516,7 +516,7 @@ export class Message extends React.PureComponent<Props, State> {
}
const { contact, checkForAccount } = this.props;
if (contact && contact.firstNumber && !contact.uuid) {
if (contact && contact.firstNumber && !contact.serviceId) {
checkForAccount(contact.firstNumber);
}
@ -1637,7 +1637,7 @@ export class Message extends React.PureComponent<Props, State> {
this.getMetadataPlacement() !== MetadataPlacement.NotRendered;
const otherContent =
(contact && contact.firstNumber && contact.uuid) || withCaption;
(contact && contact.firstNumber && contact.serviceId) || withCaption;
const tabIndex = otherContent ? 0 : -1;
return (
@ -1647,10 +1647,10 @@ export class Message extends React.PureComponent<Props, State> {
i18n={i18n}
onClick={() => {
const signalAccount =
contact.firstNumber && contact.uuid
contact.firstNumber && contact.serviceId
? {
phoneNumber: contact.firstNumber,
uuid: contact.uuid,
serviceId: contact.serviceId,
}
: undefined;
@ -1678,8 +1678,8 @@ export class Message extends React.PureComponent<Props, State> {
if (!contact) {
return null;
}
const { firstNumber, uuid } = contact;
if (!firstNumber || !uuid) {
const { firstNumber, serviceId } = contact;
if (!firstNumber || !serviceId) {
return null;
}
@ -1689,7 +1689,7 @@ export class Message extends React.PureComponent<Props, State> {
onClick={e => {
e.preventDefault();
e.stopPropagation();
startConversation(firstNumber, uuid);
startConversation(firstNumber, serviceId);
}}
className={classNames(
'module-message__send-message-button',
@ -2456,8 +2456,8 @@ export class Message extends React.PureComponent<Props, State> {
return;
}
if (contact && contact.firstNumber && contact.uuid) {
startConversation(contact.firstNumber, contact.uuid);
if (contact && contact.firstNumber && contact.serviceId) {
startConversation(contact.firstNumber, contact.serviceId);
event.preventDefault();
event.stopPropagation();
@ -2466,10 +2466,10 @@ export class Message extends React.PureComponent<Props, State> {
if (contact) {
const signalAccount =
contact.firstNumber && contact.uuid
contact.firstNumber && contact.serviceId
? {
phoneNumber: contact.firstNumber,
uuid: contact.uuid,
serviceId: contact.serviceId,
}
: undefined;
pushPanelForConversation({

32
ts/components/conversation/MessageBody.stories.tsx
View file

@ -128,7 +128,7 @@ export function Mention(): JSX.Element {
{
start: 5,
length: 1,
mentionUuid: SERVICE_ID_1,
mentionAci: SERVICE_ID_1,
replacementText: 'Bender B Rodriguez 🤖',
conversationID: 'x',
},
@ -150,21 +150,21 @@ export function MultipleMentions(): JSX.Element {
{
start: 2,
length: 1,
mentionUuid: SERVICE_ID_2,
mentionAci: SERVICE_ID_2,
replacementText: 'Philip J Fry',
conversationID: 'x',
},
{
start: 4,
length: 1,
mentionUuid: SERVICE_ID_3,
mentionAci: SERVICE_ID_3,
replacementText: 'Professor Farnsworth',
conversationID: 'x',
},
{
start: 0,
length: 1,
mentionUuid: SERVICE_ID_4,
mentionAci: SERVICE_ID_4,
replacementText: 'Yancy Fry',
conversationID: 'x',
},
@ -192,21 +192,21 @@ export function ComplexMessageBody(): JSX.Element {
{
start: 78,
length: 1,
mentionUuid: SERVICE_ID_5,
mentionAci: SERVICE_ID_5,
replacementText: 'Acid Burn',
conversationID: 'x',
},
{
start: 80,
length: 1,
mentionUuid: SERVICE_ID_6,
mentionAci: SERVICE_ID_6,
replacementText: 'Cereal Killer',
conversationID: 'x',
},
{
start: 4,
length: 1,
mentionUuid: SERVICE_ID_6,
mentionAci: SERVICE_ID_6,
replacementText: 'Zero Cool',
conversationID: 'x',
},
@ -324,14 +324,14 @@ export function FormattingSpoiler(): JSX.Element {
{
start: 54,
length: 1,
mentionUuid: SERVICE_ID_7,
mentionAci: SERVICE_ID_7,
conversationID: 'a',
replacementText: '🅰️ Alice',
},
{
start: 60,
length: 1,
mentionUuid: SERVICE_ID_8,
mentionAci: SERVICE_ID_8,
conversationID: 'b',
replacementText: '🅱️ Bob',
},
@ -384,35 +384,35 @@ export function FormattingNesting(): JSX.Element {
{
start: 29,
length: 1,
mentionUuid: SERVICE_ID_7,
mentionAci: SERVICE_ID_7,
conversationID: 'a',
replacementText: '🅰️ Alice',
},
{
start: 61,
length: 1,
mentionUuid: SERVICE_ID_8,
mentionAci: SERVICE_ID_8,
conversationID: 'b',
replacementText: '🅱️ Bob',
},
{
start: 68,
length: 1,
mentionUuid: SERVICE_ID_9,
mentionAci: SERVICE_ID_9,
conversationID: 'c',
replacementText: 'Charlie',
},
{
start: 80,
length: 1,
mentionUuid: SERVICE_ID_10,
mentionAci: SERVICE_ID_10,
conversationID: 'd',
replacementText: 'Dan',
},
{
start: 105,
length: 1,
mentionUuid: SERVICE_ID_11,
mentionAci: SERVICE_ID_11,
conversationID: 'e',
replacementText: 'Eve',
},
@ -452,7 +452,7 @@ export function FormattingComplex(): JSX.Element {
{
start: 24,
length: 1,
mentionUuid: SERVICE_ID_3,
mentionAci: SERVICE_ID_3,
conversationID: 'x',
replacementText: '🤖 Hello',
},
@ -484,7 +484,7 @@ export function FormattingComplex(): JSX.Element {
{
start: 491,
length: 1,
mentionUuid: SERVICE_ID_3,
mentionAci: SERVICE_ID_3,
conversationID: 'x',
replacementText: '🤖 Hello',
},

2
ts/components/conversation/MessageBodyReadMore.stories.tsx
View file

@ -92,7 +92,7 @@ export function LongTextWithMention(): JSX.Element {
{
start: 800,
length: 1,
mentionUuid: generateAci(),
mentionAci: generateAci(),
conversationID: 'x',
replacementText: 'Alice',
},

4
ts/components/conversation/Timeline.stories.tsx
View file

@ -267,8 +267,8 @@ const actions = () => ({
),
blockGroupLinkRequests: action('blockGroupLinkRequests'),
checkForAccount: action('checkForAccount'),
clearInvitedUuidsForNewlyCreatedGroup: action(
'clearInvitedUuidsForNewlyCreatedGroup'
clearInvitedServiceIdsForNewlyCreatedGroup: action(
'clearInvitedServiceIdsForNewlyCreatedGroup'
),
setIsNearBottom: action('setIsNearBottom'),
loadOlderMessages: action('loadOlderMessages'),

6
ts/components/conversation/Timeline.tsx
View file

@ -148,7 +148,7 @@ export type PropsActionsType = {
conversationId: string,
groupNameCollisions: ReadonlyDeep<GroupNameCollisionsWithIdsByTitle>
) => void;
clearInvitedUuidsForNewlyCreatedGroup: () => void;
clearInvitedServiceIdsForNewlyCreatedGroup: () => void;
clearTargetedMessage: () => unknown;
closeContactSpoofingReview: () => void;
loadOlderMessages: (conversationId: string, messageId: string) => unknown;
@ -743,7 +743,7 @@ export class Timeline extends React.Component<
public override render(): JSX.Element | null {
const {
acknowledgeGroupMemberNameCollisions,
clearInvitedUuidsForNewlyCreatedGroup,
clearInvitedServiceIdsForNewlyCreatedGroup,
closeContactSpoofingReview,
contactSpoofingReview,
getPreferredBadge,
@ -1139,7 +1139,7 @@ export class Timeline extends React.Component<
contacts={invitedContactsForNewlyCreatedGroup}
getPreferredBadge={getPreferredBadge}
i18n={i18n}
onClose={clearInvitedUuidsForNewlyCreatedGroup}
onClose={clearInvitedServiceIdsForNewlyCreatedGroup}
theme={theme}
/>
)}

4
ts/components/conversation/TimelineMessage.stories.tsx
View file

@ -1676,7 +1676,7 @@ Mentions.args = {
{
start: 0,
length: 1,
mentionUuid: generateAci(),
mentionAci: generateAci(),
replacementText: 'Zapp Brannigan',
conversationID: 'x',
},
@ -1944,7 +1944,7 @@ EmbeddedContactWithSendMessage.args = {
contact: {
...fullContact,
firstNumber: fullContact.number[0].value,
uuid: generateAci(),
serviceId: generateAci(),
},
direction: 'incoming',
};

2
ts/components/conversation/conversation-details/ConversationDetails.stories.tsx
View file

@ -234,7 +234,7 @@ export function WithCallHistoryGroup(): JSX.Element {
<ConversationDetails
{...props}
callHistoryGroup={{
peerId: props.conversation?.uuid ?? '',
peerId: props.conversation?.serviceId ?? '',
mode: CallMode.Direct,
type: CallType.Video,
direction: CallDirection.Incoming,

12
ts/components/conversation/conversation-details/PendingInvites.tsx
View file

@ -292,7 +292,8 @@ function getConfirmationMessage({
}
const inviter = members.find(
({ uuid }) => uuid === firstPendingMembership.metadata.addedByUserId
({ serviceId }) =>
serviceId === firstPendingMembership.metadata.addedByUserId
);
if (inviter === undefined) {
@ -412,13 +413,16 @@ function MembersPendingProfileKey({
groupedPendingMemberships;
const otherPendingMemberships = Object.keys(otherPendingMembershipGroups)
.map(id => members.find(member => member.uuid === id))
.map(id => members.find(member => member.serviceId === id))
.filter((member): member is ConversationType => member !== undefined)
.map(member => {
assertDev(member.uuid, 'We just verified that member has uuid above');
assertDev(
member.serviceId,
'We just verified that member has serviceId above'
);
return {
member,
pendingMemberships: otherPendingMembershipGroups[member.uuid],
pendingMemberships: otherPendingMembershipGroups[member.serviceId],
};
});