feat(wip): push to leaflet!

Author: desertthunder

cmd/commands.go

@@ -30,10 +30,12 @@ func (c *MovieCommand) Create() *cobra.Command {
 		Short: "Manage movie watch queue",
 		Long: `Track movies you want to watch.
 
-Search TMDB for movies and add them to your queue. Mark movies as watched when
-completed. Maintains a history of your movie watching activity.`,
+Search for movies and add them to your queue. Mark movies as watched
+when completed. Maintains a history of your movie watching activity.`,
 	}
 
+	// TODO: add colors
+	// TODO: fix critic score parsing
 	addCmd := &cobra.Command{
 		Use:   "add [search query...]",
 		Short: "Search and add movie to watch queue",
@@ -54,6 +56,7 @@ Use the -i flag for an interactive interface with navigation keys.`,
 	addCmd.Flags().BoolP("interactive", "i", false, "Use interactive interface for movie selection")
 	root.AddCommand(addCmd)
 
+	// TODO: add interactive list view
 	root.AddCommand(&cobra.Command{
 		Use:   "list [--all|--watched|--queued]",
 		Short: "List movies in queue with status filtering",
@@ -122,9 +125,9 @@ func (c *TVCommand) Create() *cobra.Command {
 		Short: "Manage TV show watch queue",
 		Long: `Track TV shows and episodes.
 
-Search TMDB for TV shows and add them to your queue. Track which shows you're
-currently watching, mark episodes as watched, and maintain a complete history
-of your viewing activity.`,
+Search for TV shows and add them to your queue. Track which shows you're currently
+watching, mark episodes as watched, and maintain a complete history of your viewing
+activity.`,
 	}
 
 	addCmd := &cobra.Command{

cmd/publication_commands.go

@@ -59,6 +59,14 @@ If credentials are not provided via flags, use the interactive input.`,
 				handle = args[0]
 			}
 
+			// Auto-fill with last authenticated handle if available
+			if handle == "" {
+				lastHandle := c.handler.GetLastAuthenticatedHandle()
+				if lastHandle != "" {
+					handle = lastHandle
+				}
+			}
+
 			password, _ := cmd.Flags().GetString("password")
 
 			if handle != "" && password != "" {

internal/handlers/publication.go

@@ -10,10 +10,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/charmbracelet/log"
 	"github.com/stormlightlabs/noteleaf/internal/models"
 	"github.com/stormlightlabs/noteleaf/internal/public"
 	"github.com/stormlightlabs/noteleaf/internal/repo"
 	"github.com/stormlightlabs/noteleaf/internal/services"
+	"github.com/stormlightlabs/noteleaf/internal/shared"
 	"github.com/stormlightlabs/noteleaf/internal/store"
 	"github.com/stormlightlabs/noteleaf/internal/ui"
 )
@@ -24,6 +26,7 @@ type PublicationHandler struct {
 	config  *store.Config
 	repos   *repo.Repositories
 	atproto services.ATProtoClient
+	debug   *log.Logger
 }
 
 // NewPublicationHandler creates a new publication handler
@@ -41,10 +44,21 @@ func NewPublicationHandler() (*PublicationHandler, error) {
 	repos := repo.NewRepositories(db.DB)
 	atproto := services.NewATProtoService()
 
+	d, _ := store.GetConfigDir()
+	debug := shared.NewDebugLoggerWithFile(d)
+
 	if config.ATProtoDID != "" && config.ATProtoAccessJWT != "" && config.ATProtoRefreshJWT != "" {
 		session, err := sessionFromConfig(config)
 		if err == nil {
-			_ = atproto.RestoreSession(session)
+			if err := atproto.RestoreSession(session); err == nil {
+				updatedSession, _ := atproto.GetSession()
+				if updatedSession != nil {
+					config.ATProtoAccessJWT = updatedSession.AccessJWT
+					config.ATProtoRefreshJWT = updatedSession.RefreshJWT
+					config.ATProtoExpiresAt = updatedSession.ExpiresAt.Format("2006-01-02T15:04:05Z07:00")
+					_ = store.SaveConfig(config)
+				}
+			}
 		}
 	}
 
@@ -53,6 +67,7 @@ func NewPublicationHandler() (*PublicationHandler, error) {
 		config:  config,
 		repos:   repos,
 		atproto: atproto,
+		debug:   debug,
 	}, nil
 }
 
@@ -272,7 +287,6 @@ func (h *PublicationHandler) Post(ctx context.Context, noteID int64, isDraft boo
 	if err != nil {
 		return err
 	}
-
 	ui.Infoln("Creating document '%s' on leaflet...", note.Title)
 
 	result, err := h.atproto.PostDocument(ctx, *doc, isDraft)
@@ -665,10 +679,22 @@ func (h *PublicationHandler) prepareDocumentForPublish(ctx context.Context, note
 		return nil, nil, fmt.Errorf("failed to convert markdown to leaflet format: %w", err)
 	}
 
+	publicationURI, err := h.atproto.GetDefaultPublication(ctx)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to get publication: %w", err)
+	}
+
+	docType := public.TypeDocument
+	if isDraft {
+		docType = public.TypeDocumentDraft
+	}
+
 	doc := &public.Document{
+		Type:        docType,
 		Author:      session.DID,
 		Title:       note.Title,
 		Description: "",
+		Publication: publicationURI,
 		Pages: []public.LinearDocument{
 			{
 				Type:   public.TypeLinearDocument,
@@ -903,6 +929,14 @@ func (h *PublicationHandler) GetAuthStatus() string {
 	return "Not authenticated"
 }
 
+// GetLastAuthenticatedHandle returns the last authenticated handle from config
+func (h *PublicationHandler) GetLastAuthenticatedHandle() string {
+	if h.config != nil && h.config.ATProtoHandle != "" {
+		return h.config.ATProtoHandle
+	}
+	return ""
+}
+
 // extractNoteDirectory extracts the directory path from a note's FilePath
 func extractNoteDirectory(note *models.Note) string {
 	if note.FilePath == "" {

internal/handlers/publication_test.go

@@ -189,6 +189,63 @@ func TestPublicationHandler(t *testing.T) {
 		})
 	})
 
+	t.Run("GetLastAuthenticatedHandle", func(t *testing.T) {
+		t.Run("returns empty string when no config", func(t *testing.T) {
+			handler := &PublicationHandler{
+				config: nil,
+			}
+
+			handle := handler.GetLastAuthenticatedHandle()
+			if handle != "" {
+				t.Errorf("Expected empty string, got '%s'", handle)
+			}
+		})
+
+		t.Run("returns empty string when handle not set", func(t *testing.T) {
+			handler := &PublicationHandler{
+				config: &store.Config{},
+			}
+
+			handle := handler.GetLastAuthenticatedHandle()
+			if handle != "" {
+				t.Errorf("Expected empty string, got '%s'", handle)
+			}
+		})
+
+		t.Run("returns handle from config", func(t *testing.T) {
+			expectedHandle := "test.bsky.social"
+			handler := &PublicationHandler{
+				config: &store.Config{
+					ATProtoHandle: expectedHandle,
+				},
+			}
+
+			handle := handler.GetLastAuthenticatedHandle()
+			if handle != expectedHandle {
+				t.Errorf("Expected '%s', got '%s'", expectedHandle, handle)
+			}
+		})
+
+		t.Run("returns handle after successful authentication", func(t *testing.T) {
+			suite := NewHandlerTestSuite(t)
+			defer suite.Cleanup()
+
+			handler := CreateHandler(t, NewPublicationHandler)
+			ctx := context.Background()
+
+			mock := services.SetupSuccessfulAuthMocks()
+			handler.atproto = mock
+
+			err := handler.Auth(ctx, "user.bsky.social", "password123")
+			suite.AssertNoError(err, "authentication should succeed")
+
+			handle := handler.GetLastAuthenticatedHandle()
+			if handle != "user.bsky.social" {
+				t.Errorf("Expected 'user.bsky.social', got '%s'", handle)
+			}
+		})
+	})
+
 	t.Run("NewPublicationHandler", func(t *testing.T) {
 		t.Run("creates handler successfully", func(t *testing.T) {
 			suite := NewHandlerTestSuite(t)
@@ -1120,7 +1177,9 @@ func TestPublicationHandler(t *testing.T) {
 			id, err := handler.repos.Notes.Create(ctx, note)
 			suite.AssertNoError(err, "create note")
 
-			session := &services.Session{
+			mock := services.NewMockATProtoService()
+			mock.IsAuthenticatedVal = true
+			mock.Session = &services.Session{
 				DID:           "did:plc:test123",
 				Handle:        "test.bsky.social",
 				AccessJWT:     "access_token",
@@ -1129,11 +1188,7 @@ func TestPublicationHandler(t *testing.T) {
 				ExpiresAt:     time.Now().Add(2 * time.Hour),
 				Authenticated: true,
 			}
-
-			err = handler.atproto.RestoreSession(session)
-			if err != nil {
-				t.Fatalf("Failed to restore session: %v", err)
-			}
+			handler.atproto = mock
 
 			err = handler.PostPreview(ctx, id, false, "", false)
 			suite.AssertNoError(err, "preview should succeed")
@@ -1154,7 +1209,9 @@ func TestPublicationHandler(t *testing.T) {
 			id, err := handler.repos.Notes.Create(ctx, note)
 			suite.AssertNoError(err, "create note")
 
-			session := &services.Session{
+			mock := services.NewMockATProtoService()
+			mock.IsAuthenticatedVal = true
+			mock.Session = &services.Session{
 				DID:           "did:plc:test123",
 				Handle:        "test.bsky.social",
 				AccessJWT:     "access_token",
@@ -1163,11 +1220,7 @@ func TestPublicationHandler(t *testing.T) {
 				ExpiresAt:     time.Now().Add(2 * time.Hour),
 				Authenticated: true,
 			}
-
-			err = handler.atproto.RestoreSession(session)
-			if err != nil {
-				t.Fatalf("Failed to restore session: %v", err)
-			}
+			handler.atproto = mock
 
 			err = handler.PostPreview(ctx, id, true, "", false)
 			suite.AssertNoError(err, "preview draft should succeed")
@@ -1207,7 +1260,9 @@ func TestPublicationHandler(t *testing.T) {
 			id, err := handler.repos.Notes.Create(ctx, note)
 			suite.AssertNoError(err, "create note")
 
-			session := &services.Session{
+			mock := services.NewMockATProtoService()
+			mock.IsAuthenticatedVal = true
+			mock.Session = &services.Session{
 				DID:           "did:plc:test123",
 				Handle:        "test.bsky.social",
 				AccessJWT:     "access_token",
@@ -1216,11 +1271,7 @@ func TestPublicationHandler(t *testing.T) {
 				ExpiresAt:     time.Now().Add(2 * time.Hour),
 				Authenticated: true,
 			}
-
-			err = handler.atproto.RestoreSession(session)
-			if err != nil {
-				t.Fatalf("Failed to restore session: %v", err)
-			}
+			handler.atproto = mock
 
 			err = handler.PostValidate(ctx, id, false, "", false)
 			suite.AssertNoError(err, "validation should succeed")
@@ -1339,7 +1390,9 @@ func TestPublicationHandler(t *testing.T) {
 			id, err := handler.repos.Notes.Create(ctx, note)
 			suite.AssertNoError(err, "create note")
 
-			session := &services.Session{
+			mock := services.NewMockATProtoService()
+			mock.IsAuthenticatedVal = true
+			mock.Session = &services.Session{
 				DID:           "did:plc:test123",
 				Handle:        "test.bsky.social",
 				AccessJWT:     "access_token",
@@ -1348,11 +1401,7 @@ func TestPublicationHandler(t *testing.T) {
 				ExpiresAt:     time.Now().Add(2 * time.Hour),
 				Authenticated: true,
 			}
-
-			err = handler.atproto.RestoreSession(session)
-			if err != nil {
-				t.Fatalf("Failed to restore session: %v", err)
-			}
+			handler.atproto = mock
 
 			err = handler.PatchPreview(ctx, id, "", false)
 			suite.AssertNoError(err, "preview should succeed")
@@ -1397,7 +1446,9 @@ func TestPublicationHandler(t *testing.T) {
 			id, err := handler.repos.Notes.Create(ctx, note)
 			suite.AssertNoError(err, "create note")
 
-			session := &services.Session{
+			mock := services.NewMockATProtoService()
+			mock.IsAuthenticatedVal = true
+			mock.Session = &services.Session{
 				DID:           "did:plc:test123",
 				Handle:        "test.bsky.social",
 				AccessJWT:     "access_token",
@@ -1406,11 +1457,7 @@ func TestPublicationHandler(t *testing.T) {
 				ExpiresAt:     time.Now().Add(2 * time.Hour),
 				Authenticated: true,
 			}
-
-			err = handler.atproto.RestoreSession(session)
-			if err != nil {
-				t.Fatalf("Failed to restore session: %v", err)
-			}
+			handler.atproto = mock
 
 			err = handler.PatchValidate(ctx, id, "", false)
 			suite.AssertNoError(err, "validation should succeed")