Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/GitHub/Data/Issues.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import GitHub.Data.Options (IssueState)
import GitHub.Data.PullRequests
import GitHub.Data.URL (URL)
import GitHub.Internal.Prelude
import Prelude ()
import Prelude ()

data Issue = Issue
{ issueClosedAt :: !(Maybe UTCTime)
Expand Down Expand Up @@ -43,7 +43,7 @@ instance Binary Issue
data NewIssue = NewIssue
{ newIssueTitle :: !Text
, newIssueBody :: !(Maybe Text)
, newIssueAssignee :: !(Maybe Text)
, newIssueAssignees :: !(Vector (Name User))
, newIssueMilestone :: !(Maybe (Id Milestone))
, newIssueLabels :: !(Maybe (Vector (Name IssueLabel)))
}
Expand All @@ -55,7 +55,7 @@ instance Binary NewIssue
data EditIssue = EditIssue
{ editIssueTitle :: !(Maybe Text)
, editIssueBody :: !(Maybe Text)
, editIssueAssignee :: !(Maybe (Name User))
, editIssueAssignees :: !(Maybe (Vector (Name User)))
, editIssueState :: !(Maybe IssueState)
, editIssueMilestone :: !(Maybe (Id Milestone))
, editIssueLabels :: !(Maybe (Vector (Name IssueLabel)))
Expand Down Expand Up @@ -203,19 +203,22 @@ instance FromJSON Issue where
<*> o .:? "milestone"

instance ToJSON NewIssue where
toJSON (NewIssue t b a m ls) = object
toJSON (NewIssue t b a m ls) = object $ filter notNull
[ "title" .= t
, "body" .= b
, "assignee" .= a
, "assignees" .= a
, "milestone" .= m
, "labels" .= ls
]
where
notNull (_, Null) = False
notNull (_, _) = True

instance ToJSON EditIssue where
toJSON (EditIssue t b a s m ls) = object $ filter notNull $
toJSON (EditIssue t b a s m ls) = object $ filter notNull
[ "title" .= t
, "body" .= b
, "assignee" .= a
, "assignees" .= a
, "state" .= s
, "milestone" .= m
, "labels" .= ls
Expand Down
2 changes: 1 addition & 1 deletion src/GitHub/Endpoints/Issues.hs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ issuesForRepoR user reqRepoName opts =
-- Creating new issues.

newIssue :: Text -> NewIssue
newIssue title = NewIssue title Nothing Nothing Nothing Nothing
newIssue title = NewIssue title Nothing mempty Nothing Nothing


-- | Create a new issue.
Expand Down