diff --git a/src/GitHub/Tools/AutoMerge.hs b/src/GitHub/Tools/AutoMerge.hs index 3e94abd..b607dcf 100644 --- a/src/GitHub/Tools/AutoMerge.hs +++ b/src/GitHub/Tools/AutoMerge.hs @@ -25,6 +25,7 @@ import GitHub.Tools.Requests (request) trustedAuthors :: [Text] trustedAuthors = [ "JFreegman" + , "TokTok" , "iphydf" , "nurupo" , "robinlinden" diff --git a/src/GitHub/Types/Base/DeploymentStatus.hs b/src/GitHub/Types/Base/DeploymentStatus.hs index ecdea44..d24f565 100644 --- a/src/GitHub/Types/Base/DeploymentStatus.hs +++ b/src/GitHub/Types/Base/DeploymentStatus.hs @@ -15,19 +15,20 @@ import GitHub.Types.Base.User -- DeploymentStatus data DeploymentStatus = DeploymentStatus - { deploymentStatusUrl :: Text - , deploymentStatusId :: Int - , deploymentStatusState :: Text - , deploymentStatusNodeId :: Text - , deploymentStatusCreator :: User - , deploymentStatusDescription :: Text - , deploymentStatusEnvironment :: Text - , deploymentStatusTargetUrl :: Text - , deploymentStatusLogUrl :: Text - , deploymentStatusCreatedAt :: DateTime - , deploymentStatusUpdatedAt :: DateTime - , deploymentStatusDeploymentUrl :: Text - , deploymentStatusRepositoryUrl :: Text + { deploymentStatusUrl :: Text + , deploymentStatusId :: Int + , deploymentStatusState :: Text + , deploymentStatusNodeId :: Text + , deploymentStatusCreator :: User + , deploymentStatusDescription :: Text + , deploymentStatusEnvironment :: Text + , deploymentStatusTargetUrl :: Text + , deploymentStatusLogUrl :: Text + , deploymentStatusCreatedAt :: DateTime + , deploymentStatusUpdatedAt :: DateTime + , deploymentStatusDeploymentUrl :: Text + , deploymentStatusRepositoryUrl :: Text + , deploymentStatusEnvironmentUrl :: Text } deriving (Eq, Show, Read) instance FromJSON DeploymentStatus where @@ -45,24 +46,26 @@ instance FromJSON DeploymentStatus where <*> x .: "updated_at" <*> x .: "deployment_url" <*> x .: "repository_url" + <*> x .: "environment_url" parseJSON _ = fail "DeploymentStatus" instance ToJSON DeploymentStatus where toJSON DeploymentStatus{..} = object - [ "url" .= deploymentStatusUrl - , "id" .= deploymentStatusId - , "state" .= deploymentStatusState - , "node_id" .= deploymentStatusNodeId - , "creator" .= deploymentStatusCreator - , "description" .= deploymentStatusDescription - , "environment" .= deploymentStatusEnvironment - , "target_url" .= deploymentStatusTargetUrl - , "log_url" .= deploymentStatusLogUrl - , "created_at" .= deploymentStatusCreatedAt - , "updated_at" .= deploymentStatusUpdatedAt - , "deployment_url" .= deploymentStatusDeploymentUrl - , "repository_url" .= deploymentStatusRepositoryUrl + [ "url" .= deploymentStatusUrl + , "id" .= deploymentStatusId + , "state" .= deploymentStatusState + , "node_id" .= deploymentStatusNodeId + , "creator" .= deploymentStatusCreator + , "description" .= deploymentStatusDescription + , "environment" .= deploymentStatusEnvironment + , "target_url" .= deploymentStatusTargetUrl + , "log_url" .= deploymentStatusLogUrl + , "created_at" .= deploymentStatusCreatedAt + , "updated_at" .= deploymentStatusUpdatedAt + , "deployment_url" .= deploymentStatusDeploymentUrl + , "repository_url" .= deploymentStatusRepositoryUrl + , "environment_url" .= deploymentStatusEnvironmentUrl ] @@ -81,3 +84,4 @@ instance Arbitrary DeploymentStatus where <*> arbitrary <*> arbitrary <*> arbitrary + <*> arbitrary diff --git a/src/GitHub/Types/Base/Milestone.hs b/src/GitHub/Types/Base/Milestone.hs index ed370ed..621566f 100644 --- a/src/GitHub/Types/Base/Milestone.hs +++ b/src/GitHub/Types/Base/Milestone.hs @@ -27,7 +27,7 @@ data Milestone = Milestone , milestoneTitle :: Text , milestoneClosedAt :: Maybe DateTime , milestoneNumber :: Int - , milestoneDescription :: Text + , milestoneDescription :: Maybe Text , milestoneLabelsUrl :: Text , milestoneHtmlUrl :: Text , milestoneOpenIssues :: Int diff --git a/src/GitHub/Types/Base/Release.hs b/src/GitHub/Types/Base/Release.hs index 7133d3f..08a0805 100644 --- a/src/GitHub/Types/Base/Release.hs +++ b/src/GitHub/Types/Base/Release.hs @@ -26,7 +26,7 @@ data Release = Release , releaseName :: Text , releaseNodeId :: Text , releasePrerelease :: Bool - , releasePublishedAt :: DateTime + , releasePublishedAt :: Maybe DateTime , releaseTagName :: Text , releaseTarballUrl :: Maybe Text , releaseTargetCommitish :: Text diff --git a/src/GitHub/Types/Base/StatusCommit.hs b/src/GitHub/Types/Base/StatusCommit.hs index a9d7a89..28fcabb 100644 --- a/src/GitHub/Types/Base/StatusCommit.hs +++ b/src/GitHub/Types/Base/StatusCommit.hs @@ -17,7 +17,7 @@ import GitHub.Types.Base.User -- StatusCommit data StatusCommit = StatusCommit - { statusCommitAuthor :: User + { statusCommitAuthor :: Maybe User , statusCommitCommentsUrl :: Text , statusCommitCommit :: CommitDetails , statusCommitCommitter :: Maybe User