{account && (
@@ -151,7 +148,7 @@ const Navbar = () => {
- {!singleUserMode && (
+ {isOpen && (
diff --git a/app/soapbox/features/ui/components/panels/__tests__/sign-up-panel.test.tsx b/app/soapbox/features/ui/components/panels/__tests__/sign-up-panel.test.tsx
new file mode 100644
index 000000000..0ff47848a
--- /dev/null
+++ b/app/soapbox/features/ui/components/panels/__tests__/sign-up-panel.test.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+
+import { storeOpen, storePepeOpen } from 'soapbox/jest/mock-stores';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import SignUpPanel from '../sign-up-panel';
+
+describe('', () => {
+ it('doesn\'t render by default', () => {
+ render();
+ expect(screen.queryByTestId('sign-up-panel')).not.toBeInTheDocument();
+ });
+
+ describe('with registrations enabled', () => {
+ it('successfully renders', () => {
+ render(, undefined, storeOpen);
+ expect(screen.getByTestId('sign-up-panel')).toBeInTheDocument();
+ });
+ });
+
+ describe('with registrations closed, Pepe enabled', () => {
+ it('successfully renders', () => {
+ render(, undefined, storePepeOpen);
+ expect(screen.getByTestId('sign-up-panel')).toBeInTheDocument();
+ });
+ });
+});
diff --git a/app/soapbox/features/ui/components/panels/sign-up-panel.tsx b/app/soapbox/features/ui/components/panels/sign-up-panel.tsx
index 318080770..f5e6c9222 100644
--- a/app/soapbox/features/ui/components/panels/sign-up-panel.tsx
+++ b/app/soapbox/features/ui/components/panels/sign-up-panel.tsx
@@ -2,17 +2,17 @@ import React from 'react';
import { FormattedMessage } from 'react-intl';
import { Button, Stack, Text } from 'soapbox/components/ui';
-import { useAppSelector, useInstance, useSoapboxConfig } from 'soapbox/hooks';
+import { useAppSelector, useInstance, useRegistrationStatus } from 'soapbox/hooks';
const SignUpPanel = () => {
const instance = useInstance();
- const { singleUserMode } = useSoapboxConfig();
+ const { isOpen } = useRegistrationStatus();
const me = useAppSelector((state) => state.me);
- if (me || singleUserMode) return null;
+ if (me || !isOpen) return null;
return (
-
+
diff --git a/app/soapbox/hooks/__tests__/useRegistrationStatus.test.ts b/app/soapbox/hooks/__tests__/useRegistrationStatus.test.ts
new file mode 100644
index 000000000..465ca3992
--- /dev/null
+++ b/app/soapbox/hooks/__tests__/useRegistrationStatus.test.ts
@@ -0,0 +1,46 @@
+import { storeClosed, storeOpen, storePepeClosed, storePepeOpen } from 'soapbox/jest/mock-stores';
+import { renderHook } from 'soapbox/jest/test-helpers';
+
+import { useRegistrationStatus } from '../useRegistrationStatus';
+
+describe('useRegistrationStatus()', () => {
+ test('Registrations open', () => {
+ const { result } = renderHook(useRegistrationStatus, undefined, storeOpen);
+
+ expect(result.current).toMatchObject({
+ isOpen: true,
+ pepeEnabled: false,
+ pepeOpen: false,
+ });
+ });
+
+ test('Registrations closed', () => {
+ const { result } = renderHook(useRegistrationStatus, undefined, storeClosed);
+
+ expect(result.current).toMatchObject({
+ isOpen: false,
+ pepeEnabled: false,
+ pepeOpen: false,
+ });
+ });
+
+ test('Registrations closed, Pepe enabled & open', () => {
+ const { result } = renderHook(useRegistrationStatus, undefined, storePepeOpen);
+
+ expect(result.current).toMatchObject({
+ isOpen: true,
+ pepeEnabled: true,
+ pepeOpen: true,
+ });
+ });
+
+ test('Registrations closed, Pepe enabled & closed', () => {
+ const { result } = renderHook(useRegistrationStatus, undefined, storePepeClosed);
+
+ expect(result.current).toMatchObject({
+ isOpen: false,
+ pepeEnabled: true,
+ pepeOpen: false,
+ });
+ });
+});
diff --git a/app/soapbox/hooks/index.ts b/app/soapbox/hooks/index.ts
index 148aadb60..7c662bca2 100644
--- a/app/soapbox/hooks/index.ts
+++ b/app/soapbox/hooks/index.ts
@@ -12,7 +12,8 @@ export { useOnScreen } from './useOnScreen';
export { useOwnAccount } from './useOwnAccount';
export { usePrevious } from './usePrevious';
export { useRefEventHandler } from './useRefEventHandler';
+export { useRegistrationStatus } from './useRegistrationStatus';
export { useSettings } from './useSettings';
export { useSoapboxConfig } from './useSoapboxConfig';
export { useSystemTheme } from './useSystemTheme';
-export { useTheme } from './useTheme';
+export { useTheme } from './useTheme';
\ No newline at end of file
diff --git a/app/soapbox/hooks/useRegistrationStatus.ts b/app/soapbox/hooks/useRegistrationStatus.ts
new file mode 100644
index 000000000..6ede86941
--- /dev/null
+++ b/app/soapbox/hooks/useRegistrationStatus.ts
@@ -0,0 +1,22 @@
+import { useAppSelector } from './useAppSelector';
+import { useFeatures } from './useFeatures';
+import { useInstance } from './useInstance';
+import { useSoapboxConfig } from './useSoapboxConfig';
+
+export const useRegistrationStatus = () => {
+ const instance = useInstance();
+ const features = useFeatures();
+ const soapboxConfig = useSoapboxConfig();
+
+ const pepeOpen = useAppSelector(state => state.verification.instance.get('registrations') === true);
+ const pepeEnabled = soapboxConfig.getIn(['extensions', 'pepe', 'enabled']) === true;
+
+ return {
+ /** Registrations are open, either through Pepe or traditional account creation. */
+ isOpen: (features.accountCreation && instance.registrations) || (pepeEnabled && pepeOpen),
+ /** Whether Pepe is open. */
+ pepeOpen,
+ /** Whether Pepe is enabled. */
+ pepeEnabled,
+ };
+};
\ No newline at end of file
diff --git a/app/soapbox/jest/mock-stores.tsx b/app/soapbox/jest/mock-stores.tsx
new file mode 100644
index 000000000..db22ed197
--- /dev/null
+++ b/app/soapbox/jest/mock-stores.tsx
@@ -0,0 +1,40 @@
+import { Map as ImmutableMap, fromJS } from 'immutable';
+
+import alexJson from 'soapbox/__fixtures__/pleroma-account.json';
+import { normalizeAccount, normalizeInstance } from 'soapbox/normalizers';
+
+/** Store with registrations open. */
+const storeOpen = { instance: normalizeInstance({ registrations: true }) };
+
+/** Store with registrations closed. */
+const storeClosed = { instance: normalizeInstance({ registrations: false }) };
+
+/** Store with registrations closed, and Pepe enabled & open. */
+const storePepeOpen = {
+ instance: normalizeInstance({ registrations: false }),
+ soapbox: fromJS({ extensions: { pepe: { enabled: true } } }),
+ verification: { instance: fromJS({ registrations: true }) },
+};
+
+/** Store with registrations closed, and Pepe enabled & closed. */
+const storePepeClosed = {
+ instance: normalizeInstance({ registrations: false }),
+ soapbox: fromJS({ extensions: { pepe: { enabled: true } } }),
+ verification: { instance: fromJS({ registrations: false }) },
+};
+
+/** Store with a logged-in user. */
+const storeLoggedIn = {
+ me: alexJson.id,
+ accounts: ImmutableMap({
+ [alexJson.id]: normalizeAccount(alexJson),
+ }),
+};
+
+export {
+ storeOpen,
+ storeClosed,
+ storePepeOpen,
+ storePepeClosed,
+ storeLoggedIn,
+};
\ No newline at end of file
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 49883461c..af571abf8 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -1198,12 +1198,10 @@
"soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.",
"soapbox_config.raw_json_invalid": "is invalid",
"soapbox_config.raw_json_label": "Advanced: Edit raw JSON data",
+ "soapbox_config.redirect_root_no_login_hint": "Path to redirect the homepage when a user is not logged in.",
+ "soapbox_config.redirect_root_no_login_label": "Redirect homepage",
"soapbox_config.save": "Save",
"soapbox_config.saved": "Soapbox config saved!",
- "soapbox_config.single_user_mode_hint": "Front page will redirect to a given user profile.",
- "soapbox_config.single_user_mode_label": "Single user mode",
- "soapbox_config.single_user_mode_profile_hint": "@handle",
- "soapbox_config.single_user_mode_profile_label": "Main user handle",
"soapbox_config.tile_server_attribution_label": "Map tiles attribution",
"soapbox_config.tile_server_label": "Map tile server",
"soapbox_config.verified_can_edit_name_label": "Allow verified users to edit their own display name.",
diff --git a/app/soapbox/normalizers/soapbox/__tests__/soapbox-config.test.ts b/app/soapbox/normalizers/soapbox/__tests__/soapbox-config.test.ts
index 9b70eba36..9142a3356 100644
--- a/app/soapbox/normalizers/soapbox/__tests__/soapbox-config.test.ts
+++ b/app/soapbox/normalizers/soapbox/__tests__/soapbox-config.test.ts
@@ -34,4 +34,17 @@ describe('normalizeSoapboxConfig()', () => {
expect(ImmutableRecord.isRecord(result.promoPanel.items.get(0))).toBe(true);
expect(result.promoPanel.items.get(2)?.icon).toBe('question-circle');
});
+
+ it('upgrades singleUserModeProfile to redirectRootNoLogin', () => {
+ expect(normalizeSoapboxConfig({ singleUserMode: true, singleUserModeProfile: 'alex' }).redirectRootNoLogin).toBe('/@alex');
+ expect(normalizeSoapboxConfig({ singleUserMode: true, singleUserModeProfile: '@alex' }).redirectRootNoLogin).toBe('/@alex');
+ expect(normalizeSoapboxConfig({ singleUserMode: true, singleUserModeProfile: 'alex@gleasonator.com' }).redirectRootNoLogin).toBe('/@alex@gleasonator.com');
+ expect(normalizeSoapboxConfig({ singleUserMode: false, singleUserModeProfile: 'alex' }).redirectRootNoLogin).toBe('');
+ });
+
+ it('normalizes redirectRootNoLogin', () => {
+ expect(normalizeSoapboxConfig({ redirectRootNoLogin: 'benis' }).redirectRootNoLogin).toBe('/benis');
+ expect(normalizeSoapboxConfig({ redirectRootNoLogin: '/benis' }).redirectRootNoLogin).toBe('/benis');
+ expect(normalizeSoapboxConfig({ redirectRootNoLogin: '/' }).redirectRootNoLogin).toBe('');
+ });
});
diff --git a/app/soapbox/normalizers/soapbox/soapbox-config.ts b/app/soapbox/normalizers/soapbox/soapbox-config.ts
index 31e24aa1c..3b8b2ea91 100644
--- a/app/soapbox/normalizers/soapbox/soapbox-config.ts
+++ b/app/soapbox/normalizers/soapbox/soapbox-config.ts
@@ -6,6 +6,7 @@ import {
} from 'immutable';
import trimStart from 'lodash/trimStart';
+import { normalizeUsername } from 'soapbox/utils/input';
import { toTailwind } from 'soapbox/utils/tailwind';
import { generateAccent } from 'soapbox/utils/theme';
@@ -106,8 +107,6 @@ export const SoapboxConfigRecord = ImmutableRecord({
}),
aboutPages: ImmutableMap>(),
authenticatedProfile: true,
- singleUserMode: false,
- singleUserModeProfile: '',
linkFooterMessage: '',
links: ImmutableMap(),
displayCta: true,
@@ -115,6 +114,7 @@ export const SoapboxConfigRecord = ImmutableRecord({
feedInjection: true,
tileServer: '',
tileServerAttribution: '',
+ redirectRootNoLogin: '',
/**
* Whether to use the preview URL for media thumbnails.
* On some platforms this can be too blurry without additional configuration.
@@ -197,6 +197,45 @@ const normalizeAdsAlgorithm = (soapboxConfig: SoapboxConfigMap): SoapboxConfigMa
}
};
+/** Single user mode is now managed by `redirectRootNoLogin`. */
+const upgradeSingleUserMode = (soapboxConfig: SoapboxConfigMap): SoapboxConfigMap => {
+ const singleUserMode = soapboxConfig.get('singleUserMode') as boolean | undefined;
+ const singleUserModeProfile = soapboxConfig.get('singleUserModeProfile') as string | undefined;
+ const redirectRootNoLogin = soapboxConfig.get('redirectRootNoLogin') as string | undefined;
+
+ if (!redirectRootNoLogin && singleUserMode && singleUserModeProfile) {
+ return soapboxConfig
+ .set('redirectRootNoLogin', `/@${normalizeUsername(singleUserModeProfile)}`)
+ .deleteAll(['singleUserMode', 'singleUserModeProfile']);
+ } else {
+ return soapboxConfig
+ .deleteAll(['singleUserMode', 'singleUserModeProfile']);
+ }
+};
+
+/** Ensure a valid path is used. */
+const normalizeRedirectRootNoLogin = (soapboxConfig: SoapboxConfigMap): SoapboxConfigMap => {
+ const redirectRootNoLogin = soapboxConfig.get('redirectRootNoLogin');
+
+ if (!redirectRootNoLogin) return soapboxConfig;
+
+ try {
+ // Basically just get the pathname with a leading slash.
+ const normalized = new URL(redirectRootNoLogin, 'http://a').pathname;
+
+ if (normalized !== '/') {
+ return soapboxConfig.set('redirectRootNoLogin', normalized);
+ } else {
+ // Prevent infinite redirect(?)
+ return soapboxConfig.delete('redirectRootNoLogin');
+ }
+ } catch (e) {
+ console.error('You have configured an invalid redirect in Soapbox Config.');
+ console.error(e);
+ return soapboxConfig.delete('redirectRootNoLogin');
+ }
+};
+
export const normalizeSoapboxConfig = (soapboxConfig: Record) => {
return SoapboxConfigRecord(
ImmutableMap(fromJS(soapboxConfig)).withMutations(soapboxConfig => {
@@ -209,6 +248,8 @@ export const normalizeSoapboxConfig = (soapboxConfig: Record) => {
normalizeCryptoAddresses(soapboxConfig);
normalizeAds(soapboxConfig);
normalizeAdsAlgorithm(soapboxConfig);
+ upgradeSingleUserMode(soapboxConfig);
+ normalizeRedirectRootNoLogin(soapboxConfig);
}),
);
};