galley-types: remove all re-exports

changelog.d/5-internal/galley-types-remove-reexports

@@ -0,0 +1 @@
+galley-types: remove all re-exports

libs/galley-types/galley-types.cabal

@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 9468b34d92756358ec15e112490166749eeb8aa4c15ec1db90adf33e41c11e7d
+-- hash: 26d987cec9407756eea729c29352c63730c0bb4e5b469b0aeb02ed79e8bd99b3
 
 name:           galley-types
 version:        0.81.0
@@ -28,7 +28,6 @@ library
       Galley.Types.Conversations.Roles
       Galley.Types.Teams
       Galley.Types.Teams.Intra
-      Galley.Types.Teams.SearchVisibility
   other-modules:
       Paths_galley_types
   hs-source-dirs:

libs/galley-types/src/Galley/Types.hs

@@ -20,82 +20,14 @@
 module Galley.Types
   ( foldrOtrRecipients,
     Accept (..),
-
-    -- * re-exports
-    ConversationMetadata (..),
-    Conversation (..),
-    cnvType,
-    cnvCreator,
-    cnvAccess,
-    cnvAccessRoles,
-    cnvName,
-    cnvTeam,
-    cnvMessageTimer,
-    cnvReceiptMode,
-    RemoteMember (..),
-    LocalMember (..),
-    ConvMembers (..),
-    OtherMember (..),
-    Connect (..),
-    NewOtrMessage (..),
-    ClientMismatch (..),
-    OtrRecipients (..),
-    OtrFilterMissing (..),
-    ConvTeamInfo (..),
-    ConversationCode (..),
-    mkConversationCode,
-    Event (..),
-    EventType (..),
-    EventData (..),
-    UserIdList (..),
-    QualifiedUserIdList (..),
-    SimpleMember (..),
-    SimpleMembers (..),
-    MemberUpdateData (..),
-    TypingData (..),
-    OtrMessage (..),
-    Access (..),
-    AccessRoleV2 (..),
-    AccessRoleLegacy (..),
-    ConversationList (..),
-    ConversationRename (..),
-    ConversationAccessData (..),
-    ConversationReceiptModeUpdate (..),
-    ConversationMessageTimerUpdate (..),
-    ConvType (..),
-    CustomBackend (..),
-    Invite (..),
-    NewConv (..),
-    MemberUpdate (..),
-    OtherMemberUpdate (..),
-    MutedStatus (..),
-    ReceiptMode (..),
-    Protocol (..),
-    ProtocolTag (..),
-    GroupId (..),
-    TypingStatus (..),
-    UserClientMap (..),
-    UserClients (..),
-    filterClients,
-    newInvite,
-    memberUpdate,
   )
 where
 
 import Data.Aeson
 import Data.Id (ClientId, UserId)
 import qualified Data.Map.Strict as Map
-import Galley.Types.Conversations.Members (LocalMember (..), RemoteMember (..))
 import Imports
-import Wire.API.Conversation hiding (Member (..))
-import Wire.API.Conversation.Code
-import Wire.API.Conversation.Protocol
-import Wire.API.Conversation.Typing
-import Wire.API.CustomBackend
-import Wire.API.Event.Conversation
 import Wire.API.Message
-import Wire.API.User (UserIdList (..))
-import Wire.API.User.Client
 
 --------------------------------------------------------------------------------
 -- Accept

libs/galley-types/src/Galley/Types/Bot.hs

@@ -29,23 +29,14 @@ module Galley.Types.Bot
     removeBot,
     rmBotConv,
     rmBotId,
-
-    -- * re-exports
-    module Service,
-    BotConvView,
-    botConvView,
-    botConvId,
-    botConvName,
-    botConvMembers,
   )
 where
 
 import Control.Lens (makeLenses)
 import Data.Aeson
 import Data.Id
-import Galley.Types.Bot.Service as Service
 import Imports
-import Wire.API.Provider.Bot (BotConvView, botConvId, botConvMembers, botConvName, botConvView)
+import Wire.API.Provider.Service (ServiceRef)
 
 -- AddBot ----------------------------------------------------------------------
 

libs/galley-types/src/Galley/Types/Bot/Service.hs

@@ -26,13 +26,6 @@ module Galley.Types.Bot.Service
     serviceToken,
     serviceFingerprints,
     serviceEnabled,
-
-    -- * re-exports
-    ServiceToken (..),
-    ServiceRef (..),
-    newServiceRef,
-    serviceRefId,
-    serviceRefProvider,
   )
 where
 

libs/galley-types/src/Galley/Types/Conversations/Roles.hs

