mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-30 20:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix CI errors by adding @context to Person() and making sure types match

Browse source
This commit is contained in:
Anthony Wang 2022-06-10 11:04:07 -05:00
parent 46cab80ef4
commit 86a3221563
No known key found for this signature in database
GPG key ID: BC96B00AEC5F2D76
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
integrations/api_activitypub_person_test.go
View file

@ -38,9 +38,9 @@ func TestActivityPubPerson(t *testing.T) {
err := person.UnmarshalJSON(resp.Body.Bytes()) err := person.UnmarshalJSON(resp.Body.Bytes())
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "Person", person.Type) assert.Equal(t, ap.ActivityVocabularyType("Person"), person.Type)
assert.Equal(t, username, person.Name) assert.Equal(t, username, person.Name.String())
keyID := person.ID.String() keyID := person.GetID().String()
assert.Regexp(t, fmt.Sprintf("activitypub/user/%s$", username), keyID) assert.Regexp(t, fmt.Sprintf("activitypub/user/%s$", username), keyID)
assert.Regexp(t, fmt.Sprintf("activitypub/user/%s/outbox$", username), person.Outbox.GetID().String()) assert.Regexp(t, fmt.Sprintf("activitypub/user/%s/outbox$", username), person.Outbox.GetID().String())
assert.Regexp(t, fmt.Sprintf("activitypub/user/%s/inbox$", username), person.Inbox.GetID().String()) assert.Regexp(t, fmt.Sprintf("activitypub/user/%s/inbox$", username), person.Inbox.GetID().String())

2
routers/api/v1/activitypub/person.go
View file

@ -75,6 +75,8 @@ func Person(ctx *context.APIContext) {
ctx.Error(http.StatusInternalServerError, "Unmarshall", err) ctx.Error(http.StatusInternalServerError, "Unmarshall", err)
} }
jsonmap["@context"] = "https://www.w3.org/ns/activitystreams"
ctx.JSON(http.StatusOK, jsonmap) ctx.JSON(http.StatusOK, jsonmap)
} }