Improve Twitter/X link handling and text formatting

- Use FxTwitter API for full note tweet text (with syndication API fallback)
- Save Twitter posts based on media content:
  - Videos → embed type (proxied video)
  - Images → image type (gallery)
  - Text-only → quote type
- Add granular preview badges: 'X VIDEO', 'X GALLERY', 'X POST'
- Preserve formatting/spacing with white-space: pre-wrap for quotes and descriptions
- Rename VideoInfo to EmbedInfo for better semantic clarity

internal/handlers/api_items.go

@@ -12,18 +12,17 @@ import (
 )
 
 type itemResponse struct {
-	ID                 string   `json:"id"`
-	Title              *string  `json:"title,omitempty"`
-	Description        *string  `json:"description,omitempty"`
-	LinkURL            *string  `json:"linkUrl,omitempty"`
-	ItemType           string   `json:"itemType"`
-	EmbedHTML          *string  `json:"embedHtml,omitempty"`
-	Tags               []string `json:"tags"`
-	CreatedAt          string   `json:"createdAt"`
-	MediaID            *int64   `json:"mediaId,omitempty"`
-	ThumbnailID        *int64   `json:"thumbnailId,omitempty"`
-	ThumbnailSourceURL *string  `json:"thumbnailSourceUrl,omitempty"`
-	GalleryIDs         []int64  `json:"galleryIds,omitempty"` // Additional images (for multi-image tweets)
+	ID          string   `json:"id"`
+	Title       *string  `json:"title,omitempty"`
+	Description *string  `json:"description,omitempty"`
+	LinkURL     *string  `json:"linkUrl,omitempty"`
+	ItemType    string   `json:"itemType"`
+	EmbedHTML   *string  `json:"embedHtml,omitempty"`
+	Tags        []string `json:"tags"`
+	CreatedAt   string   `json:"createdAt"`
+	MediaID     *int64   `json:"mediaId,omitempty"`
+	ImageIDs    []int64  `json:"imageIds,omitempty"`  // Fetched images (from URLs/embeds)
+	ImageURLs   []string `json:"imageUrls,omitempty"` // Source URLs for fetched images
 }
 
 type createItemRequest struct {
@@ -252,22 +251,17 @@ func buildItemResponse(ctx context.Context, rc *RequestContext, it item.Row) (it
 	}
 
 	// Get media IDs
-	// Media is ordered by ID, so first "image" is the thumbnail, rest are gallery
 	mediaList, err := media.QFindByItemID(ctx, rc.DB, it.ID)
 	if err != nil {
 		return itemResponse{}, err
 	}
-	firstImage := true
 	for _, m := range mediaList {
 		if m.MediaType == "original" {
 			resp.MediaID = &m.ID
 		} else if m.MediaType == "image" {
-			if firstImage {
-				resp.ThumbnailID = &m.ID
-				resp.ThumbnailSourceURL = m.SourceURL
-				firstImage = false
-			} else {
-				resp.GalleryIDs = append(resp.GalleryIDs, m.ID)
+			resp.ImageIDs = append(resp.ImageIDs, m.ID)
+			if m.SourceURL != nil {
+				resp.ImageURLs = append(resp.ImageURLs, *m.SourceURL)
 			}
 		}
 	}

internal/handlers/api_upload.go

@@ -96,22 +96,24 @@ type urlMetadata struct {
 	VideoID     string
 	EmbedHTML   string
 	VideoURL    string // Direct video URL (for Twitter)
+	MediaType   string // "video", "images", "text" - for Twitter only
 }
 
 func fetchURLMetadata(ctx context.Context, url string) (*urlMetadata, error) {
 	// Check if it's a YouTube/Vimeo/Twitter embed
-	videoInfo, err := embed.Detect(ctx, url)
-	if err == nil && videoInfo != nil {
+	embedInfo, err := embed.Detect(ctx, url)
+	if err == nil && embedInfo != nil {
 		return &urlMetadata{
-			Title:       videoInfo.Title,
-			Description: videoInfo.Description,
-			ImageURL:    videoInfo.ThumbnailURL,
-			ImageURLs:   videoInfo.ThumbnailURLs,
+			Title:       embedInfo.Title,
+			Description: embedInfo.Description,
+			ImageURL:    embedInfo.ThumbnailURL,
+			ImageURLs:   embedInfo.ThumbnailURLs,
 			IsEmbed:     true,
-			Provider:    string(videoInfo.Provider),
-			VideoID:     videoInfo.VideoID,
-			EmbedHTML:   videoInfo.EmbedHTML,
-			VideoURL:    videoInfo.VideoURL,
+			Provider:    string(embedInfo.Provider),
+			VideoID:     embedInfo.VideoID,
+			EmbedHTML:   embedInfo.EmbedHTML,
+			VideoURL:    embedInfo.VideoURL,
+			MediaType:   embedInfo.MediaType,
 		}, nil
 	}
 
@@ -139,6 +141,7 @@ type previewResponse struct {
 	Provider    string `json:"provider,omitempty"`
 	VideoID     string `json:"videoId,omitempty"`
 	EmbedHTML   string `json:"embedHtml,omitempty"`
+	MediaType   string `json:"mediaType,omitempty"` // "video", "images", "text" - for Twitter
 }
 
 // HandlePreviewLink handles POST /api/preview - fetches metadata for a URL
@@ -175,6 +178,7 @@ func HandlePreviewLink(rc *RequestContext, w http.ResponseWriter, r *http.Reques
 		Provider:    meta.Provider,
 		VideoID:     meta.VideoID,
 		EmbedHTML:   meta.EmbedHTML,
+		MediaType:   meta.MediaType,
 	})
 }
 
@@ -207,35 +211,58 @@ func HandleCreateFromLink(rc *RequestContext, w http.ResponseWriter, r *http.Req
 
 	var itemType string
 	var embedProvider, embedVideoID, embedHTML *string
+	var imageURL, videoURL string
+	var imageURLs []string // For multi-image tweets
 
 	if req.Provider != nil && *req.Provider != "" {
-		// It's an embed
-		itemType = "embed"
-		embedProvider = req.Provider
-		embedVideoID = req.VideoID
-		embedHTML = req.EmbedHTML
+		// Special handling for Twitter based on media content
+		if *req.Provider == "twitter" {
+			// Fetch tweet info to determine content type
+			videoInfo, err := embed.Detect(ctx, req.URL)
+			if err == nil && videoInfo != nil {
+				if videoInfo.VideoURL != "" {
+					// Tweet has video → keep as embed (proxied)
+					itemType = "embed"
+					embedProvider = req.Provider
+					embedVideoID = req.VideoID
+					embedHTML = req.EmbedHTML
+					videoURL = videoInfo.VideoURL
+					imageURL = videoInfo.ThumbnailURL
+				} else if len(videoInfo.ThumbnailURLs) > 0 {
+					// Tweet has image(s) → save as image
+					itemType = "image"
+					imageURL = videoInfo.ThumbnailURL
+					imageURLs = videoInfo.ThumbnailURLs
+				} else {
+					// Text-only tweet → save as quote
+					itemType = "quote"
+					// title and description already set from request
+				}
+			} else {
+				// If detection fails, fall back to link
+				itemType = "link"
+			}
+		} else {
+			// YouTube, Vimeo, etc. → keep as embed
+			itemType = "embed"
+			embedProvider = req.Provider
+			embedVideoID = req.VideoID
+			embedHTML = req.EmbedHTML
+			// Fetch thumbnail for non-Twitter embeds
+			if videoInfo, err := embed.Detect(ctx, req.URL); err == nil && videoInfo != nil {
+				imageURL = videoInfo.ThumbnailURL
+				videoURL = videoInfo.VideoURL
+			}
+		}
 	} else if req.ImageURL != nil && *req.ImageURL != "" {
 		// It's a link with an image
 		itemType = "image"
+		imageURL = *req.ImageURL
 	} else {
 		// Just a link (will be shown as a card)
 		itemType = "link"
 	}
 
-	// For embeds, fetch thumbnail(s) and video URL
-	var imageURL, videoURL string
-	var imageURLs []string // For multi-image tweets
-	if req.ImageURL != nil {
-		imageURL = *req.ImageURL
-	}
-	if itemType == "embed" && embedProvider != nil {
-		if videoInfo, err := embed.Detect(ctx, req.URL); err == nil && videoInfo != nil {
-			imageURL = videoInfo.ThumbnailURL
-			imageURLs = videoInfo.ThumbnailURLs
-			videoURL = videoInfo.VideoURL
-		}
-	}
-
 	// Create the item
 	it, err := item.QCreate(ctx, rc.DB, item.CreateParams{
 		Title:         item.Nullable(req.Title),

internal/handlers/home.go

@@ -28,11 +28,9 @@ type homeItem struct {
 	ItemType    string
 	EmbedHTML   *string
 	Tags        []string
-	ThumbnailID *int64
 	MediaID     *int64
 	HasVideo    bool
-	GalleryIDs  []int64 // Additional images for multi-image embeds
-	ImageCount  int     // Total image count (1 + len(GalleryIDs))
+	ImageIDs    []int64 // Fetched images (from URLs/embeds)
 }
 
 func (h homeContent) Render(sw *ssr.Writer) error {
@@ -54,33 +52,30 @@ func (h homeContent) Render(sw *ssr.Writer) error {
 	<div class="grid">
 		{{range .Items}}
 		<a href="/item/{{.ID}}" class="grid-item" data-type="{{.ItemType}}">
-			{{if eq .ItemType "quote"}}
-			<div class="quote-card">
-				<blockquote>{{.Description}}</blockquote>
-				{{if .Title}}<cite>— {{.Title}}</cite>{{end}}
-			</div>
-			{{else if .GalleryIDs}}
-			<div class="grid-item-images" data-gallery="true" data-count="{{.ImageCount}}">
-				<img src="/media/{{.ThumbnailID}}" alt="{{if .Title}}{{.Title}}{{else}}Image{{end}}" loading="lazy" class="active">
-				{{range .GalleryIDs}}<img src="/media/{{.}}" alt="Image" loading="lazy">{{end}}
-			</div>
-			<div class="gallery-indicator">{{.ImageCount}}</div>
-			{{else if .ThumbnailID}}
-			<img src="/media/{{.ThumbnailID}}" alt="{{if .Title}}{{.Title}}{{else}}Image{{end}}" loading="lazy">
-			{{if or .HasVideo (eq .ItemType "video")}}<div class="play-indicator">▶</div>{{end}}
-			{{else if .MediaID}}
-			<img src="/media/{{.MediaID}}" alt="{{if .Title}}{{.Title}}{{else}}Image{{end}}" loading="lazy">
-			{{if or .HasVideo (eq .ItemType "video")}}<div class="play-indicator">▶</div>{{end}}
-			{{else if eq .ItemType "embed"}}
-			<div class="embed-placeholder">
-				<span>▶</span>
-			</div>
-			{{else}}
-			<div class="link-card">
-				{{if .Title}}<div class="link-title">{{.Title}}</div>{{end}}
-				{{if .LinkURL}}<div class="link-url">{{.LinkURL}}</div>{{end}}
-			</div>
-			{{end}}
+		{{if eq .ItemType "quote"}}
+		<div class="quote-card">
+			<blockquote>{{.Description}}</blockquote>
+			{{if .Title}}<cite>— {{.Title}}</cite>{{end}}
+		</div>
+		{{else if .ImageIDs}}
+		<div class="grid-item-images"{{if gt (len .ImageIDs) 1}} data-gallery="true"{{end}} data-count="{{len .ImageIDs}}">
+			{{range $i, $id := .ImageIDs}}<img src="/media/{{$id}}" alt="Image" loading="lazy"{{if eq $i 0}} class="active"{{end}}>{{end}}
+		</div>
+		{{if gt (len .ImageIDs) 1}}<div class="gallery-indicator">{{len .ImageIDs}}</div>{{end}}
+		{{if .HasVideo}}<div class="play-indicator">▶</div>{{end}}
+		{{else if .MediaID}}
+		<img src="/media/{{.MediaID}}" alt="Image" loading="lazy">
+		{{if or .HasVideo (eq .ItemType "video")}}<div class="play-indicator">▶</div>{{end}}
+		{{else if eq .ItemType "embed"}}
+		<div class="embed-placeholder">
+			<span>▶</span>
+		</div>
+		{{else}}
+		<div class="link-card">
+			{{if .Title}}<div class="link-title">{{.Title}}</div>{{end}}
+			{{if .LinkURL}}<div class="link-url">{{.LinkURL}}</div>{{end}}
+		</div>
+		{{end}}
 		{{if or .Title .Tags}}
 		<div class="item-overlay">
 			{{if and .Title (ne .ItemType "link") (ne .ItemType "quote")}}
@@ -197,12 +192,10 @@ func HandleHome(rc *RequestContext, w http.ResponseWriter, r *http.Request) erro
 		}
 
 		// Get media
-		// Media is ordered by ID, so first "image" is the thumbnail, rest are gallery
 		mediaList, err := media.QFindByItemID(ctx, rc.DB, it.ID)
 		if err != nil {
 			return err
 		}
-		firstImage := true
 		for _, m := range mediaList {
 			if m.MediaType == "original" {
 				hi.MediaID = &m.ID
@@ -210,18 +203,9 @@ func HandleHome(rc *RequestContext, w http.ResponseWriter, r *http.Request) erro
 					hi.HasVideo = true
 				}
 			} else if m.MediaType == "image" {
-				if firstImage {
-					hi.ThumbnailID = &m.ID
-					firstImage = false
-				} else {
-					hi.GalleryIDs = append(hi.GalleryIDs, m.ID)
-				}
+				hi.ImageIDs = append(hi.ImageIDs, m.ID)
 			}
 		}
-		// Calculate total image count (thumbnail + gallery images)
-		if len(hi.GalleryIDs) > 0 {
-			hi.ImageCount = 1 + len(hi.GalleryIDs)
-		}
 
 		// Also check for embed video URL
 		if it.EmbedVideoURL.Valid && it.EmbedVideoURL.V != "" {

internal/handlers/item_page.go

@@ -28,10 +28,9 @@ type itemPageData struct {
 	EmbedVideoURL *string
 	Tags          []string
 	CreatedAt     string
-	ThumbnailID   *int64
 	MediaID       *int64
 	MediaIsVideo  bool
-	GalleryIDs    []int64 // Additional images for multi-image embeds
+	ImageIDs      []int64 // Fetched images (from URLs/embeds)
 }
 
 func (c itemPageContent) Render(sw *ssr.Writer) error {
@@ -51,37 +50,22 @@ func (c itemPageContent) Render(sw *ssr.Writer) error {
 				<source src="/media/{{.Item.MediaID}}" type="video/mp4">
 			</video>
 		</div>
-		{{else if eq .Item.ItemType "embed"}}
-		{{if .Item.EmbedVideoURL}}
+		{{else if .Item.EmbedVideoURL}}
 		<div class="video-container">
-			<video loop muted playsinline poster="{{if .Item.ThumbnailID}}/media/{{.Item.ThumbnailID}}{{end}}">
+			<video loop muted playsinline {{if .Item.ImageIDs}}poster="/media/{{index .Item.ImageIDs 0}}"{{end}}>
 				<source src="/proxy/video/{{.Item.ID}}" type="video/mp4">
 			</video>
 			<div class="video-overlay" onclick="playVideo(this)">
 				<span class="play-button">&#9654;</span>
 			</div>
 		</div>
-		{{else if .Item.GalleryIDs}}
-		<div class="image-gallery">
-			{{if .Item.ThumbnailID}}<a href="/media/{{.Item.ThumbnailID}}"><img src="/media/{{.Item.ThumbnailID}}" alt="{{if .Item.Title}}{{.Item.Title}}{{else}}Image{{end}}"></a>{{end}}
-			{{range .Item.GalleryIDs}}<a href="/media/{{.}}"><img src="/media/{{.}}" alt="Image"></a>{{end}}
-		</div>
-		{{else if .Item.ThumbnailID}}
-		<div class="image-container">
-			<a href="/media/{{.Item.ThumbnailID}}"><img src="/media/{{.Item.ThumbnailID}}" alt="{{if .Item.Title}}{{.Item.Title}}{{else}}Embed{{end}}"></a>
+		{{else if .Item.ImageIDs}}
+		<div class="image-container{{if gt (len .Item.ImageIDs) 1}} image-gallery{{end}}">
+			{{range .Item.ImageIDs}}<a href="/media/{{.}}"><img src="/media/{{.}}" alt="Image"></a>{{end}}
 		</div>
 		{{else if .Item.MediaID}}
 		<div class="image-container">
-			<a href="/media/{{.Item.MediaID}}"><img src="/media/{{.Item.MediaID}}" alt="{{if .Item.Title}}{{.Item.Title}}{{else}}Embed{{end}}"></a>
-		</div>
-		{{end}}
-		{{else if .Item.MediaID}}
-		<div class="image-container">
-			<a href="/media/{{.Item.MediaID}}"><img src="/media/{{.Item.MediaID}}" alt="{{if .Item.Title}}{{.Item.Title}}{{else}}Image{{end}}"></a>
-		</div>
-		{{else if .Item.ThumbnailID}}
-		<div class="image-container">
-			<a href="/media/{{.Item.ThumbnailID}}"><img src="/media/{{.Item.ThumbnailID}}" alt="{{if .Item.Title}}{{.Item.Title}}{{else}}Image{{end}}"></a>
+			<a href="/media/{{.Item.MediaID}}"><img src="/media/{{.Item.MediaID}}" alt="Image"></a>
 		</div>
 		{{end}}
 
@@ -179,26 +163,19 @@ func HandleItemPage(rc *RequestContext, w http.ResponseWriter, r *http.Request)
 	}
 
 	// Get media
-	// Media is ordered by ID, so first "image" is the thumbnail, rest are gallery
-	var thumbnailID, mediaID *int64
+	var mediaID *int64
 	var mediaIsVideo bool
-	var galleryIDs []int64
+	var imageIDs []int64
 	mediaList, err := media.QFindByItemID(ctx, rc.DB, it.ID)
 	if err != nil {
 		return err
 	}
-	firstImage := true
 	for _, m := range mediaList {
 		if m.MediaType == "original" {
 			mediaID = &m.ID
 			mediaIsVideo = strings.HasPrefix(m.ContentType, "video/")
 		} else if m.MediaType == "image" {
-			if firstImage {
-				thumbnailID = &m.ID
-				firstImage = false
-			} else {
-				galleryIDs = append(galleryIDs, m.ID)
-			}
+			imageIDs = append(imageIDs, m.ID)
 		}
 	}
 
@@ -212,10 +189,9 @@ func HandleItemPage(rc *RequestContext, w http.ResponseWriter, r *http.Request)
 		EmbedVideoURL: item.Ptr(it.EmbedVideoURL),
 		Tags:          tagNames,
 		CreatedAt:     it.CreatedAt.Format("Jan 2, 2006"),
-		ThumbnailID:   thumbnailID,
 		MediaID:       mediaID,
 		MediaIsVideo:  mediaIsVideo,
-		GalleryIDs:    galleryIDs,
+		ImageIDs:      imageIDs,
 	}
 
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")