TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Move getting person to own function

Browse source
This commit is contained in:
erik 2023-12-06 15:13:53 +01:00 • committed by Michael Jerger
parent 6d143e74cf
commit 2fb893843b
1 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -92,7 +92,43 @@ func searchUsersByPerson(actorId string) ([]*user_model.User, error) {
} }
// func getPersonByRest() func getPersonByRest(remoteStargazer, starReceiver string, ctx *context.APIContext) (ap.Person, error) {
client, err := api.NewClient(ctx, actionsUser, starReceiver) // The star receiver signs the http get request
if err != nil {
return ap.Person{}, err
}
// get_person_by_rest
bytes := []byte{0} // no body needed for getting user actor
response, err := client.Get(bytes, remoteStargazer)
if err != nil {
return ap.Person{}, err
}
defer response.Body.Close()
body, err := io.ReadAll(response.Body)
if err != nil {
return ap.Person{}, err
}
// parse response
person := ap.Person{}
err = person.UnmarshalJSON(body)
if err != nil {
return ap.Person{}, err
}
log.Info("remoteStargazer: %v", remoteStargazer)
log.Info("http client. %v", client)
log.Info("response: %v\n error: ", response, err)
log.Info("Person is: %v", person)
log.Info("Person Name is: %v", person.PreferredUsername)
log.Info("Person URL is: %v", person.URL)
return person, nil
}
// Repository function returns the Repository actor for a repo // Repository function returns the Repository actor for a repo
func Repository(ctx *context.APIContext) { func Repository(ctx *context.APIContext) {
@ -198,40 +234,8 @@ func RepositoryInbox(ctx *context.APIContext) {
} }
if len(users) == 0 { if len(users) == 0 {
// make http client
// TODO: Never use unvalidated input for actions - we have a validated actor already!
client, err := api.NewClient(ctx, actionsUser, starReceiver) // The star receiver signs the http get request person, err := getPersonByRest(remoteStargazer, starReceiver, ctx)
if err != nil {
panic(err)
}
// get_person_by_rest
bytes := []byte{0} // no body needed for getting user actor
response, err := client.Get(bytes, remoteStargazer)
if err != nil {
panic(err)
}
defer response.Body.Close()
body, err := io.ReadAll(response.Body)
if err != nil {
panic(err)
}
// parse response
person := ap.Person{}
err = person.UnmarshalJSON(body)
if err != nil {
panic(err)
}
log.Info("activity.Actor.GetID().String(): %v", activity.Actor.GetID().String())
log.Info("remoteStargazer: %v", remoteStargazer)
log.Info("http client. %v", client)
log.Info("response: %v\n error: ", response, err)
log.Info("Person is: %v", person)
log.Info("Person Name is: %v", person.PreferredUsername)
log.Info("Person URL is: %v", person.URL)
// create user // create user
// ToDo: We need a remote server with federation enabled to properly test this // ToDo: We need a remote server with federation enabled to properly test this