fix(discussion): various polish and small fixes

- Fix double default in list --limit help text - Wire --body-file flag in create command (symmetric with edit) - Cap comment/reply pagination to maxPageSize (100) - Use int32 for discussion number params (fixes CodeQL alerts) - Use strconv.ParseInt instead of Atoi for int32 targets - Fix IsStdoutTTY -> IsStderrTTY for web mode message - Use CancelError instead of error string for no-op edit - Trim whitespace from label names in resolution - Fix category error formatting (comma-joined instead of %q slice) - Fix typo in lookup.go comment - Remove dead len==0 check in view replies path - Inline exporterNeedsComments into needsComments - Validate comment ownership in GetCommentReplies - Remove unimplemented interface methods and CloseReason type Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
babakks · Jun 10, 2026 · Jun 1, 2026 · Jun 1, 2026 · Jun 1, 2026 · Jun 1, 2026
commit dc5d7c18a6fd325a634792401f54688e8f195fe9
@@ -11,18 +11,11 @@ import "github.com/cli/cli/v2/internal/ghrepo"
 type DiscussionClient interface {
 	List(repo ghrepo.Interface, filters ListFilters, after string, limit int) (*DiscussionListResult, error)
 	Search(repo ghrepo.Interface, filters SearchFilters, after string, limit int) (*DiscussionListResult, error)
-	GetByNumber(repo ghrepo.Interface, number int) (*Discussion, error)
-	GetWithComments(repo ghrepo.Interface, number int, commentLimit int, after string, newest bool) (*Discussion, error)
-	GetCommentReplies(repo ghrepo.Interface, number int, commentID string, limit int, after string, newest bool) (*Discussion, error)
+	GetByNumber(repo ghrepo.Interface, number int32) (*Discussion, error)
+	GetWithComments(repo ghrepo.Interface, number int32, commentLimit int, after string, newest bool) (*Discussion, error)
+	GetCommentReplies(repo ghrepo.Interface, number int32, commentID string, limit int, after string, newest bool) (*Discussion, error)
 	ListCategories(repo ghrepo.Interface) ([]DiscussionCategory, error)
 	ListLabels(repo ghrepo.Interface) ([]DiscussionLabel, error)
 	Create(repo ghrepo.Interface, input CreateDiscussionInput) (*Discussion, error)
 	Update(repo ghrepo.Interface, input UpdateDiscussionInput) (*Discussion, error)
-	Close(repo ghrepo.Interface, id string, reason CloseReason) (*Discussion, error)
-	Reopen(repo ghrepo.Interface, id string) (*Discussion, error)
-	AddComment(repo ghrepo.Interface, discussionID string, body string, replyToID string) (*DiscussionComment, error)
-	Lock(repo ghrepo.Interface, id string, reason string) error
-	Unlock(repo ghrepo.Interface, id string) error
-	MarkAnswer(repo ghrepo.Interface, commentID string) error
-	UnmarkAnswer(repo ghrepo.Interface, commentID string) error
 }
diff --git a/pkg/cmd/discussion/client/client_impl.go b/pkg/cmd/discussion/client/client_impl.go
@@ -352,7 +352,7 @@
 	return &result, nil
 }
 
