Skip to content

Remove unused data type AllowedUserSearch #2373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smatting merged 2 commits into from
May 6, 2022
Merged

Remove unused data type AllowedUserSearch #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b2e2dd
Remove unused data type AllowedUserSearch
smatting May 6, 2022
2d3e3c9
changelog
smatting May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5-internal/remove-unused-datatype
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove unused data type AllowedUserSearch
22 changes: 0 additions & 22 deletions services/brig/src/Brig/Options.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,28 +359,6 @@ instance ToSchema ListAllSFTServers where
element "disabled" HideAllSFTServers
]

data AllowedUserSearch
= NoSearch
| ExactHandleSearch
| FullSearch
deriving (Show, Generic, Enum, Bounded)

instance ToJSON AllowedUserSearch where
toJSON NoSearch = "no_search"
toJSON ExactHandleSearch = "exact_handle_search"
toJSON FullSearch = "full_search"

instance FromJSON AllowedUserSearch where
parseJSON = withText "AllowedUserSearch" $ \case
"no_search" -> pure NoSearch
"exact_handle_search" -> pure ExactHandleSearch
"full_search" -> pure FullSearch
_ ->
fail $
"unexpected value for AllowedUserSearch settings: "
<> "expected one of "
<> show (Aeson.encode <$> [(minBound :: AllowedUserSearch) ..])

data FederationDomainConfig = FederationDomainConfig
{ domain :: Domain,
cfgSearchPolicy :: FederatedUserSearchPolicy
Expand Down