on master help sign in
Improved UA presentation
110d394iko
denis/src/Server/Auth.hs+6−6
@@ -225,13 +225,13 @@ getUserAgent uaData' = fromMaybe "Unknown" $ do
225 uaData <- fmap C.pack uaData'
225 uaData <- fmap C.pack uaData'
226 let os = osrFamily <$> parseOS uaData
226 let os = osrFamily <$> parseOS uaData
227 let browser = uarFamily <$> parseUA uaData
227 let browser = uarFamily <$> parseUA uaData
228− foldl mappendMaybe Nothing $ [os, browser]
228+ foldl (mappendMaybeThrough " — ") Nothing $ [os, browser]
229 where
229 where
230− mappendMaybe :: (Semigroup a) => Maybe a -> Maybe a -> Maybe a
230+ mappendMaybeThrough :: (Semigroup a) => a -> Maybe a -> Maybe a -> Maybe a
231− mappendMaybe Nothing (Just a) = Just a
231+ mappendMaybeThrough _ Nothing (Just a) = Just a
232− mappendMaybe (Just a) Nothing = Just a
232+ mappendMaybeThrough _ (Just a) Nothing = Just a
233− mappendMaybe (Just a) (Just b) = Just (a <> b)
233+ mappendMaybeThrough i (Just a) (Just b) = Just (a <> i <> b)
234− mappendMaybe Nothing Nothing = Nothing
234+ mappendMaybeThrough _ Nothing Nothing = Nothing
235
235
236normalizaUser :: UserCreation -> UserCreation
236normalizaUser :: UserCreation -> UserCreation
237normalizaUser (UserCreation fName mName lName faculty email) =
237normalizaUser (UserCreation fName mName lName faculty email) =