twitter-conduit 0.2.0 → 0.2.1

raw patch · 17 files changed

+267/−23 lines, 17 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• .travis.yml +9/−4
• .travis/stack-lts-2.yaml +1/−1
• .travis/stack-lts-3.yaml +1/−1
• .travis/stack-lts-5.yaml +1/−1
• .travis/stack-lts-6.yaml +6/−0
• ChangeLog.md +8/−0
• README.md +1/−1
• Web/Twitter/Conduit.hs +143/−2
• Web/Twitter/Conduit/Api.hs +72/−7
• Web/Twitter/Conduit/Base.hs +1/−1
• Web/Twitter/Conduit/Parameters.hs +12/−0
• Web/Twitter/Conduit/Parameters/TH.hs +5/−0
• sample/oauth_callback.hs +1/−1
• sample/oauth_pin.hs +1/−1
• sample/postWithMultipleMedia.hs +2/−1
• sample/simple.hs +2/−1
• twitter-conduit.cabal +1/−1

@@ -3,21 +3,26 @@  matrix:   include:-    - env: GHCVER=7.8.4 STACK_YAML=stack-lts-2.yaml+    - env: GHCVER=7.8.4 STACK_LTS=lts-2 STACK_TEMPLATE=stack-lts-2.yaml       addons:         apt:           sources: [ hvr-ghc ]           packages: [ ghc-7.8.4 ]-    - env: GHCVER=7.10.2 STACK_YAML=stack-lts-3.yaml+    - env: GHCVER=7.10.2 STACK_LTS=lts-3 STACK_TEMPLATE=stack-lts-3.yaml       addons:         apt:           sources: [ hvr-ghc ]           packages: [ ghc-7.10.2 ]-    - env: GHCVER=7.10.3 STACK_YAML=stack-lts-5.yaml+    - env: GHCVER=7.10.3 STACK_LTS=lts-5 STACK_TEMPLATE=stack-lts-5.yaml       addons:         apt:           sources: [ hvr-ghc ]           packages: [ ghc-7.10.3 ]+    - env: GHCVER=7.10.3 STACK_LTS=lts-6 STACK_TEMPLATE=stack-lts-6.yaml+      addons:+        apt:+          sources: [ hvr-ghc ]+          packages: [ ghc-7.10.3 ]  before_install:   # Download and unpack the stack executable@@ -26,7 +31,7 @@   - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'   - export PATH=/opt/ghc/$GHCVER/bin:$PATH   # stack searches .cabal file based on STACK_YAML directory.-  - cp .travis/stack*.yaml .+  - m4 -D__RESOLVER__=$(curl -sL https://www.stackage.org/download/snapshots.json | jq '."'$STACK_LTS'"' -r) .travis/$STACK_TEMPLATE > stack.yaml  install:   - travis_wait stack --no-terminal --skip-ghc-check setup

@@ -5,4 +5,4 @@ extra-deps: - twitter-types-0.7.2.1 - twitter-types-lens-0.7.2-resolver: lts-2.22+resolver: __RESOLVER__

@@ -7,4 +7,4 @@ extra-deps: - twitter-types-0.7.2.1 - twitter-types-lens-0.7.2-resolver: lts-3.22+resolver: __RESOLVER__

@@ -3,4 +3,4 @@ - '.' - 'sample' extra-deps: []-resolver: lts-5.11+resolver: __RESOLVER__

@@ -0,0 +1,6 @@+flags: {}+packages:+- '.'+- 'sample'+extra-deps: []+resolver: __RESOLVER__

@@ -1,3 +1,11 @@+## 0.2.1++* Added `fullText` parameter to direct message calls [#47](https://github.com/himura/twitter-conduit/pull/47)+* Replaced `SearchStatus` with `Status` type [#46](https://github.com/himura/twitter-conduit/pull/46)+* Added `accountUpdateProfile` [#45](https://github.com/himura/twitter-conduit/pull/45)+* Added `listsMembersCreateAll` and `listsMembersDestroyAll`+* Parameter lenses in `Web.Twitter.Conduit` re-exported from `Web.Twitter.Conduit.Parameters` are deprecated+ ## 0.2.0  * Changed the signature of functions defined in Web.Twitter.Conduit.Base,

