From 1892327cee2c3fa1d3bea729bd08eb63c2189a96 Mon Sep 17 00:00:00 2001 From: FChannel <> Date: Sat, 30 Apr 2022 11:00:55 -0700 Subject: restructured code base to prevent circular dependicies --- outboxGet.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'outboxGet.go') diff --git a/outboxGet.go b/outboxGet.go index 6e7bd47..27e9cc4 100644 --- a/outboxGet.go +++ b/outboxGet.go @@ -7,19 +7,19 @@ import ( "github.com/FChannel0/FChannel-Server/activitypub" "github.com/FChannel0/FChannel-Server/config" - "github.com/FChannel0/FChannel-Server/db" + "github.com/FChannel0/FChannel-Server/webfinger" _ "github.com/lib/pq" ) func GetActorOutbox(w http.ResponseWriter, r *http.Request) error { - actor, err := db.GetActorFromPath(r.URL.Path, "/") + actor, err := webfinger.GetActorFromPath(r.URL.Path, "/") if err != nil { return err } var collection activitypub.Collection - c, err := db.GetActorObjectCollectionFromDB(actor.Id) + c, err := activitypub.GetActorObjectCollectionFromDB(actor.Id) if err != nil { return err } @@ -28,12 +28,12 @@ func GetActorOutbox(w http.ResponseWriter, r *http.Request) error { collection.AtContext.Context = "https://www.w3.org/ns/activitystreams" collection.Actor = &actor - collection.TotalItems, err = db.GetObjectPostsTotalDB(actor) + collection.TotalItems, err = activitypub.GetObjectPostsTotalDB(actor) if err != nil { return err } - collection.TotalImgs, err = db.GetObjectImgsTotalDB(actor) + collection.TotalImgs, err = activitypub.GetObjectImgsTotalDB(actor) if err != nil { return err } -- cgit v1.2.3