fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(user): display name may omit hyphenated given name parts

Browse Source
This commit is contained in:
Steffen Jost 2022-01-07 16:52:10 +01:00
parent 97f94f65f8
commit ddb1a15c18
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Handler/Utils/Profile.hs
View File

@ -22,16 +22,17 @@ validDisplayName (fmap Text.strip -> mTitle) (Text.strip -> fName) (Text.strip -
, dNameLetters `Set.isSubsetOf` Set.unions [titleLetters, fNameLetters, sNameLetters, addLetters]
]
where
titleFrags = MultiSet.fromList $ maybe [] Text.words mTitle
fNameFrags = MultiSet.fromList $ Text.words fName
sNameFrags = MultiSet.fromList $ Text.words sName
dNameFrags = MultiSet.fromList $ stripAdd <$> Text.words dName
titleFrags = foldMap makeMultiSet mTitle
dNameFrags = makeMultiSet dName
fNameFrags = makeMultiSet fName
sNameFrags = makeMultiSet sName
titleLetters = Set.fromList $ maybe [] unpack mTitle
fNameLetters = Set.fromList $ unpack fName
sNameLetters = Set.fromList $ unpack sName
dNameLetters = Set.fromList $ unpack dName
addLetters = Set.fromList [' ', ',', '.']
titleLetters = foldMap (Set.fromList . unpack) mTitle
fNameLetters = Set.fromList $ unpack fName
sNameLetters = Set.fromList $ unpack sName
dNameLetters = Set.fromList $ unpack dName
addLetters = Set.fromList [' ', ',', '.', '-']
isAdd = (`Set.member` addLetters)
stripAdd = Text.dropWhileEnd isAdd -- ? Text.dropAround isAdd
splitAdd = Text.split isAdd
makeMultiSet = MultiSet.fromList . filter (not . Text.null) . splitAdd