slack-web 0.2.0.1 → 0.2.0.2

raw patch · 3 files changed

+25/−23 lines, 3 filesdep +servant-client-coredep ~servantdep ~servant-clientPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies added: servant-client-core

Dependency ranges changed: servant, servant-client

API changes (from Hackage documentation)

Files

• slack-web.cabal +4/−3
• src/Web/Slack.hs +19/−18
• src/Web/Slack/Common.hs +2/−2

@@ -1,5 +1,5 @@ name: slack-web-version: 0.2.0.1+version: 0.2.0.2  build-type: Simple cabal-version: >= 1.21@@ -50,8 +50,9 @@     , http-api-data >= 0.3 && < 0.4     , http-client >= 0.5 && < 0.6     , http-client-tls >= 0.3 && < 0.4-    , servant >= 0.9 && < 0.12-    , servant-client >= 0.9 && < 0.12+    , servant >= 0.12 && < 0.13+    , servant-client >= 0.12 && < 0.13+    , servant-client-core >= 0.12 && < 0.13     , text >= 1.2 && < 1.3     , transformers     , mtl

@@ -64,8 +64,9 @@ import Servant.API  -- servant-client-import Servant.Client-import Servant.Common.Req (Req, appendToQueryString)+import Servant.Client hiding (Response, baseUrl)+import Servant.Client.Core (Request, appendToQueryString, ServantError)+import Servant.Client.Core.Internal.Auth  -- slack-web import qualified Web.Slack.Api as Api@@ -214,7 +215,7 @@   run (authTest_ authR)  authTest_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> ClientM (ResponseJSON Auth.TestRsp)  @@ -233,7 +234,7 @@   run (channelsCreate_ authR createReq)  channelsCreate_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> Channel.CreateReq   -> ClientM (ResponseJSON Channel.CreateRsp) @@ -252,7 +253,7 @@   run (channelsList_ authR listReq)  channelsList_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> Channel.ListReq   -> ClientM (ResponseJSON Channel.ListRsp) @@ -272,7 +273,7 @@   run (channelsHistory_ authR histReq)  channelsHistory_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> Common.HistoryReq   -> ClientM (ResponseJSON Common.HistoryRsp) @@ -291,7 +292,7 @@   run (chatPostMessage_ authR postReq)  chatPostMessage_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> Chat.PostMsgReq   -> ClientM (ResponseJSON Chat.PostMsgRsp) @@ -311,7 +312,7 @@   run (groupsList_ authR)  groupsList_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> ClientM (ResponseJSON Group.ListRsp)  -- |@@ -332,7 +333,7 @@   run (groupsHistory_ authR hisReq)  groupsHistory_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> Common.HistoryReq   -> ClientM (ResponseJSON Common.HistoryRsp) @@ -350,7 +351,7 @@   run (imList_ authR)  imList_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> ClientM (ResponseJSON Im.ListRsp)  -- |@@ -369,7 +370,7 @@   run (imHistory_ authR histReq)  imHistory_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> Common.HistoryReq   -> ClientM (ResponseJSON Common.HistoryRsp) @@ -387,7 +388,7 @@   run (mpimList_ authR)  mpimList_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> ClientM (ResponseJSON Group.ListRsp)  -- |@@ -406,7 +407,7 @@   run (mpimHistory_ authR histReq)  mpimHistory_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> Common.HistoryReq   -> ClientM (ResponseJSON Common.HistoryRsp) @@ -425,7 +426,7 @@   run (usersList_ authR)  usersList_-  :: AuthenticateReq (AuthProtect "token")+  :: AuthenticatedRequest (AuthProtect "token")   -> ClientM (ResponseJSON User.ListRsp)  -- | Returns a function to get a username from a 'Common.UserId'.@@ -525,8 +526,8 @@  authenticateReq   :: Text-  -> Req-  -> Req+  -> Request+  -> Request authenticateReq token =   appendToQueryString "token" (Just token) @@ -545,8 +546,8 @@   unnestErrors <$> liftIO (runClientM clientAction $ ClientEnv (getManager env) baseUrl)  mkSlackAuthenticateReq :: (MonadReader env m, HasToken env)-  => m (AuthenticateReq (AuthProtect "token"))-mkSlackAuthenticateReq = flip mkAuthenticateReq authenticateReq . getToken <$> ask+  => m (AuthenticatedRequest (AuthProtect "token"))+mkSlackAuthenticateReq = flip mkAuthenticatedRequest authenticateReq . getToken <$> ask  unnestErrors :: Either ServantError (ResponseJSON a) -> Response a unnestErrors (Right (ResponseJSON (Right a))) = Right a

@@ -39,9 +39,9 @@ -- http-api-data import Web.HttpApiData import Web.FormUrlEncoded-  + -- servant-client-import Servant.Common.Req+import Servant.Client  -- slack-web import Web.Slack.Types