WIP Use non generated HTTP client
This commit is contained in:
parent
4b490802d7
commit
0388240039
1 changed files with 20 additions and 17 deletions
|
@ -9,16 +9,14 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"code.gitea.io/gitea/models/activitypub"
|
"code.gitea.io/gitea/models/activitypub"
|
||||||
api "code.gitea.io/gitea/modules/activitypub2"
|
api "code.gitea.io/gitea/modules/activitypub"
|
||||||
"code.gitea.io/gitea/modules/context"
|
"code.gitea.io/gitea/modules/context"
|
||||||
"code.gitea.io/gitea/modules/forgefed"
|
"code.gitea.io/gitea/modules/forgefed"
|
||||||
"code.gitea.io/gitea/modules/log"
|
"code.gitea.io/gitea/modules/log"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/modules/web"
|
"code.gitea.io/gitea/modules/web"
|
||||||
|
|
||||||
apiPerson "code.gitea.io/gitea/modules/activitypub2/activitypub"
|
|
||||||
ap "github.com/go-ap/activitypub"
|
ap "github.com/go-ap/activitypub"
|
||||||
"github.com/go-openapi/strfmt"
|
|
||||||
//f3 "lab.forgefriends.org/friendlyforgeformat/gof3"
|
//f3 "lab.forgefriends.org/friendlyforgeformat/gof3"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -81,7 +79,7 @@ func RepositoryInbox(ctx *context.APIContext) {
|
||||||
|
|
||||||
// assume actor is: "actor": "https://codeberg.org/api/v1/activitypub/user-id/12345" - NB: This might be actually the ID? Maybe check vocabulary.
|
// assume actor is: "actor": "https://codeberg.org/api/v1/activitypub/user-id/12345" - NB: This might be actually the ID? Maybe check vocabulary.
|
||||||
// parse actor
|
// parse actor
|
||||||
actor, err := activitypub.ParseActorFromStarActivity(opt) // ToDo: somehow extract source from star activity
|
actor, err := activitypub.ParseActorFromStarActivity(opt)
|
||||||
|
|
||||||
// Is the actor IRI well formed?
|
// Is the actor IRI well formed?
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -93,21 +91,26 @@ func RepositoryInbox(ctx *context.APIContext) {
|
||||||
|
|
||||||
log.Info("RepositoryInbox: Actor parsed. %v", actor)
|
log.Info("RepositoryInbox: Actor parsed. %v", actor)
|
||||||
|
|
||||||
|
/*
|
||||||
|
Make http client, this should make a get request on given url
|
||||||
|
We then need to parse the answer and put it into a person-struct
|
||||||
|
fill the person struct using some kind of unmarshall function given in
|
||||||
|
activitypub package/actor.go
|
||||||
|
*/
|
||||||
|
|
||||||
|
// make http client
|
||||||
|
client, err := api.NewClient(ctx, ctx.Doer, opt.To.GetID().String()) // ToDo: This is hacky, we need a hostname from somewhere
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
// get_person_by_rest
|
// get_person_by_rest
|
||||||
c := api.NewHTTPClientWithConfig(
|
bytes := []byte{0}
|
||||||
strfmt.Default,
|
target := opt.ID.GetID().String()
|
||||||
api.DefaultTransportConfig().
|
response, err := client.Get(bytes, target)
|
||||||
WithHost(actor.GetHostAndPort()).
|
|
||||||
WithBasePath("/api/v1/"). // ToDo: Is there a need to get the base path dynamically?
|
|
||||||
WithSchemes([]string{"http", "https"}))
|
|
||||||
//c := client.Default
|
|
||||||
|
|
||||||
person, err := c.Activitypub.ActivitypubPerson(
|
log.Info("http client. %v", client)
|
||||||
apiPerson.NewActivitypubPersonParams().
|
log.Info("person: %v\n error: ", response, err)
|
||||||
WithUserID(int64(actor.GetUserId())), nil)
|
|
||||||
|
|
||||||
log.Info("http client. %v", c)
|
|
||||||
log.Info("person: %v\n error: ", person, err)
|
|
||||||
|
|
||||||
// create_user_from_person (if not alreaydy present)
|
// create_user_from_person (if not alreaydy present)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue