Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| added0778e | |||
| 919a91d6aa | |||
| 3c9a947017 | |||
| 04e1f21405 |
@@ -530,6 +530,103 @@ func (c *Client) GetTriageQueue(ctx context.Context, token string, orgs []string
|
||||
return queue, nil
|
||||
}
|
||||
|
||||
// Comment represents a comment on an issue or pull request.
|
||||
type Comment struct {
|
||||
ID int64 `json:"id"`
|
||||
Body string `json:"body"`
|
||||
User string `json:"-"` // populated from nested object
|
||||
CreatedAt string `json:"-"` // formatted after fetch
|
||||
RawUser struct {
|
||||
Login string `json:"login"`
|
||||
} `json:"user"`
|
||||
RawCreatedAt time.Time `json:"created_at"`
|
||||
}
|
||||
|
||||
// Label represents a Gitea label (used for available labels list).
|
||||
type Label struct {
|
||||
ID int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Color string `json:"color"`
|
||||
}
|
||||
|
||||
// GetIssue fetches a single issue by owner, repo, and index.
|
||||
func (c *Client) GetIssue(ctx context.Context, token, owner, repo string, index int64) (*Issue, error) {
|
||||
path := fmt.Sprintf("/repos/%s/%s/issues/%d", owner, repo, index)
|
||||
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("fetching issue: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var issue Issue
|
||||
if err := json.NewDecoder(resp.Body).Decode(&issue); err != nil {
|
||||
return nil, fmt.Errorf("decoding issue: %w", err)
|
||||
}
|
||||
|
||||
issue.RepoOwner = owner
|
||||
issue.RepoName = repo
|
||||
return &issue, nil
|
||||
}
|
||||
|
||||
// GetPull fetches a single pull request by owner, repo, and index.
|
||||
func (c *Client) GetPull(ctx context.Context, token, owner, repo string, index int64) (*PullRequest, error) {
|
||||
path := fmt.Sprintf("/repos/%s/%s/pulls/%d", owner, repo, index)
|
||||
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("fetching pull request: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var pr PullRequest
|
||||
if err := json.NewDecoder(resp.Body).Decode(&pr); err != nil {
|
||||
return nil, fmt.Errorf("decoding pull request: %w", err)
|
||||
}
|
||||
|
||||
pr.RepoOwner = owner
|
||||
pr.RepoName = repo
|
||||
return &pr, nil
|
||||
}
|
||||
|
||||
// GetIssueComments fetches comments for an issue or pull request.
|
||||
func (c *Client) GetIssueComments(ctx context.Context, token, owner, repo string, index int64) ([]Comment, error) {
|
||||
path := fmt.Sprintf("/repos/%s/%s/issues/%d/comments?limit=50", owner, repo, index)
|
||||
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("fetching comments: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var comments []Comment
|
||||
if err := json.NewDecoder(resp.Body).Decode(&comments); err != nil {
|
||||
return nil, fmt.Errorf("decoding comments: %w", err)
|
||||
}
|
||||
|
||||
// Populate convenience fields.
|
||||
for i := range comments {
|
||||
comments[i].User = comments[i].RawUser.Login
|
||||
comments[i].CreatedAt = comments[i].RawCreatedAt.Format("Jan 2, 2006 15:04")
|
||||
}
|
||||
|
||||
return comments, nil
|
||||
}
|
||||
|
||||
// GetRepoLabels fetches all labels for a repository.
|
||||
func (c *Client) GetRepoLabels(ctx context.Context, token, owner, repo string) ([]Label, error) {
|
||||
path := fmt.Sprintf("/repos/%s/%s/labels?limit=50", owner, repo)
|
||||
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("fetching labels: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var labels []Label
|
||||
if err := json.NewDecoder(resp.Body).Decode(&labels); err != nil {
|
||||
return nil, fmt.Errorf("decoding labels: %w", err)
|
||||
}
|
||||
|
||||
return labels, nil
|
||||
}
|
||||
|
||||
// CreateIssue creates a new issue in the specified repository.
|
||||
func (c *Client) CreateIssue(ctx context.Context, token, owner, repo, title, body string, labels []int64) (*Issue, error) {
|
||||
payload := map[string]interface{}{
|
||||
@@ -609,6 +706,51 @@ func (c *Client) SubmitReview(ctx context.Context, token, owner, repo string, in
|
||||
return nil
|
||||
}
|
||||
|
||||
// CloseIssue closes an issue by setting its state to "closed".
|
||||
func (c *Client) CloseIssue(ctx context.Context, token, owner, repo string, index int64) error {
|
||||
payload, err := json.Marshal(map[string]string{"state": "closed"})
|
||||
if err != nil {
|
||||
return fmt.Errorf("marshaling close request: %w", err)
|
||||
}
|
||||
|
||||
path := fmt.Sprintf("/repos/%s/%s/issues/%d", owner, repo, index)
|
||||
resp, err := c.doRequest(ctx, token, http.MethodPatch, path, strings.NewReader(string(payload)))
|
||||
if err != nil {
|
||||
return fmt.Errorf("closing issue: %w", err)
|
||||
}
|
||||
resp.Body.Close()
|
||||
|
||||
c.InvalidateAll()
|
||||
return nil
|
||||
}
|
||||
|
||||
// PostComment creates a comment on an issue and returns the created Comment.
|
||||
func (c *Client) PostComment(ctx context.Context, token, owner, repo string, index int64, body string) (*Comment, error) {
|
||||
payload, err := json.Marshal(map[string]string{"body": body})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("marshaling comment: %w", err)
|
||||
}
|
||||
|
||||
path := fmt.Sprintf("/repos/%s/%s/issues/%d/comments", owner, repo, index)
|
||||
resp, err := c.doRequest(ctx, token, http.MethodPost, path, strings.NewReader(string(payload)))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("posting comment: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var comment Comment
|
||||
if err := json.NewDecoder(resp.Body).Decode(&comment); err != nil {
|
||||
return nil, fmt.Errorf("decoding comment: %w", err)
|
||||
}
|
||||
|
||||
// Populate convenience fields.
|
||||
comment.User = comment.RawUser.Login
|
||||
comment.CreatedAt = comment.RawCreatedAt.Format("Jan 2, 2006 15:04")
|
||||
|
||||
c.InvalidateAll()
|
||||
return &comment, nil
|
||||
}
|
||||
|
||||
// priorityScore returns a numeric score for sorting (lower = higher priority).
|
||||
func priorityScore(labels []string) int {
|
||||
for _, l := range labels {
|
||||
|
||||
@@ -201,6 +201,97 @@ func TestGetTriageQueue_Sorting(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestCloseIssue(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPatch {
|
||||
t.Errorf("expected PATCH, got %s", r.Method)
|
||||
}
|
||||
if r.URL.Path != "/api/v1/repos/owner1/repo1/issues/42" {
|
||||
t.Errorf("unexpected path: %s", r.URL.Path)
|
||||
}
|
||||
if r.Header.Get("Authorization") != "token test-token" {
|
||||
t.Error("missing or wrong Authorization header")
|
||||
}
|
||||
|
||||
var body map[string]string
|
||||
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
||||
t.Fatalf("failed to decode body: %v", err)
|
||||
}
|
||||
if body["state"] != "closed" {
|
||||
t.Errorf("expected state=closed, got %q", body["state"])
|
||||
}
|
||||
|
||||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(map[string]string{"state": "closed"})
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
c := NewClient(server.URL)
|
||||
c.setCache("issues-org1", "should-be-invalidated")
|
||||
|
||||
err := c.CloseIssue(context.Background(), "test-token", "owner1", "repo1", 42)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
|
||||
// Verify cache was invalidated.
|
||||
_, ok := c.getFromCache("issues-org1")
|
||||
if ok {
|
||||
t.Error("expected cache to be invalidated after CloseIssue")
|
||||
}
|
||||
}
|
||||
|
||||
func TestPostComment(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
t.Errorf("expected POST, got %s", r.Method)
|
||||
}
|
||||
if r.URL.Path != "/api/v1/repos/owner1/repo1/issues/42/comments" {
|
||||
t.Errorf("unexpected path: %s", r.URL.Path)
|
||||
}
|
||||
|
||||
var body map[string]string
|
||||
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
||||
t.Fatalf("failed to decode body: %v", err)
|
||||
}
|
||||
if body["body"] != "test comment" {
|
||||
t.Errorf("expected body='test comment', got %q", body["body"])
|
||||
}
|
||||
|
||||
comment := map[string]interface{}{
|
||||
"id": 1,
|
||||
"body": body["body"],
|
||||
"user": map[string]string{"login": "testuser"},
|
||||
"created_at": "2026-03-26T12:00:00Z",
|
||||
}
|
||||
json.NewEncoder(w).Encode(comment)
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
c := NewClient(server.URL)
|
||||
c.setCache("issues-org1", "should-be-invalidated")
|
||||
|
||||
comment, err := c.PostComment(context.Background(), "test-token", "owner1", "repo1", 42, "test comment")
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if comment.Body != "test comment" {
|
||||
t.Errorf("comment.Body = %q, want %q", comment.Body, "test comment")
|
||||
}
|
||||
if comment.User != "testuser" {
|
||||
t.Errorf("comment.User = %q, want %q", comment.User, "testuser")
|
||||
}
|
||||
if comment.ID != 1 {
|
||||
t.Errorf("comment.ID = %d, want 1", comment.ID)
|
||||
}
|
||||
|
||||
// Verify cache was invalidated.
|
||||
_, ok := c.getFromCache("issues-org1")
|
||||
if ok {
|
||||
t.Error("expected cache to be invalidated after PostComment")
|
||||
}
|
||||
}
|
||||
|
||||
// sortTriageQueue is a test helper applying the same sort as GetTriageQueue.
|
||||
func sortTriageQueue(queue []TriageItem) {
|
||||
for i := 0; i < len(queue); i++ {
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/config"
|
||||
giteaclient "gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/gitea"
|
||||
@@ -39,9 +40,15 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) {
|
||||
mux.HandleFunc("GET /issues", h.ListIssues)
|
||||
mux.HandleFunc("POST /issues", h.CreateIssue)
|
||||
mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/labels", h.ApplyLabels)
|
||||
mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/close", h.CloseIssue)
|
||||
mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/comment", h.AddComment)
|
||||
|
||||
// Issue detail.
|
||||
mux.HandleFunc("GET /issues/{owner}/{repo}/{index}", h.IssueDetail)
|
||||
|
||||
// Pull requests.
|
||||
mux.HandleFunc("GET /pulls", h.ListPulls)
|
||||
mux.HandleFunc("GET /pulls/{owner}/{repo}/{index}", h.PullDetail)
|
||||
mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/review", h.SubmitReview)
|
||||
|
||||
// Settings (handled separately for auth bypass).
|
||||
@@ -329,6 +336,116 @@ func (h *Handler) ListPulls(w http.ResponseWriter, r *http.Request) {
|
||||
renderPage(w, r, "Pull Requests", "pulls", content)
|
||||
}
|
||||
|
||||
// IssueDetail handles GET /issues/{owner}/{repo}/{index}.
|
||||
func (h *Handler) IssueDetail(w http.ResponseWriter, r *http.Request) {
|
||||
token := getToken(r)
|
||||
owner := r.PathValue("owner")
|
||||
repo := r.PathValue("repo")
|
||||
indexStr := r.PathValue("index")
|
||||
|
||||
index, err := strconv.ParseInt(indexStr, 10, 64)
|
||||
if err != nil {
|
||||
http.Error(w, "invalid issue index", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
issue, err := h.Client.GetIssue(r.Context(), token, owner, repo, index)
|
||||
if err != nil {
|
||||
slog.Error("failed to get issue", "error", err, "owner", owner, "repo", repo, "index", index)
|
||||
renderPage(w, r, "Issue Not Found", "issues",
|
||||
`<h1>Issue Not Found</h1><p class="empty">Could not load the requested issue.</p>`)
|
||||
return
|
||||
}
|
||||
|
||||
comments, err := h.Client.GetIssueComments(r.Context(), token, owner, repo, index)
|
||||
if err != nil {
|
||||
slog.Error("failed to get comments", "error", err)
|
||||
comments = nil // non-fatal, render without comments
|
||||
}
|
||||
|
||||
labels, err := h.Client.GetRepoLabels(r.Context(), token, owner, repo)
|
||||
if err != nil {
|
||||
slog.Error("failed to get repo labels", "error", err)
|
||||
labels = nil
|
||||
}
|
||||
|
||||
// Build the content HTML using the template.
|
||||
tmpl, err := template.ParseFiles("internal/templates/issue_detail.html")
|
||||
if err != nil {
|
||||
slog.Error("failed to parse issue_detail template", "error", err)
|
||||
http.Error(w, "template error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
type templateData struct {
|
||||
Issue *giteaclient.Issue
|
||||
Comments []giteaclient.Comment
|
||||
AvailableLabels []giteaclient.Label
|
||||
}
|
||||
|
||||
data := templateData{
|
||||
Issue: issue,
|
||||
Comments: comments,
|
||||
AvailableLabels: labels,
|
||||
}
|
||||
|
||||
var buf strings.Builder
|
||||
if err := tmpl.ExecuteTemplate(&buf, "content", data); err != nil {
|
||||
slog.Error("failed to execute issue_detail template", "error", err)
|
||||
http.Error(w, "template error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
renderPage(w, r, fmt.Sprintf("Issue #%d", index), "issues", buf.String())
|
||||
}
|
||||
|
||||
// PullDetail handles GET /pulls/{owner}/{repo}/{index}.
|
||||
func (h *Handler) PullDetail(w http.ResponseWriter, r *http.Request) {
|
||||
token := getToken(r)
|
||||
owner := r.PathValue("owner")
|
||||
repo := r.PathValue("repo")
|
||||
indexStr := r.PathValue("index")
|
||||
|
||||
index, err := strconv.ParseInt(indexStr, 10, 64)
|
||||
if err != nil {
|
||||
http.Error(w, "invalid PR index", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
pr, err := h.Client.GetPull(r.Context(), token, owner, repo, index)
|
||||
if err != nil {
|
||||
slog.Error("failed to get pull request", "error", err, "owner", owner, "repo", repo, "index", index)
|
||||
renderPage(w, r, "PR Not Found", "pulls",
|
||||
`<h1>Pull Request Not Found</h1><p class="empty">Could not load the requested pull request.</p>`)
|
||||
return
|
||||
}
|
||||
|
||||
// Build the content HTML using the template.
|
||||
tmpl, err := template.ParseFiles("internal/templates/pull_detail.html")
|
||||
if err != nil {
|
||||
slog.Error("failed to parse pull_detail template", "error", err)
|
||||
http.Error(w, "template error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
type templateData struct {
|
||||
Pull *giteaclient.PullRequest
|
||||
}
|
||||
|
||||
data := templateData{
|
||||
Pull: pr,
|
||||
}
|
||||
|
||||
var buf strings.Builder
|
||||
if err := tmpl.ExecuteTemplate(&buf, "content", data); err != nil {
|
||||
slog.Error("failed to execute pull_detail template", "error", err)
|
||||
http.Error(w, "template error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
renderPage(w, r, fmt.Sprintf("PR #%d", index), "pulls", buf.String())
|
||||
}
|
||||
|
||||
// CreateIssue handles POST /issues.
|
||||
func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
|
||||
token := getToken(r)
|
||||
@@ -410,6 +527,77 @@ func (h *Handler) ApplyLabels(w http.ResponseWriter, r *http.Request) {
|
||||
http.Redirect(w, r, fmt.Sprintf("/issues/%s/%s/%d", owner, repo, index), http.StatusSeeOther)
|
||||
}
|
||||
|
||||
// CloseIssue handles POST /issues/{owner}/{repo}/{index}/close.
|
||||
func (h *Handler) CloseIssue(w http.ResponseWriter, r *http.Request) {
|
||||
token := getToken(r)
|
||||
owner := r.PathValue("owner")
|
||||
repo := r.PathValue("repo")
|
||||
indexStr := r.PathValue("index")
|
||||
|
||||
index, err := strconv.ParseInt(indexStr, 10, 64)
|
||||
if err != nil {
|
||||
http.Error(w, "invalid issue index", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.Client.CloseIssue(r.Context(), token, owner, repo, index); err != nil {
|
||||
slog.Error("failed to close issue", "error", err, "owner", owner, "repo", repo, "index", index)
|
||||
http.Error(w, "failed to close issue", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if isHTMX(r) {
|
||||
w.Header().Set("HX-Redirect", fmt.Sprintf("/issues/%s/%s/%d", owner, repo, index))
|
||||
w.WriteHeader(http.StatusOK)
|
||||
return
|
||||
}
|
||||
|
||||
http.Redirect(w, r, fmt.Sprintf("/issues/%s/%s/%d", owner, repo, index), http.StatusSeeOther)
|
||||
}
|
||||
|
||||
// AddComment handles POST /issues/{owner}/{repo}/{index}/comment.
|
||||
func (h *Handler) AddComment(w http.ResponseWriter, r *http.Request) {
|
||||
token := getToken(r)
|
||||
owner := r.PathValue("owner")
|
||||
repo := r.PathValue("repo")
|
||||
indexStr := r.PathValue("index")
|
||||
|
||||
index, err := strconv.ParseInt(indexStr, 10, 64)
|
||||
if err != nil {
|
||||
http.Error(w, "invalid issue index", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if err := r.ParseForm(); err != nil {
|
||||
http.Error(w, "bad request", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
body := r.FormValue("body")
|
||||
if body == "" {
|
||||
http.Error(w, "comment body is required", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
comment, err := h.Client.PostComment(r.Context(), token, owner, repo, index, body)
|
||||
if err != nil {
|
||||
slog.Error("failed to post comment", "error", err, "owner", owner, "repo", repo, "index", index)
|
||||
http.Error(w, "failed to post comment", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if isHTMX(r) {
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
fmt.Fprintf(w, `<div class="card comment">
|
||||
<div class="card-meta">%s · %s</div>
|
||||
<div class="card-body">%s</div>
|
||||
</div>`, template.HTMLEscapeString(comment.User), template.HTMLEscapeString(comment.CreatedAt), template.HTMLEscapeString(comment.Body))
|
||||
return
|
||||
}
|
||||
|
||||
http.Redirect(w, r, fmt.Sprintf("/issues/%s/%s/%d", owner, repo, index), http.StatusSeeOther)
|
||||
}
|
||||
|
||||
// SubmitReview handles POST /pulls/{owner}/{repo}/{index}/review.
|
||||
func (h *Handler) SubmitReview(w http.ResponseWriter, r *http.Request) {
|
||||
token := getToken(r)
|
||||
|
||||
Reference in New Issue
Block a user