From ea190de02cea99347ae125d86cc22bf8cd926c88 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Thu, 14 Sep 2017 03:44:38 +0200 Subject: Add `Bot` to rest of plugins Add our `Bot` monad to the rest of the plugins: * Factorial * GitRemoteSetOrigin * Help The only problem is with the Help plugin. Still trying to figure out how to set up my list comprehension so that it works with the `Bot`-wrapped `Plugin` list. --- src/Plugin/GitRemoteSetOrigin.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/Plugin/GitRemoteSetOrigin.hs') diff --git a/src/Plugin/GitRemoteSetOrigin.hs b/src/Plugin/GitRemoteSetOrigin.hs index 0fdb4ef..7d46e46 100644 --- a/src/Plugin/GitRemoteSetOrigin.hs +++ b/src/Plugin/GitRemoteSetOrigin.hs @@ -10,10 +10,12 @@ import qualified Data.Text as T import Database.SQLite.Simple import Text.Regex.TDFA ((=~)) +import Bot (Bot) import qualified Message as M import Plugin.Base -gitRemoteSetOrigin = defaultPlugin +gitRemoteSetOrigin :: Bot Plugin +gitRemoteSetOrigin = return defaultPlugin { matchRegex = "^git remote set origin ([^ ]+)$" , perform = gitRemoteSetOriginAction , command = "git remote set origin " @@ -22,7 +24,8 @@ gitRemoteSetOrigin = defaultPlugin gitRemoteSetOriginAction :: PluginAction gitRemoteSetOriginAction message = do - case M.textStr message =~ matchRegex gitRemoteSetOrigin :: [[String]] of + plugin <- gitRemoteSetOrigin + case M.textStr message =~ matchRegex plugin :: [[String]] of [] -> return $ Left "blast" (m:_) -> do let url = last m -- cgit v1.2.3