Skip to content

Commit

Permalink
Merge pull request #3060 from Bilb/fix-legacy-group-name-length
Browse files Browse the repository at this point in the history
fix: group name limited to 30 chars
  • Loading branch information
Bilb committed Apr 2, 2024
2 parents 0f06998 + 72b3537 commit 856c3e4
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions ts/components/dialog/UpdateGroupNameDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
/* eslint-disable @typescript-eslint/no-misused-promises */
import React from 'react';
import classNames from 'classnames';
import autoBind from 'auto-bind';
import classNames from 'classnames';
import React from 'react';

import { Avatar, AvatarSize } from '../avatar/Avatar';
import { SpacerMD } from '../basic/Text';
import { updateGroupNameModal } from '../../state/ducks/modalDialog';
import { ConversationModel } from '../../models/conversation';
import { Constants } from '../../session';
import { getConversationController } from '../../session/conversations';
import { SessionWrapperModal } from '../SessionWrapperModal';
import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
import { initiateOpenGroupUpdate } from '../../session/group/open-group';
import { initiateClosedGroupUpdate } from '../../session/group/closed-group';
import { initiateOpenGroupUpdate } from '../../session/group/open-group';
import { updateGroupNameModal } from '../../state/ducks/modalDialog';
import { pickFileForAvatar } from '../../types/attachments/VisualAttachment';
import { SessionWrapperModal } from '../SessionWrapperModal';
import { Avatar, AvatarSize } from '../avatar/Avatar';
import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
import { SpacerMD } from '../basic/Text';

type Props = {
conversationId: string;
Expand Down Expand Up @@ -61,6 +62,12 @@ export class UpdateGroupNameDialog extends React.Component<Props, State> {
return;
}

if (trimmedGroupName.length > Constants.VALIDATION.MAX_GROUP_NAME_LENGTH) {
this.onShowError(window.i18n('invalidGroupNameTooLong'));

return;
}

if (
trimmedGroupName !== this.convo.getRealSessionUsername() ||
newAvatarObjecturl !== oldAvatarPath
Expand Down Expand Up @@ -122,6 +129,7 @@ export class UpdateGroupNameDialog extends React.Component<Props, State> {
required={true}
aria-required={true}
autoFocus={true}
maxLength={Constants.VALIDATION.MAX_GROUP_NAME_LENGTH}
data-testid="group-name-input"
/>
) : null}
Expand Down

0 comments on commit 856c3e4

Please sign in to comment.