-func (c *discussionClient) GetByNumber(repo ghrepo.Interface, number int) (*Discussion, error) {
+func (c *discussionClient) GetByNumber(repo ghrepo.Interface, number int32) (*Discussion, error) {
 	var query struct {
 		Repository struct {
 			HasDiscussionsEnabled bool
@@ -483,7 +483,7 @@
 	return dc
 }
 
-func (c *discussionClient) GetWithComments(repo ghrepo.Interface, number int, limit int, after string, newest bool) (*Discussion, error) {
+func (c *discussionClient) GetWithComments(repo ghrepo.Interface, number int32, limit int, after string, newest bool) (*Discussion, error) {
 	var query struct {
 		Repository struct {
 			HasDiscussionsEnabled bool
@@ -514,12 +514,12 @@
 	}
 
 	if newest {
-		variables["last"] = githubv4.Int(limit)
+		variables["last"] = githubv4.Int(min(limit, maxPageSize))
 		if after != "" {
 			variables["before"] = githubv4.String(after)
 		}
 	} else {
-		variables["first"] = githubv4.Int(limit)
+		variables["first"] = githubv4.Int(min(limit, maxPageSize))
 		if after != "" {
 			variables["after"] = githubv4.String(after)
 		}
@@ -585,7 +585,7 @@
 // GetCommentReplies fetches a discussion and a single comment with its
 // paginated replies. It uses the top-level node(id:) query for the comment
 // because the Discussion type does not expose a comment(id:) field.
-func (c *discussionClient) GetCommentReplies(repo ghrepo.Interface, number int, commentID string, limit int, after string, newest bool) (*Discussion, error) {
+func (c *discussionClient) GetCommentReplies(repo ghrepo.Interface, number int32, commentID string, limit int, after string, newest bool) (*Discussion, error) {
 	var query struct {
 		Repository struct {
 			HasDiscussionsEnabled bool
@@ -608,6 +608,13 @@
 						TotalCount int
 					}
 				}
+				Discussion struct {
+					Number     int
+					Repository struct {
+						Owner struct{ Login string }
+						Name  string
+					}
+				}
 				Replies struct {
 					TotalCount int
 					PageInfo   struct {
@@ -634,12 +641,12 @@
 	}
 
 	if newest {
-		variables["last"] = githubv4.Int(limit)
+		variables["last"] = githubv4.Int(min(limit, maxPageSize))
 		if after != "" {
 			variables["before"] = githubv4.String(after)
 		}
 	} else {
-		variables["first"] = githubv4.Int(limit)
+		variables["first"] = githubv4.Int(min(limit, maxPageSize))
 		if after != "" {
 			variables["after"] = githubv4.String(after)
 		}
@@ -663,6 +670,11 @@
 		return nil, fmt.Errorf("node %s is not a discussion comment", commentID)
 	}
 
+	if !strings.EqualFold(src.Discussion.Repository.Owner.Login, repo.RepoOwner()) ||
+		!strings.EqualFold(src.Discussion.Repository.Name, repo.RepoName()) {
+		return nil, fmt.Errorf("comment %s does not belong to %s/%s", commentID, repo.RepoOwner(), repo.RepoName())
+	}
+
 	d := mapDiscussionFromListNode(query.Repository.Discussion.discussionListNode)
 
 	for _, rg := range query.Repository.Discussion.ReactionGroups {
@@ -1028,31 +1040,5 @@

 	return &d, nil
 }
 
-func (c *discussionClient) Close(_ ghrepo.Interface, _ string, _ CloseReason) (*Discussion, error) {
-	return nil, fmt.Errorf("not implemented")
-}
-
-func (c *discussionClient) Reopen(_ ghrepo.Interface, _ string) (*Discussion, error) {
-	return nil, fmt.Errorf("not implemented")
-}
 
-func (c *discussionClient) AddComment(_ ghrepo.Interface, _ string, _ string, _ string) (*DiscussionComment, error) {
-	return nil, fmt.Errorf("not implemented")
-}
-
-func (c *discussionClient) Lock(_ ghrepo.Interface, _ string, _ string) error {
-	return fmt.Errorf("not implemented")
-}
-
-func (c *discussionClient) Unlock(_ ghrepo.Interface, _ string) error {
-	return fmt.Errorf("not implemented")
-}
-
-func (c *discussionClient) MarkAnswer(_ ghrepo.Interface, _ string) error {
-	return fmt.Errorf("not implemented")
-}
-
-func (c *discussionClient) UnmarkAnswer(_ ghrepo.Interface, _ string) error {
-	return fmt.Errorf("not implemented")
-}
diff --git a/pkg/cmd/discussion/client/client_impl_test.go b/pkg/cmd/discussion/client/client_impl_test.go
@@ -1870,6 +1870,7 @@ func TestGetCommentReplies(t *testing.T) {
 									"isAnswer": true,
 									"upvoteCount": 5,
 									"reactionGroups": [{"content": "HEART", "users": {"totalCount": 2}}],
+									"discussion": {"number": 42, "repository": {"owner": {"login": "OWNER"}, "name": "REPO"}},
 									"replies": {
 										"totalCount": 1,
 										"pageInfo": {"endCursor": "REP_CUR", "hasNextPage": true, "startCursor": "REP_START", "hasPreviousPage": false},
@@ -1996,6 +1997,7 @@ func TestGetCommentReplies(t *testing.T) {
 									"isAnswer": false,
 									"upvoteCount": 0,
 									"reactionGroups": [],
+									"discussion": {"number": 42, "repository": {"owner": {"login": "OWNER"}, "name": "REPO"}},
 									"replies": {
 										"totalCount": 3,
 										"pageInfo": {"endCursor": "CUR_B", "hasNextPage": true, "startCursor": "CUR_A", "hasPreviousPage": false},
@@ -2083,6 +2085,7 @@ func TestGetCommentReplies(t *testing.T) {
 									"isAnswer": false,
 									"upvoteCount": 0,
 									"reactionGroups": [],
+									"discussion": {"number": 42, "repository": {"owner": {"login": "OWNER"}, "name": "REPO"}},
 									"replies": {
 										"totalCount": 5,
 										"pageInfo": {"endCursor": "CUR_END", "hasNextPage": false, "startCursor": "CUR_Y", "hasPreviousPage": true},
@@ -2169,6 +2172,7 @@ func TestGetCommentReplies(t *testing.T) {
 									"isAnswer": false,
 									"upvoteCount": 0,
 									"reactionGroups": [],
+									"discussion": {"number": 42, "repository": {"owner": {"login": "OWNER"}, "name": "REPO"}},
 									"replies": {
 										"totalCount": 3,
 										"pageInfo": {"endCursor": "", "hasNextPage": false, "startCursor": "CUR_START", "hasPreviousPage": true},
@@ -2255,6 +2259,7 @@ func TestGetCommentReplies(t *testing.T) {
 									"isAnswer": false,
 									"upvoteCount": 0,
 									"reactionGroups": [],
+									"discussion": {"number": 42, "repository": {"owner": {"login": "OWNER"}, "name": "REPO"}},
 									"replies": {
 										"totalCount": 1,
 										"pageInfo": {"endCursor": "CUR_ONLY", "hasNextPage": false, "startCursor": "CUR_ONLY", "hasPreviousPage": false},
@@ -2309,6 +2314,7 @@ func TestGetCommentReplies(t *testing.T) {
 									"isAnswer": false,
 									"upvoteCount": 0,
 									"reactionGroups": [],
+									"discussion": {"number": 42, "repository": {"owner": {"login": "OWNER"}, "name": "REPO"}},
 									"replies": {
 										"totalCount": 0,
 										"pageInfo": {"endCursor": null, "hasNextPage": false, "startCursor": null, "hasPreviousPage": false},
@@ -2447,6 +2453,63 @@ func TestGetCommentReplies(t *testing.T) {
 			},
 			wantErr: "node I_notacomment is not a discussion comment",
 		},
+		{
+			name:      "comment belongs to different repo",
+			commentID: "DC_other",
+			limit:     10,
+			newest:    false,
+			httpStubs: func(t *testing.T, reg *httpmock.Registry) {
+				reg.Register(
+					httpmock.GraphQL(`query DiscussionCommentReplies\b`),
+					httpmock.StringResponse(heredoc.Doc(`
+						{
+							"data": {
+								"repository": {
+									"hasDiscussionsEnabled": true,
+									"discussion": {
+										"id": "D_1",
+										"number": 1,
+										"title": "Test",
+										"body": "",
+										"url": "",
+										"closed": false,
+										"stateReason": "",
+										"isAnswered": false,
+										"answerChosenAt": "0001-01-01T00:00:00Z",
+										"author": {"__typename": "User", "login": "alice"},
+										"category": {"id": "C1", "name": "General", "slug": "general", "emoji": "", "isAnswerable": false},
+										"answerChosenBy": null,
+										"labels": {"nodes": []},
+										"reactionGroups": [],
+										"createdAt": "2024-01-01T00:00:00Z",
+										"updatedAt": "2024-01-01T00:00:00Z",
+										"closedAt": "0001-01-01T00:00:00Z",
+										"locked": false
+									}
+								},
+								"node": {
+									"id": "DC_other",
+									"url": "",
+									"author": {"__typename": "User", "login": "alice"},
+									"body": "Comment",
+									"createdAt": "2025-01-01T00:00:00Z",
+									"isAnswer": false,
+									"upvoteCount": 0,
+									"reactionGroups": [],
+									"discussion": {"number": 99, "repository": {"owner": {"login": "OTHER"}, "name": "DIFFERENT"}},
+									"replies": {
+										"totalCount": 0,
+										"pageInfo": {"endCursor": "", "hasNextPage": false, "startCursor": "", "hasPreviousPage": false},
+										"nodes": []
+									}
+								}
+							}
+						}
+					`)),
+				)
+			},
+			wantErr: "comment DC_other does not belong to OWNER/REPO",
+		},
 	}
 
 	for _, tt := range tests {