feat: fetch conversation's parent members

Author: blackheaven

services/galley/src/Galley/Cassandra/Conversation/Members.hs

@@ -123,9 +123,10 @@ removeRemoteMembersFromLocalConv cnv victims = do
       addPrepQuery Cql.removeRemoteMember (cnv, domain, uid)
 
 members :: ConvId -> Client [LocalMember]
-members conv =
-  fmap (mapMaybe toMember) . retry x1 $
-    query Cql.selectMembers (params LocalQuorum (Identity conv))
+members conv = do
+  parents <- retry x1 $ query Cql.selectConvParent (params LocalQuorum (Identity conv))
+  fmap (nubBy ((==) `on` (.id_)) . mapMaybe toMember) . retry x1 $
+    query Cql.selectMembers (params LocalQuorum (Identity $ conv : mapMaybe runIdentity parents))
 
 allMembers :: Client [LocalMember]
 allMembers =
@@ -223,9 +224,10 @@ member ::
   ConvId ->
   UserId ->
   Client (Maybe LocalMember)
-member cnv usr =
+member cnv usr = do
+  parents <- retry x1 $ query Cql.selectConvParent (params LocalQuorum (Identity cnv))
   (toMember =<<)
-    <$> retry x1 (query1 Cql.selectMember (params LocalQuorum (cnv, usr)))
+    <$> retry x1 (query1 Cql.selectMember (params LocalQuorum (cnv : mapMaybe runIdentity parents, usr)))
 
 -- | Set local users as belonging to a remote conversation. This is invoked by a
 -- remote galley when users from the current backend are added to conversations

services/galley/src/Galley/Cassandra/Queries.hs

@@ -241,6 +241,9 @@ selectConv = "select type, creator, access, access_role, access_roles_v2, name,
 isConvDeleted :: PrepQuery R (Identity ConvId) (Identity (Maybe Bool))
 isConvDeleted = "select deleted from conversation where conv = ?"
 
+selectConvParent :: PrepQuery R (Identity ConvId) (Identity (Maybe ConvId))
+selectConvParent = "select parent_conv from conversation where conv = ?"
+
 insertConv ::
   PrepQuery
     W
@@ -401,11 +404,11 @@ deleteSubConversation = "DELETE FROM subconversation where conv_id = ? and subco
 
 type MemberStatus = Int32
 
-selectMember :: PrepQuery R (ConvId, UserId) (UserId, Maybe ServiceId, Maybe ProviderId, Maybe MemberStatus, Maybe MutedStatus, Maybe Text, Maybe Bool, Maybe Text, Maybe Bool, Maybe Text, Maybe RoleName)
-selectMember = "select user, service, provider, status, otr_muted_status, otr_muted_ref, otr_archived, otr_archived_ref, hidden, hidden_ref, conversation_role from member where conv = ? and user = ?"
+selectMember :: PrepQuery R ([ConvId], UserId) (UserId, Maybe ServiceId, Maybe ProviderId, Maybe MemberStatus, Maybe MutedStatus, Maybe Text, Maybe Bool, Maybe Text, Maybe Bool, Maybe Text, Maybe RoleName)
+selectMember = "select user, service, provider, status, otr_muted_status, otr_muted_ref, otr_archived, otr_archived_ref, hidden, hidden_ref, conversation_role from member where conv in ? and user = ?"
 
-selectMembers :: PrepQuery R (Identity ConvId) (UserId, Maybe ServiceId, Maybe ProviderId, Maybe MemberStatus, Maybe MutedStatus, Maybe Text, Maybe Bool, Maybe Text, Maybe Bool, Maybe Text, Maybe RoleName)
-selectMembers = "select user, service, provider, status, otr_muted_status, otr_muted_ref, otr_archived, otr_archived_ref, hidden, hidden_ref, conversation_role from member where conv = ?"
+selectMembers :: PrepQuery R (Identity [ConvId]) (UserId, Maybe ServiceId, Maybe ProviderId, Maybe MemberStatus, Maybe MutedStatus, Maybe Text, Maybe Bool, Maybe Text, Maybe Bool, Maybe Text, Maybe RoleName)
+selectMembers = "select user, service, provider, status, otr_muted_status, otr_muted_ref, otr_archived, otr_archived_ref, hidden, hidden_ref, conversation_role from member where conv in ?"
 
 selectAllMembers :: PrepQuery R () (UserId, Maybe ServiceId, Maybe ProviderId, Maybe MemberStatus, Maybe MutedStatus, Maybe Text, Maybe Bool, Maybe Text, Maybe Bool, Maybe Text, Maybe RoleName)
 selectAllMembers = "select user, service, provider, status, otr_muted_status, otr_muted_ref, otr_archived, otr_archived_ref, hidden, hidden_ref, conversation_role from member"