From f74f6dfb5a8f831147068befc0c3dc5c3b2e0653 Mon Sep 17 00:00:00 2001 From: Diogo Date: Wed, 11 Dec 2024 11:54:06 +0000 Subject: [PATCH] attach chat tags to group info --- src/Simplex/Chat/Store/Groups.hs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs index d72e91020c..c7141b58df 100644 --- a/src/Simplex/Chat/Store/Groups.hs +++ b/src/Simplex/Chat/Store/Groups.hs @@ -1502,12 +1502,15 @@ updateGroupProfileFromMember db user g@GroupInfo {groupId} Profile {displayName GroupProfile {displayName, fullName, description, image, groupPreferences} getGroupInfo :: DB.Connection -> VersionRangeChat -> User -> Int64 -> ExceptT StoreError IO GroupInfo -getGroupInfo db vr User {userId, userContactId} groupId = - ExceptT . firstRow (toGroupInfo vr userContactId) (SEGroupNotFound groupId) $ - DB.query - db - (groupInfoQuery <> " WHERE g.group_id = ? AND g.user_id = ? AND mu.contact_id = ?") - (groupId, userId, userContactId) +getGroupInfo db vr User {userId, userContactId} groupId = do + info <- + ExceptT . firstRow (toGroupInfo vr userContactId) (SEGroupNotFound groupId) $ + DB.query + db + (groupInfoQuery <> " WHERE g.group_id = ? AND g.user_id = ? AND mu.contact_id = ?") + (groupId, userId, userContactId) + chatTags <- liftIO $ getGroupChatTags db groupId + pure (info :: GroupInfo) {chatTags} getGroupInfoByUserContactLinkConnReq :: DB.Connection -> VersionRangeChat -> User -> (ConnReqContact, ConnReqContact) -> IO (Maybe GroupInfo) getGroupInfoByUserContactLinkConnReq db vr user@User {userId} (cReqSchema1, cReqSchema2) = do