Skip to content

Avoid linear lookup when checking new members #1845

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
pcapriotti merged 1 commit into from
Dec 7, 2021
Merged

Avoid linear lookup when checking new members #1845

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions services/galley/src/Galley/API/Action.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@ module Galley.API.Action
where

import qualified Brig.Types.User as User
import Control.Arrow
import Control.Lens
import Data.Id
import Data.Kind
import Data.List.NonEmpty (NonEmpty, nonEmpty)
import qualified Data.Map as Map
import Data.Misc
import Data.Qualified
import qualified Data.Set as Set
Expand Down Expand Up @@ -165,8 +167,6 @@ instance IsConversationAction ConversationJoin where

addMembersToLocalConversation lcnv newMembers role
where
userIsMember u = (^. userId . to (== u))

checkLocals ::
Members
'[ BrigAccess,
Expand All @@ -181,8 +181,10 @@ instance IsConversationAction ConversationJoin where
[UserId] ->
Sem r ()
checkLocals lusr (Just tid) newUsers = do
tms <- E.selectTeamMembers tid newUsers
let userMembershipMap = map (\u -> (u, find (userIsMember u) tms)) newUsers
tms <-
Map.fromList . map (view userId &&& id)
<$> E.selectTeamMembers tid newUsers
let userMembershipMap = map (id &&& flip Map.lookup tms) newUsers
ensureAccessRole (convAccessRole conv) userMembershipMap
ensureConnectedOrSameTeam lusr newUsers
checkLocals lusr Nothing newUsers = do
Expand Down