@@ -22,19 +22,6 @@
 module Galley.Types.Conversations.Roles
   ( isActionAllowed,
     roleNameToActions,
-
-    -- * re-exports
-    ConversationRole,
-    convRoleWireAdmin,
-    convRoleWireMember,
-    wireConvRoles,
-    RoleName,
-    roleNameWireAdmin,
-    roleNameWireMember,
-    wireConvRoleNames,
-    Action (..),
-    Actions (..),
-    ConversationRolesList (..),
   )
 where
 

libs/galley-types/src/Galley/Types/Teams.hs

@@ -55,90 +55,6 @@ module Galley.Types.Teams
     permissionsRole,
     HiddenPerm (..),
     IsPerm (..),
-
-    -- * re-exports
-    Team,
-    TeamBinding (..),
-    newTeam,
-    teamId,
-    teamCreator,
-    teamName,
-    teamIcon,
-    teamIconKey,
-    teamBinding,
-    teamSplashScreen,
-    TeamList,
-    newTeamList,
-    teamListTeams,
-    teamListHasMore,
-    TeamMember,
-    userId,
-    nUserId,
-    permissions,
-    nPermissions,
-    invitation,
-    nInvitation,
-    legalHoldStatus,
-    TeamMemberList,
-    TeamMemberListOptPerms,
-    ListType (..),
-    newTeamMemberList,
-    teamMembers,
-    teamMemberListType,
-    TeamConversation,
-    newTeamConversation,
-    conversationId,
-    TeamConversationList,
-    newTeamConversationList,
-    teamConversations,
-    Permissions,
-    newPermissions,
-    fullPermissions,
-    noPermissions,
-    serviceWhitelistPermissions,
-    self,
-    copy,
-    Perm (..),
-    SPerm (..),
-    permToInt,
-    permsToInt,
-    intToPerm,
-    intToPerms,
-    Role (..),
-    defaultRole,
-    BindingNewTeam (..),
-    NonBindingNewTeam (..),
-    NewTeam,
-    newNewTeam,
-    newTeamName,
-    newTeamIcon,
-    newTeamIconKey,
-    newTeamMembers,
-    NewTeamMember,
-    Event,
-    newEvent,
-    eventType,
-    eventTime,
-    eventTeam,
-    eventData,
-    EventType (..),
-    EventData (..),
-    TeamUpdateData,
-    newTeamUpdateData,
-    newTeamDeleteDataWithCode,
-    nameUpdate,
-    iconUpdate,
-    iconKeyUpdate,
-    splashScreenUpdate,
-    TeamMemberDeleteData,
-    tmdAuthPassword,
-    newTeamMemberDeleteData,
-    TeamDeleteData,
-    tdAuthPassword,
-    tdVerificationCode,
-    newTeamDeleteData,
-    HardTruncationLimit,
-    hardTruncationLimit,
   )
 where
 
@@ -153,9 +69,6 @@ import Data.String.Conversions (cs)
 import Imports
 import Test.QuickCheck (Arbitrary)
 import Wire.API.Error.Galley
-import Wire.API.Event.Team
-import Wire.API.Team
-import Wire.API.Team.Conversation
 import Wire.API.Team.Feature
 import Wire.API.Team.Member
 import Wire.API.Team.Permission

libs/galley-types/src/Galley/Types/Teams/Intra.hs

@@ -32,11 +32,11 @@ import Data.Aeson.TH
 import qualified Data.Currency as Currency
 import Data.Json.Util
 import Data.Time (UTCTime)
-import Galley.Types.Teams (Team)
 import Imports
 import Test.QuickCheck.Arbitrary (Arbitrary)
 import Wire.API.Arbitrary (GenericUniform (..))
 import Wire.API.Message (UserClients)
+import Wire.API.Team (Team)
 import Wire.API.Team.LegalHold (LegalholdProtectee)
 
 data TeamStatus

libs/galley-types/test/unit/Test/Galley/Types.hs

@@ -32,6 +32,8 @@ import Test.Tasty
 import Test.Tasty.HUnit
 import Test.Tasty.QuickCheck
 import Wire.API.Team.Feature as Public
+import Wire.API.Team.Permission
+import Wire.API.Team.Role
 
 tests :: TestTree
 tests =

services/brig/src/Brig/API/Connection.hs

@@ -50,11 +50,11 @@ import Data.Proxy (Proxy (Proxy))
 import Data.Qualified
 import Data.Range
 import qualified Data.UUID.V4 as UUID
