miklo
/
soapbox
sforkowany z mirror/soapbox
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność

Correctly normalize singleUserModeProfile if it has an @

bosnian
Alex Gleason 2023-01-13 18:54:25 -06:00
rodzic d64f4edf61
commit 29bf78d09b
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
2 zmienionych plików z 5 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
app/soapbox/normalizers/soapbox/__tests__/soapbox-config.test.ts
Wyświetl plik

@ -37,6 +37,7 @@ describe('normalizeSoapboxConfig()', () => {
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: false, singleUserModeProfile: 'alex' }).redirectRootNoLogin).toBe('');
});

8
app/soapbox/normalizers/soapbox/soapbox-config.ts
Wyświetl plik

@ -198,13 +198,13 @@ const normalizeAdsAlgorithm = (soapboxConfig: SoapboxConfigMap): SoapboxConfigMa
/** Single user mode is now managed by `redirectRootNoLogin`. */
const upgradeSingleUserMode = (soapboxConfig: SoapboxConfigMap): SoapboxConfigMap => {
const singleUserMode = soapboxConfig.get('singleUserMode');
const singleUserModeProfile = soapboxConfig.get('singleUserModeProfile');
const redirectRootNoLogin = soapboxConfig.get('redirectRootNoLogin');
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', `/@${singleUserModeProfile}`)
.set('redirectRootNoLogin', `/@${singleUserModeProfile.replaceAll('@', '')}`)
.deleteAll(['singleUserMode', 'singleUserModeProfile']);
} else {
return soapboxConfig