From 75738ba5498de1964d292588478ba127cb9fe646 Mon Sep 17 00:00:00 2001 From: Gautier DI FOLCO Date: Tue, 3 Mar 2026 18:58:05 +0100 Subject: [PATCH] WPB-23789: Remove redundant constraints in Galley/Action --- services/galley/src/Galley/API/Action.hs | 152 ++----------------- services/galley/src/Galley/API/Federation.hs | 6 - services/galley/src/Galley/API/LegalHold.hs | 20 --- services/galley/src/Galley/API/MLS/Reset.hs | 2 - services/galley/src/Galley/API/Teams.hs | 6 +- services/galley/src/Galley/API/Update.hs | 41 +---- 6 files changed, 15 insertions(+), 212 deletions(-) diff --git a/services/galley/src/Galley/API/Action.hs b/services/galley/src/Galley/API/Action.hs index 9f12ae99e8..dc161f6969 100644 --- a/services/galley/src/Galley/API/Action.hs +++ b/services/galley/src/Galley/API/Action.hs @@ -82,8 +82,6 @@ import Galley.API.MLS.Migration import Galley.API.MLS.Removal import Galley.API.Teams.Features.Get import Galley.Effects -import Galley.Env (Env) -import Galley.Options (Opts) import Galley.Types.Error import Imports hiding ((\\)) import Polysemy @@ -146,18 +144,14 @@ type family HasConversationActionEffects (tag :: ConversationActionTag) r :: Con ( -- TODO: Replace with subsystems Member BrigAPIAccess r, Member (Error FederationError) r, - Member (Error InternalError) r, Member (ErrorS 'NotATeamMember) r, Member (ErrorS 'NotConnected) r, - Member (ErrorS ('ActionDenied 'LeaveConversation)) r, Member (ErrorS ('ActionDenied 'AddConversationMember)) r, Member (ErrorS 'InvalidOperation) r, Member (ErrorS 'ConvAccessDenied) r, - Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'TooManyMembers) r, Member (ErrorS 'MissingLegalholdConsent) r, Member (ErrorS 'GroupIdVersionNotSupported) r, - Member (Error NonFederatingBackends) r, Member (Error UnreachableBackends) r, Member ExternalAccess r, Member (FederationAPIAccess FederatorClient) r, @@ -165,7 +159,6 @@ type family HasConversationActionEffects (tag :: ConversationActionTag) r :: Con Member (Input ConversationSubsystemConfig) r, Member Now r, Member LegalHoldStore r, - Member ConversationStore r, Member ProposalStore r, Member Random r, Member TeamStore r, @@ -174,131 +167,50 @@ type family HasConversationActionEffects (tag :: ConversationActionTag) r :: Con Member (Error NoChanges) r ) HasConversationActionEffects 'ConversationLeaveTag r = - ( Member (Error InternalError) r, - Member (Error NoChanges) r, - Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, - Member NotificationSubsystem r, - Member Now r, - Member (Input Env) r, - Member (Input ConversationSubsystemConfig) r, - Member ProposalStore r, - Member ConversationStore r, - Member Random r, - Member TinyLog r - ) + () HasConversationActionEffects 'ConversationRemoveMembersTag r = - ( Member (Error NoChanges) r, - Member ConversationStore r, - Member ProposalStore r, - Member (Input Env) r, - Member (Input ConversationSubsystemConfig) r, - Member Now r, - Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, - Member NotificationSubsystem r, - Member (Error InternalError) r, - Member Random r, - Member TinyLog r, - Member (Error NoChanges) r - ) + () HasConversationActionEffects 'ConversationMemberUpdateTag r = ( Member (ErrorS 'ConvMemberNotFound) r, Member ConversationStore r ) HasConversationActionEffects 'ConversationDeleteTag r = - ( Member BrigAPIAccess r, - Member CodeStore r, - Member ConversationStore r, - Member (Error FederationError) r, - Member (ErrorS 'NotATeamMember) r, - Member (FederationAPIAccess FederatorClient) r, - Member ProposalStore r, - Member TeamStore r - ) + (Member (ErrorS 'NotATeamMember) r) HasConversationActionEffects 'ConversationRenameTag r = - ( Member (Error InvalidInput) r, - Member ConversationStore r, - Member TeamStore r, - Member (ErrorS InvalidOperation) r - ) + () HasConversationActionEffects 'ConversationAccessDataTag r = ( Member BrigAPIAccess r, Member CodeStore r, - Member (Error InternalError) r, - Member (Error InvalidInput) r, Member (Error NoChanges) r, Member (ErrorS 'InvalidTargetAccess) r, Member (ErrorS ('ActionDenied 'RemoveConversationMember)) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member FireAndForget r, Member NotificationSubsystem r, - Member (Input Env) r, Member (Input ConversationSubsystemConfig) r, Member ProposalStore r, - Member TeamStore r, Member TinyLog r, Member Now r, Member ConversationStore r, Member Random r ) HasConversationActionEffects 'ConversationHistoryUpdateTag r = - ( Member ConversationStore r, - Member (ErrorS HistoryNotSupported) r - ) + () HasConversationActionEffects 'ConversationMessageTimerUpdateTag r = - ( Member ConversationStore r, - Member (Error NoChanges) r - ) + () HasConversationActionEffects 'ConversationReceiptModeUpdateTag r = - ( Member ConversationStore r, - Member (Error NoChanges) r, - Member (ErrorS MLSReadReceiptsNotAllowed) r - ) + (Member (ErrorS MLSReadReceiptsNotAllowed) r) HasConversationActionEffects 'ConversationUpdateProtocolTag r = - ( Member ConversationStore r, - Member (ErrorS 'ConvInvalidProtocolTransition) r, - Member (ErrorS 'MLSMigrationCriteriaNotSatisfied) r, - Member (Error NoChanges) r, - Member BrigAPIAccess r, - Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, - Member NotificationSubsystem r, - Member (Input Env) r, - Member (Input Opts) r, - Member Now r, - Member ProposalStore r, - Member Random r, - Member TeamFeatureStore r, - Member TinyLog r, - Member FeaturesConfigSubsystem r + ( ) HasConversationActionEffects 'ConversationUpdateAddPermissionTag r = - ( Member (Error NoChanges) r, - Member ConversationStore r, - Member (ErrorS 'InvalidTargetAccess) r - ) + (Member (ErrorS 'InvalidTargetAccess) r) HasConversationActionEffects 'ConversationResetTag r = - ( Member (Input Env) r, - Member Now r, - Member (ErrorS ConvNotFound) r, - Member (ErrorS InvalidOperation) r, - Member ConversationStore r, - Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, - Member NotificationSubsystem r, - Member ProposalStore r, - Member Random r, - Member Resource r, - Member TinyLog r, - Member (ErrorS MLSStaleMessage) r - ) + () type family HasConversationActionGalleyErrors (tag :: ConversationActionTag) :: EffectRow where HasConversationActionGalleyErrors 'ConversationJoinTag = - '[ ErrorS ('ActionDenied 'LeaveConversation), - ErrorS ('ActionDenied 'AddConversationMember), + '[ ErrorS ('ActionDenied 'AddConversationMember), ErrorS 'GroupIdVersionNotSupported, ErrorS 'NotATeamMember, ErrorS 'InvalidOperation, @@ -358,32 +270,23 @@ type family HasConversationActionGalleyErrors (tag :: ConversationActionTag) :: ErrorS 'InvalidOperation, ErrorS 'ConvNotFound, ErrorS 'ConvInvalidProtocolTransition, - ErrorS 'MLSMigrationCriteriaNotSatisfied, - ErrorS 'NotATeamMember, - ErrorS OperationDenied, - ErrorS 'TeamNotFound + ErrorS 'MLSMigrationCriteriaNotSatisfied ] HasConversationActionGalleyErrors 'ConversationUpdateAddPermissionTag = '[ ErrorS ('ActionDenied 'ModifyAddPermission), ErrorS 'InvalidOperation, ErrorS 'ConvNotFound, - ErrorS 'NotATeamMember, - ErrorS OperationDenied, - ErrorS 'TeamNotFound, ErrorS 'InvalidTargetAccess ] HasConversationActionGalleyErrors 'ConversationResetTag = '[ ErrorS (ActionDenied LeaveConversation), - ErrorS GroupIdVersionNotSupported, ErrorS MLSStaleMessage, ErrorS InvalidOperation, ErrorS ConvNotFound ] HasConversationActionGalleyErrors 'ConversationHistoryUpdateTag = '[ ErrorS (ActionDenied ModifyConversationAccess), - ErrorS GroupIdVersionNotSupported, ErrorS HistoryNotSupported, - ErrorS MLSStaleMessage, ErrorS InvalidOperation, ErrorS ConvNotFound ] @@ -717,15 +620,12 @@ updateLocalConversationJoin :: Member TeamSubsystem r, Member (Input ConversationSubsystemConfig) r, Member BrigAPIAccess r, - Member (Error InternalError) r, Member (ErrorS 'NotATeamMember) r, Member (ErrorS 'NotConnected) r, - Member (ErrorS ('ActionDenied 'LeaveConversation)) r, Member (ErrorS 'ConvAccessDenied) r, Member (ErrorS 'TooManyMembers) r, Member (ErrorS 'MissingLegalholdConsent) r, Member (ErrorS 'GroupIdVersionNotSupported) r, - Member (Error NonFederatingBackends) r, Member (Error UnreachableBackends) r, Member ExternalAccess r, Member (FederationAPIAccess FederatorClient) r, @@ -765,13 +665,9 @@ updateLocalConversationLeave :: Member ConversationSubsystem r, Member TeamSubsystem r, Member (Input ConversationSubsystemConfig) r, - Member (Error InternalError) r, - Member (Error NoChanges) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, Member Now r, - Member (Input Env) r, Member ProposalStore r, Member ConversationStore r, Member Random r, @@ -819,14 +715,11 @@ updateLocalConversationDelete :: Member (ErrorS 'ConvNotFound) r, Member ConversationSubsystem r, Member TeamSubsystem r, - Member BrigAPIAccess r, Member CodeStore r, Member ConversationStore r, Member (Error FederationError) r, Member (ErrorS 'NotATeamMember) r, - Member (FederationAPIAccess FederatorClient) r, - Member ProposalStore r, - Member TeamStore r + Member ProposalStore r ) => Local ConvId -> Qualified UserId -> @@ -867,7 +760,6 @@ updateLocalConversationRename :: Member TeamSubsystem r, Member (Error InvalidInput) r, Member ConversationStore r, - Member TeamStore r, Member (ErrorS InvalidOperation) r ) => Local ConvId -> @@ -944,11 +836,7 @@ updateLocalConversationAccessData :: Member (ErrorS ('ActionDenied (ConversationActionPermission 'ConversationAccessDataTag))) r, Member (ErrorS 'ConvNotFound) r, Member ConversationSubsystem r, - Member (Input Env) r, - Member (Error InternalError) r, - Member (Error InvalidInput) r, Member (Error NoChanges) r, - Member (FederationAPIAccess FederatorClient) r, Member TinyLog r, Member ConversationStore r, Member BrigAPIAccess r, @@ -956,7 +844,6 @@ updateLocalConversationAccessData :: Member ExternalAccess r, Member NotificationSubsystem r, Member ProposalStore r, - Member TeamStore r, Member Now r, Member Random r, Member FireAndForget r, @@ -988,10 +875,7 @@ updateLocalConversationRemoveMembers :: Member (Error FederationError) r, Member (ErrorS ('ActionDenied (ConversationActionPermission 'ConversationRemoveMembersTag))) r, Member ConversationSubsystem r, - Member (Input Env) r, - Member (Error InternalError) r, Member (Error NoChanges) r, - Member (FederationAPIAccess FederatorClient) r, Member TinyLog r, Member ConversationStore r, Member ExternalAccess r, @@ -1027,8 +911,6 @@ updateLocalConversationUpdateProtocol :: Member (ErrorS 'InvalidOperation) r, Member (ErrorS 'ConvNotFound) r, Member ConversationSubsystem r, - Member (Input Opts) r, - Member (Input Env) r, Member (Error NoChanges) r, Member (FederationAPIAccess FederatorClient) r, Member TinyLog r, @@ -1040,7 +922,6 @@ updateLocalConversationUpdateProtocol :: Member Now r, Member Random r, Member TeamSubsystem r, - Member TeamFeatureStore r, Member FeaturesConfigSubsystem r, Member (Input ConversationSubsystemConfig) r, Member (ErrorS 'ConvInvalidProtocolTransition) r, @@ -1113,7 +994,6 @@ updateLocalConversationReset :: Member (ErrorS 'InvalidOperation) r, Member (ErrorS 'ConvNotFound) r, Member ConversationSubsystem r, - Member (Input Env) r, Member (FederationAPIAccess FederatorClient) r, Member TinyLog r, Member ConversationStore r, @@ -1183,15 +1063,12 @@ updateLocalConversationUncheckedJoin :: Member TeamSubsystem r, Member (Input ConversationSubsystemConfig) r, Member BrigAPIAccess r, - Member (Error InternalError) r, Member (ErrorS 'NotATeamMember) r, Member (ErrorS 'NotConnected) r, - Member (ErrorS ('ActionDenied 'LeaveConversation)) r, Member (ErrorS 'ConvAccessDenied) r, Member (ErrorS 'TooManyMembers) r, Member (ErrorS 'MissingLegalholdConsent) r, Member (ErrorS 'GroupIdVersionNotSupported) r, - Member (Error NonFederatingBackends) r, Member (Error UnreachableBackends) r, Member ExternalAccess r, Member (FederationAPIAccess FederatorClient) r, @@ -1234,12 +1111,9 @@ updateLocalConversationUncheckedRemoveMembers :: Member (Error NoChanges) r, Member ConversationStore r, Member ProposalStore r, - Member (Input Env) r, Member Now r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, - Member (Error InternalError) r, Member Random r, Member TinyLog r ) => diff --git a/services/galley/src/Galley/API/Federation.hs b/services/galley/src/Galley/API/Federation.hs index 80f72f2c0b..596269a7ba 100644 --- a/services/galley/src/Galley/API/Federation.hs +++ b/services/galley/src/Galley/API/Federation.hs @@ -274,10 +274,8 @@ leaveConversation :: Member ConversationStore r, Member (Error InternalError) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member ConversationSubsystem r, Member NotificationSubsystem r, - Member (Input Env) r, Member (Input (Local ())) r, Member Now r, Member ProposalStore r, @@ -486,11 +484,8 @@ updateConversation :: Member (Error InvalidInput) r, Member ExternalAccess r, Member (FederationAPIAccess FederatorClient) r, - Member (Error InternalError) r, Member ConversationSubsystem r, Member NotificationSubsystem r, - Member (Input Env) r, - Member (Input Opts) r, Member Now r, Member LegalHoldStore r, Member ProposalStore r, @@ -500,7 +495,6 @@ updateConversation :: Member ConversationStore r, Member Random r, Member FederationSubsystem r, - Member TeamFeatureStore r, Member (Input (Local ())) r, Member TeamCollaboratorsSubsystem r, Member E.MLSCommitLockStore r, diff --git a/services/galley/src/Galley/API/LegalHold.hs b/services/galley/src/Galley/API/LegalHold.hs index c2a3c8443a..2fb4f61223 100644 --- a/services/galley/src/Galley/API/LegalHold.hs +++ b/services/galley/src/Galley/API/LegalHold.hs @@ -45,7 +45,6 @@ import Galley.API.LegalHold.Get import Galley.API.LegalHold.Team import Galley.API.Query (iterateConversations) import Galley.API.Update (removeMemberFromLocalConv) -import Galley.App import Galley.Effects import Galley.Effects.TeamMemberStore import Galley.External.LegalHoldService qualified as LHService @@ -63,7 +62,6 @@ import Wire.API.Conversation.Protocol import Wire.API.Conversation.Role import Wire.API.Error import Wire.API.Error.Galley -import Wire.API.Federation.Client (FederatorClient) import Wire.API.Federation.Error import Wire.API.Provider.Service import Wire.API.Routes.Internal.Brig.Connection @@ -165,11 +163,9 @@ removeSettingsInternalPaging :: Member (ErrorS OperationDenied) r, Member (ErrorS 'UserLegalHoldIllegalOperation) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member FireAndForget r, Member NotificationSubsystem r, Member ConversationSubsystem r, - Member (Input Env) r, Member (Input (Local ())) r, Member Now r, Member LegalHoldStore r, @@ -211,11 +207,9 @@ removeSettings :: Member (ErrorS OperationDenied) r, Member (ErrorS 'UserLegalHoldIllegalOperation) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member FireAndForget r, Member NotificationSubsystem r, Member ConversationSubsystem r, - Member (Input Env) r, Member (Input (Local ())) r, Member Now r, Member LegalHoldStore r, @@ -268,13 +262,11 @@ removeSettings' :: Member (ErrorS 'UserLegalHoldIllegalOperation) r, Member (ErrorS 'LegalHoldCouldNotBlockConnections) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member FireAndForget r, Member NotificationSubsystem r, Member ConversationSubsystem r, Member Now r, Member (Input (Local ())) r, - Member (Input Env) r, Member LegalHoldStore r, Member (TeamMemberStore p) r, Member TeamStore r, @@ -321,10 +313,8 @@ grantConsent :: Member (ErrorS 'TeamMemberNotFound) r, Member (ErrorS 'UserLegalHoldIllegalOperation) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, Member ConversationSubsystem r, - Member (Input Env) r, Member Now r, Member LegalHoldStore r, Member ProposalStore r, @@ -369,11 +359,9 @@ requestDevice :: Member (ErrorS 'UserLegalHoldAlreadyEnabled) r, Member (ErrorS 'UserLegalHoldIllegalOperation) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, Member ConversationSubsystem r, Member (Input (Local ())) r, - Member (Input Env) r, Member Now r, Member LegalHoldStore r, Member ProposalStore r, @@ -464,11 +452,9 @@ approveDevice :: Member (ErrorS 'UserLegalHoldIllegalOperation) r, Member (ErrorS 'UserLegalHoldNotPending) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, Member ConversationSubsystem r, Member (Input (Local ())) r, - Member (Input Env) r, Member Now r, Member LegalHoldStore r, Member ProposalStore r, @@ -543,10 +529,8 @@ disableForUser :: Member (ErrorS OperationDenied) r, Member (ErrorS 'UserLegalHoldIllegalOperation) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, Member ConversationSubsystem r, - Member (Input Env) r, Member (Input (Local ())) r, Member Now r, Member LegalHoldStore r, @@ -609,10 +593,8 @@ changeLegalholdStatusAndHandlePolicyConflicts :: Member (ErrorS 'LegalHoldCouldNotBlockConnections) r, Member (ErrorS 'UserLegalHoldIllegalOperation) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, Member ConversationSubsystem r, - Member (Input Env) r, Member Now r, Member LegalHoldStore r, Member TeamStore r, @@ -727,10 +709,8 @@ handleGroupConvPolicyConflicts :: Member (Error InternalError) r, Member (ErrorS ('ActionDenied 'RemoveConversationMember)) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, Member ConversationSubsystem r, - Member (Input Env) r, Member Now r, Member ProposalStore r, Member P.TinyLog r, diff --git a/services/galley/src/Galley/API/MLS/Reset.hs b/services/galley/src/Galley/API/MLS/Reset.hs index 96078cd2f3..3b0cf263f2 100644 --- a/services/galley/src/Galley/API/MLS/Reset.hs +++ b/services/galley/src/Galley/API/MLS/Reset.hs @@ -58,7 +58,6 @@ resetMLSConversation :: Member (Error InternalError) r, Member (ErrorS InvalidOperation) r, Member (ErrorS MLSFederatedResetNotSupported) r, - Member (ErrorS GroupIdVersionNotSupported) r, Member BackendNotificationQueueAccess r, Member ConversationStore r, Member (FederationAPIAccess FederatorClient) r, @@ -107,7 +106,6 @@ resetRemoteMLSConversation :: Member (ErrorS InvalidOperation) r, Member (ErrorS ConvNotFound) r, Member (ErrorS MLSFederatedResetNotSupported) r, - Member (ErrorS GroupIdVersionNotSupported) r, Member (ErrorS MLSStaleMessage) r, Member (Error FederationError) r, Member (Error InternalError) r, diff --git a/services/galley/src/Galley/API/Teams.hs b/services/galley/src/Galley/API/Teams.hs index b882e4f700..49940fb77d 100644 --- a/services/galley/src/Galley/API/Teams.hs +++ b/services/galley/src/Galley/API/Teams.hs @@ -102,7 +102,6 @@ import Wire.API.Error import Wire.API.Error.Galley import Wire.API.Event.LeaveReason import Wire.API.Event.Team -import Wire.API.Federation.Client (FederatorClient) import Wire.API.Federation.Error import Wire.API.Push.V2 (RecipientClients (RecipientClientsAll)) import Wire.API.Routes.Internal.Galley.TeamsIntra @@ -960,18 +959,15 @@ getTeamConversation zusr tid cid = do pure $ newTeamConversation teamConv deleteTeamConversation :: - ( Member BrigAPIAccess r, - Member CodeStore r, + ( Member CodeStore r, Member ConversationStore r, Member (Error FederationError) r, Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'InvalidOperation) r, Member (ErrorS 'NotATeamMember) r, Member (ErrorS ('ActionDenied 'Public.DeleteConversation)) r, - Member (FederationAPIAccess FederatorClient) r, Member ProposalStore r, Member ConversationSubsystem r, - Member TeamStore r, Member TeamSubsystem r ) => Local UserId -> diff --git a/services/galley/src/Galley/API/Update.hs b/services/galley/src/Galley/API/Update.hs index e307b62dfa..d72009026d 100644 --- a/services/galley/src/Galley/API/Update.hs +++ b/services/galley/src/Galley/API/Update.hs @@ -496,18 +496,15 @@ updateConversationMessageTimerUnqualified :: updateConversationMessageTimerUnqualified lusr zcon cnv = updateConversationMessageTimer lusr zcon (tUntagged (qualifyAs lusr cnv)) deleteLocalConversation :: - ( Member BrigAPIAccess r, - Member CodeStore r, + ( Member CodeStore r, Member ConversationStore r, Member (Error FederationError) r, Member (ErrorS 'NotATeamMember) r, Member (ErrorS ('ActionDenied 'DeleteConversation)) r, Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'InvalidOperation) r, - Member (FederationAPIAccess FederatorClient) r, Member ConversationSubsystem r, Member ProposalStore r, - Member TeamStore r, Member TeamSubsystem r ) => Local UserId -> @@ -729,14 +726,9 @@ updateConversationProtocolWithLocalUser :: Member (ErrorS 'InvalidOperation) r, Member (Error FederationError) r, Member (ErrorS 'MLSMigrationCriteriaNotSatisfied) r, - Member (ErrorS 'NotATeamMember) r, - Member (ErrorS OperationDenied) r, - Member (ErrorS 'TeamNotFound) r, Member (Error InternalError) r, Member Now r, - Member (Input Env) r, Member (Input (Local ())) r, - Member (Input Opts) r, Member BackendNotificationQueueAccess r, Member BrigAPIAccess r, Member ConversationStore r, @@ -747,7 +739,6 @@ updateConversationProtocolWithLocalUser :: Member (FederationAPIAccess FederatorClient) r, Member Random r, Member ProposalStore r, - Member TeamFeatureStore r, Member FeaturesConfigSubsystem r, Member TeamSubsystem r, Member (Input ConversationSubsystemConfig) r @@ -785,9 +776,6 @@ updateChannelAddPermission :: Member ConversationSubsystem r, Member (Input (Local ())) r, Member TinyLog r, - Member (ErrorS (MissingPermission Nothing)) r, - Member (ErrorS NotATeamMember) r, - Member (ErrorS TeamNotFound) r, Member (Error NonFederatingBackends) r, Member (Error UnreachableBackends) r, Member BrigAPIAccess r, @@ -918,9 +906,7 @@ addMembers :: ( Member BackendNotificationQueueAccess r, Member BrigAPIAccess r, Member ConversationStore r, - Member (Error InternalError) r, Member (ErrorS ('ActionDenied 'AddConversationMember)) r, - Member (ErrorS ('ActionDenied 'LeaveConversation)) r, Member (ErrorS 'ConvAccessDenied) r, Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'InvalidOperation) r, @@ -930,7 +916,6 @@ addMembers :: Member (ErrorS 'MissingLegalholdConsent) r, Member (ErrorS 'GroupIdVersionNotSupported) r, Member (Error FederationError) r, - Member (Error NonFederatingBackends) r, Member (Error UnreachableBackends) r, Member ExternalAccess r, Member (FederationAPIAccess FederatorClient) r, @@ -974,9 +959,7 @@ addMembersUnqualifiedV2 :: Member BrigAPIAccess r, Member ConversationStore r, Member (Error FederationError) r, - Member (Error InternalError) r, Member (ErrorS ('ActionDenied 'AddConversationMember)) r, - Member (ErrorS ('ActionDenied 'LeaveConversation)) r, Member (ErrorS 'ConvAccessDenied) r, Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'InvalidOperation) r, @@ -985,7 +968,6 @@ addMembersUnqualifiedV2 :: Member (ErrorS 'TooManyMembers) r, Member (ErrorS 'MissingLegalholdConsent) r, Member (ErrorS 'GroupIdVersionNotSupported) r, - Member (Error NonFederatingBackends) r, Member (Error UnreachableBackends) r, Member ExternalAccess r, Member (FederationAPIAccess FederatorClient) r, @@ -1018,9 +1000,7 @@ addMembersUnqualified :: Member BrigAPIAccess r, Member ConversationStore r, Member (Error FederationError) r, - Member (Error InternalError) r, Member (ErrorS ('ActionDenied 'AddConversationMember)) r, - Member (ErrorS ('ActionDenied 'LeaveConversation)) r, Member (ErrorS 'ConvAccessDenied) r, Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'InvalidOperation) r, @@ -1029,7 +1009,6 @@ addMembersUnqualified :: Member (ErrorS 'TooManyMembers) r, Member (ErrorS 'MissingLegalholdConsent) r, Member (ErrorS 'GroupIdVersionNotSupported) r, - Member (Error NonFederatingBackends) r, Member (Error UnreachableBackends) r, Member ExternalAccess r, Member (FederationAPIAccess FederatorClient) r, @@ -1063,9 +1042,7 @@ replaceMembers :: ( Member BackendNotificationQueueAccess r, Member BrigAPIAccess r, Member ConversationStore r, - Member (Error InternalError) r, Member (ErrorS ('ActionDenied 'AddConversationMember)) r, - Member (ErrorS ('ActionDenied 'LeaveConversation)) r, Member (ErrorS ('ActionDenied 'RemoveConversationMember)) r, Member (ErrorS 'ConvAccessDenied) r, Member (ErrorS 'ConvNotFound) r, @@ -1076,12 +1053,10 @@ replaceMembers :: Member (ErrorS 'MissingLegalholdConsent) r, Member (ErrorS 'GroupIdVersionNotSupported) r, Member (Error FederationError) r, - Member (Error NonFederatingBackends) r, Member (Error UnreachableBackends) r, Member ExternalAccess r, Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, - Member (Input Env) r, Member Now r, Member LegalHoldStore r, Member ProposalStore r, @@ -1290,7 +1265,6 @@ removeMemberUnqualified :: ( Member BackendNotificationQueueAccess r, Member ConversationStore r, Member (Error FederationError) r, - Member (Error InternalError) r, Member (ErrorS ('ActionDenied 'RemoveConversationMember)) r, Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'InvalidOperation) r, @@ -1298,7 +1272,6 @@ removeMemberUnqualified :: Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, Member ConversationSubsystem r, - Member (Input Env) r, Member Now r, Member ProposalStore r, Member Random r, @@ -1320,7 +1293,6 @@ removeMemberQualified :: ( Member BackendNotificationQueueAccess r, Member ConversationStore r, Member (Error FederationError) r, - Member (Error InternalError) r, Member (ErrorS ('ActionDenied 'RemoveConversationMember)) r, Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'InvalidOperation) r, @@ -1328,7 +1300,6 @@ removeMemberQualified :: Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, Member ConversationSubsystem r, - Member (Input Env) r, Member Now r, Member ProposalStore r, Member Random r, @@ -1397,16 +1368,13 @@ removeMemberFromLocalConv :: ( Member BackendNotificationQueueAccess r, Member ConversationStore r, Member (Error FederationError) r, - Member (Error InternalError) r, Member (ErrorS ('ActionDenied 'LeaveConversation)) r, Member (ErrorS ('ActionDenied 'RemoveConversationMember)) r, Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'InvalidOperation) r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, Member ConversationSubsystem r, - Member (Input Env) r, Member Now r, Member ProposalStore r, Member Random r, @@ -1445,15 +1413,11 @@ removeMemberFromLocalConv lcnv lusr con victim removeMemberFromChannel :: forall r. ( Member (ErrorS 'ConvNotFound) r, - Member (Input Env) r, - Member (Error NoChanges) r, Member ProposalStore r, Member Now r, Member ExternalAccess r, - Member (FederationAPIAccess FederatorClient) r, Member NotificationSubsystem r, Member ConversationSubsystem r, - Member (Error InternalError) r, Member Random r, Member TinyLog r, Member (Error FederationError) r, @@ -1648,7 +1612,6 @@ updateConversationName :: Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'InvalidOperation) r, Member ConversationSubsystem r, - Member TeamStore r, Member TeamSubsystem r ) => Local UserId -> @@ -1672,7 +1635,6 @@ updateUnqualifiedConversationName :: Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'InvalidOperation) r, Member ConversationSubsystem r, - Member TeamStore r, Member TeamSubsystem r ) => Local UserId -> @@ -1692,7 +1654,6 @@ updateLocalConversationName :: Member (ErrorS 'ConvNotFound) r, Member (ErrorS 'InvalidOperation) r, Member ConversationSubsystem r, - Member TeamStore r, Member TeamSubsystem r ) => Local UserId ->