Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion internal/commands/cards.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/basecamp/basecamp-cli/internal/completion"
"github.com/basecamp/basecamp-cli/internal/dateparse"
"github.com/basecamp/basecamp-cli/internal/output"
"github.com/basecamp/basecamp-cli/internal/richtext"
)

// NewCardsCmd creates the cards command group.
Expand Down Expand Up @@ -398,6 +399,19 @@ func newCardsCreateCmd(project, cardTable *string) *cobra.Command {
}
}

// Convert content through rich text pipeline
if content != "" {
content = richtext.MarkdownToHTML(content)
content, err = resolveLocalImages(cmd, app, content)
if err != nil {
return err
}
content, err = resolveMentions(cmd.Context(), app.Names, content)
if err != nil {
return err
}
}

// Build request
req := &basecamp.CreateCardRequest{
Title: title,
Expand Down Expand Up @@ -488,7 +502,16 @@ You can pass either a card ID or a Basecamp URL:
req.Title = title
}
if content != "" {
req.Content = content
html := richtext.MarkdownToHTML(content)
html, err = resolveLocalImages(cmd, app, html)
if err != nil {
return err
}
html, err = resolveMentions(cmd.Context(), app.Names, html)
if err != nil {
return err
}
req.Content = html
}
if due != "" {
req.DueOn = dateparse.Parse(due)
Expand Down Expand Up @@ -882,6 +905,19 @@ func NewCardCmd() *cobra.Command {
}
}

// Convert content through rich text pipeline
if content != "" {
content = richtext.MarkdownToHTML(content)
content, err = resolveLocalImages(cmd, app, content)
if err != nil {
return err
}
content, err = resolveMentions(cmd.Context(), app.Names, content)
if err != nil {
return err
}
}

// Build request
req := &basecamp.CreateCardRequest{
Title: title,
Expand Down
174 changes: 174 additions & 0 deletions internal/commands/cards_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1067,3 +1067,177 @@ func TestCardShortcutFlagsAfterTitle(t *testing.T) {
assert.NotEqual(t, "Project ID required", e.Message)
}
}

// =============================================================================
// Card Content HTML Conversion Tests
// =============================================================================

// mockCardCreateTransport handles resolver and dock API calls, and captures the POST body.
type mockCardCreateTransport struct {
capturedBody []byte
capturedPath string
}

func (t *mockCardCreateTransport) RoundTrip(req *http.Request) (*http.Response, error) {
header := make(http.Header)
header.Set("Content-Type", "application/json")

if req.Method == "GET" {
var body string
if strings.Contains(req.URL.Path, "/projects.json") {
body = `[{"id": 123, "name": "Test Project"}]`
} else if strings.Contains(req.URL.Path, "/projects/") {
body = `{"id": 123, "dock": [{"name": "card_table", "id": 777, "enabled": true}]}`
} else {
body = `{}`
}
return &http.Response{
StatusCode: 200,
Body: io.NopCloser(strings.NewReader(body)),
Header: header,
}, nil
}

if req.Method == "POST" || req.Method == "PUT" {
t.capturedPath = req.URL.Path
if req.Body != nil {
body, _ := io.ReadAll(req.Body)
t.capturedBody = body
req.Body.Close()
}
mockResp := `{"id": 999, "title": "Test", "status": "active"}`
status := 201
if req.Method == "PUT" {
status = 200
}
return &http.Response{
StatusCode: status,
Body: io.NopCloser(strings.NewReader(mockResp)),
Header: header,
}, nil
}

return nil, errors.New("unexpected request")
}

func setupCardsMockApp(t *testing.T, transport http.RoundTripper) *appctx.App {
t.Helper()
t.Setenv("BASECAMP_NO_KEYRING", "1")

cfg := &config.Config{
AccountID: "99999",
ProjectID: "123",
}

sdkCfg := &basecamp.Config{}
sdkClient := basecamp.NewClient(sdkCfg, &testTokenProvider{},
basecamp.WithTransport(transport),
basecamp.WithMaxRetries(1),
)
authMgr := auth.NewManager(cfg, nil)
nameResolver := names.NewResolver(sdkClient, authMgr, cfg.AccountID)

return &appctx.App{
Config: cfg,
Auth: authMgr,
SDK: sdkClient,
Names: nameResolver,
Output: output.New(output.Options{
Format: output.FormatJSON,
Writer: &bytes.Buffer{},
}),
}
}

func TestCardsCreateContentIsHTML(t *testing.T) {
transport := &mockCardCreateTransport{}
app := setupCardsMockApp(t, transport)

cmd := NewCardsCmd()
err := executeCommand(cmd, app, "create", "Title", "**bold** text", "--column", "12345")
require.NoError(t, err)
require.NotEmpty(t, transport.capturedBody)

var body map[string]any
err = json.Unmarshal(transport.capturedBody, &body)
require.NoError(t, err)

content, ok := body["content"].(string)
require.True(t, ok)
assert.Contains(t, content, "<strong>bold</strong>")
}

