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

Group creation/update: Don't allow self-selection via phone number

Browse source
This commit is contained in:
Scott Nonnenberg 2024-01-05 14:47:29 -08:00
parent 6579b1a70a
commit 661727c290
8 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ts/components/LeftPane.stories.tsx
View file

@ -938,6 +938,7 @@ export function ChooseGroupMembersPartialPhoneNumber(): JSX.Element {
isShowingRecommendedGroupSizeModal: false,
isShowingMaximumGroupSizeModal: false,
isUsernamesEnabled: true,
ourE164: undefined,
ourUsername: undefined,
searchTerm: '+1(212) 555',
regionCode: 'US',
@ -961,6 +962,7 @@ export function ChooseGroupMembersValidPhoneNumber(): JSX.Element {
isShowingRecommendedGroupSizeModal: false,
isShowingMaximumGroupSizeModal: false,
isUsernamesEnabled: true,
ourE164: undefined,
ourUsername: undefined,
searchTerm: '+1(212) 555 5454',
regionCode: 'US',
@ -984,6 +986,7 @@ export function ChooseGroupMembersUsername(): JSX.Element {
isShowingRecommendedGroupSizeModal: false,
isShowingMaximumGroupSizeModal: false,
isUsernamesEnabled: true,
ourE164: undefined,
ourUsername: undefined,
searchTerm: '@signal',
regionCode: 'US',

1
ts/components/conversation/conversation-details/AddGroupMembersModal.stories.tsx
View file

@ -64,6 +64,7 @@ const createProps = (
)}
regionCode="US"
getPreferredBadge={() => undefined}
ourE164={undefined}
ourUsername={undefined}
theme={ThemeType.light}
i18n={i18n}

8
ts/components/conversation/conversation-details/AddGroupMembersModal/ChooseGroupMembersModal.tsx
View file

@ -55,6 +55,7 @@ export type StatePropsType = {
i18n: LocalizerType;
theme: ThemeType;
maxGroupSize: number;
ourE164: string | undefined;
ourUsername: string | undefined;
searchTerm: string;
selectedContacts: ReadonlyArray<ConversationType>;
@ -86,6 +87,7 @@ export function ChooseGroupMembersModal({
i18n,
maxGroupSize,
onClose,
ourE164,
ourUsername,
removeSelectedContact,
searchTerm,
@ -129,9 +131,9 @@ export function ChooseGroupMembersModal({
phoneNumber.isValid &&
selectedContacts.some(contact => contact.e164 === e164);
isPhoneNumberVisible = candidateContacts.every(
contact => contact.e164 !== e164
);
isPhoneNumberVisible =
e164 !== ourE164 &&
candidateContacts.every(contact => contact.e164 !== e164);
}
const inputRef = useRef<null | HTMLInputElement>(null);

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

@ -122,6 +122,7 @@ const createProps = (
theme={ThemeType.light}
i18n={i18n}
lookupConversationWithoutServiceId={makeFakeLookupConversationWithoutServiceId()}
ourE164={undefined}
ourUsername={undefined}
showUserNotFoundModal={action('showUserNotFoundModal')}
isUsernamesEnabled

11
ts/components/leftPane/LeftPaneChooseGroupMembersHelper.tsx
View file

@ -35,6 +35,7 @@ export type LeftPaneChooseGroupMembersPropsType = {
isShowingRecommendedGroupSizeModal: boolean;
isShowingMaximumGroupSizeModal: boolean;
isUsernamesEnabled: boolean;
ourE164: string | undefined;
ourUsername: string | undefined;
searchTerm: string;
regionCode: string | undefined;
@ -75,6 +76,7 @@ export class LeftPaneChooseGroupMembersHelper extends LeftPaneHelper<LeftPaneCho
isUsernamesEnabled,
groupSizeRecommendedLimit,
groupSizeHardLimit,
ourE164,
ourUsername,
searchTerm,
regionCode,
@ -117,13 +119,14 @@ export class LeftPaneChooseGroupMembersHelper extends LeftPaneHelper<LeftPaneCho
(ourUsername === undefined || username !== ourUsername) &&
phoneNumber
) {
const { e164 } = phoneNumber;
this.isPhoneNumberChecked =
phoneNumber.isValid &&
selectedContacts.some(contact => contact.e164 === phoneNumber.e164);
selectedContacts.some(contact => contact.e164 === e164);
const isVisible = this.candidateContacts.every(
contact => contact.e164 !== phoneNumber.e164
);
const isVisible =
e164 !== ourE164 &&
this.candidateContacts.every(contact => contact.e164 !== e164);
if (isVisible) {
this.phoneNumber = phoneNumber;
}

1
ts/state/smart/ChooseGroupMembersModal.tsx
View file

@ -55,6 +55,7 @@ const mapStateToProps = (
getPreferredBadge: getPreferredBadgeSelector(state),
i18n: getIntl(state),
theme: getTheme(state),
ourE164: getMe(state).e164,
ourUsername: getMe(state).username,
selectedContacts,
lookupConversationWithoutServiceId,

1
ts/state/smart/LeftPane.tsx
View file

@ -180,6 +180,7 @@ const getModeSpecificProps = (
OneTimeModalState.Showing,
isShowingMaximumGroupSizeModal:
getMaximumGroupSizeModalState(state) === OneTimeModalState.Showing,
ourE164: getMe(state).e164,
ourUsername: getMe(state).username,
regionCode: getRegionCode(state),
searchTerm: getComposerConversationSearchTerm(state),

1
ts/test-node/components/leftPane/LeftPaneChooseGroupMembersHelper_test.ts
View file

@ -17,6 +17,7 @@ describe('LeftPaneChooseGroupMembersHelper', () => {
isShowingRecommendedGroupSizeModal: false,
isShowingMaximumGroupSizeModal: false,
isUsernamesEnabled: true,
ourE164: undefined,
ourUsername: undefined,
groupSizeRecommendedLimit: 22,
groupSizeHardLimit: 33,