Github.PullReqests.pullRequestReviewComments . Change the Comment record to handle this, adding another Maybe where there was once a String (commentHtmlUrl).

mike-burns · mike-burns · commit ef9ea4d600d1 · 2011-12-26T08:35:18.000-05:00
diff --git a/Github/Data.hs b/Github/Data.hs
@@ -104,7 +104,7 @@ instance FromJSON Comment where
             <*> o .: "body"
             <*> o .: "commit_id"
             <*> o .: "updated_at"
-            <*> o .: "html_url"
+            <*> o .:? "html_url"
             <*> o .: "url"
             <*> o .: "created_at"
             <*> o .: "path"
diff --git a/Github/Data/Definitions.hs b/Github/Data/Definitions.hs
@@ -92,7 +92,7 @@ data Comment = Comment {
   ,commentBody :: String
   ,commentCommitId :: String
   ,commentUpdatedAt :: UTCTime
-  ,commentHtmlUrl :: String
+  ,commentHtmlUrl :: Maybe String
   ,commentUrl :: String
   ,commentCreatedAt :: UTCTime
   ,commentPath :: Maybe String
diff --git a/Github/PullRequests.hs b/Github/PullRequests.hs
@@ -3,6 +3,7 @@ module Github.PullRequests (
 ,pullRequest
 ,pullRequestCommits
 ,pullRequestFiles
+,pullRequestReviewComments
 ,module Github.Data
 ) where
 
@@ -24,3 +25,7 @@ pullRequestCommits userName repoName number =
 pullRequestFiles :: String -> String -> Int -> IO (Either Error [File])
 pullRequestFiles userName repoName number =
   githubGet ["repos", userName, repoName, "pulls", show number, "files"]
+
+pullRequestReviewComments :: String -> String -> Int -> IO (Either Error [Comment])
+pullRequestReviewComments userName repoName number =
+  githubGet ["repos", userName, repoName, "pulls", show number, "comments"]
diff --git a/samples/Pulls/ReviewComments/ListComments.hs b/samples/Pulls/ReviewComments/ListComments.hs
@@ -0,0 +1,21 @@
+module ListComments where
+
+import qualified Github.PullRequests as Github
+import Data.List
+
+main = do
+  possiblePullRequestComments <- Github.pullRequestReviewComments "thoughtbot" "factory_girl" 256
+  case possiblePullRequestComments of
+       (Left error)     -> putStrLn $ "Error: " ++ (show error)
+       (Right comments) -> putStrLn $ intercalate "\n\n" $ map formatComment comments
+
+formatComment :: Github.Comment -> String
+formatComment comment =
+  "Author: " ++ (formatAuthor $ Github.commentUser comment) ++
+    "\nUpdated: " ++ (show $ Github.commentUpdatedAt comment) ++
+    (maybe "" ("\nURL: "++) $ Github.commentHtmlUrl comment) ++
+    "\n\n" ++ (Github.commentBody comment)
+
+formatAuthor :: Github.GithubUser -> String
+formatAuthor user =
+  (Github.githubUserLogin user) ++ " (" ++ (Github.githubUserUrl user) ++ ")"
diff --git a/samples/Repos/Commits/CommitComment.hs b/samples/Repos/Commits/CommitComment.hs
@@ -1,6 +1,7 @@
 module CommitComment where
 
 import qualified Github.Repos.Commits as Github
+import Data.Maybe (maybe)
 
 main = do
   possibleComment <- Github.commitCommentFor "thoughtbot" "paperclip" "669575"
@@ -12,7 +13,7 @@ formatComment :: Github.Comment -> String
 formatComment comment =
   "Author: " ++ (formatAuthor $ Github.commentUser comment) ++
     "\nUpdated: " ++ (show $ Github.commentUpdatedAt comment) ++
-    "\nURL: " ++ (Github.commentHtmlUrl comment) ++
+    (maybe "" ("\nURL: "++) $ Github.commentHtmlUrl comment) ++
     "\n\n" ++ (Github.commentBody comment)
 
 formatAuthor :: Github.GithubUser -> String
diff --git a/samples/Repos/Commits/CommitComments.hs b/samples/Repos/Commits/CommitComments.hs
@@ -2,6 +2,7 @@ module CommitComments where
 
 import qualified Github.Repos.Commits as Github
 import Data.List
+import Data.Maybe (maybe)
 
 main = do
   possibleComments <- Github.commitCommentsFor "thoughtbot" "paperclip" "41f685f6e01396936bb8cd98e7cca517e2c7d96b"
@@ -13,7 +14,7 @@ formatComment :: Github.Comment -> String
 formatComment comment =
   "Author: " ++ (formatAuthor $ Github.commentUser comment) ++
     "\nUpdated: " ++ (show $ Github.commentUpdatedAt comment) ++
-    "\nURL: " ++ (Github.commentHtmlUrl comment) ++
+    (maybe "" ("\nURL: "++) $ Github.commentHtmlUrl comment) ++
     "\n\n" ++ (Github.commentBody comment)
 
 formatAuthor :: Github.GithubUser -> String
diff --git a/samples/Repos/Commits/RepoComments.hs b/samples/Repos/Commits/RepoComments.hs
@@ -2,6 +2,7 @@ module RepoComments where
 
 import qualified Github.Repos.Commits as Github
 import Data.List
+import Data.Maybe (maybe)
 
 main = do
   possibleComments <- Github.commentsFor "thoughtbot" "paperclip"
@@ -13,7 +14,7 @@ formatComment :: Github.Comment -> String
 formatComment comment =
   "Author: " ++ (formatAuthor $ Github.commentUser comment) ++
     "\nUpdated: " ++ (show $ Github.commentUpdatedAt comment) ++
-    "\nURL: " ++ (Github.commentHtmlUrl comment) ++
+    (maybe "" ("\nURL: "++) $ Github.commentHtmlUrl comment) ++
     "\n\n" ++ (Github.commentBody comment)
 
 formatAuthor :: Github.GithubUser -> String