func TestCardsUpdateContentIsHTML(t *testing.T) {
transport := &mockCardCreateTransport{}
app := setupCardsMockApp(t, transport)

cmd := NewCardsCmd()
err := executeCommand(cmd, app, "update", "999", "--body", "**bold** text")
require.NoError(t, err)
require.NotEmpty(t, transport.capturedBody)

var body map[string]any
err = json.Unmarshal(transport.capturedBody, &body)
require.NoError(t, err)

content, ok := body["content"].(string)
require.True(t, ok)
assert.Contains(t, content, "<strong>bold</strong>")
}

func TestCardShortcutContentIsHTML(t *testing.T) {
transport := &mockCardCreateTransport{}
app := setupCardsMockApp(t, transport)

cmd := NewCardCmd()
err := executeCommand(cmd, app, "Title", "**bold** text", "--column", "12345")
require.NoError(t, err)
require.NotEmpty(t, transport.capturedBody)

var body map[string]any
err = json.Unmarshal(transport.capturedBody, &body)
require.NoError(t, err)

content, ok := body["content"].(string)
require.True(t, ok)
assert.Contains(t, content, "<strong>bold</strong>")
}

func TestCardsCreateLocalImageErrors(t *testing.T) {
transport := &mockCardCreateTransport{}
app := setupCardsMockApp(t, transport)

cmd := NewCardsCmd()
// Local image path triggers resolveLocalImages which should error on missing file
err := executeCommand(cmd, app, "create", "Title", "![alt](./missing.png)", "--column", "12345")
require.Error(t, err)
assert.Contains(t, err.Error(), "missing.png")
}

func TestCardsUpdateLocalImageErrors(t *testing.T) {
transport := &mockCardCreateTransport{}
app := setupCardsMockApp(t, transport)

cmd := NewCardsCmd()
err := executeCommand(cmd, app, "update", "999", "--body", "![alt](./missing.png)")
require.Error(t, err)
assert.Contains(t, err.Error(), "missing.png")
}

func TestCardsCreateRemoteImagePassesThrough(t *testing.T) {
transport := &mockCardCreateTransport{}
app := setupCardsMockApp(t, transport)

cmd := NewCardsCmd()
err := executeCommand(cmd, app, "create", "Title", "![alt](https://example.com/img.png)", "--column", "12345")
require.NoError(t, err)
require.NotEmpty(t, transport.capturedBody)

var body map[string]any
err = json.Unmarshal(transport.capturedBody, &body)
require.NoError(t, err)

content, ok := body["content"].(string)
require.True(t, ok)
assert.Contains(t, content, `<img src="https://example.com/img.png"`)
}
6 changes: 6 additions & 0 deletions internal/commands/comment.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,12 @@ You can pass either a comment ID or a Basecamp URL:
// Convert Markdown content to HTML for Basecamp's rich text fields
html := richtext.MarkdownToHTML(content)

// Resolve inline images (![alt](./path) → upload + <bc-attachment>)
html, err = resolveLocalImages(cmd, app, html)
if err != nil {
return err
}

// Resolve @mentions
html, err = resolveMentions(cmd.Context(), app.Names, html)
if err != nil {
Expand Down
6 changes: 6 additions & 0 deletions internal/commands/messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,12 @@ You can pass either a message ID or a Basecamp URL:
// Convert Markdown content to HTML for Basecamp's rich text fields
html := richtext.MarkdownToHTML(body)

// Resolve inline images (![alt](./path) → upload + <bc-attachment>)
html, err = resolveLocalImages(cmd, app, html)
if err != nil {
return err
}

// Resolve @mentions
html, err = resolveMentions(cmd.Context(), app.Names, html)
if err != nil {
Expand Down
25 changes: 24 additions & 1 deletion internal/commands/schedule.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/basecamp/basecamp-cli/internal/appctx"
"github.com/basecamp/basecamp-cli/internal/output"
"github.com/basecamp/basecamp-cli/internal/richtext"
)

// NewScheduleCmd creates the schedule command for managing schedules.
Expand Down Expand Up @@ -463,6 +464,19 @@ func runScheduleCreate(cmd *cobra.Command, app *appctx.App, project, scheduleID,

scheduleIDInt, _ := strconv.ParseInt(scheduleID, 10, 64)

// Convert description through rich text pipeline
if description != "" {
description = richtext.MarkdownToHTML(description)
description, err = resolveLocalImages(cmd, app, description)
if err != nil {
return err
}
description, err = resolveMentions(cmd.Context(), app.Names, description)
if err != nil {
return err
}
}

// Build request
req := &basecamp.CreateScheduleEntryRequest{
Summary: summary,
Expand Down Expand Up @@ -580,7 +594,16 @@ You can pass either an entry ID or a Basecamp URL:
hasChanges = true
}
if description != "" {
req.Description = description
html := richtext.MarkdownToHTML(description)
html, err = resolveLocalImages(cmd, app, html)
if err != nil {
return err
}
html, err = resolveMentions(cmd.Context(), app.Names, html)
if err != nil {
return err
}
req.Description = html
hasChanges = true
}
if cmd.Flags().Changed("all-day") {
Expand Down
Loading
Loading