Skip to content

[WPB-28382] Re-visit wire-subsystem implementation of indexing team collaborators. #5495

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

Draft
fisx wants to merge 2 commits into
base: develop
Choose a base branch
from
+13 −10
Draft

[WPB-28382] Re-visit wire-subsystem implementation of indexing team collaborators. #5495

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
e77b4cb
Changelog.
fisx Aug 31, 2026
873a7b5
[drive-by] Cleanup: isolate stores in their home subsystems.
fisx Sep 1, 2026
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 ...-internal/WPB-28382-re-visit-wire-subsystem-implementation-of-indexing-team-collaborators
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Re-visit wire-subsystem implementation of indexing team collaborators.
2 changes: 2 additions & 0 deletions libs/wire-subsystems/src/Wire/UserSubsystem.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,3 +381,5 @@ ensurePermissions u t perms = do
check :: Maybe TeamMember -> Bool
check (Just m) = all (hasPermission m) perms
check Nothing = False

-- fake change.
20 changes: 10 additions & 10 deletions libs/wire-subsystems/src/Wire/UserSubsystem/Interpreter.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ import Wire.Sem.Metrics qualified as Metrics
import Wire.Sem.Now (Now)
import Wire.Sem.Now qualified as Now
import Wire.StoredUser
import Wire.TeamCollaboratorsStore (TeamCollaboratorsStore)
import Wire.TeamCollaboratorsStore qualified as TeamCollaboratorsStore
import Wire.TeamCollaboratorsSubsystem (TeamCollaboratorsSubsystem)
import Wire.TeamCollaboratorsSubsystem qualified as TeamCollaboratorsSubsystem
import Wire.TeamSubsystem
import Wire.UserGroupStore (UserGroupStore, getUserGroupIdsForUsers)
import Wire.UserKeyStore
Expand Down Expand Up @@ -144,7 +144,7 @@ runUserSubsystem ::
Member TinyLog r,
Member (Input UserSubsystemConfig) r,
Member TeamSubsystem r,
Member TeamCollaboratorsStore r,
Member TeamCollaboratorsSubsystem r,
Member UserGroupStore r,
Member (Input (Local any)) r
) =>
Expand Down Expand Up @@ -715,7 +715,7 @@ updateUserProfileImpl ::
Member Events r,
Member GalleyAPIAccess r,
Member IndexedUserStore r,
Member TeamCollaboratorsStore r,
Member TeamCollaboratorsSubsystem r,
Member Metrics r
) =>
Local UserId ->
Expand Down Expand Up @@ -777,7 +777,7 @@ updateHandleImpl ::
Member Events r,
Member UserStore r,
Member IndexedUserStore r,
Member TeamCollaboratorsStore r,
Member TeamCollaboratorsSubsystem r,
Member Metrics r
) =>
Local UserId ->
Expand Down Expand Up @@ -846,7 +846,7 @@ syncUserIndex ::
Member GalleyAPIAccess r,
Member IndexedUserStore r,
Member Metrics r,
Member TeamCollaboratorsStore r
Member TeamCollaboratorsSubsystem r
) =>
UserId ->
Sem r ()
Expand All @@ -867,7 +867,7 @@ syncUserIndex uid =
teamSearchVisibilityInbound
indexUser.teamId
tm <- maybe (pure Nothing) selectTeamMember indexUser.teamId
collabTeams <- map gTeam <$> TeamCollaboratorsStore.getTeamCollaborations uid
collabTeams <- map gTeam <$> TeamCollaboratorsSubsystem.internalGetTeamCollaborations uid
let mRole = tm >>= mkRoleWithWriteTime
userDoc = indexUserToDoc vis (value <$> mRole) collabTeams indexUser
-- GTE, not GT: the version comes from the user row alone, but the document also
Expand Down Expand Up @@ -1191,7 +1191,7 @@ acceptTeamInvitationImpl ::
Member (Error UserSubsystemError) r,
Member InvitationStore r,
Member IndexedUserStore r,
Member TeamCollaboratorsStore r,
Member TeamCollaboratorsSubsystem r,
Member Metrics r,
Member Events r,
Member AuthenticationSubsystem r,
Expand Down Expand Up @@ -1256,7 +1256,7 @@ removeEmailEitherImpl ::
Member UserStore r,
Member Events r,
Member IndexedUserStore r,
Member TeamCollaboratorsStore r,
Member TeamCollaboratorsSubsystem r,
Member (Input UserSubsystemConfig) r,
Member GalleyAPIAccess r,
Member Metrics r
Expand Down Expand Up @@ -1293,7 +1293,7 @@ setUserSearchableImpl ::
Member TeamSubsystem r,
Member GalleyAPIAccess r,
Member IndexedUserStore r,
Member TeamCollaboratorsStore r,
Member TeamCollaboratorsSubsystem r,
Member Metrics r
) =>
Local UserId ->
Expand Down