Merge pull request #5 from mariuskimmina/fix-bluesky-links

Fix bluesky links

CLAUDE.md

···
 
 **Configuration** (`internal/config/config.go`):
 - `Source`: Specifies handle, collection, optional publication_name
-- `Output`: Defines posts_dir, images_dir, image_path_prefix
+- `Output`: Defines posts_dir, images_dir, image_path_prefix, bsky_embed_style
 - `Template`: Go template strings for frontmatter and content
 
 ### Important Implementation Details
···
   posts_dir: "content/posts/leaflet"
   images_dir: "static/images/leaflet"
   image_path_prefix: "/images/leaflet"
+  bsky_embed_style: "link"  # "link" (default) or "shortcode" for Hugo embeds
 
 template:
   frontmatter: |

README.md

···
   posts_dir: "content/posts/leaflet"
   images_dir: "static/images/leaflet"
   image_path_prefix: "/images/leaflet"
+  bsky_embed_style: "link"  # Optional: "link" (default) or "shortcode"
 
 template:
   frontmatter: |
···
     original_url: "{{ .OriginalURL }}"
     ---
 ```
+
+## BlueSky Post Embeds
+
+When your Leaflet posts reference BlueSky posts, they can be rendered in two ways:
+
+- **`link`** (default): Simple markdown links that work everywhere
+- **`shortcode`**: Rich Hugo shortcodes for custom styling
+
+For shortcode setup instructions, see [SHORTCODE_SETUP.md](SHORTCODE_SETUP.md).
 
 ## How it works
 

SHORTCODE_SETUP.md

···
+# BlueSky Post Embed Setup
+
+The sync tool can generate BlueSky post embeds in two ways:
+- **Simple links** (default) - Plain markdown links that work everywhere
+- **Hugo shortcodes** (optional) - Rich, styled embeds with custom styling
+
+## Quick Setup for Hugo Shortcodes
+
+By default, BlueSky posts are rendered as simple markdown links. To enable rich Hugo shortcode embeds:
+
+1. **Enable shortcode mode in your config file** (`.leaflet-sync.yaml`):
+   ```yaml
+   output:
+     posts_dir: "content/posts/leaflet"
+     images_dir: "static/images/leaflet"
+     image_path_prefix: "/images/leaflet"
+     bsky_embed_style: "shortcode"  # Add this line
+   ```
+
+3. **Copy the shortcode to your Hugo site:**
+   ```bash
+   cp bsky.html /path/to/your/hugo/site/layouts/shortcodes/bsky.html
+   ```
+
+4. **Run the sync:**
+   ```bash
+   leaflet-hugo-sync -config .leaflet-sync.yaml
+   ```

bsky.html

···
+{{/*
+  BlueSky Post Embed Shortcode (Enhanced with oEmbed)
+
+  Usage: {{< bsky-oembed did="did:plc:abc123" postid="3mbrxzvw36c22" >}}
+
+  This shortcode uses BlueSky's iframe embed for rich post display.
+  Copy this file to your Hugo site's layouts/shortcodes/ directory as bsky.html
+*/}}
+
+{{ $did := .Get "did" }}
+{{ $postid := .Get "postid" }}
+{{ $url := printf "https://bsky.app/profile/%s/post/%s" $did $postid }}
+
+<div class="bsky-embed-container" style="margin: 1.5em 0;">
+  <blockquote class="bluesky-embed" data-bluesky-uri="at://{{ $did }}/app.bsky.feed.post/{{ $postid }}" data-bluesky-cid="">
+    <p lang="en">
+      <a href="{{ $url }}" target="_blank" rel="noopener noreferrer">
+        View post on Bluesky
+      </a>
+    </p>
+  </blockquote>
+  <script async src="https://embed.bsky.app/static/embed.js" charset="utf-8"></script>
+</div>

cmd/leaflet-hugo-sync/main.go

···
 
 	downloader := media.NewDownloader(cfg.Output.ImagesDir, cfg.Output.ImagePathPrefix, pdsClient.XRPC.Host)
 	gen := generator.NewGenerator(cfg)
-	conv := converter.NewConverter()
+	conv := converter.NewConverter(cfg.Output.BskyEmbedStyle)
 
 	for _, rec := range records {
 		// Try to unmarshal as LeafletDocument

internal/config/config.go

···
 	PostsDir        string `yaml:"posts_dir"`
 	ImagesDir       string `yaml:"images_dir"`
 	ImagePathPrefix string `yaml:"image_path_prefix"`
+	BskyEmbedStyle  string `yaml:"bsky_embed_style"` // "link" (default) or "shortcode"
 }
 
 type Template struct {

internal/converter/markdown.go

···
 )
 
 type Converter struct {
-	// No state needed; conversion is stateless
+	bskyEmbedStyle string // "link" (default) or "shortcode"
 }
 
 type ConversionResult struct {
···
 	Alt  string
 }
 
-func NewConverter() *Converter {
-	return &Converter{}
+func NewConverter(bskyEmbedStyle string) *Converter {
+	// Default to "link" if not specified or invalid
+	if bskyEmbedStyle != "shortcode" {
+		bskyEmbedStyle = "link"
+	}
+	return &Converter{
+		bskyEmbedStyle: bskyEmbedStyle,
+	}
 }
 
 func (c *Converter) ConvertLeaflet(doc *atproto.LeafletDocument) (*ConversionResult, error) {
···
 					continue
 				}
 				// Render as a blockquote link to the Bluesky post
-				postURL := fmt.Sprintf("https://bsky.app/profile/%s/post/%s", "did:...", lastPathPart(postBlock.PostRef.Uri))
-				sb.WriteString(fmt.Sprintf("> [View on Bluesky](%s)\n\n", postURL))
+				// Parse AT-URI: at://did:plc:abc123/app.bsky.feed.post/postID
+				did, postID := parseATUri(postBlock.PostRef.Uri)
+
+				if c.bskyEmbedStyle == "shortcode" {
+					// Render as Hugo shortcode for rich embed
+					sb.WriteString(fmt.Sprintf("{{< bsky did=\"%s\" postid=\"%s\" >}}\n\n", did, postID))
+				} else {
+					// Default: render as simple markdown link
+					postURL := fmt.Sprintf("https://bsky.app/profile/%s/post/%s", did, postID)
+					sb.WriteString(fmt.Sprintf("[View on Bluesky](%s)\n\n", postURL))
+				}
 			}
 		}
 	}
···
 	parts := strings.Split(uri, "/")
 	return parts[len(parts)-1]
 }
+
+// parseATUri extracts DID and record key from an AT-URI
+// Example: at://did:plc:abc123/app.bsky.feed.post/3mbrxzvw36c22
+// Returns: (did:plc:abc123, 3mbrxzvw36c22)
+func parseATUri(uri string) (did string, recordKey string) {
+	// Remove "at://" prefix
+	uri = strings.TrimPrefix(uri, "at://")
+
+	// Split into parts
+	parts := strings.Split(uri, "/")
+	if len(parts) >= 3 {
+		did = parts[0]                  // did:plc:abc123
+		recordKey = parts[len(parts)-1] // 3mbrxzvw36c22
+	}
+
+	return did, recordKey
+}

internal/converter/markdown_test.go

···
 		},
 	}
 
-	conv := NewConverter()
+	conv := NewConverter("")
 	result, err := conv.ConvertLeaflet(doc)
 	if err != nil {
 		t.Fatalf("ConvertLeaflet failed: %v", err)
···
 		},
 	}
 
-	conv := NewConverter()
+	conv := NewConverter("")
 	result, err := conv.ConvertLeaflet(doc)
 	if err != nil {
 		t.Fatalf("ConvertLeaflet failed: %v", err)
···
 		},
 	}
 
-	conv := NewConverter()
+	conv := NewConverter("")
 	result, err := conv.ConvertLeaflet(doc)
 	if err != nil {
 		t.Fatalf("ConvertLeaflet failed: %v", err)
···
 		},
 	}
 
-	conv := NewConverter()
+	conv := NewConverter("")
 	result := conv.renderText(block)
 
 	expected := "Check out [example.com](https://example.com) for more info"
···
 		},
 	}
 
-	conv := NewConverter()
+	conv := NewConverter("")
 	result := conv.renderText(block)
 
 	expected := "Use the `fmt.Println` function"
···
 		},
 	}
 
-	conv := NewConverter()
+	conv := NewConverter("")
 	result := conv.renderText(block)
 
 	expected := "Thanks [@alice](https://bsky.app/profile/did:plc:alice123) for the help"
···
 		},
 	}
 
-	conv := NewConverter()
+	conv := NewConverter("")
 	result, err := conv.ConvertLeaflet(doc)
 	if err != nil {
 		t.Fatalf("ConvertLeaflet failed: %v", err)
···
 
 	if !strings.Contains(result.Markdown, "- First item") {
 		t.Errorf("expected list item, got %q", result.Markdown)
+	}
+}
+
+func TestConvertLeaflet_BskyPost_Link(t *testing.T) {
+	doc := &atproto.LeafletDocument{
+		Pages: []atproto.Page{
+			{
+				Blocks: []atproto.BlockWrapper{
+					{
+						Block: mustMarshal(atproto.BskyPostBlock{
+							Type: "pub.leaflet.blocks.bskyPost",
+							PostRef: atproto.PostRef{
+								Uri: "at://did:plc:abc123/app.bsky.feed.post/3mbrxzvw36c22",
+								Cid: "test-cid",
+							},
+						}),
+					},
+				},
+			},
+		},
+	}
+
+	conv := NewConverter("link") // Default link mode
+	result, err := conv.ConvertLeaflet(doc)
+	if err != nil {
+		t.Fatalf("ConvertLeaflet failed: %v", err)
+	}
+
+	expected := "[View on Bluesky](https://bsky.app/profile/did:plc:abc123/post/3mbrxzvw36c22)"
+	if !strings.Contains(result.Markdown, expected) {
+		t.Errorf("expected link format, got %q", result.Markdown)
+	}
+}
+
+func TestConvertLeaflet_BskyPost_Shortcode(t *testing.T) {
+	doc := &atproto.LeafletDocument{
+		Pages: []atproto.Page{
+			{
+				Blocks: []atproto.BlockWrapper{
+					{
+						Block: mustMarshal(atproto.BskyPostBlock{
+							Type: "pub.leaflet.blocks.bskyPost",
+							PostRef: atproto.PostRef{
+								Uri: "at://did:plc:abc123/app.bsky.feed.post/3mbrxzvw36c22",
+								Cid: "test-cid",
+							},
+						}),
+					},
+				},
+			},
+		},
+	}
+
+	conv := NewConverter("shortcode")
+	result, err := conv.ConvertLeaflet(doc)
+	if err != nil {
+		t.Fatalf("ConvertLeaflet failed: %v", err)
+	}
+
+	expected := `{{< bsky did="did:plc:abc123" postid="3mbrxzvw36c22" >}}`
+	if !strings.Contains(result.Markdown, expected) {
+		t.Errorf("expected shortcode format, got %q", result.Markdown)
 	}
 }