Skip to content

Commit 992b430

Browse files
committed
Set group ID mapping for remote conversations
1 parent 5c9da21 commit 992b430

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

services/galley/src/Galley/API/Federation.hs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module Galley.API.Federation where
2020

2121
import Brig.Types.Connection (Relation (Accepted))
2222
import Control.Error
23-
import Control.Lens (itraversed, (<.>))
23+
import Control.Lens (itraversed, preview, to, (<.>))
2424
import Data.Bifunctor
2525
import Data.ByteString.Conversion (toByteString')
2626
import Data.Containers.ListUtils (nubOrd)
@@ -68,6 +68,7 @@ import qualified System.Logger.Class as Log
6868
import Wire.API.Conversation hiding (Member)
6969
import qualified Wire.API.Conversation as Public
7070
import Wire.API.Conversation.Action
71+
import Wire.API.Conversation.Protocol
7172
import Wire.API.Conversation.Role
7273
import qualified Wire.API.Conversation.Role as Public
7374
import Wire.API.Error
@@ -106,6 +107,7 @@ federationSitemap =
106107
onConversationCreated ::
107108
Members
108109
'[ BrigAccess,
110+
ConversationStore,
109111
GundeckAccess,
110112
ExternalAccess,
111113
Input (Local ()),
@@ -139,7 +141,11 @@ onConversationCreated domain rc = do
139141
-- Make sure to notify only about local users connected to the adder
140142
let qrcConnected = qrc {F.rcNonCreatorMembers = connectedMembers}
141143

142-
forM_ (fromNewRemoteConversation loc qrcConnected) $ \(mem, c) -> do
144+
-- update group_id -> conv_id mapping
145+
for_ (preview (to F.rcProtocol . _ProtocolMLS) rc) $ \mls -> do
146+
E.setGroupId (cnvmlsGroupId mls) (qUntagged (F.rcCnvId qrc))
147+
148+
for_ (fromNewRemoteConversation loc qrcConnected) $ \(mem, c) -> do
143149
let event =
144150
Event
145151
(qUntagged (F.rcCnvId qrcConnected))

0 commit comments

Comments
 (0)