tmp; fix/rewordtmp

2 files changed, 34 insertions, 15 deletions

diff --git a/src/Plugin/Base.hs b/src/Plugin/Base.hs
index d4194ee..1ef4cd2 100644
--- a/src/Plugin/Base.hs
+++ b/src/Plugin/Base.hs
@@ -7,13 +7,18 @@ module Plugin.Base
     , defaultPlugin
     ) where
 
+import Control.Monad.Trans.Class (lift)
 import qualified Data.Text as T
 
 import Database.SQLite.Simple
 
+-- import Config (Config)
+import Bot (Bot(Bot))
 import Message
 
-type PluginAction = Message -> IO (Either T.Text T.Text)
+type PluginAction = Message -> Bot (Either T.Text T.Text)
+
+-- newtype Foo = Config Plugin
 
 data Plugin = Plugin
     { matchRegex  :: String
diff --git a/src/Plugin/GitHubCommit.hs b/src/Plugin/GitHubCommit.hs
index ae9d68f..454e838 100644
--- a/src/Plugin/GitHubCommit.hs
+++ b/src/Plugin/GitHubCommit.hs
@@ -4,43 +4,57 @@ module Plugin.GitHubCommit
     ( gitHubCommit
     ) where
 
+import Control.Monad.IO.Class (liftIO)
+import Control.Monad.Trans.Class (lift)
+import Control.Monad.Trans.Reader (ask)
 import qualified Data.Text as T
 
 import Database.SQLite.Simple
 import Database.SQLite.Simple.FromRow
 import Text.Regex.TDFA
 
+-- import Config (Config(..))
+import Bot (Bot, runBot)
 import I18n
 import qualified Message as M
 import qualified CliOptions as Cli (lang)
 import Plugin.Base
 
-gitHubCommit = defaultPlugin
-    { matchRegex  = "^[0-9a-f]{40}$"
-    , perform     = gitHubCommitAction
-    , command     = "<git_sha>"
-    , description = "Generate a commit URL based on the given SHA."
-    }
+gitHubCommit :: Bot Plugin
+gitHubCommit = do
+    cfg <- ask
+    return $ defaultPlugin
+        { matchRegex  = "^[0-9a-f]{40}$"
+        , perform     = gitHubCommitAction
+        , command     = "<git_sha>"
+        , description = translate (lang cfg) GitHubCommitDescription
+            -- "Generate a commit URL based on the given SHA."
+        }
 
 gitHubCommitAction :: PluginAction
 gitHubCommitAction message = do
-    dbConn <- open "db/sorbot_development.sqlite3"
-    rs <- query dbConn "SELECT repo_url \
+    dbConn <- liftIO $ open "db/sorbot_development.sqlite3"
+    rs <- liftIO $ query dbConn "SELECT repo_url \
         \ FROM plugin_github_commit_channel_repo_urls \
         \ WHERE channel = ? \
         \ LIMIT 1"
         (Only (M.channel message))
-        :: IO [RepoUrlRow]
-    close dbConn
+        :: Bot [RepoUrlRow]
+    liftIO $ close dbConn
 
-    respond rs
+    liftIO $ respond rs
   where
+    respond :: Bot (Either T.Text T.Text)
     respond [] = do
         lang <- Cli.lang
-        return $ Left $ translate lang GitHubCommitRepoURLNotFound
-    respond ((RepoUrlRow r):_) =
+        -- TODO: remove need for `lang`
+        return $ Left $ translate (lang cfg) GitHubCommitRepoURLNotFound
+    respond ((RepoUrlRow r):_) = do
+        -- bot <- ask
+        -- plugin <- runBot bot >>= gitHubCommit
+        plugin <- gitHubCommit
         return $ Right $ r `T.append` "/commits/" `T.append` T.pack (
-            M.textStr message =~ matchRegex gitHubCommit)
+            M.textStr message =~ matchRegex plugin)
 
 type RepoUrl = T.Text