From ccf11b5467b2f41690390a20bc50a02c006be3f0 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Thu, 10 Aug 2017 23:54:57 +0200
Subject: gitHubCommitAction: Get error handling to work using `Either`

Get rid of the `fail` and use an `Either` for error handling instead.
This allows us to send back the response string like before, but provide
an additional error message when no data comes back from the database
query.

Remove the old error handling code I had tried to set up previously.
---
 src/Plugin/GitHubCommit.hs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/Plugin/GitHubCommit.hs')

diff --git a/src/Plugin/GitHubCommit.hs b/src/Plugin/GitHubCommit.hs
index 8c11a12..73b617c 100644
--- a/src/Plugin/GitHubCommit.hs
+++ b/src/Plugin/GitHubCommit.hs
@@ -24,15 +24,12 @@ gitHubCommitAction message dbConn = do
         \ LIMIT 1"
         (Only (M.channel message))
         :: IO [RepoUrlRow]
-    -- return $ response rs
-    respond rs
+    return $ respond rs
   where
-    respond []     = fail "I couldn't find a repo URL for this channel. \
-        \ Try `git remote set origin REPO_URL`"
+    respond []     = Left "I couldn't find a repo URL for this channel. \
+        \Try `git remote set origin REPO_URL`"
     respond ((RepoUrlRow r):rs) =
-        return r ++ "/commits/" ++ M.text message =~ matchRegex gitHubCommit
--- TODO: Make an Either type for plugins to return errors
--- if empty query result, return an empty error, otherwise return the string
+        Right $ r ++ "/commits/" ++ M.text message =~ matchRegex gitHubCommit
 
 type Id = Int
 
-- 
cgit v1.2.3