cli · samcoe · Oct 18, 2022 · Oct 1, 2022 · Oct 1, 2022 · Oct 6, 2022
@@ -15,7 +15,18 @@ type Comments struct {
 	}
 }
 
+func (cs Comments) CurrentUserComments() []Comment {
+	var comments []Comment
+	for _, c := range cs.Nodes {
+		if c.ViewerDidAuthor {
+			comments = append(comments, c)
+		}
+	}
+	return comments
+}
+
 type Comment struct {
+	ID                  string         `json:"id"`
 	Author              Author         `json:"author"`
 	AuthorAssociation   string         `json:"authorAssociation"`
 	Body                string         `json:"body"`
@@ -24,13 +35,20 @@ type Comment struct {
 	IsMinimized         bool           `json:"isMinimized"`
 	MinimizedReason     string         `json:"minimizedReason"`
 	ReactionGroups      ReactionGroups `json:"reactionGroups"`
+	URL                 string         `json:"url,omitempty"`
+	ViewerDidAuthor     bool           `json:"viewerDidAuthor"`
 }
 
 type CommentCreateInput struct {
 	Body      string
 	SubjectId string
 }
 
+type CommentUpdateInput struct {
+	Body      string
+	CommentId string
+}
+
 func CommentCreate(client *Client, repoHost string, params CommentCreateInput) (string, error) {
 	var mutation struct {
 		AddComment struct {
@@ -57,6 +75,34 @@ func CommentCreate(client *Client, repoHost string, params CommentCreateInput) (
 	return mutation.AddComment.CommentEdge.Node.URL, nil
 }
 
+func CommentUpdate(client *Client, repoHost string, params CommentUpdateInput) (string, error) {
+	var mutation struct {
+		UpdateIssueComment struct {
+			IssueComment struct {
+				URL string
+			}
+		} `graphql:"updateIssueComment(input: $input)"`
+	}
+
+	variables := map[string]interface{}{
+		"input": githubv4.UpdateIssueCommentInput{
+			Body: githubv4.String(params.Body),
+			ID:   githubv4.ID(params.CommentId),
+		},
+	}
+
+	err := client.Mutate(repoHost, "CommentUpdate", &mutation, variables)
+	if err != nil {
+		return "", err
+	}
+
+	return mutation.UpdateIssueComment.IssueComment.URL, nil
+}
+
+func (c Comment) Identifier() string {
+	return c.ID
+}
+
 func (c Comment) AuthorLogin() string {
 	return c.Author.Login
 }
@@ -86,7 +132,7 @@ func (c Comment) IsHidden() bool {
 }
 
 func (c Comment) Link() string {
-	return ""
+	return c.URL
 }
 
 func (c Comment) Reactions() ReactionGroups {

@@ -244,3 +244,7 @@ func (i Issue) Link() string {
 func (i Issue) Identifier() string {
 	return i.ID
 }
+
+func (i Issue) CurrentUserComments() []Comment {
+	return i.Comments.CurrentUserComments()
+}
@@ -214,6 +214,10 @@ func (pr PullRequest) Identifier() string {
 	return pr.ID
 }
 
+func (pr PullRequest) CurrentUserComments() []Comment {
+	return pr.Comments.CurrentUserComments()
+}
+
 func (pr PullRequest) IsOpen() bool {
 	return pr.State == "OPEN"
 }

@@ -30,6 +30,7 @@ type PullRequestReviews struct {
 }
 
 type PullRequestReview struct {
+	ID                  string         `json:"id"`
 	Author              Author         `json:"author"`
 	AuthorAssociation   string         `json:"authorAssociation"`
 	Body                string         `json:"body"`
@@ -67,6 +68,10 @@ func AddReview(client *Client, repo ghrepo.Interface, pr *PullRequest, input *Pu
 	return client.Mutate(repo.RepoHost(), "PullRequestReviewAdd", &mutation, variables)
 }
 
+func (prr PullRequestReview) Identifier() string {
+	return prr.ID
+}
+
 func (prr PullRequestReview) AuthorLogin() string {
 	return prr.Author.Login
 }

@@ -23,14 +23,17 @@ func shortenQuery(q string) string {
 var issueComments = shortenQuery(`
 	comments(first: 100) {
 		nodes {
+			id,
 			author{login},
 			authorAssociation,
 			body,
 			createdAt,
 			includesCreatedEdit,
 			isMinimized,
 			minimizedReason,
-			reactionGroups{content,users{totalCount}}
+			reactionGroups{content,users{totalCount}},
+			url,
+			viewerDidAuthor
 		},
 		pageInfo{hasNextPage,endCursor},
 		totalCount

@@ -40,7 +40,11 @@ func NewCmdComment(f *cmdutil.Factory, runF func(*prShared.CommentableOptions) e
 				if err != nil {
 					return nil, nil, err
 				}
-				return issueShared.IssueFromArgWithFields(httpClient, f.BaseRepo, args[0], []string{"id", "url"})
+				fields := []string{"id", "url"}
+				if opts.EditLast {
+					fields = append(fields, "comments")
+				}
+				return issueShared.IssueFromArgWithFields(httpClient, f.BaseRepo, args[0], fields)
 			}
 			return prShared.CommentablePreRun(cmd, opts)
 		},
@@ -64,6 +68,7 @@ func NewCmdComment(f *cmdutil.Factory, runF func(*prShared.CommentableOptions) e
 	cmd.Flags().StringVarP(&bodyFile, "body-file", "F", "", "Read body text from `file` (use \"-\" to read from standard input)")
 	cmd.Flags().BoolP("editor", "e", false, "Skip prompts and open the text editor to write the body in")
 	cmd.Flags().BoolP("web", "w", false, "Open the web browser to write the comment")
+	cmd.Flags().BoolVar(&opts.EditLast, "edit-last", false, "Edit the last comment of the same author")
 
 	return cmd
 }
@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/cli/cli/v2/api"
 	"github.com/cli/cli/v2/internal/browser"
 	"github.com/cli/cli/v2/internal/ghrepo"
 	"github.com/cli/cli/v2/pkg/cmd/pr/shared"
@@ -200,14 +201,30 @@ func Test_commentRun(t *testing.T) {
 				InputType:   0,
 				Body:        "",
 
-				InteractiveEditSurvey: func() (string, error) { return "comment body", nil },
+				InteractiveEditSurvey: func(string) (string, error) { return "comment body", nil },
 				ConfirmSubmitSurvey:   func() (bool, error) { return true, nil },
 			},
 			httpStubs: func(t *testing.T, reg *httpmock.Registry) {
 				mockCommentCreate(t, reg)
 			},
 			stdout: "https://github.com/OWNER/REPO/issues/123#issuecomment-456\n",
 		},
+		{
+			name: "interactive editor with edit last",
+			input: &shared.CommentableOptions{
+				Interactive: true,
+				InputType:   0,
+				Body:        "",
+				EditLast:    true,
+
+				InteractiveEditSurvey: func(string) (string, error) { return "comment body", nil },
+				ConfirmSubmitSurvey:   func() (bool, error) { return true, nil },
+			},
+			httpStubs: func(t *testing.T, reg *httpmock.Registry) {
+				mockCommentUpdate(t, reg)
+			},
+			stdout: "https://github.com/OWNER/REPO/issues/123#issuecomment-111\n",
+		},
 		{
 			name: "non-interactive web",
 			input: &shared.CommentableOptions{
@@ -219,20 +236,47 @@ func Test_commentRun(t *testing.T) {
 			},
 			stderr: "Opening github.com/OWNER/REPO/issues/123 in your browser.\n",
 		},
+		{
+			name: "non-interactive web with edit last",
+			input: &shared.CommentableOptions{
+				Interactive: false,
+				InputType:   shared.InputTypeWeb,
+				Body:        "",
+				EditLast:    true,
+
+				OpenInBrowser: func(string) error { return nil },
+			},
+			stderr: "Opening github.com/OWNER/REPO/issues/123 in your browser.\n",
+		},
 		{
 			name: "non-interactive editor",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeEditor,
 				Body:        "",
 
-				EditSurvey: func() (string, error) { return "comment body", nil },
+				EditSurvey: func(string) (string, error) { return "comment body", nil },
 			},
 			httpStubs: func(t *testing.T, reg *httpmock.Registry) {
 				mockCommentCreate(t, reg)
 			},
 			stdout: "https://github.com/OWNER/REPO/issues/123#issuecomment-456\n",
 		},
+		{
+			name: "non-interactive editor with edit last",
+			input: &shared.CommentableOptions{
+				Interactive: false,
+				InputType:   shared.InputTypeEditor,
+				Body:        "",
+				EditLast:    true,
+
+				EditSurvey: func(string) (string, error) { return "comment body", nil },
+			},
+			httpStubs: func(t *testing.T, reg *httpmock.Registry) {
+				mockCommentUpdate(t, reg)
+			},
+			stdout: "https://github.com/OWNER/REPO/issues/123#issuecomment-111\n",
+		},
 		{
 			name: "non-interactive inline",
 			input: &shared.CommentableOptions{
@@ -245,6 +289,19 @@ func Test_commentRun(t *testing.T) {
 			},
 			stdout: "https://github.com/OWNER/REPO/issues/123#issuecomment-456\n",
 		},
+		{
+			name: "non-interactive inline with edit last",
+			input: &shared.CommentableOptions{
+				Interactive: false,
+				InputType:   shared.InputTypeInline,
+				Body:        "comment body",
+				EditLast:    true,
+			},
+			httpStubs: func(t *testing.T, reg *httpmock.Registry) {
+				mockCommentUpdate(t, reg)
+			},
+			stdout: "https://github.com/OWNER/REPO/issues/123#issuecomment-111\n",
+		},
 	}
 	for _, tt := range tests {
 		ios, _, stdout, stderr := iostreams.Test()
@@ -263,7 +320,14 @@ func Test_commentRun(t *testing.T) {
 			return &http.Client{Transport: reg}, nil
 		}
 		tt.input.RetrieveCommentable = func() (shared.Commentable, ghrepo.Interface, error) {
-			return &mockCommentable{}, ghrepo.New("OWNER", "REPO"), nil
+			return &api.Issue{
+				ID:  "ISSUE-ID",
+				URL: "https://github.com/OWNER/REPO/issues/123",
+				Comments: api.Comments{Nodes: []api.Comment{
+					{ID: "id1", Author: api.Author{Login: "octocat"}, URL: "https://github.com/OWNER/REPO/issues/123#issuecomment-111", ViewerDidAuthor: true},
+					{ID: "id2", Author: api.Author{Login: "monalisa"}, URL: "https://github.com/OWNER/REPO/issues/123#issuecomment-222"},
+				}},
+			}, ghrepo.New("OWNER", "REPO"), nil
 		}
 
 		t.Run(tt.name, func(t *testing.T) {
@@ -275,15 +339,6 @@ func Test_commentRun(t *testing.T) {
 	}
 }
 
-type mockCommentable struct{}
-
-func (c mockCommentable) Identifier() string {
-	return "ISSUE-ID"
-}
-func (c mockCommentable) Link() string {
-	return "https://github.com/OWNER/REPO/issues/123"
-}
-
 func mockCommentCreate(t *testing.T, reg *httpmock.Registry) {
 	reg.Register(
 		httpmock.GraphQL(`mutation CommentCreate\b`),
@@ -297,3 +352,17 @@ func mockCommentCreate(t *testing.T, reg *httpmock.Registry) {
 			}),
 	)
 }
+
+func mockCommentUpdate(t *testing.T, reg *httpmock.Registry) {
+	reg.Register(
+		httpmock.GraphQL(`mutation CommentUpdate\b`),
+		httpmock.GraphQLMutation(`
+		{ "data": { "updateIssueComment": { "issueComment": {
+			"url": "https://github.com/OWNER/REPO/issues/123#issuecomment-111"
+		} } } }`,
+			func(inputs map[string]interface{}) {
+				assert.Equal(t, "id1", inputs["id"])
+				assert.Equal(t, "comment body", inputs["body"])
+			}),
+	)
+}
@@ -41,11 +41,15 @@ func NewCmdComment(f *cmdutil.Factory, runF func(*shared.CommentableOptions) err
 			if len(args) > 0 {
 				selector = args[0]
 			}
+			fields := []string{"id", "url"}
+			if opts.EditLast {
+				fields = append(fields, "comments")
+			}
 			finder := shared.NewFinder(f)
 			opts.RetrieveCommentable = func() (shared.Commentable, ghrepo.Interface, error) {
 				return finder.Find(shared.FindOptions{
 					Selector: selector,
-					Fields:   []string{"id", "url"},
+					Fields:   fields,
 				})
 			}
 			return shared.CommentablePreRun(cmd, opts)
@@ -70,6 +74,7 @@ func NewCmdComment(f *cmdutil.Factory, runF func(*shared.CommentableOptions) err
 	cmd.Flags().StringVarP(&bodyFile, "body-file", "F", "", "Read body text from `file` (use \"-\" to read from standard input)")
 	cmd.Flags().BoolP("editor", "e", false, "Skip prompts and open the text editor to write the body in")
 	cmd.Flags().BoolP("web", "w", false, "Open the web browser to write the comment")
+	cmd.Flags().BoolVar(&opts.EditLast, "edit-last", false, "Edit the last comment of the same author")
 
 	return cmd
 }