marvin 0.2.4 → 0.2.5

raw patch · 3 files changed

+9/−5 lines, 3 filesdep ~aesonPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: aeson

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• marvin.cabal +3/−3
• src/Marvin/Adapter/Telegram/Common.hs +2/−2

@@ -1,3 +1,7 @@+# 0.2.4 - 24.09.2017++- Compatibility changes for aeson >= 1.2+ # 0.2.4 - 23.09.2017  - Fixed an old bug when getting information about unnamed channels

@@ -1,5 +1,5 @@ name:                marvin-version:             0.2.4+version:             0.2.5 synopsis:            A framework for modular, portable chat bots. description:         A framework for writing portable chat bots. Inspired by hubot.                      .@@ -50,7 +50,7 @@                      , Marvin.Adapter.Telegram.Common   build-depends:       base >= 4.7 && < 5                      , wreq >= 0.4 && < 0.6-                     , aeson >= 0.11 && < 1.2+                     , aeson >= 0.11 && < 1.3                      , mtl >= 2.2 && < 3                      , lens >= 4 && < 5                      , text-icu >= 0.6 && < 0.8@@ -108,7 +108,7 @@                      , optparse-applicative >= 0.11 && < 1                      , bytestring >= 0.10                      , text >= 1.0-                     , aeson >= 0.11 && < 1.2+                     , aeson >= 0.11 && < 1.3   default-language:    Haskell2010   default-extensions:  OverloadedStrings                      , TypeFamilies

@@ -22,7 +22,7 @@ import qualified Data.Text.Lazy                  as L import           Marvin.Adapter                  hiding (mkAdapterId) import           Marvin.Interpolate.All-import           Network.Wreq+import           Network.Wreq as Wreq import           Util  import           Control.Exception.Lifted@@ -143,7 +143,7 @@ execAPIMethod :: MkTelegram b => (Value -> Parser a) -> String -> [FormParam] -> AdapterM (TelegramAdapter b) (Either String (APIResponse a)) execAPIMethod = execAPIMethodWith defaults -execAPIMethodWith :: MkTelegram b => Options -> (Value -> Parser a) -> String -> [FormParam] -> AdapterM (TelegramAdapter b) (Either String (APIResponse a))+execAPIMethodWith :: MkTelegram b => Wreq.Options -> (Value -> Parser a) -> String -> [FormParam] -> AdapterM (TelegramAdapter b) (Either String (APIResponse a)) execAPIMethodWith opts innerParser methodName params = do     token <- requireFromAdapterConfig "token"     res <- retry 3 (liftIO (postWith opts $(isS "https://api.telegram.org/bot#{token :: String}/#{methodName}") params))