Merge pull request #813 from tsoding/urlencode

Introduce builtin urlencode function

Author: rexim

src/Bot.hs

@@ -459,11 +459,6 @@ builtinCommands =
             cmapR return $
             liftR (flip (liftM2 utcToLocalTime) now) $
             cmapR (T.pack . show) $ Reaction replyMessage))
-    , ( "urlencode"
-      , mkBuiltinCommand
-          ( "!google URL encode"
-          , $githubLinkLocationStr
-          , liftR (callFun "urlencode" . return) $ ignoreNothing sayMessage))
     , ( "reloadmarkov"
       , mkBuiltinCommand
           ( "Reloads Markov model file"

src/Bot/CustomCommand.hs

@@ -24,6 +24,7 @@ import Data.Time
 import Effect
 import Entity
 import HyperNerd.Parser
+import qualified Network.URI.Encode as URI
 import Property
 import Reaction
 import Text.InterpolatedString.QM
@@ -174,6 +175,8 @@ evalExpr :: M.Map T.Text T.Text -> Expr -> T.Text
 evalExpr _ (TextExpr t) = t
 evalExpr vars (FunCallExpr "or" args) =
   fromMaybe "" $ listToMaybe $ dropWhile T.null $ map (evalExpr vars) args
+evalExpr vars (FunCallExpr "urlencode" args) =
+  T.concat $ map (T.pack . URI.encode . T.unpack . evalExpr vars) args
 evalExpr vars (FunCallExpr funame _) = fromMaybe "" $ M.lookup funame vars
 
 expandVars :: M.Map T.Text T.Text -> [Expr] -> T.Text

src/BotState.hs

@@ -29,7 +29,6 @@ import Effect
 import Free
 import Markov
 import Network.HTTP.Simple
-import qualified Network.URI.Encode as URI
 import qualified Sqlite.EntityPersistence as SEP
 import System.IO
 import System.Random
@@ -197,10 +196,6 @@ applyEffect (botState, Free (ReloadMarkov s)) = do
   markov <-
     runMaybeT (MaybeT (return $ bsMarkovPath botState) >>= lift . loadMarkov)
   return (botState {bsMarkov = markov}, s ("Reloaded the model" <$ markov))
-applyEffect (botState, Free (GetVar _ s)) = return (botState, s Nothing)
-applyEffect (botState, Free (CallFun "urlencode" [text] s)) =
-  return (botState, s $ Just $ T.pack $ URI.encode $ T.unpack text)
-applyEffect (botState, Free (CallFun _ _ s)) = return (botState, s Nothing)
 applyEffect (botState, Free (RandomEff range s)) = do
   v <- randomRIO range
   return (botState, s v)

src/Effect.hs

@@ -27,7 +27,6 @@ module Effect
   , twitchCommand
   , randomMarkov
   , reloadMarkov
-  , callFun
   , githubApiRequest
   , randomEff
   ) where
@@ -112,11 +111,6 @@ data EffectF s
                   s
   | RandomMarkov (Maybe T.Text -> s)
   | ReloadMarkov (Maybe T.Text -> s)
-  | GetVar T.Text
-           (Maybe T.Text -> s)
-  | CallFun T.Text
-            [T.Text]
-            (Maybe T.Text -> s)
   | RandomEff (Int, Int)
               (Int -> s)
   deriving (Functor)
@@ -204,8 +198,5 @@ randomMarkov = liftF $ RandomMarkov id
 reloadMarkov :: Effect (Maybe T.Text)
 reloadMarkov = liftF $ ReloadMarkov id
 
-callFun :: T.Text -> [T.Text] -> Effect (Maybe T.Text)
-callFun name args = liftF $ CallFun name args id
-
 randomEff :: (Int, Int) -> Effect Int
 randomEff range = liftF $ RandomEff range id