foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-21 08:31:27 -05:00
Code Issues Wiki Activity

fix most of the tests

Browse source
This commit is contained in:
Michael Jerger 2023-12-15 16:02:50 +01:00
parent 9e6c45f87d
commit 1704ac5bc2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/forgefed/star_test.go
View file

@ -31,7 +31,7 @@ func Test_StarMarshalJSON(t *testing.T) {
Object: ap.IRI("https://codeberg.org/api/v1/activitypub/repository-id/1"), Object: ap.IRI("https://codeberg.org/api/v1/activitypub/repository-id/1"),
}, },
}, },
want: []byte(`{"source":"forgejo","type":"Star","actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1","object":"https://codeberg.org/api/activitypub/repository-id/1"}`), want: []byte(`{"source":"forgejo","type":"Star","actor":"https://repo.prod.meissa.de/api/v1/activitypub/user-id/1","object":"https://codeberg.org/api/v1/activitypub/repository-id/1"}`),
}, },
} }

4
routers/api/v1/activitypub/repository.go
View file

@ -110,7 +110,7 @@ func RepositoryInbox(ctx *context.APIContext) {
// Check if user already exists // Check if user already exists
users, err := SearchUsersByLoginName(actorAsLoginId) users, err := SearchUsersByLoginName(actorAsLoginId)
if err != nil { if err != nil {
ctx.ServerError(fmt.Sprintf("Searching for user failed: %v"), err) ctx.ServerError("Searching for user failed", err)
return return
} }
log.Info("RepositoryInbox: local found users: %v", len(users)) log.Info("RepositoryInbox: local found users: %v", len(users))
@ -120,7 +120,7 @@ func RepositoryInbox(ctx *context.APIContext) {
{ {
user, err = createUserFromAP(ctx, actorId) user, err = createUserFromAP(ctx, actorId)
if err != nil { if err != nil {
ctx.ServerError(fmt.Sprintf("Searching for user failed: %v"), err) ctx.ServerError("Searching for user failed", err)
return return
} }
log.Info("RepositoryInbox: created user from ap: %v", user) log.Info("RepositoryInbox: created user from ap: %v", user)