NPM Packages: change Metadata.RepositoryUrl to Metadata.Repository.URL

Mai-Lapyst · Mai-Lapyst · commit af00cce93b16 · 2023-03-28T11:40:12.000+02:00
diff --git a/modules/packages/npm/metadata.go b/modules/packages/npm/metadata.go
@@ -14,7 +14,6 @@ type Metadata struct {
 	Author                  string            `json:"author,omitempty"`
 	License                 string            `json:"license,omitempty"`
 	ProjectURL              string            `json:"project_url,omitempty"`
-	RepositoryURL           string            `json:"repository_url,omitempty"`
 	Keywords                []string          `json:"keywords,omitempty"`
 	Dependencies            map[string]string `json:"dependencies,omitempty"`
 	DevelopmentDependencies map[string]string `json:"development_dependencies,omitempty"`
diff --git a/routers/api/packages/npm/npm.go b/routers/api/packages/npm/npm.go
@@ -169,7 +169,7 @@ func UploadPackage(ctx *context.Context) {
 		return
 	}
 
-	repo, err := repo_model.GetRepositoryByURL(ctx, npmPackage.Metadata.RepositoryURL)
+	repo, err := repo_model.GetRepositoryByURL(ctx, npmPackage.Metadata.Repository.URL)
 	if err == nil {
 		canWrite := repo.OwnerID == ctx.Doer.ID
 

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func UploadPackage(ctx *context.Context) {`
`169`	`169`	`return`
`170`	`170`	`}`
`171`	`171`
`172`		`- repo, err := repo_model.GetRepositoryByURL(ctx, npmPackage.Metadata.RepositoryURL)`
	`172`	`+ repo, err := repo_model.GetRepositoryByURL(ctx, npmPackage.Metadata.Repository.URL)`
`173`	`173`	`if err == nil {`
`174`	`174`	`canWrite := repo.OwnerID == ctx.Doer.ID`
`175`	`175`