Switch back to mainline go-ap

Marius merged my last go-ap patch (https://lists.sr.ht/~mariusor/activitypub-go/%3Cf23190d1-1376-6ad1-63ee-9c0d291d1eb5%40exozy.me%3E#%3C20230218114214.b5hecpabruk66g7r@slate%3E) so we no longer have to use my custom fork

5 files changed, 16 insertions, 16 deletions

diff --git a/modules/forgefed/branch.go b/modules/forgefed/branch.go
index 5e20b6ef4..9e122d60c 100644
--- a/modules/forgefed/branch.go
+++ b/modules/forgefed/branch.go
@@ -36,7 +36,7 @@ func (b Branch) MarshalJSON() ([]byte, error) {
 
 	bin = bin[:len(bin)-1]
 	if b.Ref != nil {
-		ap.JSONWriteItemJSONProp(&bin, "ref", b.Ref)
+		ap.JSONWriteItemProp(&bin, "ref", b.Ref)
 	}
 	ap.JSONWrite(&bin, '}')
 	return bin, nil
diff --git a/modules/forgefed/commit.go b/modules/forgefed/commit.go
index b8c0bf3eb..f1234b796 100644
--- a/modules/forgefed/commit.go
+++ b/modules/forgefed/commit.go
@@ -39,10 +39,10 @@ func (c Commit) MarshalJSON() ([]byte, error) {
 
 	b = b[:len(b)-1]
 	if !c.Created.IsZero() {
-		ap.JSONWriteTimeJSONProp(&b, "created", c.Created)
+		ap.JSONWriteTimeProp(&b, "created", c.Created)
 	}
 	if !c.Committed.IsZero() {
-		ap.JSONWriteTimeJSONProp(&b, "committed", c.Committed)
+		ap.JSONWriteTimeProp(&b, "committed", c.Committed)
 	}
 	ap.JSONWrite(&b, '}')
 	return b, nil
diff --git a/modules/forgefed/push.go b/modules/forgefed/push.go
index 9881aac49..74acdd3ae 100644
--- a/modules/forgefed/push.go
+++ b/modules/forgefed/push.go
@@ -40,13 +40,13 @@ func (p Push) MarshalJSON() ([]byte, error) {
 
 	b = b[:len(b)-1]
 	if p.Target != nil {
-		ap.JSONWriteItemJSONProp(&b, "target", p.Target)
+		ap.JSONWriteItemProp(&b, "target", p.Target)
 	}
 	if p.HashBefore != nil {
-		ap.JSONWriteItemJSONProp(&b, "hashBefore", p.HashBefore)
+		ap.JSONWriteItemProp(&b, "hashBefore", p.HashBefore)
 	}
 	if p.HashAfter != nil {
-		ap.JSONWriteItemJSONProp(&b, "hashAfter", p.HashAfter)
+		ap.JSONWriteItemProp(&b, "hashAfter", p.HashAfter)
 	}
 	ap.JSONWrite(&b, '}')
 	return b, nil
diff --git a/modules/forgefed/repository.go b/modules/forgefed/repository.go
index 71701d9f3..63680ccd3 100644
--- a/modules/forgefed/repository.go
+++ b/modules/forgefed/repository.go
@@ -41,13 +41,13 @@ func (r Repository) MarshalJSON() ([]byte, error) {
 
 	b = b[:len(b)-1]
 	if r.Team != nil {
-		ap.JSONWriteItemJSONProp(&b, "team", r.Team)
+		ap.JSONWriteItemProp(&b, "team", r.Team)
 	}
 	if r.Forks != nil {
-		ap.JSONWriteItemJSONProp(&b, "forks", r.Forks)
+		ap.JSONWriteItemProp(&b, "forks", r.Forks)
 	}
 	if r.ForkedFrom != nil {
-		ap.JSONWriteItemJSONProp(&b, "forkedFrom", r.ForkedFrom)
+		ap.JSONWriteItemProp(&b, "forkedFrom", r.ForkedFrom)
 	}
 	ap.JSONWrite(&b, '}')
 	return b, nil
diff --git a/modules/forgefed/ticket.go b/modules/forgefed/ticket.go
index be2607001..1759de547 100644
--- a/modules/forgefed/ticket.go
+++ b/modules/forgefed/ticket.go
@@ -49,23 +49,23 @@ func (t Ticket) MarshalJSON() ([]byte, error) {
 
 	b = b[:len(b)-1]
 	if t.Dependants != nil {
-		ap.JSONWriteItemCollectionJSONProp(&b, "dependants", t.Dependants)
+		ap.JSONWriteItemCollectionProp(&b, "dependants", t.Dependants)
 	}
 	if t.Dependencies != nil {
-		ap.JSONWriteItemCollectionJSONProp(&b, "dependencies", t.Dependencies)
+		ap.JSONWriteItemCollectionProp(&b, "dependencies", t.Dependencies)
 	}
-	ap.JSONWriteBoolJSONProp(&b, "isResolved", t.IsResolved)
+	ap.JSONWriteBoolProp(&b, "isResolved", t.IsResolved)
 	if t.ResolvedBy != nil {
-		ap.JSONWriteItemJSONProp(&b, "resolvedBy", t.ResolvedBy)
+		ap.JSONWriteItemProp(&b, "resolvedBy", t.ResolvedBy)
 	}
 	if !t.Resolved.IsZero() {
-		ap.JSONWriteTimeJSONProp(&b, "resolved", t.Resolved)
+		ap.JSONWriteTimeProp(&b, "resolved", t.Resolved)
 	}
 	if t.Origin != nil {
-		ap.JSONWriteItemJSONProp(&b, "origin", t.Origin)
+		ap.JSONWriteItemProp(&b, "origin", t.Origin)
 	}
 	if t.Target != nil {
-		ap.JSONWriteItemJSONProp(&b, "target", t.Target)
+		ap.JSONWriteItemProp(&b, "target", t.Target)
 	}
 	ap.JSONWrite(&b, '}')
 	return b, nil