Adjust Create{Note} activity to match Betula

Author: bouncepaw

activitypub/activitypub.go

@@ -70,7 +70,7 @@ type Outbox struct {
 
 // OutboxItem represents a single activity in an outbox.
 type OutboxItem struct {
-	Context   string       `json:"@context"`
+	Context   any          `json:"@context"`
 	ID        string       `json:"id"`
 	Type      string       `json:"type"`
 	Actor     string       `json:"actor"`
@@ -95,6 +95,14 @@ type OutboxObject struct {
 	Published    string            `json:"published"`
 	Tag          []Tag             `json:"tag"`
 	Replies      map[string]string `json:"replies"`
+	Name         string            `json:"name"`
+	Source       SourceObject      `json:"source"`
+	Attachments  []Attachment      `json:"attachment"`
+}
+
+type SourceObject struct {
+	Content   string `json:"content"`
+	MediaType string `json:"mediaType"`
 }
 
 // Tag represents a tag or mention in ActivityPub content.
@@ -208,9 +216,10 @@ type FollowResponseObject struct {
 // Attachment represents a media attachment in an ActivityPub post.
 type Attachment struct {
 	Type      string `json:"type"`
-	MediaType string `json:"mediaType"`
-	URL       string `json:"url"`
-	Name      string `json:"name"`
+	MediaType string `json:"mediaType,omitempty"`
+	URL       string `json:"url,omitempty"`
+	Href      string `json:"href,omitempty"`
+	Name      string `json:"name,omitempty"`
 }
 
 // https://docs.joinmastodon.org/spec/security/#ld

webapp/activitypub.go

@@ -95,10 +95,15 @@ func apCreateBookmarkItem(c *gin.Context, b *model.Bookmark, actor string) *ap.O
 		body = fmt.Sprintf("<p>%s</p>", truncate(b.Notes, 350-len(title)))
 	}
 	item := &ap.OutboxItem{
-		Context: "https://www.w3.org/ns/activitystreams",
-		ID:      id + "#activity",
-		Type:    createAction,
-		Actor:   actor,
+		Context: []any{
+			"https://www.w3.org/ns/activitystreams",
+			map[string]string{
+				"Hashtag": "https://www.w3.org/ns/activitystreams#Hashtag",
+			},
+		},
+		ID:    id + "#activity",
+		Type:  createAction,
+		Actor: actor,
 		To: []string{
 			"https://www.w3.org/ns/activitystreams#Public",
 		},
@@ -107,10 +112,10 @@ func apCreateBookmarkItem(c *gin.Context, b *model.Bookmark, actor string) *ap.O
 		Object: ap.OutboxObject{
 			ID:           id,
 			Type:         noteAction,
-			Summary:      "",
 			Content:      fmt.Sprintf(contentTpl, b.URL, title, body, id),
-			URL:          b.URL,
+			URL:          id,
 			URI:          b.URL,
+			Summary:      "",
 			AttributedTo: actor,
 			To: []string{
 				"https://www.w3.org/ns/activitystreams#Public",
@@ -119,14 +124,25 @@ func apCreateBookmarkItem(c *gin.Context, b *model.Bookmark, actor string) *ap.O
 			Published: published,
 			Tag:       make([]ap.Tag, len(b.Tags)),
 			Replies:   map[string]string{},
+			Name:      b.Title,
+			Source: ap.SourceObject{
+				Content:   b.Notes,
+				MediaType: "text/plain",
+			},
+			Attachments: []ap.Attachment{
+				{
+					Type: "Link",
+					Href: b.URL,
+				},
+			},
 		},
 	}
 	for i, t := range b.Tags {
 		tagBase := getFullURL(c, fmt.Sprintf("%s?tag=", URLFor("Public bookmarks")))
 		item.Object.Tag[i] = ap.Tag{
 			Type: "Hashtag",
 			Href: tagBase + t.Text,
-			Name: t.Text,
+			Name: "#" + t.Text,
 		}
 	}
 	return item