core: code style

src/Simplex/Chat/Library/Commands.hs

@@ -3944,38 +3944,36 @@ processChatCommand vr nm = \case
       mapConcurrently addRelay relays
       where
         addRelay :: UserChatRelay -> CM (UserChatRelay, Either ChatError GroupRelay)
-        addRelay relay@UserChatRelay {address} = do
-          r <- tryAllErrors $ do
-            (FixedLinkData {linkConnReq = cReq}, _cData) <- getShortLinkConnReq nm user address
-            lift (withAgent' $ \a -> connRequestPQSupport a PQSupportOff cReq) >>= \case
-              Nothing -> throwChatError CEInvalidConnReq
-              Just (agentV, _) -> do
-                let chatV = agentToChatVersion agentV
-                gVar <- asks random
-                subMode <- chatReadVar subscriptionMode
-                connId <- withAgent $ \a -> prepareConnectionToJoin a (aUserId user) True cReq PQSupportOff
-                (relayMember, conn, groupRelay) <- withFastStore $ \db -> do
-                  relayMember <- createRelayForOwner db vr gVar user gInfo relay
-                  groupRelay <- createGroupRelayRecord db gInfo relayMember relay
-                  conn <- createRelayConnection db vr user (groupMemberId' relayMember) connId ConnPrepared chatV subMode
-                  pure (relayMember, conn, groupRelay)
-                let GroupMember {memberRole = userRole, memberId = userMemberId} = membership
-                    allowSimplexLinks = groupFeatureUserAllowed SGFSimplexLinks gInfo
-                    membershipProfile = redactedMemberProfile allowSimplexLinks $ fromLocalProfile $ memberProfile membership
-                    GroupMember {memberId = relayMemberId} = relayMember
-                    relayInv = GroupRelayInvitation {
-                      fromMember = MemberIdRole userMemberId userRole,
-                      fromMemberProfile = membershipProfile,
-                      relayMemberId,
-                      groupLink = groupSLink
-                    }
-                dm <- encodeConnInfo $ XGrpRelayInv relayInv
-                (sqSecured, _serviceId) <- withAgent $ \a -> joinConnection a nm (aUserId user) (aConnId conn) True cReq dm PQSupportOff subMode
-                let newConnStatus = if sqSecured then ConnSndReady else ConnJoined
-                withFastStore' $ \db -> do
-                  void $ updateConnectionStatusFromTo db conn ConnPrepared newConnStatus
-                  updateRelayStatusFromTo db groupRelay RSNew RSInvited
-          pure (relay, r)
+        addRelay relay@UserChatRelay {address} = fmap (relay,) . tryAllErrors $ do
+          (FixedLinkData {linkConnReq = cReq}, _cData) <- getShortLinkConnReq nm user address
+          lift (withAgent' $ \a -> connRequestPQSupport a PQSupportOff cReq) >>= \case
+            Nothing -> throwChatError CEInvalidConnReq
+            Just (agentV, _) -> do
+              let chatV = agentToChatVersion agentV
+              gVar <- asks random
+              subMode <- chatReadVar subscriptionMode
+              connId <- withAgent $ \a -> prepareConnectionToJoin a (aUserId user) True cReq PQSupportOff
+              (relayMember, conn, groupRelay) <- withFastStore $ \db -> do
+                relayMember <- createRelayForOwner db vr gVar user gInfo relay
+                groupRelay <- createGroupRelayRecord db gInfo relayMember relay
+                conn <- createRelayConnection db vr user (groupMemberId' relayMember) connId ConnPrepared chatV subMode
+                pure (relayMember, conn, groupRelay)
+              let GroupMember {memberRole = userRole, memberId = userMemberId} = membership
+                  allowSimplexLinks = groupFeatureUserAllowed SGFSimplexLinks gInfo
+                  membershipProfile = redactedMemberProfile allowSimplexLinks $ fromLocalProfile $ memberProfile membership
+                  GroupMember {memberId = relayMemberId} = relayMember
+                  relayInv = GroupRelayInvitation {
+                    fromMember = MemberIdRole userMemberId userRole,
+                    fromMemberProfile = membershipProfile,
+                    relayMemberId,
+                    groupLink = groupSLink
+                  }
+              dm <- encodeConnInfo $ XGrpRelayInv relayInv
+              (sqSecured, _serviceId) <- withAgent $ \a -> joinConnection a nm (aUserId user) (aConnId conn) True cReq dm PQSupportOff subMode
+              let newConnStatus = if sqSecured then ConnSndReady else ConnJoined
+              withFastStore' $ \db -> do
+                void $ updateConnectionStatusFromTo db conn ConnPrepared newConnStatus
+                updateRelayStatusFromTo db groupRelay RSNew RSInvited
     privateGetUser :: UserId -> CM User
     privateGetUser userId =
       tryAllErrors (withStore (`getUser` userId)) >>= \case