diff options
| author | FChannel <> | 2021-06-28 08:18:14 -0700 |
|---|---|---|
| committer | FChannel <> | 2021-06-28 08:18:14 -0700 |
| commit | 34fa3d38b97ff08130e8709c4820915dfd684b19 (patch) | |
| tree | 36e0f9cf2d58ab6b915b29bda515ac662dbcae55 /outboxGet.go | |
| parent | e3eba9b6c64b1e8d884a51638deca0078f2f4760 (diff) | |
| parent | ea9b7878dcbcedce3669eb2df23a14546f7188af (diff) | |
Merge with master
Diffstat (limited to 'outboxGet.go')
| -rw-r--r-- | outboxGet.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/outboxGet.go b/outboxGet.go index 49b7bd5..4064f0b 100644 --- a/outboxGet.go +++ b/outboxGet.go @@ -16,7 +16,7 @@ func GetActorOutbox(w http.ResponseWriter, r *http.Request, db *sql.DB) { collection.TotalItems = GetObjectPostsTotalDB(db, actor) collection.TotalImgs = GetObjectImgsTotalDB(db, actor) - enc, _ := json.MarshalIndent(collection, "", "\t") + enc, _ := json.Marshal(collection) w.Header().Set("Content-Type", activitystreams) w.Write(enc) @@ -45,7 +45,7 @@ func GetCollectionFromPath(db *sql.DB, path string) Collection { CheckError(err, "error scan object into post struct from path") - post.Actor = &actor + post.Actor = actor.Id post.InReplyTo = GetInReplyToDB(db, post) @@ -88,9 +88,9 @@ func GetObjectFromPath(db *sql.DB, path string) ObjectBase{ var previewID string var nActor Actor - nObj.Actor = &nActor + nObj.Actor = nActor.Id - err = rows.Scan(&nObj.Id, &nObj.Name, &nObj.Content, &nObj.Type, &nObj.Published, &nObj.AttributedTo, &attachID, &previewID, &nObj.Actor.Id) + err = rows.Scan(&nObj.Id, &nObj.Name, &nObj.Content, &nObj.Type, &nObj.Published, &nObj.AttributedTo, &attachID, &previewID, &nObj.Actor) CheckError(err, "error scan object into post struct from path") |