linklater 2.0.0.1 → 2.0.0.2

raw patch · 4 files changed

+26/−22 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• README.md +1/−1
• changelog +7/−0
• examples/JointPhotographicExpertsGroupTonga.hs +17/−20
• linklater.cabal +1/−1

@@ -38,7 +38,7 @@     (False, Nothing) -> return "Something went wrong!"   where config' = (Config "trello.slack.com" . filter (/= '\n') . pack) <$> readFile "token"         subdomain = (intercalate "." . fmap (filter isLetter . filter isAscii) . words) text-        messageOf url = FormattedMessage (EmojiIcon "gift") "jpgtobot" channel [FormatAt user, FormatLink url (subdomain <> ".jpg.to>"), FormatString "no way!: &<>"]+        messageOf url = FormattedMessage (EmojiIcon "gift") "jpgtobot" channel [FormatAt user, FormatLink url (subdomain <> ".jpg.to>")]         debug = True jpgto _ = return "Type more! (Did you know? jpgtobot is only 26 lines of Haskell. <https://github.com/hlian/jpgtobot/blob/master/Main.hs>)" 

@@ -1,5 +1,12 @@ -*- markdown -*- +## 2014-07-27 2.0.0.1++* Documentation improved with links+* jpgtobot code shortened due to market forces+* slashSimple+* FormattedMessage+ ## 2014-07-23 1.0.0.3  * Include extra source files in `.cabal`

@@ -3,35 +3,32 @@ -- Full package here: https://github.com/hlian/jpgtobot/ module JointPhotographicExpertsGroupTonga where -import BasePrelude hiding (words, intercalate)+import BasePrelude hiding (words, intercalate, filter) import Control.Lens ((^.))+import Data.Aeson (encode) import Data.Attoparsec.Text.Lazy-import Data.Text.Lazy hiding (filter)+import Data.Char (isLetter, isAscii)+import Data.Text.Lazy import Data.Text.Lazy.Encoding (decodeUtf8)-import Network.HTTP.Types (status200)-import Network.Linklater (say, slash, Channel(..), Command(..), User(..), Config(..), Message(..), Icon(..))-import Network.Wai (Application, responseLBS)+import Network.Linklater (say, slashSimple, Command(..), Config(..), Message(..), Icon(..), Format(..)) import Network.Wai.Handler.Warp (run) import Network.Wreq hiding (params)  findUrl :: Text -> Maybe Text findUrl = fmap fromStrict . maybeResult . parse (manyTill (notChar '\n') (string "src=\"") *> takeTill (== '"')) -messageOf :: User -> Channel -> Text -> Text -> Message-messageOf (User u) c search = Message (EmojiIcon "gift") c . mappend (mconcat ["@", u, " Hello, wanderer. I found you this for \"", search, "\": "])--jpgto :: Maybe Command -> Application-jpgto (Just (Command user channel (Just text))) _ respond = do-  message <- get url >>= (return . fmap (messageOf user channel text) . findUrl . decodeUtf8 . flip (^.) responseBody)+jpgto :: Maybe Command -> IO Text+jpgto (Just (Command user channel (Just text))) = do+  message <- (fmap messageOf . findUrl . decodeUtf8 . flip (^.) responseBody) <$> get ("http://" <> (unpack subdomain) <> ".jpg.to/")   case (debug, message) of-    (True, _) -> putStrLn ("+ Pretending to post " <> show message) >> respondWith ""-    (False, Just m) -> config' >>= say m >> respondWith ""-    (False, Nothing) -> respondWith "Something went wrong!"-  where ourHeaders = [("Content-Type", "text/plain")]-        respondWith = respond . responseLBS status200 ourHeaders-        config' = (Config "trello.slack.com" . pack . filter (/= '\n')) <$> readFile "token"-        url = "http://" <> (unpack . intercalate "." . words $ text) <> ".jpg.to/"-        debug = True+    (True, _) -> putStrLn ("+ Pretending to post " <> (unpack . decodeUtf8 . encode) message) >> return ""+    (False, Just m) -> config' >>= say m >> return ""+    (False, Nothing) -> return "Something went wrong!"+  where config' = (Config "trello.slack.com" . filter (/= '\n') . pack) <$> readFile "token"+        subdomain = (intercalate "." . fmap (filter isLetter . filter isAscii) . words) text+        messageOf url = FormattedMessage (EmojiIcon "gift") "jpgtobot" channel [FormatAt user, FormatLink url (subdomain <> ".jpg.to>")]+        debug = False+jpgto _ = return "Type more! (Did you know? jpgtobot is only 26 lines of Haskell. <https://github.com/hlian/jpgtobot/blob/master/Main.hs>)"  main :: IO ()-main = let port = 3000 in putStrLn ("+ Listening on port " <> show port) >> run port (slash jpgto)+main = let port = 3000 in putStrLn ("+ Listening on port " <> show port) >> run port (slashSimple jpgto)

@@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/  name: linklater-version: 2.0.0.1+version: 2.0.0.2 synopsis: The fast and fun way to write Slack.com bots homepage: https://github.com/hlian/linklater bug-reports: https://github.com/hlian/linklater/issues