@@ -1,6 +1,6 @@ # twitter-conduit: An Conduit based Twitter API library for Haskell # -[![Travis](https://img.shields.io/travis/himura/twitter-conduit.svg)](https://travis-ci.org/himura/twitter-conduit)+[![Travis](https://img.shields.io/travis/himura/twitter-conduit/master.svg)](https://travis-ci.org/himura/twitter-conduit) [![Hackage-Deps](https://img.shields.io/hackage-deps/v/twitter-conduit.svg)](http://packdeps.haskellers.com/feed?needle=twitter-conduit)  ## About ##

@@ -19,7 +19,6 @@        -- * Re-exports          module Web.Twitter.Conduit.Api        , module Web.Twitter.Conduit.Cursor-       , module Web.Twitter.Conduit.Parameters        , module Web.Twitter.Conduit.Request        , module Web.Twitter.Conduit.Response        , module Web.Twitter.Conduit.Status@@ -38,6 +37,12 @@        , sourceWithSearchResult        , sourceWithSearchResult' +       -- * 'Web.Twitter.Conduit.Parameters'+       , Parameters.ListParam(..)+       , Parameters.MediaData(..)+       , Parameters.UserListParam(..)+       , Parameters.UserParam(..)+        -- * re-exports        , OAuth (..)        , Credential (..)@@ -45,22 +50,54 @@        , Manager        , newManager        , tlsManagerSettings++       -- * deprecated+       , contributorDetails+       , count+       , cursor+       , displayCoordinates+       , excludeReplies+       , filterLevel+       , follow+       , inReplyToStatusId+       , includeEntities+       , includeMyRetweet+       , includeRts+       , includeUserEntities+       , lang+       , language+       , locale+       , map+       , maxId+       , mediaIds+       , page+       , possiblySensitive+       , replies+       , sinceId+       , skipStatus+       , stallWarnings+       , trimUser+       , until        ) where  import Web.Twitter.Conduit.Api import Web.Twitter.Conduit.Base import Web.Twitter.Conduit.Cursor-import Web.Twitter.Conduit.Parameters+import qualified Web.Twitter.Conduit.Parameters as Parameters import Web.Twitter.Conduit.Request import Web.Twitter.Conduit.Response import Web.Twitter.Conduit.Status import Web.Twitter.Conduit.Stream import Web.Twitter.Conduit.Types+import Web.Twitter.Types  import Data.Default (def)+import Data.Time.Calendar (Day) import Network.HTTP.Conduit (Manager, newManager, tlsManagerSettings) import Web.Authenticate.OAuth +import Prelude hiding (map, until)+ -- for haddock import Data.Conduit import qualified Data.Conduit.List as CL@@ -185,3 +222,107 @@ --                                   , status ^. statusText --                                   ] -- @++contributorDetails :: Parameters.HasContributorDetailsParam a => Lens' a (Maybe Bool)+contributorDetails = Parameters.contributorDetails+{-# DEPRECATED contributorDetails "Please use Web.Twitter.Conduit.Parameters.contributorDetails" #-}++count :: Parameters.HasCountParam a => Lens' a (Maybe Integer)+count = Parameters.count+{-# DEPRECATED count "Please use Web.Twitter.Conduit.Parameters.count" #-}++cursor :: Parameters.HasCursorParam a => Lens' a (Maybe Integer)+cursor = Parameters.cursor+{-# DEPRECATED cursor "Please use Web.Twitter.Conduit.Parameters.cursor" #-}++displayCoordinates :: Parameters.HasDisplayCoordinatesParam a => Lens' a (Maybe Bool)+displayCoordinates = Parameters.displayCoordinates+{-# DEPRECATED displayCoordinates "Please use Web.Twitter.Conduit.Parameters.displayCoordinates" #-}++excludeReplies :: Parameters.HasExcludeRepliesParam a => Lens' a (Maybe Bool)+excludeReplies = Parameters.excludeReplies+{-# DEPRECATED excludeReplies "Please use Web.Twitter.Conduit.Parameters.excludeReplies" #-}++filterLevel :: Parameters.HasFilterLevelParam a => Lens' a (Maybe T.Text)+filterLevel = Parameters.filterLevel+{-# DEPRECATED filterLevel "Please use Web.Twitter.Conduit.Parameters.filterLevel" #-}++follow :: Parameters.HasFollowParam a => Lens' a (Maybe Bool)+follow = Parameters.follow+{-# DEPRECATED follow "Please use Web.Twitter.Conduit.Parameters.follow" #-}++inReplyToStatusId :: Parameters.HasInReplyToStatusIdParam a => Lens' a (Maybe Integer)+inReplyToStatusId = Parameters.inReplyToStatusId+{-# DEPRECATED inReplyToStatusId "Please use Web.Twitter.Conduit.Parameters.inReplyToStatusId" #-}++includeEntities :: Parameters.HasIncludeEntitiesParam a => Lens' a (Maybe Bool)+includeEntities = Parameters.includeEntities+{-# DEPRECATED includeEntities "Please use Web.Twitter.Conduit.Parameters.includeEntities" #-}++includeMyRetweet :: Parameters.HasIncludeMyRetweetParam a => Lens' a (Maybe Bool)+includeMyRetweet = Parameters.includeMyRetweet+{-# DEPRECATED includeMyRetweet "Please use Web.Twitter.Conduit.Parameters.includeMyRetweet" #-}++includeRts :: Parameters.HasIncludeRtsParam a => Lens' a (Maybe Bool)+includeRts = Parameters.includeRts+{-# DEPRECATED includeRts "Please use Web.Twitter.Conduit.Parameters.includeRts" #-}++includeUserEntities :: Parameters.HasIncludeUserEntitiesParam a => Lens' a (Maybe Bool)+includeUserEntities = Parameters.includeUserEntities+{-# DEPRECATED includeUserEntities "Please use Web.Twitter.Conduit.Parameters.includeUserEntities" #-}++lang :: Parameters.HasLangParam a => Lens' a (Maybe T.Text)+lang = Parameters.lang+{-# DEPRECATED lang "Please use Web.Twitter.Conduit.Parameters.lang" #-}++language :: Parameters.HasLanguageParam a => Lens' a (Maybe T.Text)+language = Parameters.language+{-# DEPRECATED language "Please use Web.Twitter.Conduit.Parameters.language" #-}++locale :: Parameters.HasLocaleParam a => Lens' a (Maybe T.Text)+locale = Parameters.locale+{-# DEPRECATED locale "Please use Web.Twitter.Conduit.Parameters.locale" #-}++map :: Parameters.HasMapParam a => Lens' a (Maybe Bool)+map = Parameters.map+{-# DEPRECATED map "Please use Web.Twitter.Conduit.Parameters.map" #-}++maxId :: Parameters.HasMaxIdParam a => Lens' a (Maybe Integer)+maxId = Parameters.maxId+{-# DEPRECATED maxId "Please use Web.Twitter.Conduit.Parameters.maxId" #-}++mediaIds :: Parameters.HasMediaIdsParam a => Lens' a (Maybe [Integer])+mediaIds = Parameters.mediaIds+{-# DEPRECATED mediaIds "Please use Web.Twitter.Conduit.Parameters.mediaIds" #-}++page :: Parameters.HasPageParam a => Lens' a (Maybe Integer)+page = Parameters.page+{-# DEPRECATED page "Please use Web.Twitter.Conduit.Parameters.page" #-}++possiblySensitive :: Parameters.HasPossiblySensitiveParam a => Lens' a (Maybe Bool)+possiblySensitive = Parameters.possiblySensitive+{-# DEPRECATED possiblySensitive "Please use Web.Twitter.Conduit.Parameters.possiblySensitive" #-}++replies :: Parameters.HasRepliesParam a => Lens' a (Maybe T.Text)+replies = Parameters.replies+{-# DEPRECATED replies "Please use Web.Twitter.Conduit.Parameters.replies" #-}++sinceId :: Parameters.HasSinceIdParam a => Lens' a (Maybe Integer)+sinceId = Parameters.sinceId+{-# DEPRECATED sinceId "Please use Web.Twitter.Conduit.Parameters.sinceId" #-}++skipStatus :: Parameters.HasSkipStatusParam a => Lens' a (Maybe Bool)+skipStatus = Parameters.skipStatus+{-# DEPRECATED skipStatus "Please use Web.Twitter.Conduit.Parameters.skipStatus" #-}++stallWarnings :: Parameters.HasStallWarningsParam a => Lens' a (Maybe Bool)+stallWarnings = Parameters.stallWarnings+{-# DEPRECATED stallWarnings "Please use Web.Twitter.Conduit.Parameters.stallWarnings" #-}++trimUser :: Parameters.HasTrimUserParam a => Lens' a (Maybe Bool)+trimUser = Parameters.trimUser+{-# DEPRECATED trimUser "Please use Web.Twitter.Conduit.Parameters.trimUser" #-}++until :: Parameters.HasUntilParam a => Lens' a (Maybe Day)+until = Parameters.until+{-# DEPRECATED until "Please use Web.Twitter.Conduit.Parameters.until" #-}

@@ -52,7 +52,8 @@        , accountVerifyCredentials        -- , accountSettingsUpdate        -- , accountUpdateDeliveryDevice-       -- , accountUpdateProfile+       , AccountUpdateProfile+       , accountUpdateProfile        -- , accountUpdateProfileBackgroundImage        -- , accountUpdateProfileColors        -- , accoutUpdateProfileImage@@ -102,7 +103,8 @@        -- , listsSubscribersCreate        -- , listsSubscribersShow        -- , listsSubscribersDestroy-       -- , listsMembersCreateAll+       , ListsMembersCreateAll+       , listsMembersCreateAll        -- , listsMembersShow        , ListsMembers        , listsMembers@@ -118,7 +120,8 @@        , listsShow        , ListsSubscriptions        , listsSubscriptions-       -- , listsMembersDestroyAll+       , ListsMembersDestroyAll+       , listsMembersDestroyAll        , ListsOwnerships        , listsOwnerships @@ -141,7 +144,7 @@        ) where  import Web.Twitter.Types-import Web.Twitter.Conduit.Parameters+import Web.Twitter.Conduit.Parameters hiding (description, name) import Web.Twitter.Conduit.Parameters.TH import Web.Twitter.Conduit.Base import Web.Twitter.Conduit.Request@@ -170,7 +173,7 @@ -- >>> searchTweets "search text" & lang ?~ "ja" & count ?~ 100 -- APIRequestGet "https://api.twitter.com/1.1/search/tweets.json" [("count","100"),("lang","ja"),("q","search text")] searchTweets :: T.Text -- ^ search string-             -> APIRequest SearchTweets (SearchResult [SearchStatus])+             -> APIRequest SearchTweets (SearchResult [Status]) searchTweets q = APIRequestGet (endpoint ++ "search/tweets.json") [("q", PVString q)] deriveHasParamInstances ''SearchTweets     [ "lang"@@ -186,7 +189,7 @@  -- | Alias of 'searchTweets', for backward compatibility search :: T.Text -- ^ search string-       -> APIRequest SearchTweets (SearchResult [SearchStatus])+       -> APIRequest SearchTweets (SearchResult [Status]) search = searchTweets  data DirectMessages@@ -210,6 +213,7 @@     , "count"     , "include_entities"     , "skip_status"+    , "full_text"     ]  data DirectMessagesSent@@ -234,6 +238,7 @@     , "include_entities"     , "page"     , "skip_status"+    , "full_text"     ]  data DirectMessagesShow@@ -249,6 +254,9 @@ -- APIRequestGet "https://api.twitter.com/1.1/direct_messages/show.json" [("id","1234567890")] directMessagesShow :: StatusId -> APIRequest DirectMessagesShow DirectMessage directMessagesShow sId = APIRequestGet (endpoint ++ "direct_messages/show.json") [("id", PVInteger sId)]+deriveHasParamInstances ''DirectMessagesShow+    [ "full_text"+    ]  data DirectMessagesDestroy -- | Returns post data which destroys the direct message specified in the required ID parameter.@@ -508,6 +516,30 @@     , "skip_status"     ] +data AccountUpdateProfile+-- | Returns user object with updated fields.+-- Note that while no specific parameter is required, you need to provide at least one parameter before executing the query.+--+-- You can perform request by using 'call':+--+-- @+-- res <- 'call' twInfo mgr '$' 'accountUpdateProfile' & 'Web.Twitter.Conduit.Parameters.url' ?~ \"http://www.example.com\"+-- @+--+-- >>> accountUpdateProfile & url ?~ "http://www.example.com"+-- APIRequestPost "https://api.twitter.com/1.1/account/update_profile.json" [("url","http://www.example.com")]+accountUpdateProfile :: APIRequest AccountUpdateProfile User+accountUpdateProfile = APIRequestPost (endpoint ++ "account/update_profile.json") []+deriveHasParamInstances ''AccountUpdateProfile+    [ "include_entities"+    , "skip_status"+    , "name"+    , "url"+    , "location"+    , "description"+    , "profile_link_color"+    ]+ data UsersLookup -- | Returns query data asks user objects. --@@ -735,6 +767,38 @@     , "count"     ] +data ListsMembersCreateAll+-- | Adds multiple members to a list.+--+-- You can perform request by using 'call':+--+-- @+-- res <- 'call' twInfo mgr '$' 'listsMembersCreateAll' ('ListNameParam' "thimura/haskell") ('ScreenNameListParam' [\"thimura\", \"twitterapi\"])+-- @+--+-- >>> listsMembersCreateAll (ListNameParam "thimura/haskell") (ScreenNameListParam ["thimura", "twitterapi"])+-- APIRequestPost "https://api.twitter.com/1.1/lists/members/create_all.json" [("slug","haskell"),("owner_screen_name","thimura"),("screen_name","thimura,twitterapi")]+-- >>> listsMembersCreateAll (ListIdParam 20849097) (UserIdListParam [69179963, 6253282])+-- APIRequestPost "https://api.twitter.com/1.1/lists/members/create_all.json" [("list_id","20849097"),("user_id","69179963,6253282")]+listsMembersCreateAll :: ListParam -> UserListParam -> APIRequest ListsMembersCreateAll List+listsMembersCreateAll list users = APIRequestPost (endpoint ++ "lists/members/create_all.json") (mkListParam list ++ mkUserListParam users)++data ListsMembersDestroyAll+-- | Adds multiple members to a list.+--+-- You can perform request by using 'call':+--+-- @+-- res <- 'call' twInfo mgr '$' 'listsMembersDestroyAll' ('ListNameParam' "thimura/haskell") ('ScreenNameListParam' [\"thimura\", \"twitterapi\"])+-- @+--+-- >>> listsMembersDestroyAll (ListNameParam "thimura/haskell") (ScreenNameListParam ["thimura", "twitterapi"])+-- APIRequestPost "https://api.twitter.com/1.1/lists/members/destroy_all.json" [("slug","haskell"),("owner_screen_name","thimura"),("screen_name","thimura,twitterapi")]+-- >>> listsMembersDestroyAll (ListIdParam 20849097) (UserIdListParam [69179963, 6253282])+-- APIRequestPost "https://api.twitter.com/1.1/lists/members/destroy_all.json" [("list_id","20849097"),("user_id","69179963,6253282")]+listsMembersDestroyAll :: ListParam -> UserListParam -> APIRequest ListsMembersDestroyAll List+listsMembersDestroyAll list users = APIRequestPost (endpoint ++ "lists/members/destroy_all.json") (mkListParam list ++ mkUserListParam users)+ data ListsMembers -- | Returns query data asks the members of the specified list. --@@ -751,7 +815,8 @@ listsMembers :: ListParam -> APIRequest ListsMembers (WithCursor UsersCursorKey User) listsMembers q = APIRequestGet (endpoint ++ "lists/members.json") (mkListParam q) deriveHasParamInstances ''ListsMembers-    [ "cursor"+    [ "count"+    , "cursor"     , "skip_status"     ] 

