Merge pull request #568 from traPtitech/fix-ci

🎨 add setup-go in lint
traPtitech · Oct 4, 2024 · 9296cc9 · 9296cc9
2 parents 6ebf399 + 5ac48d9
commit 9296cc9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,6 +50,9 @@ jobs:
     needs: build
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: ./go.mod
       - uses: golangci/golangci-lint-action@v6
         with:
           version: latest

diff --git a/router/users.go b/router/users.go
@@ -16,7 +16,7 @@ import (
 func (h *Handlers) HandleGetUserMe(c echo.Context) error {
 	user, err := h.Repo.GetUserMe(getConinfo(c))
 	if err != nil {
-		if errors.Is(domain.ErrInvalidToken, err) {
+		if errors.Is(err, domain.ErrInvalidToken) {
 			return forbidden(err, message("token is invalid."), needAuthorization(true))
 		}
 		return judgeErrorResponse(err)
@@ -30,7 +30,7 @@ func (h *Handlers) HandleGetUsers(c echo.Context) error {
 
 	users, err := h.Repo.GetAllUsers(includeSuspend, true, getConinfo(c))
 	if err != nil {
-		if errors.Is(domain.ErrInvalidToken, err) {
+		if errors.Is(err, domain.ErrInvalidToken) {
 			return forbidden(err, message("token is invalid."), needAuthorization(true))
 		}
 		return judgeErrorResponse(err)