ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4104 from Ocelot-Social-Community/bgt-german-umlaut-slug

Browse Source 
[WIP] fix: 🍰 Issue #3504 umlaut encoding #3676
This commit is contained in:
Brandon Tripp 2021-01-21 15:39:52 -07:00 committed by GitHub
commit e33da64c10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/middleware/slugify/uniqueSlug.js
View File

@ -2,6 +2,7 @@ import slugify from 'slug'
export default async function uniqueSlug(string, isUnique) { export default async function uniqueSlug(string, isUnique) {
const slug = slugify(string || 'anonymous', { const slug = slugify(string || 'anonymous', {
lower: true, lower: true,
multicharmap: { Ä: 'AE', ä: 'ae', Ö: 'OE', ö: 'oe', Ü: 'UE', ü: 'ue', ß: 'ss' },
}) })
if (await isUnique(slug)) return slug if (await isUnique(slug)) return slug

12
backend/src/middleware/slugify/uniqueSlug.spec.js
View File

@ -18,4 +18,16 @@ describe('uniqueSlug', () => {
const isUnique = jest.fn().mockResolvedValue(true) const isUnique = jest.fn().mockResolvedValue(true)
expect(uniqueSlug(string, isUnique)).resolves.toEqual('anonymous') expect(uniqueSlug(string, isUnique)).resolves.toEqual('anonymous')
}) })
it('Converts umlaut to a two letter equivalent', async () => {
const umlaut = 'ÄÖÜäöüß'
const isUnique = jest.fn().mockResolvedValue(true)
await expect(uniqueSlug(umlaut, isUnique)).resolves.toEqual('aeoeueaeoeuess')
})
it('Removes Spanish enya and diacritics', async () => {
const diacritics = 'áàéèíìóòúùñçÁÀÉÈÍÌÓÒÚÙÑÇ'
const isUnique = jest.fn().mockResolvedValue(true)
await expect(uniqueSlug(diacritics, isUnique)).resolves.toEqual('aaeeiioouuncaaeeiioouunc')
})
}) })