From 4b806ab73c6865bbb9d09d3137acdbab2638f339 Mon Sep 17 00:00:00 2001
From: solomon <ssbothwell@gmail.com>
Date: Sun, 6 Feb 2022 16:46:47 -0800
Subject: [PATCH] Adds `createWithSession`

---
 matrix-client/src/Network/Matrix/Client.hs   | 27 ++++++++++++++++++++
 matrix-client/src/Network/Matrix/Internal.hs |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/matrix-client/src/Network/Matrix/Client.hs b/matrix-client/src/Network/Matrix/Client.hs
index 4bcd78e..b08bd3d 100644
--- a/matrix-client/src/Network/Matrix/Client.hs
+++ b/matrix-client/src/Network/Matrix/Client.hs
@@ -23,6 +23,8 @@ module Network.Matrix.Client
     LoginResponse (..),
     getTokenFromEnv,
     createSession,
+    createWithSession,
+    createWithSessionIO,
     login,
     loginToken,
     logout,
@@ -31,6 +33,7 @@ module Network.Matrix.Client
     MatrixM,
     MatrixIO,
     runMatrixM,
+    runMatrixIO,
     MatrixError (..),
     retry,
     retryWithLog,
@@ -180,6 +183,7 @@ import Network.Matrix.Internal
     mkRequest',
     retry,
     retryWithLog,
+    runMatrixIO,
     runMatrixM,
   )
 import Network.Matrix.Room
@@ -238,6 +242,29 @@ createSession ::
   IO ClientSession
 createSession baseUrl' token' = ClientSession baseUrl' token' <$> mkManager
 
+createWithSession ::
+  MonadIO m =>
+  -- | The matrix client-server base url, e.g. "https://matrix.org"
+  T.Text ->
+  -- | The user token
+  MatrixToken ->
+  -- | The matrix action to perform
+  MatrixM m a ->
+  m (Either MatrixError a)
+createWithSession baseUrl' token' action = do
+  session <- liftIO $ createSession baseUrl' token'
+  runMatrixM session action
+
+createWithSessionIO ::
+  -- | The matrix client-server base url, e.g. "https://matrix.org"
+  T.Text ->
+  -- | The user token
+  MatrixToken ->
+  -- | The matrix action to perform
+  MatrixIO a ->
+  IO (Either MatrixError a)
+createWithSessionIO = createWithSession
+
 mkRequest :: MonadIO m => Bool -> T.Text -> MatrixM m HTTP.Request
 mkRequest auth path = do
   ClientSession {..} <- ask
diff --git a/matrix-client/src/Network/Matrix/Internal.hs b/matrix-client/src/Network/Matrix/Internal.hs
index c1b5446..6d68fc6 100644
--- a/matrix-client/src/Network/Matrix/Internal.hs
+++ b/matrix-client/src/Network/Matrix/Internal.hs
@@ -194,7 +194,7 @@ runMatrixM session = flip runReaderT session . runExceptT . unMatrixM
 -- | Run Matrix actions in 'IO'.
 runMatrixIO :: ClientSession -> MatrixM IO a -> IO (Either MatrixError a)
 runMatrixIO = runMatrixM
-    
+
 -- | Retry a network action
 retryWithLog ::
   (MonadMask m, MonadIO m) =>