From afdf8a014236452e098ab1266c9a9315824f8103 Mon Sep 17 00:00:00 2001 From: Julio Capote Date: Mon, 19 Dec 2022 10:41:43 -0500 Subject: url helpers, cgi response format --- resources/outbox.go | 21 +++++++++------------ resources/profile.go | 9 +++------ 2 files changed, 12 insertions(+), 18 deletions(-) (limited to 'resources') diff --git a/resources/outbox.go b/resources/outbox.go index 4dd022b..93bed92 100644 --- a/resources/outbox.go +++ b/resources/outbox.go @@ -1,23 +1,20 @@ package resources import ( - "fmt" - "net/url" - "path" - + "git.capotej.com/capotej/communique/urls" "github.com/dgraph-io/badger/v3" "github.com/go-fed/activity/streams" ) func RenderOutboxPage(name, domain string, db *badger.DB) (map[string]interface{}, error) { - id, err := url.Parse(path.Join("https://", domain, "actors", name, "outbox") + "?page=true") + id, err := urls.UrlOutboxPage(name, domain) if err != nil { - return nil, fmt.Errorf("could not partse url: %w", err) + return nil, err } - partOf, err := url.Parse(path.Join("https://", domain, "actors", name, "outbox")) + partOf, err := urls.UrlOutbox(name, domain) if err != nil { - return nil, fmt.Errorf("could not partse url: %w", err) + return nil, err } oc := streams.NewActivityStreamsOrderedCollectionPage() @@ -69,15 +66,15 @@ func RenderOutboxPage(name, domain string, db *badger.DB) (map[string]interface{ } func RenderOutbox(name, domain string, db *badger.DB) (map[string]interface{}, error) { - id, err := url.Parse(path.Join("https://", domain, "actors", name, "outbox") + "?page=true") + id, err := urls.UrlOutbox(name, domain) if err != nil { - return nil, fmt.Errorf("could not partse url: %w", err) + return nil, err } - first, err := url.Parse(path.Join("https://", domain, "actors", name, "outbox") + "?page=true") + first, err := urls.UrlOutboxPage(name, domain) if err != nil { - return nil, fmt.Errorf("could not partse url: %w", err) + return nil, err } oc := streams.NewActivityStreamsOrderedCollection() diff --git a/resources/profile.go b/resources/profile.go index b62a9c5..971b11c 100644 --- a/resources/profile.go +++ b/resources/profile.go @@ -1,17 +1,14 @@ package resources import ( - "fmt" - "net/url" - "path" - + "git.capotej.com/capotej/communique/urls" "github.com/go-fed/activity/streams" ) func RenderProfile(name, domain string) (map[string]interface{}, error) { - u, err := url.Parse(path.Join("https://", domain, "actors", name, "inbox")) + u, err := urls.UrlInbox(name, domain) if err != nil { - return nil, fmt.Errorf("could not partse url: %w", err) + return nil, err } inb := streams.NewActivityStreamsInboxProperty() -- cgit v1.2.3