diff --git a/cmd/xcheck/main.go b/cmd/xcheck/main.go index f7af081..9c8dd8c 100644 --- a/cmd/xcheck/main.go +++ b/cmd/xcheck/main.go @@ -96,6 +96,26 @@ func (s *apiSource) listAll(path string, params map[string]string, out any) erro return json.Unmarshal([]byte(b.String()), out) } +// CurrentUser 以 token 呼叫 /user 取實際帳號,與 gitea.py 的 +// get_current_username() 同源(token 決定帳號,不接受環境變數覆寫, +// 失敗即報錯退出,不靜默退回預設值)。 +func (s *apiSource) CurrentUser() (string, error) { + var user struct { + Username string `json:"username"` + Login string `json:"login"` + } + if err := s.getJSON("user", nil, &user); err != nil { + return "", err + } + if user.Username != "" { + return user.Username, nil + } + if user.Login != "" { + return user.Login, nil + } + return "", fmt.Errorf("無法從 Gitea API /user 取得目前帳號") +} + func (s *apiSource) MyOrganizations() ([]string, error) { var orgs []struct { Username string `json:"username"` @@ -202,14 +222,15 @@ func main() { token: token, hc: &http.Client{Timeout: 30 * time.Second}, } - username := os.Getenv("USERNAME") - if username == "" { - username = "ceo" + username, err := src.CurrentUser() + if err != nil { + fmt.Fprintln(os.Stderr, "CurrentUser:", err) + os.Exit(1) } hours := 4.0 - items, err := workflow.ScanStalled(src, username, hours, time.Now()) - if err != nil { - fmt.Fprintln(os.Stderr, "ScanStalled:", err) + items, scanErr := workflow.ScanStalled(src, username, hours, time.Now()) + if scanErr != nil { + fmt.Fprintln(os.Stderr, "ScanStalled:", scanErr) os.Exit(1) } // json.Marshal* 會把 <、>、& 轉義成 \u003c 等(含自訂 MarshalJSON 的輸出),