From 78fc75135fd5287b35701349b4d846eb3ffd578e Mon Sep 17 00:00:00 2001 From: erik Date: Thu, 16 Nov 2023 15:02:20 +0100 Subject: [PATCH] Rename to ActorData --- models/activitypub/actor.go | 4 ++-- routers/api/v1/activitypub/repository.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/models/activitypub/actor.go b/models/activitypub/actor.go index 5b70a184b9..dfe0009214 100644 --- a/models/activitypub/actor.go +++ b/models/activitypub/actor.go @@ -14,7 +14,7 @@ type ActorData struct { port string // optional } -func (a ActorData) ValidateActor() error { +func (a ActorData) ValidateActorData() error { if a.schema == "" || a.host == "" { return fmt.Errorf("the actor ID was not valid: Invalid Schema or Host") @@ -28,7 +28,7 @@ func (a ActorData) ValidateActor() error { } -func ParseActor(actor string) (ActorData, error) { +func ParseActorData(actor string) (ActorData, error) { u, err := url.Parse(actor) // check if userID IRI is well formed url diff --git a/routers/api/v1/activitypub/repository.go b/routers/api/v1/activitypub/repository.go index be7e21592b..c59b3e5f65 100644 --- a/routers/api/v1/activitypub/repository.go +++ b/routers/api/v1/activitypub/repository.go @@ -78,7 +78,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. // parse actor - actor, err := activitypub.ParseActor(opt.Actor.GetID().String()) + actor, err := activitypub.ParseActorData(opt.Actor.GetID().String()) // Is the actor IRI well formed? if err != nil { @@ -86,7 +86,7 @@ func RepositoryInbox(ctx *context.APIContext) { } // Is the ActorData Struct valid? - err = actor.ValidateActor() + err = actor.ValidateActorData() if err != nil { panic(err)