Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/lib/generate-site-name.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,23 @@ export function generateSiteName( usedSiteNames: string[] ): string {
__( 'My Swift Website' ),
__( 'My True Website' ),
];
let proposedName = __( 'My WordPress Website' );
let tryCount = 0;

while ( usedSiteNames.includes( proposedName ) && tryCount < siteNames.length ) {
tryCount++;
proposedName = siteNames[ Math.floor( Math.random() * siteNames.length ) ];
const defaultName = __( 'My WordPress Website' );

if ( ! usedSiteNames.includes( defaultName ) ) {
return defaultName;
}

const availableNames = siteNames.filter( ( name ) => ! usedSiteNames.includes( name ) );
if ( availableNames.length > 0 ) {
return availableNames[ Math.floor( Math.random() * availableNames.length ) ];
}

return proposedName;
let siteNumber = 2;
while ( usedSiteNames.includes( `${ defaultName } ${ siteNumber }` ) ) {
siteNumber++;
}
return `${ defaultName } ${ siteNumber }`;
}

export const sanitizeFolderName = ( filename: string ) => {
Expand Down