cmd/bsky-webhook: address review feedback

Author: Erisa

.gitignore

@@ -0,0 +1 @@
+.env

cmd/bsky-webhook/facets.go

@@ -1,44 +1,42 @@
 package main
 
 import (
+	"cmp"
 	"fmt"
 	"slices"
 	"strings"
 )
 
-func bskyMessageToSlackMarkup(bskyMessage BskyMessage) (string, error) {
-	var slackStringBuilder strings.Builder
+func (b BskyTextFragment) featureURI() string {
+	for _, feat := range b.Features {
+		switch feat.URI {
+		case "app.bsky.richtext.facet#link":
+			return feat.URI
+		case "app.bsky.richtext.facet#mention":
+			return fmt.Sprintf("https://bsky.app/profile/%s", feat.DID)
+		case "app.bsky.richtext.facet#tag":
+			return fmt.Sprintf("https://bsky.app/hashtag/%s", feat.Tag)
+		}
+	}
+	return ""
+}
+
+func bskyMessageToSlackMarkup(msg BskyMessage) (string, error) {
+	var sb strings.Builder
 
-	fragments, err := facetsToFragments(bskyMessage)
+	fragments, err := facetsToFragments(msg)
 	if err != nil {
 		return "", err
 	}
 
-	for _, fragment := range fragments {
-		if fragment.Features == nil {
-			slackStringBuilder.WriteString(fragment.Text)
+	for _, frag := range fragments {
+		if uri := frag.featureURI(); uri != "" {
+			fmt.Fprintf(&sb, "<%s|%s>", uri, frag.Text)
 		} else {
-			uri := ""
-			for _, feature := range fragment.Features {
-				if feature.Type == "app.bsky.richtext.facet#link" {
-					uri = feature.Uri
-					break
-				} else if feature.Type == "app.bsky.richtext.facet#mention" {
-					uri = fmt.Sprintf("https://bsky.app/profile/%s", feature.Did)
-					break
-				} else if feature.Type == "app.bsky.richtext.facet#tag" {
-					uri = fmt.Sprintf("https://bsky.app/hashtag/%s", feature.Tag)
-				}
-			}
-			if uri != "" {
-				slackStringBuilder.WriteString(fmt.Sprintf("<%s|%s>", uri, fragment.Text))
-			} else {
-				slackStringBuilder.WriteString(fragment.Text)
-			}
+			sb.WriteString(frag.Text)
 		}
 	}
-
-	return slackStringBuilder.String(), nil
+	return sb.String(), nil
 }
 
 func facetsToFragments(bskyMessage BskyMessage) ([]BskyTextFragment, error) {
@@ -47,8 +45,9 @@ func facetsToFragments(bskyMessage BskyMessage) ([]BskyTextFragment, error) {
 
 	fragments := []BskyTextFragment{}
 
+	// We use SortStable here as we want the original order of equal elements to stay the same.
 	slices.SortStableFunc(facets, func(a, b BskyFacet) int {
-		return a.Index.ByteStart - b.Index.ByteStart
+		return cmp.Compare(a.Index.ByteStart, b.Index.ByteStart)
 	})
 
 	textCursor := 0

cmd/bsky-webhook/main.go

@@ -237,7 +237,7 @@ func readJetstreamMessage(ctx context.Context, jetstreamMessageEncoded []byte, b
 	}
 
 	// parse timestamp user provided when posting
-	postTime, err := time.Parse(time.RFC3339, bskyMessage.Commit.Record.CreatedAtString)
+	postTime, err := time.Parse(time.RFC3339, bskyMessage.Commit.Record.CreatedAt)
 	if err != nil {
 		return err
 	}
@@ -260,7 +260,7 @@ func readJetstreamMessage(ctx context.Context, jetstreamMessageEncoded []byte, b
 			var imageURL string
 
 			if len(bskyMessage.Commit.Record.Embed.Images) != 0 {
-				imageURL = fmt.Sprintf("https://cdn.bsky.app/img/feed_fullsize/plain/%s/%s", bskyMessage.Did, bskyMessage.Commit.Record.Embed.Images[0].Image.Ref.Link)
+				imageURL = fmt.Sprintf("https://cdn.bsky.app/img/feed_fullsize/plain/%s/%s", bskyMessage.DID, bskyMessage.Commit.Record.Embed.Images[0].Image.Ref.Link)
 			}
 
 			err = sendToSlack(ctx, jetstreamMessageStr, bskyMessage, imageURL, *profile, postTime)
@@ -274,7 +274,7 @@ func readJetstreamMessage(ctx context.Context, jetstreamMessageEncoded []byte, b
 }
 
 func getBskyProfile(ctx context.Context, bskyMessage BskyMessage, bsky *bluesky.Client) (*bluesky.Profile, error) {
-	profile, err := bsky.FetchProfile(ctx, bskyMessage.Did)
+	profile, err := bsky.FetchProfile(ctx, bskyMessage.DID)
 	if err != nil {
 		return nil, err
 	}
@@ -291,13 +291,9 @@ func sendToSlack(ctx context.Context, jetstreamMessageStr string, bskyMessage Bs
 	var messageText string
 	var err error
 
-	if len(bskyMessage.Commit.Record.Facets) != 0 {
-		messageText, err = bskyMessageToSlackMarkup(bskyMessage)
-		if err != nil {
-			return err
-		}
-	} else {
-		messageText = bskyMessage.Commit.Record.Text
+	messageText, err = bskyMessageToSlackMarkup(bskyMessage)
+	if err != nil {
+		return err
 	}
 
 	attachments := []SlackAttachment{

cmd/bsky-webhook/types.go

@@ -6,7 +6,7 @@ import (
 )
 
 type BskyMessage struct {
-	Did    string      `json:"did"`
+	DID    string      `json:"did"`
 	Commit *BskyCommit `json:"commit"`
 	Kind   string      `json:"kind"`
 	Time   int64       `json:"time_us"`
@@ -15,7 +15,7 @@ type BskyMessage struct {
 func (m *BskyMessage) toURL(handle *string) string {
 	author := handle
 	if author == nil {
-		author = &m.Did
+		author = &m.DID
 	}
 
 	return fmt.Sprintf("https://bsky.app/profile/%s/post/%s", url.PathEscape(*author), url.PathEscape(m.Commit.Rkey))
@@ -29,10 +29,10 @@ type BskyCommit struct {
 }
 
 type BskyRecord struct {
-	Text            string      `json:"text"`
-	Embed           BskyEmbed   `json:"embed"`
-	CreatedAtString string      `json:"createdAt"`
-	Facets          []BskyFacet `json:"facets"`
+	Text      string      `json:"text"`
+	Embed     BskyEmbed   `json:"embed"`
+	CreatedAt string      `json:"createdAt"` // RFC3339 timestamp
+	Facets    []BskyFacet `json:"facets"`
 }
 
 type BskyEmbed struct {
@@ -58,8 +58,8 @@ type BskyFacet struct {
 
 type BskyFacetFeatures struct {
 	Type string `json:"$type"`
-	Uri  string `json:"uri"`
-	Did  string `json:"did"`
+	URI  string `json:"uri"`
+	DID  string `json:"did"`
 	Tag  string `json:"tag"`
 }