From 7570a7c8667de9966dd124124551250c0774964f Mon Sep 17 00:00:00 2001 From: 1os21ka23r9navae6mrro <1os21ka23r9navae6mrro@gmail.com> Date: Wed, 8 Jul 2026 14:30:20 +0000 Subject: [PATCH] feat(repo): add +activity for the project trends feed Wraps GET /:owner/:repo/activity (ProjectTrendsController#index) with the server's documented filters: - --type: Issue | PullRequest | Version - --status: create | close | journal - --time: only events from the past N days (integer-validated) Production-verified on gitlink.org.cn (filtered Issue/close feed returns trends plus aggregate counts). Unit test covers query shape and the --time guard; README example and bilingual i18n keys. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- README.md | 3 +++ internal/i18n/locales/en-US.json | 4 ++++ internal/i18n/locales/zh-CN.json | 4 ++++ shortcuts/repo/repo.go | 36 ++++++++++++++++++++++++++++++++ shortcuts/repo/repo_test.go | 27 ++++++++++++++++++++++++ 5 files changed, 74 insertions(+) diff --git a/README.md b/README.md index e5e4318..959c090 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,9 @@ gitlink-cli repo +languages --owner Gitlink --repo forgeplus # List contributors gitlink-cli repo +contributors --owner Gitlink --repo forgeplus +# Repository activity feed, filterable by type/action/time window +gitlink-cli repo +activity --owner Gitlink --repo forgeplus -t Issue -s close --time 30 + # Show contributor code-line stats for a branch, tag, or commit gitlink-cli repo +contributor-stats --owner Gitlink --repo forgeplus --ref master --pass-year 1 diff --git a/internal/i18n/locales/en-US.json b/internal/i18n/locales/en-US.json index 0739395..a654db3 100644 --- a/internal/i18n/locales/en-US.json +++ b/internal/i18n/locales/en-US.json @@ -81,6 +81,7 @@ "cmd.release.list.short": "List releases", "cmd.release.short": "Release operations", "cmd.release.view.short": "View release details", + "cmd.repo.activity.short": "List repository activity feed (project trends)", "cmd.repo.create.short": "Create a new repository", "cmd.repo.delete.short": "Delete a repository", "cmd.repo.fork.short": "Fork a repository", @@ -208,6 +209,9 @@ "flag.release.tag": "Tag name", "flag.release.target": "Target branch", "flag.repo": "Repository name (auto-detected from git remote)", + "flag.repo.activity.status": "Action filter: create, close, journal", + "flag.repo.activity.time": "Only include events from the past N days", + "flag.repo.activity.type": "Trend type filter: Issue, PullRequest, Version", "flag.repo.category": "Filter: manage/mirror/sync/fork/all (default: manage)", "flag.repo.description": "Repository description", "flag.repo.name": "Repository name", diff --git a/internal/i18n/locales/zh-CN.json b/internal/i18n/locales/zh-CN.json index 2e6fc4d..c942a66 100644 --- a/internal/i18n/locales/zh-CN.json +++ b/internal/i18n/locales/zh-CN.json @@ -81,6 +81,7 @@ "cmd.release.list.short": "列出发布", "cmd.release.short": "发布操作", "cmd.release.view.short": "查看发布详情", + "cmd.repo.activity.short": "列出仓库动态（project trends）", "cmd.repo.create.short": "创建新仓库", "cmd.repo.delete.short": "删除仓库", "cmd.repo.fork.short": "Fork 仓库", @@ -208,6 +209,9 @@ "flag.release.tag": "标签名称", "flag.release.target": "目标分支", "flag.repo": "仓库名称（自动从 git remote 检测）", + "flag.repo.activity.status": "动作过滤：create、close、journal", + "flag.repo.activity.time": "仅包含最近 N 天的动态", + "flag.repo.activity.type": "动态类型过滤：Issue、PullRequest、Version", "flag.repo.category": "筛选：manage/mirror/sync/fork/all（默认：manage）", "flag.repo.description": "仓库描述", "flag.repo.name": "仓库名称", diff --git a/shortcuts/repo/repo.go b/shortcuts/repo/repo.go index 06774a6..2b95c0b 100644 --- a/shortcuts/repo/repo.go +++ b/shortcuts/repo/repo.go @@ -118,6 +118,42 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut { Description: "List repository contributors", Run: runContributors, }, + { + Name: "activity", + Description: tr.T("cmd.repo.activity.short"), + Flags: []common.Flag{ + {Name: "type", Short: "t", Usage: tr.T("flag.repo.activity.type")}, + {Name: "status", Short: "s", Usage: tr.T("flag.repo.activity.status")}, + {Name: "time", Usage: tr.T("flag.repo.activity.time")}, + {Name: "page", Short: "p", Usage: tr.T("flag.page"), Default: "1"}, + {Name: "limit", Short: "l", Usage: tr.T("flag.limit"), Default: "20"}, + }, + Run: func(ctx *common.RuntimeContext) error { + if err := ctx.ResolveOwnerRepo(); err != nil { + return err + } + q := url.Values{} + q.Set("page", ctx.Arg("page")) + q.Set("limit", ctx.Arg("limit")) + if trendType := ctx.Arg("type"); trendType != "" { + q.Set("type", trendType) + } + if status := ctx.Arg("status"); status != "" { + q.Set("status", status) + } + if timeDays := ctx.Arg("time"); timeDays != "" { + if _, err := strconv.Atoi(timeDays); err != nil { + return fmt.Errorf("--time must be an integer number of days, got %q", timeDays) + } + q.Set("time", timeDays) + } + env, err := ctx.CallAPIWithQuery("GET", ctx.RepoPath()+"/activity", q) + if err != nil { + return err + } + return ctx.Output(env) + }, + }, { Name: "contributor-stats", Description: "List contributor statistics with code line counts", diff --git a/shortcuts/repo/repo_test.go b/shortcuts/repo/repo_test.go index 5c5f34b..dbabde7 100644 --- a/shortcuts/repo/repo_test.go +++ b/shortcuts/repo/repo_test.go @@ -5,6 +5,7 @@ import ( "fmt" "net/http" "net/http/httptest" + "strings" "testing" "github.com/gitlink-org/gitlink-cli/internal/client" @@ -634,3 +635,29 @@ func assertEqual(t *testing.T, got interface{}, want interface{}) { t.Fatalf("got %v (%T), want %v (%T)", got, got, want, want) } } + +func TestRepoActivityForwardsFilters(t *testing.T) { + var query string + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.Method != "GET" || r.URL.Path != "/owner/repo/activity.json" { + t.Fatalf("unexpected request: %s %s", r.Method, r.URL.Path) + } + query = r.URL.RawQuery + writeJSON(t, w, map[string]interface{}{"project_trends": []interface{}{}}) + })) + defer server.Close() + + args := map[string]string{"type": "Issue", "status": "create", "time": "30", "page": "1", "limit": "20"} + if err := runShortcut(t, server, "activity", args); err != nil { + t.Fatalf("activity failed: %v", err) + } + for _, want := range []string{"type=Issue", "status=create", "time=30"} { + if !strings.Contains(query, want) { + t.Fatalf("expected %q in query, got %q", want, query) + } + } + + if err := runShortcut(t, server, "activity", map[string]string{"time": "abc", "page": "1", "limit": "20"}); err == nil { + t.Fatal("expected error for non-integer --time") + } +}