TakeV
/
forgejo
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make gofmt happy

This commit is contained in:
Gusted 2022-08-22 18:48:17 +02:00
parent b9dd4a2f5f
commit 819e495dc0
No known key found for this signature in database
GPG Key ID: FD821B732837125F
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/activitypub/authorize_interaction.go
View File

@ -64,7 +64,7 @@ func AuthorizeInteraction(ctx *context.Context) {
ctx.ServerError("repositoryIRIToName", err) ctx.ServerError("repositoryIRIToName", err)
return return
} }
ctx.Redirect(username+"/"+reponame) ctx.Redirect(username + "/" + reponame)
} }
ctx.Status(http.StatusOK) ctx.Status(http.StatusOK)

6
modules/activitypub/iri.go
View File

@ -83,9 +83,11 @@ func repositoryIRIToOwnerIRI(repoIRI ap.IRI) (ap.IRI, error) {
r := repoIRI.String() r := repoIRI.String()
rSplit := strings.Split(r, "/") rSplit := strings.Split(r, "/")
if len(rSplit) < 5 { if len(rSplit) < 5 {
return "", errors.New("Not a Repository actor IRI") return "", errors.New("not a Repository actor IRI")
} }
username := rSplit[len(rSplit)-2] username := rSplit[len(rSplit)-2]
reponame := rSplit[len(rSplit)-1] reponame := rSplit[len(rSplit)-1]
return ap.IRI(strings.TrimSuffix(r, "repo/"+username+"/"+reponame)+"user/"+username), nil ownerIRI := ap.IRI(strings.TrimSuffix(r, "repo/"+username+"/"+reponame) + "user/" + username)
return ownerIRI, nil
} }

2
modules/activitypub/repo.go
View File

@ -8,8 +8,8 @@ import (
"context" "context"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
repo_service "code.gitea.io/gitea/services/repository"
"code.gitea.io/gitea/modules/forgefed" "code.gitea.io/gitea/modules/forgefed"
repo_service "code.gitea.io/gitea/services/repository"
) )
// Create a new federated repo from a Repository object // Create a new federated repo from a Repository object

2
modules/forgefed/forgefed.go
View File

@ -31,7 +31,7 @@ func GetItemByType(typ ap.ActivityVocabularyType) (ap.Item, error) {
// JSONUnmarshalerFn is the type of the function that will load the data from a fastjson.Value into an Item // JSONUnmarshalerFn is the type of the function that will load the data from a fastjson.Value into an Item
// that the go-ap/activitypub package doesn't know about. // that the go-ap/activitypub package doesn't know about.
func JSONUnmarshalerFn(typ ap.ActivityVocabularyType, val *fastjson.Value, i ap.Item) error { func JSONUnmarshalerFn(typ ap.ActivityVocabularyType, val *fastjson.Value, i ap.Item) error {
switch typ { switch typ {
case CommitType: case CommitType:
return OnCommit(i, func(c *Commit) error { return OnCommit(i, func(c *Commit) error {