use repository apiurl method

Author: ChristopherHX

routers/api/v1/repo/action.go

@@ -936,14 +936,12 @@ func GetArtifactsOfRun(ctx *context.APIContext) {
 		return
 	}
 
-	repoName := ctx.Repo.Repository.FullName()
-
 	res := new(api.ActionArtifactsResponse)
 	res.TotalCount = total
 
 	res.Entries = make([]*api.ActionArtifact, len(artifacts))
 	for i := range artifacts {
-		convertedArtifact, err := convert.ToActionArtifact(ctx, repoName, artifacts[i])
+		convertedArtifact, err := convert.ToActionArtifact(ctx, ctx.Repo.Repository, artifacts[i])
 		if err != nil {
 			ctx.Error(http.StatusInternalServerError, "ToActionArtifact", err)
 			return
@@ -999,14 +997,12 @@ func GetArtifacts(ctx *context.APIContext) {
 		return
 	}
 
-	repoName := ctx.Repo.Repository.FullName()
-
 	res := new(api.ActionArtifactsResponse)
 	res.TotalCount = total
 
 	res.Entries = make([]*api.ActionArtifact, len(artifacts))
 	for i := range artifacts {
-		convertedArtifact, err := convert.ToActionArtifact(ctx, repoName, artifacts[i])
+		convertedArtifact, err := convert.ToActionArtifact(ctx, ctx.Repo.Repository, artifacts[i])
 		if err != nil {
 			ctx.Error(http.StatusInternalServerError, "ToActionArtifact", err)
 			return
@@ -1054,8 +1050,7 @@ func GetArtifact(ctx *context.APIContext) {
 	}
 
 	if actions.IsArtifactV4(art) {
-		repoName := ctx.Repo.Repository.FullName()
-		convertedArtifact, err := convert.ToActionArtifact(ctx, repoName, art)
+		convertedArtifact, err := convert.ToActionArtifact(ctx, ctx.Repo.Repository, art)
 		if err != nil {
 			ctx.Error(http.StatusInternalServerError, "ToActionArtifact", err)
 			return

services/convert/convert.go

@@ -19,12 +19,12 @@ import (
 	"code.gitea.io/gitea/models/organization"
 	"code.gitea.io/gitea/models/perm"
 	access_model "code.gitea.io/gitea/models/perm/access"
+	"code.gitea.io/gitea/models/repo"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/container"
 	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/httplib"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
@@ -231,8 +231,8 @@ func ToActionTask(ctx context.Context, t *actions_model.ActionTask) (*api.Action
 }
 
 // ToActionArtifact convert a actions_model.ActionArtifact to an api.ActionArtifact
-func ToActionArtifact(ctx context.Context, repoName string, art *actions_model.ActionArtifact) (*api.ActionArtifact, error) {
-	url := httplib.MakeAbsoluteURL(ctx, setting.AppSubURL+"/api/v1/repos/"+repoName+"/actions/artifacts/"+fmt.Sprintf("%d", art.ID))
+func ToActionArtifact(ctx context.Context, repo *repo.Repository, art *actions_model.ActionArtifact) (*api.ActionArtifact, error) {
+	url := fmt.Sprintf("%s/actions/artifacts/%d", repo.APIURL(), art.ID)
 
 	return &api.ActionArtifact{
 		ID:                 art.ID,