@@ -22,7 +22,7 @@        ) where  import Web.Twitter.Conduit.Cursor-import Web.Twitter.Conduit.Parameters+import Web.Twitter.Conduit.Parameters hiding (url) import Web.Twitter.Conduit.Request import Web.Twitter.Conduit.Response import Web.Twitter.Conduit.Types

@@ -34,6 +34,12 @@        , HasFollowParam (..)        , HasMapParam (..)        , HasMediaIdsParam (..)+       , HasDescriptionParam (..)+       , HasNameParam (..)+       , HasProfileLinkColorParam (..)+       , HasLocationParam (..)+       , HasUrlParam (..)+       , HasFullTextParam (..)         , UserParam(..)        , UserListParam(..)@@ -85,6 +91,12 @@ defineHasParamClassBool "follow" defineHasParamClassBool "map" defineHasParamClassIntegerArray "media_ids"+defineHasParamClassString "description"+defineHasParamClassString "name"+defineHasParamClassString "profile_link_color"+defineHasParamClassString "location"+defineHasParamClassURI "url"+defineHasParamClassBool "full_text"  -- | converts 'UserParam' to 'HT.SimpleQuery'. --

@@ -12,6 +12,7 @@ import Data.Char import Data.Text (Text) import Data.Time.Calendar (Day)+import Web.Twitter.Types  snakeToLowerCamel :: String -> String snakeToLowerCamel [] = []@@ -91,6 +92,10 @@ defineHasParamClassString :: String -> Q [Dec] defineHasParamClassString =     defineHasParamClass 'PVString 'unPVString [t|Text|]++defineHasParamClassURI :: String -> Q [Dec]+defineHasParamClassURI =+    defineHasParamClass 'PVString 'unPVString [t|URIString|]  defineHasParamClassIntegerArray :: String -> Q [Dec] defineHasParamClassIntegerArray =

