drop image:{} in local actors

dimkr · Jul 3, 2024 · ff7a670 · ff7a670
1 parent ef51bad
commit ff7a670
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/ap/actor.go b/ap/actor.go
@@ -43,7 +43,7 @@ type Actor struct {
 	Followers                 string            `json:"followers,omitempty"`
 	PublicKey                 PublicKey         `json:"publicKey"`
 	Icon                      Array[Attachment] `json:"icon,omitempty"`
-	Image                     Attachment        `json:"image,omitempty"`
+	Image                     *Attachment       `json:"image,omitempty"`
 	ManuallyApprovesFollowers bool              `json:"manuallyApprovesFollowers"`
 	AlsoKnownAs               Audience          `json:"alsoKnownAs,omitempty"`
 	Published                 *Time             `json:"published"`

diff --git a/front/outbox.go b/front/outbox.go
@@ -219,7 +219,7 @@ func (h *Handler) userOutbox(w text.Writer, r *request, args ...string) {
 		showSeparator = true
 	}
 
-	if offset == 0 && actor.Image.URL != "" {
+	if offset == 0 && actor.Image != nil && actor.Image.URL != "" {
 		w.Link(actor.Image.URL, "Header")
 		showSeparator = true
 	}

diff --git a/migrations/030_noimage.go b/migrations/030_noimage.go
@@ -0,0 +1,11 @@
+package migrations
+
+import (
+	"context"
+	"database/sql"
+)
+
+func noimage(ctx context.Context, domain string, tx *sql.Tx) error {
+	_, err := tx.ExecContext(ctx, `UPDATE persons SET actor = json_remove(actor, '$.image') WHERE host = ?`, domain)
+	return err
+}