summaryrefslogtreecommitdiff
path: root/haskell/src/SpaceTraders/APIClient
diff options
context:
space:
mode:
Diffstat (limited to 'haskell/src/SpaceTraders/APIClient')
-rw-r--r--haskell/src/SpaceTraders/APIClient/Client.hs11
1 files changed, 1 insertions, 10 deletions
diff --git a/haskell/src/SpaceTraders/APIClient/Client.hs b/haskell/src/SpaceTraders/APIClient/Client.hs
index 402431f..c7b58e0 100644
--- a/haskell/src/SpaceTraders/APIClient/Client.hs
+++ b/haskell/src/SpaceTraders/APIClient/Client.hs
@@ -7,7 +7,6 @@ module SpaceTraders.APIClient.Client
, APIPaginatedResponse
, APIResponse
, defaultReq
- , fromJSONValue
, send
, sendPaginated
, tokenReq
@@ -16,9 +15,6 @@ module SpaceTraders.APIClient.Client
import Control.Concurrent
import Control.Monad.Reader
import Data.Aeson
-import Data.Aeson.Types
-import qualified Data.ByteString as B
-import qualified Data.ByteString.Internal as B
import qualified Data.Text as T
import qualified Data.Text.Encoding as T
import Network.HTTP.Simple
@@ -27,6 +23,7 @@ import Network.HTTP.Types.Status
import SpaceTraders
import SpaceTraders.APIClient.Errors
import SpaceTraders.APIClient.Pagination
+import SpaceTraders.Utils
data FromJSON a => APIMessage a = APIMessage { messageData :: a
, messagePagination :: Maybe Pagination
@@ -49,12 +46,6 @@ defaultReq = setRequestHost "api.spacetraders.io"
tokenReq :: T.Text -> Request
tokenReq token = setRequestHeader "Authorization" [T.encodeUtf8 $ "Bearer " <> token] defaultReq
-fromJSONValue :: FromJSON a => Value -> Either String a
-fromJSONValue = parseEither parseJSON
-
-int2ByteString :: Int -> B.ByteString
-int2ByteString = B.pack . map B.c2w . show
-
send :: (FromJSON a, HasRequest env, MonadIO m, MonadReader env m) => (Request -> Request) -> m (APIResponse a)
send requestBuilder = do
response <- sendPaginated Nothing requestBuilder