Skip to content

Commit 26514c9

Browse files
committed
use MakeAbsoluteURL
1 parent ef5b069 commit 26514c9

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

services/convert/convert.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package convert
77
import (
88
"context"
99
"fmt"
10+
"net/url"
1011
"strconv"
1112
"strings"
1213
"time"
@@ -24,6 +25,7 @@ import (
2425
user_model "code.gitea.io/gitea/models/user"
2526
"code.gitea.io/gitea/modules/container"
2627
"code.gitea.io/gitea/modules/git"
28+
"code.gitea.io/gitea/modules/httplib"
2729
"code.gitea.io/gitea/modules/log"
2830
"code.gitea.io/gitea/modules/setting"
2931
api "code.gitea.io/gitea/modules/structs"
@@ -231,7 +233,7 @@ func ToActionTask(ctx context.Context, t *actions_model.ActionTask) (*api.Action
231233

232234
// ToActionArtifact convert a actions_model.ActionArtifact to an api.ActionArtifact
233235
func ToActionArtifact(ctx context.Context, repoName string, art *actions_model.ActionArtifact) (*api.ActionArtifact, error) {
234-
url := strings.TrimSuffix(setting.AppURL, "/") + "/api/v1/repos/" + repoName + "/actions/artifacts/" + fmt.Sprintf("%d", art.ID)
236+
url := httplib.MakeAbsoluteURL(ctx, setting.AppSubURL+"/api/v1/repos/"+url.PathEscape(repoName)+"/actions/artifacts/"+fmt.Sprintf("%d", art.ID))
235237

236238
return &api.ActionArtifact{
237239
ID: art.ID,

0 commit comments

Comments
 (0)