From 42813c09263d352e1d0b2ef7a9f76145422a0a71 Mon Sep 17 00:00:00 2001 From: yougotwill Date: Tue, 23 Jul 2024 14:32:03 +1000 Subject: [PATCH] fix: replace MAX_COMMUNITY_NAME_LENGTH using libsession COMMUNITY_FULL_URL_MAX_LENGTH --- ts/components/leftpane/overlay/OverlayCommunity.tsx | 5 +++-- ts/session/constants.ts | 1 - ts/session/utils/libsession/libsession_constants.ts | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ts/components/leftpane/overlay/OverlayCommunity.tsx b/ts/components/leftpane/overlay/OverlayCommunity.tsx index 52ece519b..ac109faf4 100644 --- a/ts/components/leftpane/overlay/OverlayCommunity.tsx +++ b/ts/components/leftpane/overlay/OverlayCommunity.tsx @@ -14,7 +14,6 @@ import { resetLeftOverlayMode } from '../../../state/ducks/section'; import { SessionButton } from '../../basic/SessionButton'; import { SessionSpinner } from '../../loading'; -import { VALIDATION } from '../../../session/constants'; import { markConversationInitialLoadingInProgress, openConversationWithMessages, @@ -23,6 +22,7 @@ import { getLeftOverlayMode } from '../../../state/selectors/section'; import { Spacer2XL } from '../../basic/Text'; import { SessionInput } from '../../inputs'; import { StyledLeftPaneOverlay } from './OverlayMessage'; +import LIBSESSION_CONSTANTS from '../../../session/utils/libsession/libsession_constants'; async function joinOpenGroup( serverUrl: string, @@ -105,7 +105,8 @@ export const OverlayCommunity = () => { onValueChanged={setGroupUrl} onEnterPressed={onTryJoinRoom} error={groupUrlError} - maxLength={VALIDATION.MAX_COMMUNITY_NAME_LENGTH} + // - 1 for null terminator + maxLength={LIBSESSION_CONSTANTS.COMMUNITY_FULL_URL_MAX_LENGTH - 1} textSize="md" centerText={true} monospaced={true} diff --git a/ts/session/constants.ts b/ts/session/constants.ts index 3f39a8a1d..73c944d39 100644 --- a/ts/session/constants.ts +++ b/ts/session/constants.ts @@ -72,7 +72,6 @@ export const MAX_ATTACHMENT_FILESIZE_BYTES = 10 * 1000 * 1000; export const VALIDATION = { MAX_GROUP_NAME_LENGTH: 30, - MAX_COMMUNITY_NAME_LENGTH: 300, CLOSED_GROUP_SIZE_LIMIT: 100, }; diff --git a/ts/session/utils/libsession/libsession_constants.ts b/ts/session/utils/libsession/libsession_constants.ts index e41ea5597..be7d7a07e 100644 --- a/ts/session/utils/libsession/libsession_constants.ts +++ b/ts/session/utils/libsession/libsession_constants.ts @@ -1,13 +1,18 @@ import { CONSTANTS, ConstantsType } from 'libsession_util_nodejs'; // NOTE CONSTANTS is an immediately invoked function that returns the libsession constants object -const { CONTACT_MAX_NAME_LENGTH, BASE_GROUP_MAX_NAME_LENGTH, GROUP_INFO_MAX_NAME_LENGTH } = - CONSTANTS; +const { + CONTACT_MAX_NAME_LENGTH, + BASE_GROUP_MAX_NAME_LENGTH, + GROUP_INFO_MAX_NAME_LENGTH, + COMMUNITY_FULL_URL_MAX_LENGTH, +} = CONSTANTS; const LIBSESSION_CONSTANTS: ConstantsType = { CONTACT_MAX_NAME_LENGTH, BASE_GROUP_MAX_NAME_LENGTH, GROUP_INFO_MAX_NAME_LENGTH, + COMMUNITY_FULL_URL_MAX_LENGTH, }; export default LIBSESSION_CONSTANTS;