@@ -9,7 +9,7 @@  import Web.Scotty import qualified Network.HTTP.Types as HT-import Web.Twitter.Conduit hiding (lookup)+import Web.Twitter.Conduit hiding (lookup,url) import qualified Web.Authenticate.OAuth as OA import qualified Data.Text.Lazy as LT import qualified Data.ByteString as S

@@ -8,7 +8,7 @@  module Main where -import Web.Twitter.Conduit hiding (lookup)+import Web.Twitter.Conduit hiding (lookup,url) import Web.Authenticate.OAuth as OA import qualified Data.ByteString.Char8 as S8 import Data.Maybe

@@ -2,6 +2,7 @@ module Main where  import Web.Twitter.Conduit+import qualified Web.Twitter.Conduit.Parameters as P import Web.Twitter.Types.Lens import Common @@ -26,5 +27,5 @@         putStrLn $ "Upload completed: media_id: " ++ ret ^. uploadedMediaId . to show ++ ", filepath: " ++ filepath         return ret     putStrLn $ "Post message: " ++ status-    res <- call twInfo mgr $ update (T.pack status) & mediaIds ?~ (uploadedMediaList ^.. traversed .  uploadedMediaId)+    res <- call twInfo mgr $ update (T.pack status) & P.mediaIds ?~ (uploadedMediaList ^.. traversed .  uploadedMediaId)     print res

@@ -4,6 +4,7 @@ module Main where  import Web.Twitter.Conduit+import qualified Web.Twitter.Conduit.Parameters as P import Web.Twitter.Types.Lens  import Control.Lens@@ -47,7 +48,7 @@     mgr <- newManager tlsManagerSettings     twInfo <- getTWInfo mgr     putStrLn $ "# your home timeline (up to 800 tweets):"-    sourceWithMaxId twInfo mgr (homeTimeline & count ?~ 200)+    sourceWithMaxId twInfo mgr (homeTimeline & P.count ?~ 200)         C.$= CL.isolate 800         C.$$ CL.mapM_ $ \status -> do             T.putStrLn $ T.concat [ T.pack . show $ status ^. statusId

@@ -1,5 +1,5 @@ name:              twitter-conduit-version:           0.2.0+version:           0.2.1 license:           BSD3 license-file:      LICENSE author:            HATTORI Hiroki, Hideyuki Tanaka, Takahiro HIMURA