X Tutup
Skip to content

Commit bb2876c

Browse files
probablycoreyprobablycorey
authored
Merge branch 'master' into test
2 parents 59ddb56 + 1009ad5 commit bb2876c

File tree

5 files changed

+63
-64
lines changed

5 files changed

+63
-64
lines changed

‎api/client.go‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if err != nil {
4545
4646
fmt.Printf("%+v\n", resp)
4747
*/
48-
var GraphQL = func(query string, variables map[string]string, v interface{}) error {
48+
var GraphQL = func(query string, variables map[string]string, data interface{}) error {
4949
url := "https://api.github.com/graphql"
5050
reqBody, err := json.Marshal(map[string]interface{}{"query": query, "variables": variables})
5151
if err != nil {
@@ -81,29 +81,31 @@ var GraphQL = func(query string, variables map[string]string, v interface{}) err
8181
}
8282

8383
debugResponse(resp, string(body))
84-
return handleResponse(resp, body, v)
84+
return handleResponse(resp, body, data)
8585
}
8686

87-
func handleResponse(resp *http.Response, body []byte, v interface{}) error {
87+
func handleResponse(resp *http.Response, body []byte, data interface{}) error {
8888
success := resp.StatusCode >= 200 && resp.StatusCode < 300
8989

90-
if success {
91-
gr := &graphQLResponse{Data: v}
92-
err := json.Unmarshal(body, &gr)
93-
if err != nil {
94-
return err
95-
}
96-
if len(gr.Errors) > 0 {
97-
errorMessages := gr.Errors[0].Message
98-
for _, e := range gr.Errors[1:] {
99-
errorMessages += ", " + e.Message
100-
}
101-
return fmt.Errorf("graphql error: '%s'", errorMessages)
90+
if !success {
91+
return handleHTTPError(resp, body)
92+
}
93+
94+
gr := &graphQLResponse{Data: data}
95+
err := json.Unmarshal(body, &gr)
96+
if err != nil {
97+
return err
98+
}
99+
100+
if len(gr.Errors) > 0 {
101+
errorMessages := gr.Errors[0].Message
102+
for _, e := range gr.Errors[1:] {
103+
errorMessages += ", " + e.Message
102104
}
103-
return nil
105+
return fmt.Errorf("graphql error: '%s'", errorMessages)
104106
}
107+
return nil
105108

106-
return handleHTTPError(resp, body)
107109
}
108110

109111
func handleHTTPError(resp *http.Response, body []byte) error {

‎api/queries.go‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -41,45 +41,45 @@ func PullRequests() (PullRequestsPayload, error) {
4141
}
4242

4343
query := `
44-
fragment pr on PullRequest {
45-
number
46-
title
47-
url
48-
headRefName
49-
}
50-
51-
query($owner: String!, $repo: String!, $headRefName: String!, $viewerQuery: String!, $reviewerQuery: String!, $per_page: Int = 10) {
52-
repository(owner: $owner, name: $repo) {
53-
pullRequests(headRefName: $headRefName, first: 1) {
54-
edges {
55-
node {
56-
...pr
57-
}
58-
}
59-
}
60-
}
61-
viewerCreated: search(query: $viewerQuery, type: ISSUE, first: $per_page) {
62-
edges {
63-
node {
64-
...pr
65-
}
66-
}
67-
pageInfo {
68-
hasNextPage
69-
}
70-
}
71-
reviewRequested: search(query: $reviewerQuery, type: ISSUE, first: $per_page) {
72-
edges {
73-
node {
74-
...pr
75-
}
76-
}
77-
pageInfo {
78-
hasNextPage
79-
}
80-
}
81-
}
82-
`
44+
fragment pr on PullRequest {
45+
number
46+
title
47+
url
48+
headRefName
49+
}
50+
51+
query($owner: String!, $repo: String!, $headRefName: String!, $viewerQuery: String!, $reviewerQuery: String!, $per_page: Int = 10) {
52+
repository(owner: $owner, name: $repo) {
53+
pullRequests(headRefName: $headRefName, first: 1) {
54+
edges {
55+
node {
56+
...pr
57+
}
58+
}
59+
}
60+
}
61+
viewerCreated: search(query: $viewerQuery, type: ISSUE, first: $per_page) {
62+
edges {
63+
node {
64+
...pr
65+
}
66+
}
67+
pageInfo {
68+
hasNextPage
69+
}
70+
}
71+
reviewRequested: search(query: $reviewerQuery, type: ISSUE, first: $per_page) {
72+
edges {
73+
node {
74+
...pr
75+
}
76+
}
77+
pageInfo {
78+
hasNextPage
79+
}
80+
}
81+
}
82+
`
8383

8484
project := project()
8585
owner := project.Owner

‎command/pr.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ work with pull requests.`,
2626
var prListCmd = &cobra.Command{
2727
Use: "list",
2828
Short: "List pull requests",
29-
Run: func(cmd *cobra.Command, args []string) {
30-
err := ExecutePr()
31-
if err != nil {
32-
panic(err) // In the future this should handle the error better, but for now panic seems like a valid reaction
33-
}
29+
RunE: func(cmd *cobra.Command, args []string) error {
30+
return ExecutePr()
3431
},
3532
}
3633

‎github/client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717

1818
const (
1919
GitHubHost string = "github.com"
20-
OAuthAppURL string = "https://hub.github.com/"
20+
OAuthAppURL string = "https://github.com/github/gh-cli"
2121
)
2222

23-
var UserAgent = "Hub " + version.Version
23+
var userAgent = "GitHub CLI " + version.Version
2424

2525
func NewClient(h string) *Client {
2626
return NewClientWithHost(&Host{Host: h})

‎github/http.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ func (c *simpleClient) performRequestUrl(method string, url *url.URL, body io.Re
221221
if c.PrepareRequest != nil {
222222
c.PrepareRequest(req)
223223
}
224-
req.Header.Set("User-Agent", UserAgent)
224+
req.Header.Set("User-Agent", userAgent)
225225
req.Header.Set("Accept", apiPayloadVersion)
226226

227227
if configure != nil {

0 commit comments

Comments
 (0)
X Tutup