Fix (some) HLint issues in wire-api

There are a lot left, but these ones should be safe to not change the
application's behavior.

Author: supersven

changelog.d/5-internal/fix-hlint-issues-in-wire-api

@@ -0,0 +1 @@
+Fix some HLint issues in libs/wire-api.

libs/wire-api/src/Wire/API/Arbitrary.hs

@@ -1,6 +1,5 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE DisambiguateRecordFields #-}
 {-# LANGUAGE KindSignatures #-}
-{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 

libs/wire-api/src/Wire/API/Conversation/Member.hs

@@ -252,13 +252,12 @@ instance Arbitrary MemberUpdate where
 
 validateMemberUpdate :: MemberUpdate -> Either String MemberUpdate
 validateMemberUpdate u =
-  if ( isJust (mupOtrMuteStatus u)
-         || isJust (mupOtrMuteRef u)
-         || isJust (mupOtrArchive u)
-         || isJust (mupOtrArchiveRef u)
-         || isJust (mupHidden u)
-         || isJust (mupHiddenRef u)
-     )
+  if isJust (mupOtrMuteStatus u)
+    || isJust (mupOtrMuteRef u)
+    || isJust (mupOtrArchive u)
+    || isJust (mupOtrArchiveRef u)
+    || isJust (mupHidden u)
+    || isJust (mupHiddenRef u)
     then Right u
     else
       Left

libs/wire-api/src/Wire/API/Conversation/Role.hs

@@ -137,7 +137,7 @@ instance FromJSON ConversationRole where
   parseJSON = A.withObject "conversationRole" $ \o -> do
     role <- o A..: "conversation_role"
     actions <- o A..: "actions"
-    case (toConvRole role (Just $ Actions actions)) of
+    case toConvRole role (Just $ Actions actions) of
       Just cr -> return cr
       Nothing -> fail ("Failed to parse: " ++ show o)
 

libs/wire-api/src/Wire/API/CustomBackend.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE StrictData #-}
 
 -- This file is part of the Wire Server implementation.

libs/wire-api/src/Wire/API/Push/V2/Token.hs

@@ -83,7 +83,7 @@ data PushToken = PushToken
   deriving (Arbitrary) via (GenericUniform PushToken)
 
 pushToken :: Transport -> AppName -> Token -> ClientId -> PushToken
-pushToken tp an tk cl = PushToken tp an tk cl
+pushToken = PushToken
 
 modelPushToken :: Doc.Model
 modelPushToken = Doc.defineModel "PushToken" $ do

libs/wire-api/src/Wire/API/Routes/Internal/Brig/Connection.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE DisambiguateRecordFields #-}
 
 -- This file is part of the Wire Server implementation.
 --

libs/wire-api/src/Wire/API/Routes/MultiVerb.hs

@@ -325,7 +325,7 @@ instance
   type ResponseStatus (WithHeaders hs a r) = ResponseStatus r
   type ResponseBody (WithHeaders hs a r) = ResponseBody r
 
-  responseRender acc x = fmap addHeaders $ responseRender @cs @r acc y
+  responseRender acc x = addHeaders <$> responseRender @cs @r acc y
     where
       (hs, y) = toHeaders @xs x
       addHeaders r =

libs/wire-api/src/Wire/API/Routes/Public/Galley.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE DerivingVia #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 -- This file is part of the Wire Server implementation.

libs/wire-api/src/Wire/API/Team/Invitation.hs

@@ -74,7 +74,7 @@ modelTeamInvitationRequest = Doc.defineModel "TeamInvitationRequest" $ do
 
 instance ToJSON InvitationRequest where
   toJSON i =
-    object $
+    object
       [ "locale" .= irLocale i,
         "role" .= irRole i,
         "name" .= irInviteeName i,
@@ -137,7 +137,7 @@ modelTeamInvitation = Doc.defineModel "TeamInvitation" $ do
 
 instance ToJSON Invitation where
   toJSON i =
-    object $
+    object
       [ "team" .= inTeam i,
         "role" .= inRole i,
         "id" .= inInvitation i,