-import Galley.Types (ConvType (..), cnvType)
 import Imports
 import qualified System.Logger.Class as Log
 import System.Logger.Message
 import Wire.API.Connection (RelationWithHistory (..))
+import Wire.API.Conversation
 import Wire.API.Error
 import qualified Wire.API.Error.Brig as E
 import Wire.API.Routes.Public.Util (ResponseForExistedCreated (..))

services/brig/src/Brig/API/Internal.hs

@@ -66,7 +66,6 @@ import Data.Id as Id
 import qualified Data.Map.Strict as Map
 import Data.Qualified
 import qualified Data.Set as Set
-import Galley.Types (UserClients (..))
 import Imports hiding (head)
 import Network.HTTP.Types.Status
 import Network.Wai (Response)
@@ -84,6 +83,7 @@ import Wire.API.Error
 import qualified Wire.API.Error.Brig as E
 import Wire.API.MLS.Credential
 import Wire.API.MLS.KeyPackage
+import Wire.API.Message (UserClients (UserClients))
 import Wire.API.Routes.Internal.Brig (NewKeyPackageRef)
 import qualified Wire.API.Routes.Internal.Brig as BrigIRoutes
 import Wire.API.Routes.Internal.Brig.Connection

services/brig/src/Brig/API/User.hs

@@ -163,8 +163,10 @@ import Wire.API.Error
 import qualified Wire.API.Error.Brig as E
 import Wire.API.Federation.Error
 import Wire.API.Routes.Internal.Brig.Connection
+import Wire.API.Team hiding (newTeam)
 import Wire.API.Team.Feature (forgetLock)
-import Wire.API.Team.Member (legalHoldStatus)
+import Wire.API.Team.Member (TeamMember, legalHoldStatus)
+import Wire.API.Team.Role
 import Wire.API.User
 
 data AllowSCIMUpdates
@@ -364,7 +366,7 @@ createUser new = do
       ok <- lift . wrapClient $ Data.claimKey uk uid
       unless ok $
         throwE RegisterErrorUserKeyExists
-      let minvmeta :: (Maybe (UserId, UTCTimeMillis), Team.Role)
+      let minvmeta :: (Maybe (UserId, UTCTimeMillis), Role)
           minvmeta = ((,inCreatedAt inv) <$> inCreatedBy inv, Team.inRole inv)
       added <- lift $ wrapHttp $ Intra.addTeamMember uid (Team.iiTeam ii) minvmeta
       unless added $
@@ -383,7 +385,7 @@ createUser new = do
     addUserToTeamSSO :: UserAccount -> TeamId -> UserIdentity -> ExceptT RegisterError (AppT r) CreateUserTeam
     addUserToTeamSSO account tid ident = do
       let uid = userId (accountUser account)
-      added <- lift $ wrapHttp $ Intra.addTeamMember uid tid (Nothing, Team.defaultRole)
+      added <- lift $ wrapHttp $ Intra.addTeamMember uid tid (Nothing, defaultRole)
       unless added $
         throwE RegisterErrorTooManyTeamMembers
       lift $ do
@@ -930,8 +932,8 @@ sendActivationCode emailOrPhone loc call = case emailOrPhone of
         -- user has 'userTeam' set, it must be binding.
         case mbTeam of
           Just team
-            | team ^. Team.teamCreator == uid ->
-              sendTeamActivationMail em name p loc' (team ^. Team.teamName)
+            | team ^. teamCreator == uid ->
+              sendTeamActivationMail em name p loc' (team ^. teamName)
           _otherwise ->
             sendActivationMail em name p loc' ident
 
@@ -1350,7 +1352,7 @@ lookupLocalProfiles requestingUser others = do
     toMap :: [ConnectionStatus] -> Map UserId Relation
     toMap = Map.fromList . map (csFrom &&& csStatus)
 
-    getSelfInfo :: UserId -> m (Maybe (TeamId, Team.TeamMember))
+    getSelfInfo :: UserId -> m (Maybe (TeamId, TeamMember))
     getSelfInfo selfId = do
       -- FUTUREWORK: it is an internal error for the two lookups (for 'User' and 'TeamMember')
       -- to return 'Nothing'.  we could throw errors here if that happens, rather than just
@@ -1401,7 +1403,7 @@ getLegalHoldStatus' user =
 
 data EmailVisibility'
   = EmailVisibleIfOnTeam'
-  | EmailVisibleIfOnSameTeam' (Maybe (TeamId, Team.TeamMember))
+  | EmailVisibleIfOnSameTeam' (Maybe (TeamId, TeamMember))
   | EmailVisibleToSelf'
 
 -- | Gets the email if it's visible to the requester according to configured settings