aboutsummaryrefslogtreecommitdiff
path: root/activitypub/util.go
diff options
context:
space:
mode:
authorFChannel <>2022-06-12 15:36:19 -0700
committerFChannel <>2022-06-19 12:53:29 -0700
commitf57d5722e6f2187bea249240eb14c881f989c3c1 (patch)
treeef8f4d23f9c40e0b0ba1ab2efb03e3795efe8ec0 /activitypub/util.go
parentdac4b267cab31fb3a4ce301f1bcdf364fcb541a1 (diff)
first pass on federation working
Diffstat (limited to 'activitypub/util.go')
-rw-r--r--activitypub/util.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/activitypub/util.go b/activitypub/util.go
index 274493f..a55e4c4 100644
--- a/activitypub/util.go
+++ b/activitypub/util.go
@@ -159,7 +159,7 @@ func GetActivityFromJson(ctx *fiber.Ctx) (Activity, error) {
}
nActivity.Name = respActivity.Name
- nActivity.Object = &jObj
+ nActivity.Object = jObj
} else if err != nil {
return nActivity, util.MakeError(err, "GetActivityFromJson")
}
@@ -351,7 +351,7 @@ func GetActorFromDB(id string) (Actor, error) {
err := config.DB.QueryRow(query, id).Scan(&nActor.Type, &nActor.Id, &nActor.Name, &nActor.PreferredUsername, &nActor.Inbox, &nActor.Outbox, &nActor.Following, &nActor.Followers, &nActor.Restricted, &nActor.Summary, &publicKeyPem)
if err != nil {
- return nActor, nil
+ return nActor, util.MakeError(err, "GetActorFromDB")
}
nActor.PublicKey, err = GetActorPemFromDB(publicKeyPem)