diff --git a/app.go b/app.go index 53297c6..0b5592a 100644 --- a/app.go +++ b/app.go @@ -174,18 +174,21 @@ func (a *App) Quit() { // DownloadMediaRequest represents the request for downloading media (legacy) type DownloadMediaRequest struct { - URLs []string `json:"urls"` - OutputDir string `json:"output_dir"` - Username string `json:"username"` + URLs []string `json:"urls"` + OutputDir string `json:"output_dir"` + Username string `json:"username"` + Proxy string `json:"proxy,omitempty"` // Optional proxy URL (e.g., http://proxy:port or socks5://proxy:port) } // MediaItemRequest represents a media item with metadata type MediaItemRequest struct { - URL string `json:"url"` - Date string `json:"date"` - TweetID backend.TweetIDString `json:"tweet_id"` - Type string `json:"type"` - Content string `json:"content,omitempty"` // Tweet text content (for text-only tweets) + URL string `json:"url"` + Date string `json:"date"` + TweetID backend.TweetIDString `json:"tweet_id"` + Type string `json:"type"` + Content string `json:"content,omitempty"` // Tweet text content (for text-only tweets) + OriginalFilename string `json:"original_filename,omitempty"` // Original filename from API + AuthorUsername string `json:"author_username,omitempty"` // Username of tweet author (for bookmarks and likes) } // DownloadMediaWithMetadataRequest represents the request for downloading media with metadata @@ -193,12 +196,14 @@ type DownloadMediaWithMetadataRequest struct { Items []MediaItemRequest `json:"items"` OutputDir string `json:"output_dir"` Username string `json:"username"` + Proxy string `json:"proxy,omitempty"` // Optional proxy URL (e.g., http://proxy:port or socks5://proxy:port) } // DownloadMediaResponse represents the response for download operation type DownloadMediaResponse struct { Success bool `json:"success"` Downloaded int `json:"downloaded"` + Skipped int `json:"skipped"` Failed int `json:"failed"` Message string `json:"message"` } @@ -222,11 +227,12 @@ func (a *App) DownloadMedia(req DownloadMediaRequest) (DownloadMediaResponse, er outputDir = filepath.Join(outputDir, req.Username) } - downloaded, failed, err := backend.DownloadMediaFiles(req.URLs, outputDir) + downloaded, failed, err := backend.DownloadMediaFiles(req.URLs, outputDir, req.Proxy) if err != nil { return DownloadMediaResponse{ Success: false, Downloaded: downloaded, + Skipped: 0, Failed: failed, Message: err.Error(), }, err @@ -235,6 +241,7 @@ func (a *App) DownloadMedia(req DownloadMediaRequest) (DownloadMediaResponse, er return DownloadMediaResponse{ Success: true, Downloaded: downloaded, + Skipped: 0, Failed: failed, Message: fmt.Sprintf("Downloaded %d files, %d failed", downloaded, failed), }, nil @@ -268,16 +275,31 @@ func (a *App) DownloadMediaWithMetadata(req DownloadMediaWithMetadataRequest) (D outputDir = backend.GetDefaultDownloadPath() } - // Convert request items to backend items - items := make([]backend.MediaItem, len(req.Items)) - for i, item := range req.Items { + // Convert request items to backend items + // For bookmarks and likes, use author_username from each item if available + items := make([]backend.MediaItem, len(req.Items)) + for i, item := range req.Items { + // Use original filename from API if available, otherwise extract from URL + originalFilename := item.OriginalFilename + if originalFilename == "" { + // Fallback: extract from URL if not provided in API response + originalFilename = backend.ExtractOriginalFilename(item.URL) + } + + // For bookmarks and likes, use author_username from item, otherwise use req.Username + username := req.Username + if item.AuthorUsername != "" { + username = item.AuthorUsername + } + items[i] = backend.MediaItem{ - URL: item.URL, - Date: item.Date, - TweetID: int64(item.TweetID), - Type: item.Type, - Username: req.Username, - Content: item.Content, + URL: item.URL, + Date: item.Date, + TweetID: int64(item.TweetID), + Type: item.Type, + Username: username, + Content: item.Content, + OriginalFilename: originalFilename, } } @@ -306,11 +328,12 @@ func (a *App) DownloadMediaWithMetadata(req DownloadMediaWithMetadataRequest) (D }) } - downloaded, failed, err := backend.DownloadMediaWithMetadataProgressAndStatus(items, outputDir, req.Username, progressCallback, itemStatusCallback, a.downloadCtx) + downloaded, skipped, failed, err := backend.DownloadMediaWithMetadataProgressAndStatus(items, outputDir, req.Username, progressCallback, itemStatusCallback, a.downloadCtx, req.Proxy) if err != nil { return DownloadMediaResponse{ Success: false, Downloaded: downloaded, + Skipped: skipped, Failed: failed, Message: err.Error(), }, err @@ -322,8 +345,9 @@ func (a *App) DownloadMediaWithMetadata(req DownloadMediaWithMetadataRequest) (D return DownloadMediaResponse{ Success: true, Downloaded: downloaded, + Skipped: skipped, Failed: failed, - Message: fmt.Sprintf("Downloaded %d files, %d failed", downloaded, failed), + Message: fmt.Sprintf("Downloaded %d files, %d skipped, %d failed", downloaded, skipped, failed), }, nil } @@ -378,6 +402,11 @@ func (a *App) ExportAccountJSON(id int64, outputDir string) (string, error) { return backend.ExportAccountToFile(id, outputDir) } +// ExportAccountsTXT exports selected accounts to TXT file in specified directory +func (a *App) ExportAccountsTXT(ids []int64, outputDir string) (string, error) { + return backend.ExportAccountsToTXT(ids, outputDir) +} + // UpdateAccountGroup updates the group for an account func (a *App) UpdateAccountGroup(id int64, groupName, groupColor string) error { return backend.UpdateAccountGroup(id, groupName, groupColor) @@ -400,6 +429,16 @@ func (a *App) DownloadFFmpeg() error { return backend.DownloadFFmpeg(nil) } +// IsExifToolInstalled checks if exiftool is available +func (a *App) IsExifToolInstalled() bool { + return backend.IsExifToolInstalled() +} + +// DownloadExifTool downloads exiftool binary +func (a *App) DownloadExifTool() error { + return backend.DownloadExifTool(nil) +} + // ConvertGIFsRequest represents request for converting GIFs type ConvertGIFsRequest struct { FolderPath string `json:"folder_path"` diff --git a/backend/config.go b/backend/config.go index a75a267..878aa0c 100644 --- a/backend/config.go +++ b/backend/config.go @@ -1,8 +1,12 @@ package backend import ( + "fmt" + "net/http" + "net/url" "os" "path/filepath" + "time" ) func GetDefaultDownloadPath() string { @@ -16,3 +20,57 @@ func GetDefaultDownloadPath() string { // Return path to user's Pictures folder return filepath.Join(homeDir, "Pictures") } + +// GetProxyURL gets proxy URL from environment variables or custom proxy setting +// Priority: customProxy > HTTP_PROXY/HTTPS_PROXY > http_proxy/https_proxy +func GetProxyURL(customProxy string) (*url.URL, error) { + // First, check custom proxy setting + if customProxy != "" { + proxyURL, err := url.Parse(customProxy) + if err != nil { + return nil, fmt.Errorf("invalid custom proxy URL: %v", err) + } + return proxyURL, nil + } + + // Check environment variables (case-insensitive on Windows) + proxyEnv := os.Getenv("HTTPS_PROXY") + if proxyEnv == "" { + proxyEnv = os.Getenv("https_proxy") + } + if proxyEnv == "" { + proxyEnv = os.Getenv("HTTP_PROXY") + } + if proxyEnv == "" { + proxyEnv = os.Getenv("http_proxy") + } + + if proxyEnv != "" { + proxyURL, err := url.Parse(proxyEnv) + if err != nil { + return nil, fmt.Errorf("invalid proxy URL from environment: %v", err) + } + return proxyURL, nil + } + + return nil, nil // No proxy +} + +// CreateHTTPClient creates an HTTP client with proxy support +func CreateHTTPClient(customProxy string, timeout time.Duration) (*http.Client, error) { + proxyURL, err := GetProxyURL(customProxy) + if err != nil { + return nil, err + } + + transport := &http.Transport{ + Proxy: http.ProxyURL(proxyURL), + } + + client := &http.Client{ + Transport: transport, + Timeout: timeout, + } + + return client, nil +} diff --git a/backend/database.go b/backend/database.go index 4047397..104192a 100644 --- a/backend/database.go +++ b/backend/database.go @@ -241,36 +241,6 @@ func ClearAllAccounts() error { return err } -// GetAccountByUsername returns a specific account by username -func GetAccountByUsername(username string) (*AccountDB, error) { - if db == nil { - if err := InitDB(); err != nil { - return nil, err - } - } - - var acc AccountDB - var lastFetched time.Time - var completedInt int - err := db.QueryRow(` - SELECT id, username, name, profile_image, total_media, last_fetched, response_json, - COALESCE(cursor, '') as cursor, COALESCE(completed, 1) as completed - FROM accounts WHERE username = ? - `, username).Scan(&acc.ID, &acc.Username, &acc.Name, &acc.ProfileImage, &acc.TotalMedia, &lastFetched, &acc.ResponseJSON, &acc.Cursor, &completedInt) - - if err != nil { - return nil, err - } - acc.LastFetched = lastFetched - acc.Completed = completedInt == 1 - - // Convert legacy format if needed - if converted, err := ConvertLegacyToNewFormat(acc.ResponseJSON); err == nil { - acc.ResponseJSON = converted - } - - return &acc, nil -} // GetAccountByID returns a specific account by ID func GetAccountByID(id int64) (*AccountDB, error) { @@ -314,14 +284,6 @@ func DeleteAccount(id int64) error { _, err := db.Exec("DELETE FROM accounts WHERE id = ?", id) return err } - -// ParseResponseJSON parses the stored JSON response -func ParseResponseJSON(jsonStr string) (map[string]interface{}, error) { - var result map[string]interface{} - err := json.Unmarshal([]byte(jsonStr), &result) - return result, err -} - // LegacyMediaEntry represents media entry in old format type LegacyMediaEntry struct { TweetID string `json:"tweet_id"` @@ -442,6 +404,53 @@ func ExportAccountToFile(id int64, outputDir string) (string, error) { return filePath, nil } +// ExportAccountsToTXT exports selected accounts to TXT file (one username per line) +func ExportAccountsToTXT(ids []int64, outputDir string) (string, error) { + if len(ids) == 0 { + return "", fmt.Errorf("no accounts to export") + } + + // Create export directory if not exists + exportDir := filepath.Join(outputDir, "twitterxmediabatchdownloader_backups") + if err := os.MkdirAll(exportDir, 0755); err != nil { + return "", err + } + + // Get all accounts by IDs + var usernames []string + for _, id := range ids { + acc, err := GetAccountByID(id) + if err != nil { + continue // Skip if account not found + } + if acc.Username != "" { + usernames = append(usernames, acc.Username) + } + } + + if len(usernames) == 0 { + return "", fmt.Errorf("no valid usernames found") + } + + // Create TXT content (one username per line) + txtContent := "" + for i, username := range usernames { + if i > 0 { + txtContent += "\n" + } + txtContent += username + } + + // Filename: twitterxmediabatchdownloader_multiple.txt + filePath := filepath.Join(exportDir, "twitterxmediabatchdownloader_multiple.txt") + + if err := os.WriteFile(filePath, []byte(txtContent), 0644); err != nil { + return "", err + } + + return filePath, nil +} + // ImportAccountFromFile imports account from JSON file (supports both old and new format) func ImportAccountFromFile(filePath string) (string, error) { if db == nil { diff --git a/backend/download.go b/backend/download.go index 497b22d..9565d84 100644 --- a/backend/download.go +++ b/backend/download.go @@ -21,23 +21,29 @@ const ( // MediaItem represents a media item with metadata for download type MediaItem struct { - URL string `json:"url"` - Date string `json:"date"` - TweetID int64 `json:"tweet_id"` - Type string `json:"type"` - Username string `json:"username"` - Content string `json:"content,omitempty"` // Tweet text content (for text-only tweets) + URL string `json:"url"` + Date string `json:"date"` + TweetID int64 `json:"tweet_id"` + Type string `json:"type"` + Username string `json:"username"` + Content string `json:"content,omitempty"` // Tweet text content (for text-only tweets) + OriginalFilename string `json:"original_filename,omitempty"` // Original Twitter media filename (15 char alphanumeric) } // DownloadMediaFiles downloads media files from URLs to the output directory (legacy) -func DownloadMediaFiles(urls []string, outputDir string) (downloaded int, failed int, err error) { +func DownloadMediaFiles(urls []string, outputDir string, customProxy string) (downloaded int, failed int, err error) { // Create output directory if it doesn't exist if err := os.MkdirAll(outputDir, 0755); err != nil { return 0, len(urls), fmt.Errorf("failed to create output directory: %v", err) } - client := &http.Client{ - Timeout: 60 * time.Second, + // Create HTTP client with proxy support + client, err := CreateHTTPClient(customProxy, 60*time.Second) + if err != nil { + // If proxy setup fails, use default client without proxy + client = &http.Client{ + Timeout: 60 * time.Second, + } } for _, mediaURL := range urls { @@ -73,38 +79,35 @@ type downloadTask struct { index int } -// DownloadMediaWithMetadata downloads media files with proper naming and categorization -func DownloadMediaWithMetadata(items []MediaItem, outputDir string, username string) (downloaded int, failed int, err error) { - return DownloadMediaWithMetadataProgressAndStatus(items, outputDir, username, nil, nil, nil) -} - -// DownloadMediaWithMetadataProgress downloads media files with progress callback and cancellation support -func DownloadMediaWithMetadataProgress(items []MediaItem, outputDir string, username string, progress ProgressCallback, ctx context.Context) (downloaded int, failed int, err error) { - return DownloadMediaWithMetadataProgressAndStatus(items, outputDir, username, progress, nil, ctx) -} - // DownloadMediaWithMetadataProgressAndStatus downloads media files with progress and per-item status callbacks -func DownloadMediaWithMetadataProgressAndStatus(items []MediaItem, outputDir string, username string, progress ProgressCallback, itemStatus ItemStatusCallback, ctx context.Context) (downloaded int, failed int, err error) { +// Returns: downloaded count, skipped count, failed count, error +func DownloadMediaWithMetadataProgressAndStatus(items []MediaItem, outputDir string, username string, progress ProgressCallback, itemStatus ItemStatusCallback, ctx context.Context, customProxy string) (downloaded int, skipped int, failed int, err error) { if ctx == nil { ctx = context.Background() } - // Create base output directory - baseDir := filepath.Join(outputDir, username) - if err := os.MkdirAll(baseDir, 0755); err != nil { - return 0, len(items), fmt.Errorf("failed to create output directory: %v", err) - } - total := len(items) if total == 0 { - return 0, 0, nil + return 0, 0, 0, nil } // Prepare all tasks first (sequential to handle tweet media count) - tweetMediaCount := make(map[int64]int) + // For bookmarks and likes, each item may have different username, so we track per username + tweetMediaCount := make(map[string]map[int64]int) // username -> tweet_id -> count tasks := make([]downloadTask, 0, total) for i, item := range items { + // Use item.Username if available (for bookmarks/likes with different authors), otherwise use provided username + itemUsername := item.Username + if itemUsername == "" { + itemUsername = username + } + + // Initialize tweet media count for this username if needed + if tweetMediaCount[itemUsername] == nil { + tweetMediaCount[itemUsername] = make(map[int64]int) + } + // Determine subfolder based on type var subfolder string switch item.Type { @@ -120,6 +123,12 @@ func DownloadMediaWithMetadataProgressAndStatus(items []MediaItem, outputDir str subfolder = "other" } + // Create base directory for this username + baseDir := filepath.Join(outputDir, itemUsername) + if err := os.MkdirAll(baseDir, 0755); err != nil { + continue + } + // Create type subfolder typeDir := filepath.Join(baseDir, subfolder) if err := os.MkdirAll(typeDir, 0755); err != nil { @@ -132,12 +141,12 @@ func DownloadMediaWithMetadataProgressAndStatus(items []MediaItem, outputDir str // Get file extension ext := getExtension(item.URL, item.Type) - // Increment counter for this tweet_id - tweetMediaCount[item.TweetID]++ - mediaIndex := tweetMediaCount[item.TweetID] + // Increment counter for this username and tweet_id + tweetMediaCount[itemUsername][item.TweetID]++ + mediaIndex := tweetMediaCount[itemUsername][item.TweetID] // Create filename: {username}_{timestamp}_{tweet_id}_{index}.{ext} - filename := fmt.Sprintf("%s_%s_%d_%02d%s", username, timestamp, item.TweetID, mediaIndex, ext) + filename := fmt.Sprintf("%s_%s_%d_%02d%s", itemUsername, timestamp, item.TweetID, mediaIndex, ext) outputPath := filepath.Join(typeDir, filename) tasks = append(tasks, downloadTask{ @@ -149,6 +158,7 @@ func DownloadMediaWithMetadataProgressAndStatus(items []MediaItem, outputDir str // Counters for parallel downloads var downloadedCount int64 + var skippedCount int64 var failedCount int64 var completedCount int64 @@ -162,13 +172,23 @@ func DownloadMediaWithMetadataProgressAndStatus(items []MediaItem, outputDir str numWorkers = len(tasks) } + // Create HTTP client once for all workers (shared client is more efficient) + var sharedClient *http.Client + client, err := CreateHTTPClient(customProxy, 60*time.Second) + if err != nil { + // If proxy setup fails, use default client without proxy + sharedClient = &http.Client{ + Timeout: 60 * time.Second, + } + } else { + sharedClient = client + } + for i := 0; i < numWorkers; i++ { wg.Add(1) go func() { defer wg.Done() - client := &http.Client{ - Timeout: 60 * time.Second, - } + client := sharedClient for task := range taskChan { // Check for cancellation @@ -181,8 +201,13 @@ func DownloadMediaWithMetadataProgressAndStatus(items []MediaItem, outputDir str var status string // Skip if file already exists if _, err := os.Stat(task.outputPath); err == nil { - atomic.AddInt64(&downloadedCount, 1) status = "skipped" + // Emit status immediately for skipped files + if itemStatus != nil { + itemStatus(task.item.TweetID, task.index, status) + } + atomic.AddInt64(&skippedCount, 1) + continue // Skip to next task } else if task.item.Type == "text" { // For text tweets, write content to file if err := os.WriteFile(task.outputPath, []byte(task.item.Content), 0644); err != nil { @@ -196,6 +221,20 @@ func DownloadMediaWithMetadataProgressAndStatus(items []MediaItem, outputDir str atomic.AddInt64(&failedCount, 1) status = "failed" } else { + // Embed metadata after successful download + tweetURL := fmt.Sprintf("https://x.com/i/status/%d", task.item.TweetID) + // Always extract original filename from URL (simpler approach) + originalFilename := ExtractOriginalFilename(task.item.URL) + + // For debugging: if original filename is still empty for video, it means it's not in the URL + // This is acceptable - video URLs from Twitter may not contain original filename + + // Embed metadata (non-fatal: if it fails, file is still downloaded) + if err := EmbedMetadata(task.outputPath, task.item.Content, tweetURL, originalFilename); err != nil { + // Log error but don't fail the download + // Metadata embedding is optional + } + atomic.AddInt64(&downloadedCount, 1) status = "success" } @@ -220,7 +259,7 @@ func DownloadMediaWithMetadataProgressAndStatus(items []MediaItem, outputDir str case <-ctx.Done(): close(taskChan) wg.Wait() - return int(downloadedCount), int(failedCount) + (total - int(completedCount)), ctx.Err() + return int(downloadedCount), int(skippedCount), int(failedCount) + (total - int(completedCount)), ctx.Err() case taskChan <- task: } } @@ -229,7 +268,7 @@ func DownloadMediaWithMetadataProgressAndStatus(items []MediaItem, outputDir str // Wait for all workers to finish wg.Wait() - return int(downloadedCount), int(failedCount), nil + return int(downloadedCount), int(skippedCount), int(failedCount), nil } // downloadFileWithContext downloads a single file with context support for cancellation diff --git a/backend/exiftool.go b/backend/exiftool.go new file mode 100644 index 0000000..639d6a4 --- /dev/null +++ b/backend/exiftool.go @@ -0,0 +1,348 @@ +package backend + +import ( + "archive/zip" + "crypto/sha256" + "encoding/hex" + "fmt" + "io" + "net/http" + "os" + "os/exec" + "path/filepath" + "runtime" + "strings" +) + +// ExifTool download URLs (SourceForge) +const ( + // Windows 64-bit + exiftoolWindows64URL = "https://sourceforge.net/projects/exiftool/files/exiftool-13.43_64.zip/download" + // Windows 32-bit + exiftoolWindows32URL = "https://sourceforge.net/projects/exiftool/files/exiftool-13.43_32.zip/download" + // Unix (Linux/macOS): tar.gz + exiftoolUnixURL = "https://sourceforge.net/projects/exiftool/files/Image-ExifTool-13.43.tar.gz/download" +) + +// ExifTool SHA256 hashes for verification +// Note: Hashes will be calculated during download if not provided +// For now, we'll skip hash verification for version 13.43 (can be added later if needed) +const ( + exiftoolWindows64Hash = "" // Hash not provided, will skip verification + exiftoolWindows32Hash = "" // Hash not provided, will skip verification + exiftoolUnixHash = "" // Hash not provided, will skip verification +) + +// GetExifToolPath returns the path to exiftool binary +func GetExifToolPath() string { + homeDir, _ := os.UserHomeDir() + baseDir := filepath.Join(homeDir, ".twitterxmediabatchdownloader") + + switch runtime.GOOS { + case "windows": + return filepath.Join(baseDir, "exiftool.exe") + default: + // For Unix (Linux/macOS), exiftool is in Image-ExifTool-VERSION/exiftool + // We need to find the folder dynamically since version may vary + pattern := filepath.Join(baseDir, "Image-ExifTool-*") + matches, err := filepath.Glob(pattern) + if err == nil && len(matches) > 0 { + // Use the first match (should only be one) + exiftoolPath := filepath.Join(matches[0], "exiftool") + if _, err := os.Stat(exiftoolPath); err == nil { + return exiftoolPath + } + } + // Fallback: return path that will be created after extraction + return filepath.Join(baseDir, "exiftool") + } +} + +// IsExifToolInstalled checks if exiftool is available +func IsExifToolInstalled() bool { + exiftoolPath := GetExifToolPath() + if _, err := os.Stat(exiftoolPath); err == nil { + // Test if it's executable by running version command + cmd := exec.Command(exiftoolPath, "-ver") + hideWindow(cmd) + if err := cmd.Run(); err == nil { + return true + } + } + return false +} + +// calculateSHA256 calculates SHA256 hash of a file +func calculateSHA256(filePath string) (string, error) { + file, err := os.Open(filePath) + if err != nil { + return "", err + } + defer file.Close() + + hash := sha256.New() + if _, err := io.Copy(hash, file); err != nil { + return "", err + } + + return hex.EncodeToString(hash.Sum(nil)), nil +} + +// verifyHash verifies the SHA256 hash of a downloaded file +func verifyHash(filePath, expectedHash string) error { + actualHash, err := calculateSHA256(filePath) + if err != nil { + return fmt.Errorf("failed to calculate hash: %v", err) + } + + if !strings.EqualFold(actualHash, expectedHash) { + return fmt.Errorf("hash verification failed: expected %s, got %s", expectedHash, actualHash) + } + + return nil +} + +// is64Bit checks if the system is 64-bit +func is64Bit() bool { + return runtime.GOARCH == "amd64" || runtime.GOARCH == "arm64" +} + +// DownloadExifTool downloads exiftool binary for current platform +func DownloadExifTool(progressCallback func(downloaded, total int64)) error { + var downloadURL string + var expectedHash string + + switch runtime.GOOS { + case "windows": + if is64Bit() { + downloadURL = exiftoolWindows64URL + expectedHash = exiftoolWindows64Hash + } else { + downloadURL = exiftoolWindows32URL + expectedHash = exiftoolWindows32Hash + } + case "linux", "darwin": + // Linux and macOS use the same tar.gz archive + downloadURL = exiftoolUnixURL + expectedHash = exiftoolUnixHash + default: + return fmt.Errorf("unsupported platform: %s", runtime.GOOS) + } + + // Create temp file for download + tempFile, err := os.CreateTemp("", "exiftool-*") + if err != nil { + return fmt.Errorf("failed to create temp file: %v", err) + } + tempPath := tempFile.Name() + defer os.Remove(tempPath) + defer tempFile.Close() + + // Download file + resp, err := http.Get(downloadURL) + if err != nil { + return fmt.Errorf("failed to download exiftool: %v", err) + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + return fmt.Errorf("failed to download exiftool: status %d", resp.StatusCode) + } + + // Copy with progress + total := resp.ContentLength + var downloaded int64 + buf := make([]byte, 32*1024) + + for { + n, err := resp.Body.Read(buf) + if n > 0 { + _, writeErr := tempFile.Write(buf[:n]) + if writeErr != nil { + return fmt.Errorf("failed to write temp file: %v", writeErr) + } + downloaded += int64(n) + if progressCallback != nil { + progressCallback(downloaded, total) + } + } + if err == io.EOF { + break + } + if err != nil { + return fmt.Errorf("failed to download: %v", err) + } + } + tempFile.Close() + + // Verify hash before extraction + if expectedHash != "" { + if err := verifyHash(tempPath, expectedHash); err != nil { + return fmt.Errorf("hash verification failed: %v", err) + } + } + + // Extract exiftool binary + exiftoolPath := GetExifToolPath() + baseDir := filepath.Dir(exiftoolPath) + if err := os.MkdirAll(baseDir, 0755); err != nil { + return fmt.Errorf("failed to create directory: %v", err) + } + + switch runtime.GOOS { + case "windows": + return extractExifToolFromZip(tempPath, exiftoolPath) + case "linux", "darwin": + // For Linux/macOS, we need to extract and build + // For simplicity, we'll extract the exiftool script from tar.gz + return extractExifToolFromTarGz(tempPath, exiftoolPath) + } + + return nil +} + +// extractExifToolFromZip extracts exiftool from Windows zip archive +func extractExifToolFromZip(zipPath, destPath string) error { + r, err := zip.OpenReader(zipPath) + if err != nil { + return fmt.Errorf("failed to open zip: %v", err) + } + defer r.Close() + + // Look for exiftool(-k).exe or exiftool.exe in the zip + var exiftoolFile *zip.File + for _, f := range r.File { + name := filepath.Base(f.Name) + // ExifTool Windows zip contains exiftool(-k).exe + if name == "exiftool(-k).exe" || name == "exiftool.exe" { + exiftoolFile = f + break + } + } + + if exiftoolFile == nil { + return fmt.Errorf("exiftool.exe not found in archive") + } + + rc, err := exiftoolFile.Open() + if err != nil { + return fmt.Errorf("failed to open file in zip: %v", err) + } + defer rc.Close() + + out, err := os.Create(destPath) + if err != nil { + return fmt.Errorf("failed to create output file: %v", err) + } + defer out.Close() + + if _, err := io.Copy(out, rc); err != nil { + return fmt.Errorf("failed to extract file: %v", err) + } + + // Also need to extract the lib directory for Windows (exiftool_files folder) + libDir := filepath.Join(filepath.Dir(destPath), "exiftool_files") + for _, f := range r.File { + // Check if file is in exiftool_files directory + if strings.Contains(f.Name, "exiftool_files") && !strings.HasSuffix(f.Name, "/") { + // Extract relative path from exiftool_files + parts := strings.Split(f.Name, "exiftool_files/") + if len(parts) < 2 { + continue + } + relPath := parts[1] + if relPath == "" { + continue + } + + targetPath := filepath.Join(libDir, relPath) + + // Create directory structure + if err := os.MkdirAll(filepath.Dir(targetPath), 0755); err != nil { + continue + } + + // Skip if it's a directory entry + if f.FileInfo().IsDir() { + os.MkdirAll(targetPath, 0755) + continue + } + + // Extract file + rc, err := f.Open() + if err != nil { + continue // Skip on error + } + + outFile, err := os.Create(targetPath) + if err != nil { + rc.Close() + continue + } + + io.Copy(outFile, rc) + outFile.Close() + rc.Close() + } + } + + return nil +} + +// extractExifToolFromTarGz extracts exiftool from tar.gz archive (Linux/macOS) +func extractExifToolFromTarGz(tarGzPath, destPath string) error { + // For Linux/macOS, ExifTool is a Perl script that requires the lib directory + // We'll extract the entire folder and use exiftool directly from Image-ExifTool-VERSION/exiftool + // This is simpler than implementing tar.gz extraction in Go + + baseDir := filepath.Dir(destPath) + + // Use system tar command to extract + cmd := exec.Command("tar", "-xzf", tarGzPath, "-C", baseDir) + hideWindow(cmd) + output, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("failed to extract tar.gz: %v, output: %s", err, string(output)) + } + + // Find the extracted exiftool script + // The archive extracts to Image-ExifTool-VERSION/exiftool + // We need to find the folder dynamically since version may vary + var extractedDir string + var exiftoolScript string + + // Use glob pattern to find Image-ExifTool-* directories + pattern := filepath.Join(baseDir, "Image-ExifTool-*") + matches, err := filepath.Glob(pattern) + if err == nil && len(matches) > 0 { + // Use the first match (should only be one) + extractedDir = matches[0] + exiftoolScript = filepath.Join(extractedDir, "exiftool") + } else { + // Fallback: try common version or alternative location + extractedDir = filepath.Join(baseDir, "Image-ExifTool-13.43") + exiftoolScript = filepath.Join(extractedDir, "exiftool") + } + + // Check if exiftool script exists + if _, err := os.Stat(exiftoolScript); err != nil { + // Try alternative location + extractedDir = filepath.Join(baseDir, "exiftool") + exiftoolScript = filepath.Join(extractedDir, "exiftool") + if _, err := os.Stat(exiftoolScript); err != nil { + return fmt.Errorf("exiftool script not found in extracted archive (searched in: %s and %s)", pattern, extractedDir) + } + } + + // Make exiftool executable (required for Unix systems) + if err := os.Chmod(exiftoolScript, 0755); err != nil { + return fmt.Errorf("failed to make exiftool executable: %v", err) + } + + // For Unix, we keep the entire folder structure and use exiftool directly from it + // The folder will remain in baseDir and GetExifToolPath() will find it via glob pattern + // No need to copy or remove anything + + return nil +} + diff --git a/backend/metadata.go b/backend/metadata.go new file mode 100644 index 0000000..7c42eab --- /dev/null +++ b/backend/metadata.go @@ -0,0 +1,227 @@ +package backend + +import ( + "fmt" + "net/url" + "os" + "os/exec" + "path/filepath" + "regexp" + "runtime" + "strings" +) + +// ExtractOriginalFilename extracts the original filename from Twitter media URL +// Supports 3 formats: +// 1. animated_gif: https://video.twimg.com/tweet_video/GzstJyDbIAAPuX9.mp4 -> GzstJyDbIAAPuX9 +// 2. photo: https://pbs.twimg.com/media/GynjhU0bYAAA_I4?format=jpg -> GynjhU0bYAAA_I4 +// 3. video: https://video.twimg.com/amplify_video/.../Jpo0cDa7aNtjSv7o.mp4 -> Jpo0cDa7aNtjSv7o +func ExtractOriginalFilename(mediaURL string) string { + parsedURL, err := url.Parse(mediaURL) + if err != nil { + return "" + } + + path := parsedURL.Path + parts := strings.Split(path, "/") + + // 1. animated_gif: video.twimg.com/tweet_video/XXX.mp4 + if strings.Contains(mediaURL, "/tweet_video/") { + for i, part := range parts { + if part == "tweet_video" && i+1 < len(parts) { + filename := parts[i+1] + // Remove extension + if idx := strings.LastIndex(filename, "."); idx > 0 { + filename = filename[:idx] + } + // Validate alphanumeric + underscore (Twitter filenames can contain _) + if matched, _ := regexp.MatchString(`^[A-Za-z0-9_]+$`, filename); matched && len(filename) > 0 { + return filename + } + } + } + } + + // 2. photo: pbs.twimg.com/media/XXX + if strings.Contains(mediaURL, "pbs.twimg.com/media/") { + if len(parts) > 0 { + filename := parts[len(parts)-1] + // Remove extension if present + if idx := strings.LastIndex(filename, "."); idx > 0 { + filename = filename[:idx] + } + // Validate alphanumeric + underscore (Twitter filenames can contain _) + if matched, _ := regexp.MatchString(`^[A-Za-z0-9_]+$`, filename); matched && len(filename) > 0 { + return filename + } + } + } + + // 3. video: video.twimg.com/amplify_video/.../XXX.mp4 or video.twimg.com/ext_tw_video/.../XXX.mp4 + // Filename is the last segment (before extension) + // Note: Skip if already handled by tweet_video above + if strings.Contains(mediaURL, "video.twimg.com") && !strings.Contains(mediaURL, "/tweet_video/") { + if len(parts) > 0 { + filename := parts[len(parts)-1] + // Remove extension + if idx := strings.LastIndex(filename, "."); idx > 0 { + filename = filename[:idx] + } + // Validate: alphanumeric + underscore with at least one letter (to exclude pure numeric IDs) + if matched, _ := regexp.MatchString(`^[A-Za-z0-9_]+$`, filename); matched { + hasLetter, _ := regexp.MatchString(`[A-Za-z]`, filename) + if hasLetter && len(filename) >= 8 { + return filename + } + } + } + } + + return "" +} + +// EmbedMetadata embeds metadata into a media file +// Only supports JPG (images) and MP4 (videos) +func EmbedMetadata(filePath string, tweetContent string, tweetURL string, originalFilename string) error { + ext := strings.ToLower(filepath.Ext(filePath)) + + switch ext { + case ".jpg", ".jpeg": + return embedImageMetadata(filePath, tweetContent, tweetURL, originalFilename) + case ".mp4": + return embedVideoMetadata(filePath, tweetContent, tweetURL, originalFilename) + default: + // For unsupported formats, skip metadata embedding + return nil + } +} + +// embedImageMetadata embeds metadata into image files using exiftool or similar +// Since we don't want to add heavy dependencies, we'll use a simple approach: +// For JPEG: We can use exiftool if available, or skip if not +// For PNG: Limited support, skip for now +func embedImageMetadata(filePath string, tweetContent string, tweetURL string, originalFilename string) error { + // Try to use exiftool if available (common tool for metadata) + exiftoolPath := findExifTool() + if exiftoolPath == "" { + // exiftool not found, skip metadata embedding for images + // This is acceptable as it's an optional feature + return nil + } + + // Build metadata comment + metadataComment := buildMetadataComment(tweetContent, tweetURL, originalFilename) + + // Use exiftool to add comment only (URL | filename) + args := []string{ + "-overwrite_original", + "-Comment=" + metadataComment, + filePath, + } + + cmd := exec.Command(exiftoolPath, args...) + hideWindow(cmd) + output, err := cmd.CombinedOutput() + if err != nil { + // Non-fatal: if exiftool fails, just skip metadata + return fmt.Errorf("exiftool error (non-fatal): %v, output: %s", err, string(output)) + } + + _ = output // Suppress unused variable warning + return nil +} + +// embedVideoMetadata embeds metadata into video/GIF files using ExifTool +func embedVideoMetadata(filePath string, tweetContent string, tweetURL string, originalFilename string) error { + // Use ExifTool for video metadata (works well for MP4) + exiftoolPath := findExifTool() + if exiftoolPath == "" { + // ExifTool not available, skip metadata embedding (non-fatal) + return nil + } + + return embedVideoMetadataWithExifTool(exiftoolPath, filePath, tweetContent, tweetURL, originalFilename) +} + +// embedVideoMetadataWithExifTool embeds metadata using ExifTool (preferred for MP4) +func embedVideoMetadataWithExifTool(exiftoolPath string, filePath string, tweetContent string, tweetURL string, originalFilename string) error { + // Build metadata comment + metadataComment := buildMetadataComment(tweetContent, tweetURL, originalFilename) + + // Use exiftool to add comment only (URL | filename) + args := []string{ + "-overwrite_original", + "-Comment=" + metadataComment, + filePath, + } + + cmd := exec.Command(exiftoolPath, args...) + hideWindow(cmd) + output, err := cmd.CombinedOutput() + if err != nil { + // Non-fatal: if exiftool fails, skip metadata (file still downloaded) + return fmt.Errorf("exiftool error (non-fatal): %v, output: %s", err, string(output)) + } + + _ = output // Suppress unused variable warning + return nil +} + + +// buildMetadataComment builds a formatted metadata comment string +func buildMetadataComment(tweetContent string, tweetURL string, originalFilename string) string { + var parts []string + + if tweetURL != "" { + parts = append(parts, tweetURL) + } + if originalFilename != "" { + parts = append(parts, originalFilename) + } + + // If no original filename, just return URL (don't add empty part) + if len(parts) == 0 { + return "" + } + + return strings.Join(parts, " | ") +} + +// findExifTool searches for exiftool, prioritizing the installed version in .twitterxmediabatchdownloader +func findExifTool() string { + // First, check if exiftool is installed in .twitterxmediabatchdownloader + if IsExifToolInstalled() { + return GetExifToolPath() + } + + // Fallback: check common system locations + commonPaths := []string{ + "exiftool", + "/usr/bin/exiftool", + "/usr/local/bin/exiftool", + "C:\\Program Files\\exiftool\\exiftool.exe", + "C:\\exiftool\\exiftool.exe", + } + + for _, path := range commonPaths { + if runtime.GOOS == "windows" { + // On Windows, try .exe extension + if _, err := exec.LookPath(path); err == nil { + return path + } + } else { + // On Unix, check if executable + if _, err := os.Stat(path); err == nil { + return path + } + } + } + + // Try to find in PATH + if path, err := exec.LookPath("exiftool"); err == nil { + return path + } + + return "" +} + diff --git a/backend/twitter.go b/backend/twitter.go index 2f33fd4..6ef995e 100644 --- a/backend/twitter.go +++ b/backend/twitter.go @@ -213,6 +213,8 @@ type TimelineEntry struct { ReplyCount int `json:"reply_count,omitempty"` Source string `json:"source,omitempty"` Verified bool `json:"verified,omitempty"` + OriginalFilename string `json:"original_filename,omitempty"` // Original filename from API + AuthorUsername string `json:"author_username,omitempty"` // Username of tweet author (for bookmarks and likes) } // AccountInfo represents Twitter account information (derived from metadata) @@ -395,27 +397,39 @@ func convertMetadataToTimelineEntry(meta TweetMetadata) TimelineEntry { FavoriteCount: meta.FavoriteCount, RetweetCount: meta.RetweetCount, ReplyCount: meta.ReplyCount, + AuthorUsername: meta.Author.Name, } } // convertToTimelineEntry converts CLIMediaItem to TimelineEntry func convertToTimelineEntry(media CLIMediaItem) TimelineEntry { + // Get username from Author field (preferred for bookmarks/likes) or User field + // Author field always contains the tweet author, while User might be the account fetching for likes + authorUsername := "" + if media.Author.Name != "" { + authorUsername = media.Author.Name + } else if media.User.Name != "" { + authorUsername = media.User.Name + } + entry := TimelineEntry{ - URL: media.URL, - TweetID: media.TweetID, - Date: media.Date, - Extension: media.Extension, - Width: media.Width, - Height: media.Height, - IsRetweet: media.RetweetID != 0, - Content: media.Content, - ViewCount: media.ViewCount, - BookmarkCount: media.BookmarkCount, - FavoriteCount: media.FavoriteCount, - RetweetCount: media.RetweetCount, - ReplyCount: media.ReplyCount, - Source: media.Source, - Verified: media.Author.Verified, + URL: media.URL, + TweetID: media.TweetID, + Date: media.Date, + Extension: media.Extension, + Width: media.Width, + Height: media.Height, + IsRetweet: media.RetweetID != 0, + Content: media.Content, + ViewCount: media.ViewCount, + BookmarkCount: media.BookmarkCount, + FavoriteCount: media.FavoriteCount, + RetweetCount: media.RetweetCount, + ReplyCount: media.ReplyCount, + Source: media.Source, + Verified: media.Author.Verified, + AuthorUsername: authorUsername, + // OriginalFilename will be extracted from URL in download.go } // Determine type - media item already has type from CLI @@ -627,6 +641,17 @@ func ExtractTimeline(req TimelineRequest) (*TwitterResponse, error) { mediaTweetIDs[int64(media.TweetID)] = true } + // For bookmarks and likes, keep name as "bookmarks"/"likes" (not from author tweet) + isBookmarks := req.TimelineType == "bookmarks" + isLikes := req.TimelineType == "likes" + if isBookmarks { + accountInfo.Name = "bookmarks" + accountInfo.Nick = "My Bookmarks" + } else if isLikes { + accountInfo.Name = "likes" + accountInfo.Nick = "My Likes" + } + if isTextOnly { // Text-only mode: get tweets from metadata that don't have media timeline = make([]TimelineEntry, 0) @@ -637,19 +662,31 @@ func ExtractTimeline(req TimelineRequest) (*TwitterResponse, error) { } // Get account info from first media item if available, otherwise from metadata - if len(cliResponse.Media) > 0 { - user := cliResponse.Media[0].User - accountInfo.Name = user.Name - accountInfo.Nick = user.Nick - accountInfo.Date = user.Date - accountInfo.FollowersCount = user.FollowersCount - accountInfo.FriendsCount = user.FriendsCount - accountInfo.ProfileImage = user.ProfileImage - accountInfo.StatusesCount = user.StatusesCount - } else if len(cliResponse.Metadata) > 0 { - firstMeta := cliResponse.Metadata[0] - accountInfo.Name = firstMeta.Author.Name - accountInfo.Nick = firstMeta.Author.Nick + if !isBookmarks && !isLikes { + if len(cliResponse.Media) > 0 { + user := cliResponse.Media[0].User + accountInfo.Name = user.Name + accountInfo.Nick = user.Nick + accountInfo.Date = user.Date + accountInfo.FollowersCount = user.FollowersCount + accountInfo.FriendsCount = user.FriendsCount + accountInfo.ProfileImage = user.ProfileImage + accountInfo.StatusesCount = user.StatusesCount + } else if len(cliResponse.Metadata) > 0 { + firstMeta := cliResponse.Metadata[0] + accountInfo.Name = firstMeta.Author.Name + accountInfo.Nick = firstMeta.Author.Nick + } + } else { + // For bookmarks and likes, get other info from first media item if available + if len(cliResponse.Media) > 0 { + user := cliResponse.Media[0].User + accountInfo.Date = user.Date + accountInfo.FollowersCount = user.FollowersCount + accountInfo.FriendsCount = user.FriendsCount + accountInfo.ProfileImage = user.ProfileImage + accountInfo.StatusesCount = user.StatusesCount + } } } else if len(cliResponse.Media) > 0 { // Normal media items only (text tweets handled separately with "text" media type) @@ -662,8 +699,10 @@ func ExtractTimeline(req TimelineRequest) (*TwitterResponse, error) { // Get account info from first media item user := cliResponse.Media[0].User - accountInfo.Name = user.Name - accountInfo.Nick = user.Nick + if !isBookmarks && !isLikes { + accountInfo.Name = user.Name + accountInfo.Nick = user.Nick + } accountInfo.Date = user.Date accountInfo.FollowersCount = user.FollowersCount accountInfo.FriendsCount = user.FriendsCount @@ -688,13 +727,16 @@ func ExtractTimeline(req TimelineRequest) (*TwitterResponse, error) { FavoriteCount: meta.FavoriteCount, RetweetCount: meta.RetweetCount, ReplyCount: meta.ReplyCount, + AuthorUsername: meta.Author.Name, } timeline = append(timeline, entry) } // Get account info from first metadata - firstMeta := cliResponse.Metadata[0] - accountInfo.Name = firstMeta.Author.Name - accountInfo.Nick = firstMeta.Author.Nick + if !isBookmarks && !isLikes { + firstMeta := cliResponse.Metadata[0] + accountInfo.Name = firstMeta.Author.Name + accountInfo.Nick = firstMeta.Author.Nick + } } // Determine if there's more data to fetch @@ -874,25 +916,3 @@ func extractJSON(output string) string { return "" } - -// GetThumbnailURL converts a Twitter media URL to thumbnail size -func GetThumbnailURL(url string) string { - // For images: https://pbs.twimg.com/media/XXX?format=jpg&name=thumb - if strings.Contains(url, "pbs.twimg.com/media/") { - // Check if it already has format parameter - if strings.Contains(url, "?format=") { - // Replace name parameter with thumb - if strings.Contains(url, "&name=") { - parts := strings.Split(url, "&name=") - return parts[0] + "&name=thumb" - } - return url + "&name=thumb" - } - // Add format and name parameters - if strings.Contains(url, "?") { - return url + "&name=thumb" - } - return url + "?format=jpg&name=thumb" - } - return url -} diff --git a/frontend/package.json b/frontend/package.json index 0c05088..050e389 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -16,31 +16,32 @@ "@radix-ui/react-checkbox": "^1.3.3", "@radix-ui/react-context-menu": "^2.2.16", "@radix-ui/react-dialog": "^1.1.15", + "@radix-ui/react-dropdown-menu": "^2.1.16", "@radix-ui/react-label": "^2.1.8", "@radix-ui/react-progress": "^1.1.8", "@radix-ui/react-radio-group": "^1.3.8", "@radix-ui/react-select": "^2.2.6", "@radix-ui/react-slot": "^1.2.4", - "@radix-ui/react-switch": "^1.1.4", + "@radix-ui/react-switch": "^1.2.6", "@radix-ui/react-tabs": "^1.1.13", "@radix-ui/react-tooltip": "^1.2.8", "@tailwindcss/vite": "^4.1.17", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", - "lucide-react": "^0.554.0", + "lucide-react": "^0.559.0", "next-themes": "^0.4.6", - "react": "^19.2.0", - "react-dom": "^19.2.0", + "react": "^19.2.1", + "react-dom": "^19.2.1", "sonner": "^2.0.7", "tailwind-merge": "^3.4.0", "tailwindcss": "^4.1.17" }, "devDependencies": { "@eslint/js": "^9.39.1", - "@types/node": "^24.10.1", - "@types/react": "^19.2.6", + "@types/node": "^25.0.0", + "@types/react": "^19.2.7", "@types/react-dom": "^19.2.3", - "@vitejs/plugin-react": "^5.1.1", + "@vitejs/plugin-react": "^5.1.2", "eslint": "^9.39.1", "eslint-plugin-react-hooks": "^7.0.1", "eslint-plugin-react-refresh": "^0.4.24", @@ -48,7 +49,7 @@ "sharp": "^0.34.5", "tw-animate-css": "^1.4.0", "typescript": "~5.9.3", - "typescript-eslint": "^8.47.0", - "vite": "^7.2.4" + "typescript-eslint": "^8.49.0", + "vite": "^7.2.7" } } diff --git a/frontend/package.json.md5 b/frontend/package.json.md5 index c495aec..6661610 100644 --- a/frontend/package.json.md5 +++ b/frontend/package.json.md5 @@ -1 +1 @@ -6d6b26a2fed70996ef14dbc3e325f141 \ No newline at end of file +9fa5d67c42a33ac8765a4b51d8bc1bb5 \ No newline at end of file diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index ddb419e..eeaf00d 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -10,43 +10,46 @@ importers: dependencies: '@radix-ui/react-accordion': specifier: ^1.2.12 - version: 1.2.12(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 1.2.12(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@radix-ui/react-checkbox': specifier: ^1.3.3 - version: 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@radix-ui/react-context-menu': specifier: ^2.2.16 - version: 2.2.16(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 2.2.16(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@radix-ui/react-dialog': specifier: ^1.1.15 - version: 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-dropdown-menu': + specifier: ^2.1.16 + version: 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@radix-ui/react-label': specifier: ^2.1.8 - version: 2.1.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 2.1.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@radix-ui/react-progress': specifier: ^1.1.8 - version: 1.1.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 1.1.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@radix-ui/react-radio-group': specifier: ^1.3.8 - version: 1.3.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 1.3.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@radix-ui/react-select': specifier: ^2.2.6 - version: 2.2.6(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 2.2.6(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@radix-ui/react-slot': specifier: ^1.2.4 - version: 1.2.4(@types/react@19.2.6)(react@19.2.0) + version: 1.2.4(@types/react@19.2.7)(react@19.2.1) '@radix-ui/react-switch': - specifier: ^1.1.4 - version: 1.2.6(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + specifier: ^1.2.6 + version: 1.2.6(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@radix-ui/react-tabs': specifier: ^1.1.13 - version: 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@radix-ui/react-tooltip': specifier: ^1.2.8 - version: 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@tailwindcss/vite': specifier: ^4.1.17 - version: 4.1.17(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2)) + version: 4.1.17(vite@7.2.7(@types/node@25.0.0)(jiti@2.6.1)(lightningcss@1.30.2)) class-variance-authority: specifier: ^0.7.1 version: 0.7.1 @@ -54,20 +57,20 @@ importers: specifier: ^2.1.1 version: 2.1.1 lucide-react: - specifier: ^0.554.0 - version: 0.554.0(react@19.2.0) + specifier: ^0.559.0 + version: 0.559.0(react@19.2.1) next-themes: specifier: ^0.4.6 - version: 0.4.6(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 0.4.6(react-dom@19.2.1(react@19.2.1))(react@19.2.1) react: - specifier: ^19.2.0 - version: 19.2.0 + specifier: ^19.2.1 + version: 19.2.1 react-dom: - specifier: ^19.2.0 - version: 19.2.0(react@19.2.0) + specifier: ^19.2.1 + version: 19.2.1(react@19.2.1) sonner: specifier: ^2.0.7 - version: 2.0.7(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 2.0.7(react-dom@19.2.1(react@19.2.1))(react@19.2.1) tailwind-merge: specifier: ^3.4.0 version: 3.4.0 @@ -79,17 +82,17 @@ importers: specifier: ^9.39.1 version: 9.39.1 '@types/node': - specifier: ^24.10.1 - version: 24.10.1 + specifier: ^25.0.0 + version: 25.0.0 '@types/react': - specifier: ^19.2.6 - version: 19.2.6 + specifier: ^19.2.7 + version: 19.2.7 '@types/react-dom': specifier: ^19.2.3 - version: 19.2.3(@types/react@19.2.6) + version: 19.2.3(@types/react@19.2.7) '@vitejs/plugin-react': - specifier: ^5.1.1 - version: 5.1.1(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2)) + specifier: ^5.1.2 + version: 5.1.2(vite@7.2.7(@types/node@25.0.0)(jiti@2.6.1)(lightningcss@1.30.2)) eslint: specifier: ^9.39.1 version: 9.39.1(jiti@2.6.1) @@ -112,11 +115,11 @@ importers: specifier: ~5.9.3 version: 5.9.3 typescript-eslint: - specifier: ^8.47.0 - version: 8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) + specifier: ^8.49.0 + version: 8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) vite: - specifier: ^7.2.4 - version: 7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2) + specifier: ^7.2.7 + version: 7.2.7(@types/node@25.0.0)(jiti@2.6.1)(lightningcss@1.30.2) packages: @@ -384,8 +387,8 @@ packages: resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/eslintrc@3.3.1': - resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==} + '@eslint/eslintrc@3.3.3': + resolution: {integrity: sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/js@9.39.1': @@ -584,18 +587,6 @@ packages: '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} - '@nodelib/fs.scandir@2.1.5': - resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} - engines: {node: '>= 8'} - - '@nodelib/fs.stat@2.0.5': - resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} - engines: {node: '>= 8'} - - '@nodelib/fs.walk@1.2.8': - resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} - engines: {node: '>= 8'} - '@radix-ui/number@1.1.1': resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==} @@ -742,6 +733,19 @@ packages: '@types/react-dom': optional: true + '@radix-ui/react-dropdown-menu@2.1.16': + resolution: {integrity: sha512-1PLGQEynI/3OX/ftV54COn+3Sud/Mn8vALg2rWnBLnRaGtJDduNW/22XjlGgPdpcIbiQxjKtb7BkcjP00nqfJw==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc + react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + '@radix-ui/react-focus-guards@1.1.3': resolution: {integrity: sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==} peerDependencies: @@ -1061,8 +1065,8 @@ packages: '@radix-ui/rect@1.1.1': resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==} - '@rolldown/pluginutils@1.0.0-beta.47': - resolution: {integrity: sha512-8QagwMH3kNCuzD8EWL8R2YPW5e4OrHNSAHRFDdmFqEwEaD/KcNKjVoumo+gP2vW5eKB2UPbM6vTYiGZX0ixLnw==} + '@rolldown/pluginutils@1.0.0-beta.53': + resolution: {integrity: sha512-vENRlFU4YbrwVqNDZ7fLvy+JR1CRkyr01jhSiDpE1u6py3OMzQfztQU2jxykW3ALNxO4kSlqIDeYyD0Y9RcQeQ==} '@rollup/rollup-android-arm-eabi@4.53.3': resolution: {integrity: sha512-mRSi+4cBjrRLoaal2PnqH82Wqyb+d3HsPUN/W+WslCXsZsyHa9ZeQQX/pQsZaVIWDkPcpV6jJ+3KLbTbgnwv8w==} @@ -1282,78 +1286,78 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/node@24.10.1': - resolution: {integrity: sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==} + '@types/node@25.0.0': + resolution: {integrity: sha512-rl78HwuZlaDIUSeUKkmogkhebA+8K1Hy7tddZuJ3D0xV8pZSfsYGTsliGUol1JPzu9EKnTxPC4L1fiWouStRew==} '@types/react-dom@19.2.3': resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==} peerDependencies: '@types/react': ^19.2.0 - '@types/react@19.2.6': - resolution: {integrity: sha512-p/jUvulfgU7oKtj6Xpk8cA2Y1xKTtICGpJYeJXz2YVO2UcvjQgeRMLDGfDeqeRW2Ta+0QNFwcc8X3GH8SxZz6w==} + '@types/react@19.2.7': + resolution: {integrity: sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==} - '@typescript-eslint/eslint-plugin@8.47.0': - resolution: {integrity: sha512-fe0rz9WJQ5t2iaLfdbDc9T80GJy0AeO453q8C3YCilnGozvOyCG5t+EZtg7j7D88+c3FipfP/x+wzGnh1xp8ZA==} + '@typescript-eslint/eslint-plugin@8.49.0': + resolution: {integrity: sha512-JXij0vzIaTtCwu6SxTh8qBc66kmf1xs7pI4UOiMDFVct6q86G0Zs7KRcEoJgY3Cav3x5Tq0MF5jwgpgLqgKG3A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.47.0 + '@typescript-eslint/parser': ^8.49.0 eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/parser@8.47.0': - resolution: {integrity: sha512-lJi3PfxVmo0AkEY93ecfN+r8SofEqZNGByvHAI3GBLrvt1Cw6H5k1IM02nSzu0RfUafr2EvFSw0wAsZgubNplQ==} + '@typescript-eslint/parser@8.49.0': + resolution: {integrity: sha512-N9lBGA9o9aqb1hVMc9hzySbhKibHmB+N3IpoShyV6HyQYRGIhlrO5rQgttypi+yEeKsKI4idxC8Jw6gXKD4THA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/project-service@8.47.0': - resolution: {integrity: sha512-2X4BX8hUeB5JcA1TQJ7GjcgulXQ+5UkNb0DL8gHsHUHdFoiCTJoYLTpib3LtSDPZsRET5ygN4qqIWrHyYIKERA==} + '@typescript-eslint/project-service@8.49.0': + resolution: {integrity: sha512-/wJN0/DKkmRUMXjZUXYZpD1NEQzQAAn9QWfGwo+Ai8gnzqH7tvqS7oNVdTjKqOcPyVIdZdyCMoqN66Ia789e7g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/scope-manager@8.47.0': - resolution: {integrity: sha512-a0TTJk4HXMkfpFkL9/WaGTNuv7JWfFTQFJd6zS9dVAjKsojmv9HT55xzbEpnZoY+VUb+YXLMp+ihMLz/UlZfDg==} + '@typescript-eslint/scope-manager@8.49.0': + resolution: {integrity: sha512-npgS3zi+/30KSOkXNs0LQXtsg9ekZ8OISAOLGWA/ZOEn0ZH74Ginfl7foziV8DT+D98WfQ5Kopwqb/PZOaIJGg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/tsconfig-utils@8.47.0': - resolution: {integrity: sha512-ybUAvjy4ZCL11uryalkKxuT3w3sXJAuWhOoGS3T/Wu+iUu1tGJmk5ytSY8gbdACNARmcYEB0COksD2j6hfGK2g==} + '@typescript-eslint/tsconfig-utils@8.49.0': + resolution: {integrity: sha512-8prixNi1/6nawsRYxet4YOhnbW+W9FK/bQPxsGB1D3ZrDzbJ5FXw5XmzxZv82X3B+ZccuSxo/X8q9nQ+mFecWA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/type-utils@8.47.0': - resolution: {integrity: sha512-QC9RiCmZ2HmIdCEvhd1aJELBlD93ErziOXXlHEZyuBo3tBiAZieya0HLIxp+DoDWlsQqDawyKuNEhORyku+P8A==} + '@typescript-eslint/type-utils@8.49.0': + resolution: {integrity: sha512-KTExJfQ+svY8I10P4HdxKzWsvtVnsuCifU5MvXrRwoP2KOlNZ9ADNEWWsQTJgMxLzS5VLQKDjkCT/YzgsnqmZg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/types@8.47.0': - resolution: {integrity: sha512-nHAE6bMKsizhA2uuYZbEbmp5z2UpffNrPEqiKIeN7VsV6UY/roxanWfoRrf6x/k9+Obf+GQdkm0nPU+vnMXo9A==} + '@typescript-eslint/types@8.49.0': + resolution: {integrity: sha512-e9k/fneezorUo6WShlQpMxXh8/8wfyc+biu6tnAqA81oWrEic0k21RHzP9uqqpyBBeBKu4T+Bsjy9/b8u7obXQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.47.0': - resolution: {integrity: sha512-k6ti9UepJf5NpzCjH31hQNLHQWupTRPhZ+KFF8WtTuTpy7uHPfeg2NM7cP27aCGajoEplxJDFVCEm9TGPYyiVg==} + '@typescript-eslint/typescript-estree@8.49.0': + resolution: {integrity: sha512-jrLdRuAbPfPIdYNppHJ/D0wN+wwNfJ32YTAm10eJVsFmrVpXQnDWBn8niCSMlWjvml8jsce5E/O+86IQtTbJWA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/utils@8.47.0': - resolution: {integrity: sha512-g7XrNf25iL4TJOiPqatNuaChyqt49a/onq5YsJ9+hXeugK+41LVg7AxikMfM02PC6jbNtZLCJj6AUcQXJS/jGQ==} + '@typescript-eslint/utils@8.49.0': + resolution: {integrity: sha512-N3W7rJw7Rw+z1tRsHZbK395TWSYvufBXumYtEGzypgMUthlg0/hmCImeA8hgO2d2G4pd7ftpxxul2J8OdtdaFA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/visitor-keys@8.47.0': - resolution: {integrity: sha512-SIV3/6eftCy1bNzCQoPmbWsRLujS8t5iDIZ4spZOBHqrM+yfX2ogg8Tt3PDTAVKw3sSCiUgg30uOAvK2r9zGjQ==} + '@typescript-eslint/visitor-keys@8.49.0': + resolution: {integrity: sha512-LlKaciDe3GmZFphXIc79THF/YYBugZ7FS1pO581E/edlVVNbZKDy93evqmrfQ9/Y4uN0vVhX4iuchq26mK/iiA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@vitejs/plugin-react@5.1.1': - resolution: {integrity: sha512-WQfkSw0QbQ5aJ2CHYw23ZGkqnRwqKHD/KYsMeTkZzPT4Jcf0DcBxBtwMJxnu6E7oxw5+JC6ZAiePgh28uJ1HBA==} + '@vitejs/plugin-react@5.1.2': + resolution: {integrity: sha512-EcA07pHJouywpzsoTUqNh5NwGayl2PPVEJKUSinGGSxFGYn+shYbqMGBg6FXDqgXum9Ou/ecb+411ssw8HImJQ==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 @@ -1385,8 +1389,8 @@ packages: balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - baseline-browser-mapping@2.8.31: - resolution: {integrity: sha512-a28v2eWrrRWPpJSzxc+mKwm0ZtVx/G8SepdQZDArnXYU/XS+IF6mp8aB/4E+hH1tyGCoDo3KlUCdlSxGDsRkAw==} + baseline-browser-mapping@2.9.6: + resolution: {integrity: sha512-v9BVVpOTLB59C9E7aSnmIF8h7qRsFpx+A2nugVMTszEOMcfjlZMsXRm4LF23I3Z9AJxc8ANpIvzbzONoX9VJlg==} hasBin: true brace-expansion@1.1.12: @@ -1395,12 +1399,8 @@ packages: brace-expansion@2.0.2: resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==} - braces@3.0.3: - resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} - engines: {node: '>=8'} - - browserslist@4.28.0: - resolution: {integrity: sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==} + browserslist@4.28.1: + resolution: {integrity: sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true @@ -1408,8 +1408,8 @@ packages: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} - caniuse-lite@1.0.30001756: - resolution: {integrity: sha512-4HnCNKbMLkLdhJz3TToeVWHSnfJvPaq6vu/eRP0Ahub/07n484XHhBF5AJoSGHdVrS8tKFauUQz8Bp9P7LVx7A==} + caniuse-lite@1.0.30001760: + resolution: {integrity: sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==} chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} @@ -1461,8 +1461,8 @@ packages: detect-node-es@1.1.0: resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==} - electron-to-chromium@1.5.259: - resolution: {integrity: sha512-I+oLXgpEJzD6Cwuwt1gYjxsDmu/S/Kd41mmLA3O+/uH2pFRO/DvOjUyGozL8j3KeLV6WyZ7ssPwELMsXCcsJAQ==} + electron-to-chromium@1.5.267: + resolution: {integrity: sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==} enhanced-resolve@5.18.3: resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==} @@ -1537,19 +1537,12 @@ packages: fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - fast-glob@3.3.3: - resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==} - engines: {node: '>=8.6.0'} - fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} fast-levenshtein@2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} - fastq@1.19.1: - resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==} - fdir@6.5.0: resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} engines: {node: '>=12.0.0'} @@ -1563,10 +1556,6 @@ packages: resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} engines: {node: '>=16.0.0'} - fill-range@7.1.1: - resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} - engines: {node: '>=8'} - find-up@5.0.0: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} @@ -1591,10 +1580,6 @@ packages: resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==} engines: {node: '>=6'} - glob-parent@5.1.2: - resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} - engines: {node: '>= 6'} - glob-parent@6.0.2: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} engines: {node: '>=10.13.0'} @@ -1610,9 +1595,6 @@ packages: graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - graphemer@1.4.0: - resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} - has-flag@4.0.0: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} @@ -1647,10 +1629,6 @@ packages: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} - is-number@7.0.0: - resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} - engines: {node: '>=0.12.0'} - isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} @@ -1771,22 +1749,14 @@ packages: lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} - lucide-react@0.554.0: - resolution: {integrity: sha512-St+z29uthEJVx0Is7ellNkgTEhaeSoA42I7JjOCBCrc5X6LYMGSv0P/2uS5HDLTExP5tpiqRD2PyUEOS6s9UXA==} + lucide-react@0.559.0: + resolution: {integrity: sha512-3ymrkBPXWk3U2bwUDg6TdA6hP5iGDMgPEAMLhchEgTQmA+g0Zk24tOtKtXMx35w1PizTmsBC3RhP88QYm+7mHQ==} peerDependencies: react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0 magic-string@0.30.21: resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==} - merge2@1.4.1: - resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} - engines: {node: '>= 8'} - - micromatch@4.0.8: - resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} - engines: {node: '>=8.6'} - minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} @@ -1841,10 +1811,6 @@ packages: picocolors@1.1.1: resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} - picomatch@2.3.1: - resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} - engines: {node: '>=8.6'} - picomatch@4.0.3: resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} engines: {node: '>=12'} @@ -1861,13 +1827,10 @@ packages: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} - queue-microtask@1.2.3: - resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - - react-dom@19.2.0: - resolution: {integrity: sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==} + react-dom@19.2.1: + resolution: {integrity: sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==} peerDependencies: - react: ^19.2.0 + react: ^19.2.1 react-refresh@0.18.0: resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==} @@ -1883,8 +1846,8 @@ packages: '@types/react': optional: true - react-remove-scroll@2.7.1: - resolution: {integrity: sha512-HpMh8+oahmIdOuS5aFKKY6Pyog+FNaZV/XyJOq7b4YFwsFHe5yYfdbIalI4k3vU2nSDql7YskmUseHsRrJqIPA==} + react-remove-scroll@2.7.2: + resolution: {integrity: sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==} engines: {node: '>=10'} peerDependencies: '@types/react': '*' @@ -1903,26 +1866,19 @@ packages: '@types/react': optional: true - react@19.2.0: - resolution: {integrity: sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==} + react@19.2.1: + resolution: {integrity: sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==} engines: {node: '>=0.10.0'} resolve-from@4.0.0: resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} engines: {node: '>=4'} - reusify@1.1.0: - resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==} - engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - rollup@4.53.3: resolution: {integrity: sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true - run-parallel@1.2.0: - resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} - scheduler@0.27.0: resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==} @@ -1979,10 +1935,6 @@ packages: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} - to-regex-range@5.0.1: - resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} - engines: {node: '>=8.0'} - ts-api-utils@2.1.0: resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==} engines: {node: '>=18.12'} @@ -1999,8 +1951,8 @@ packages: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} - typescript-eslint@8.47.0: - resolution: {integrity: sha512-Lwe8i2XQ3WoMjua/r1PHrCTpkubPYJCAfOurtn+mtTzqB6jNd+14n9UN1bJ4s3F49x9ixAm0FLflB/JzQ57M8Q==} + typescript-eslint@8.49.0: + resolution: {integrity: sha512-zRSVH1WXD0uXczCXw+nsdjGPUdx4dfrs5VQoHnUWmv1U3oNlAKv4FUNdLDhVUg+gYn+a5hUESqch//Rv5wVhrg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -2014,8 +1966,8 @@ packages: undici-types@7.16.0: resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} - update-browserslist-db@1.1.4: - resolution: {integrity: sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==} + update-browserslist-db@1.2.2: + resolution: {integrity: sha512-E85pfNzMQ9jpKkA7+TJAi4TJN+tBCuWh5rUcS/sv6cFi+1q9LYDwDI5dpUL0u/73EElyQ8d3TEaeW4sPedBqYA==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' @@ -2043,8 +1995,8 @@ packages: '@types/react': optional: true - vite@7.2.4: - resolution: {integrity: sha512-NL8jTlbo0Tn4dUEXEsUg8KeyG/Lkmc4Fnzb8JXN/Ykm9G4HNImjtABMJgkQoVjOBN/j2WAwDTRytdqJbZsah7w==} + vite@7.2.7: + resolution: {integrity: sha512-ITcnkFeR3+fI8P1wMgItjGrR10170d8auB4EpMLPqmx6uxElH3a/hHGQabSHKdqd4FXWO1nFIp9rRn7JQ34ACQ==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: @@ -2150,7 +2102,7 @@ snapshots: dependencies: '@babel/compat-data': 7.28.5 '@babel/helper-validator-option': 7.27.1 - browserslist: 4.28.0 + browserslist: 4.28.1 lru-cache: 5.1.1 semver: 6.3.1 @@ -2328,7 +2280,7 @@ snapshots: dependencies: '@types/json-schema': 7.0.15 - '@eslint/eslintrc@3.3.1': + '@eslint/eslintrc@3.3.3': dependencies: ajv: 6.12.6 debug: 4.4.3 @@ -2360,11 +2312,11 @@ snapshots: '@floating-ui/core': 1.7.3 '@floating-ui/utils': 0.2.10 - '@floating-ui/react-dom@2.1.6(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@floating-ui/react-dom@2.1.6(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@floating-ui/dom': 1.7.4 - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) '@floating-ui/utils@0.2.10': {} @@ -2494,485 +2446,488 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.5 - '@nodelib/fs.scandir@2.1.5': - dependencies: - '@nodelib/fs.stat': 2.0.5 - run-parallel: 1.2.0 - - '@nodelib/fs.stat@2.0.5': {} - - '@nodelib/fs.walk@1.2.8': - dependencies: - '@nodelib/fs.scandir': 2.1.5 - fastq: 1.19.1 - '@radix-ui/number@1.1.1': {} '@radix-ui/primitive@1.1.3': {} - '@radix-ui/react-accordion@1.2.12(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-accordion@1.2.12(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-checkbox@1.3.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-checkbox@1.3.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-collapsible@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-collapsible@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-collection@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-collection@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-slot': 1.2.3(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.7)(react@19.2.1)': dependencies: - react: 19.2.0 + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-context-menu@2.2.16(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-context-menu@2.2.16(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-context@1.1.2(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-context@1.1.2(@types/react@19.2.7)(react@19.2.1)': dependencies: - react: 19.2.0 + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-context@1.1.3(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-context@1.1.3(@types/react@19.2.7)(react@19.2.1)': dependencies: - react: 19.2.0 + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-dialog@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-dialog@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-slot': 1.2.3(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.6)(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) aria-hidden: 1.2.6 - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) - react-remove-scroll: 2.7.1(@types/react@19.2.6)(react@19.2.0) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) + react-remove-scroll: 2.7.2(@types/react@19.2.7)(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-direction@1.1.1(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-direction@1.1.1(@types/react@19.2.7)(react@19.2.1)': dependencies: - react: 19.2.0 + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-dismissable-layer@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-dismissable-layer@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.6)(react@19.2.0)': - dependencies: - react: 19.2.0 - optionalDependencies: - '@types/react': 19.2.6 - - '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': - dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) - optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) - - '@radix-ui/react-id@1.1.1(@types/react@19.2.6)(react@19.2.0)': - dependencies: - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - optionalDependencies: - '@types/react': 19.2.6 - - '@radix-ui/react-label@2.1.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': - dependencies: - '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) - optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) - - '@radix-ui/react-menu@2.1.16(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-dropdown-menu@2.1.16(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-slot': 1.2.3(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.6)(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) + optionalDependencies: + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) + + '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.7)(react@19.2.1)': + dependencies: + react: 19.2.1 + optionalDependencies: + '@types/react': 19.2.7 + + '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': + dependencies: + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) + optionalDependencies: + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) + + '@radix-ui/react-id@1.1.1(@types/react@19.2.7)(react@19.2.1)': + dependencies: + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + optionalDependencies: + '@types/react': 19.2.7 + + '@radix-ui/react-label@2.1.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': + dependencies: + '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) + optionalDependencies: + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) + + '@radix-ui/react-menu@2.1.16(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': + dependencies: + '@radix-ui/primitive': 1.1.3 + '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.2.1) aria-hidden: 1.2.6 - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) - react-remove-scroll: 2.7.1(@types/react@19.2.6)(react@19.2.0) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) + react-remove-scroll: 2.7.2(@types/react@19.2.7)(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-popper@1.2.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-popper@1.2.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: - '@floating-ui/react-dom': 2.1.6(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-arrow': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.6)(react@19.2.0) + '@floating-ui/react-dom': 2.1.6(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-arrow': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.2.1) '@radix-ui/rect': 1.1.1 - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-presence@1.1.5(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-presence@1.1.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: - '@radix-ui/react-slot': 1.2.3(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-primitive@2.1.4(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-primitive@2.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: - '@radix-ui/react-slot': 1.2.4(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-slot': 1.2.4(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-progress@1.1.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-progress@1.1.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: - '@radix-ui/react-context': 1.1.3(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-context': 1.1.3(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-radio-group@1.3.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-radio-group@1.3.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-roving-focus@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-roving-focus@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-select@2.2.6(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-select@2.2.6(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/number': 1.1.1 '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-slot': 1.2.3(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) aria-hidden: 1.2.6 - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) - react-remove-scroll: 2.7.1(@types/react@19.2.6)(react@19.2.0) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) + react-remove-scroll: 2.7.2(@types/react@19.2.7)(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-slot@1.2.3(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-slot@1.2.3(@types/react@19.2.7)(react@19.2.1)': dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-slot@1.2.4(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-slot@1.2.4(@types/react@19.2.7)(react@19.2.1)': dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-switch@1.2.6(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-switch@1.2.6(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-tabs@1.1.13(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-tabs@1.1.13(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-direction': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-tooltip@1.2.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-tooltip@1.2.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-id': 1.1.1(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-slot': 1.2.3(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) - '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.7)(react@19.2.1)': dependencies: - react: 19.2.0 + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.7)(react@19.2.1)': dependencies: - '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.6)(react@19.2.0) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 + '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.7)(react@19.2.1) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.7)(react@19.2.1)': dependencies: - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.7)(react@19.2.1)': dependencies: - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.7)(react@19.2.1)': dependencies: - react: 19.2.0 + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.7)(react@19.2.1)': dependencies: - react: 19.2.0 + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.7)(react@19.2.1)': dependencies: '@radix-ui/rect': 1.1.1 - react: 19.2.0 + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-use-size@1.1.1(@types/react@19.2.6)(react@19.2.0)': + '@radix-ui/react-use-size@1.1.1(@types/react@19.2.7)(react@19.2.1)': dependencies: - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.6)(react@19.2.0) - react: 19.2.0 + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.2.1) + react: 19.2.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@radix-ui/react-visually-hidden@1.2.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-visually-hidden@1.2.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 - '@types/react-dom': 19.2.3(@types/react@19.2.6) + '@types/react': 19.2.7 + '@types/react-dom': 19.2.3(@types/react@19.2.7) '@radix-ui/rect@1.1.1': {} - '@rolldown/pluginutils@1.0.0-beta.47': {} + '@rolldown/pluginutils@1.0.0-beta.53': {} '@rollup/rollup-android-arm-eabi@4.53.3': optional: true @@ -3101,12 +3056,12 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.1.17 '@tailwindcss/oxide-win32-x64-msvc': 4.1.17 - '@tailwindcss/vite@4.1.17(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2))': + '@tailwindcss/vite@4.1.17(vite@7.2.7(@types/node@25.0.0)(jiti@2.6.1)(lightningcss@1.30.2))': dependencies: '@tailwindcss/node': 4.1.17 '@tailwindcss/oxide': 4.1.17 tailwindcss: 4.1.17 - vite: 7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2) + vite: 7.2.7(@types/node@25.0.0)(jiti@2.6.1)(lightningcss@1.30.2) '@types/babel__core@7.20.5': dependencies: @@ -3133,28 +3088,27 @@ snapshots: '@types/json-schema@7.0.15': {} - '@types/node@24.10.1': + '@types/node@25.0.0': dependencies: undici-types: 7.16.0 - '@types/react-dom@19.2.3(@types/react@19.2.6)': + '@types/react-dom@19.2.3(@types/react@19.2.7)': dependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - '@types/react@19.2.6': + '@types/react@19.2.7': dependencies: csstype: 3.2.3 - '@typescript-eslint/eslint-plugin@8.47.0(@typescript-eslint/parser@8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/eslint-plugin@8.49.0(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/scope-manager': 8.47.0 - '@typescript-eslint/type-utils': 8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/utils': 8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.47.0 + '@typescript-eslint/parser': 8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/scope-manager': 8.49.0 + '@typescript-eslint/type-utils': 8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/utils': 8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/visitor-keys': 8.49.0 eslint: 9.39.1(jiti@2.6.1) - graphemer: 1.4.0 ignore: 7.0.5 natural-compare: 1.4.0 ts-api-utils: 2.1.0(typescript@5.9.3) @@ -3162,41 +3116,41 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)': dependencies: - '@typescript-eslint/scope-manager': 8.47.0 - '@typescript-eslint/types': 8.47.0 - '@typescript-eslint/typescript-estree': 8.47.0(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.47.0 + '@typescript-eslint/scope-manager': 8.49.0 + '@typescript-eslint/types': 8.49.0 + '@typescript-eslint/typescript-estree': 8.49.0(typescript@5.9.3) + '@typescript-eslint/visitor-keys': 8.49.0 debug: 4.4.3 eslint: 9.39.1(jiti@2.6.1) typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.47.0(typescript@5.9.3)': + '@typescript-eslint/project-service@8.49.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.47.0(typescript@5.9.3) - '@typescript-eslint/types': 8.47.0 + '@typescript-eslint/tsconfig-utils': 8.49.0(typescript@5.9.3) + '@typescript-eslint/types': 8.49.0 debug: 4.4.3 typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.47.0': + '@typescript-eslint/scope-manager@8.49.0': dependencies: - '@typescript-eslint/types': 8.47.0 - '@typescript-eslint/visitor-keys': 8.47.0 + '@typescript-eslint/types': 8.49.0 + '@typescript-eslint/visitor-keys': 8.49.0 - '@typescript-eslint/tsconfig-utils@8.47.0(typescript@5.9.3)': + '@typescript-eslint/tsconfig-utils@8.49.0(typescript@5.9.3)': dependencies: typescript: 5.9.3 - '@typescript-eslint/type-utils@8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/type-utils@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)': dependencies: - '@typescript-eslint/types': 8.47.0 - '@typescript-eslint/typescript-estree': 8.47.0(typescript@5.9.3) - '@typescript-eslint/utils': 8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/types': 8.49.0 + '@typescript-eslint/typescript-estree': 8.49.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) debug: 4.4.3 eslint: 9.39.1(jiti@2.6.1) ts-api-utils: 2.1.0(typescript@5.9.3) @@ -3204,49 +3158,48 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.47.0': {} + '@typescript-eslint/types@8.49.0': {} - '@typescript-eslint/typescript-estree@8.47.0(typescript@5.9.3)': + '@typescript-eslint/typescript-estree@8.49.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/project-service': 8.47.0(typescript@5.9.3) - '@typescript-eslint/tsconfig-utils': 8.47.0(typescript@5.9.3) - '@typescript-eslint/types': 8.47.0 - '@typescript-eslint/visitor-keys': 8.47.0 + '@typescript-eslint/project-service': 8.49.0(typescript@5.9.3) + '@typescript-eslint/tsconfig-utils': 8.49.0(typescript@5.9.3) + '@typescript-eslint/types': 8.49.0 + '@typescript-eslint/visitor-keys': 8.49.0 debug: 4.4.3 - fast-glob: 3.3.3 - is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.7.3 + tinyglobby: 0.2.15 ts-api-utils: 2.1.0(typescript@5.9.3) typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/utils@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@2.6.1)) - '@typescript-eslint/scope-manager': 8.47.0 - '@typescript-eslint/types': 8.47.0 - '@typescript-eslint/typescript-estree': 8.47.0(typescript@5.9.3) + '@typescript-eslint/scope-manager': 8.49.0 + '@typescript-eslint/types': 8.49.0 + '@typescript-eslint/typescript-estree': 8.49.0(typescript@5.9.3) eslint: 9.39.1(jiti@2.6.1) typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.47.0': + '@typescript-eslint/visitor-keys@8.49.0': dependencies: - '@typescript-eslint/types': 8.47.0 + '@typescript-eslint/types': 8.49.0 eslint-visitor-keys: 4.2.1 - '@vitejs/plugin-react@5.1.1(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2))': + '@vitejs/plugin-react@5.1.2(vite@7.2.7(@types/node@25.0.0)(jiti@2.6.1)(lightningcss@1.30.2))': dependencies: '@babel/core': 7.28.5 '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.5) '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.5) - '@rolldown/pluginutils': 1.0.0-beta.47 + '@rolldown/pluginutils': 1.0.0-beta.53 '@types/babel__core': 7.20.5 react-refresh: 0.18.0 - vite: 7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2) + vite: 7.2.7(@types/node@25.0.0)(jiti@2.6.1)(lightningcss@1.30.2) transitivePeerDependencies: - supports-color @@ -3275,7 +3228,7 @@ snapshots: balanced-match@1.0.2: {} - baseline-browser-mapping@2.8.31: {} + baseline-browser-mapping@2.9.6: {} brace-expansion@1.1.12: dependencies: @@ -3286,21 +3239,17 @@ snapshots: dependencies: balanced-match: 1.0.2 - braces@3.0.3: + browserslist@4.28.1: dependencies: - fill-range: 7.1.1 - - browserslist@4.28.0: - dependencies: - baseline-browser-mapping: 2.8.31 - caniuse-lite: 1.0.30001756 - electron-to-chromium: 1.5.259 + baseline-browser-mapping: 2.9.6 + caniuse-lite: 1.0.30001760 + electron-to-chromium: 1.5.267 node-releases: 2.0.27 - update-browserslist-db: 1.1.4(browserslist@4.28.0) + update-browserslist-db: 1.2.2(browserslist@4.28.1) callsites@3.1.0: {} - caniuse-lite@1.0.30001756: {} + caniuse-lite@1.0.30001760: {} chalk@4.1.2: dependencies: @@ -3341,7 +3290,7 @@ snapshots: detect-node-es@1.1.0: {} - electron-to-chromium@1.5.259: {} + electron-to-chromium@1.5.267: {} enhanced-resolve@5.18.3: dependencies: @@ -3412,7 +3361,7 @@ snapshots: '@eslint/config-array': 0.21.1 '@eslint/config-helpers': 0.4.2 '@eslint/core': 0.17.0 - '@eslint/eslintrc': 3.3.1 + '@eslint/eslintrc': 3.3.3 '@eslint/js': 9.39.1 '@eslint/plugin-kit': 0.4.1 '@humanfs/node': 0.16.7 @@ -3466,22 +3415,10 @@ snapshots: fast-deep-equal@3.1.3: {} - fast-glob@3.3.3: - dependencies: - '@nodelib/fs.stat': 2.0.5 - '@nodelib/fs.walk': 1.2.8 - glob-parent: 5.1.2 - merge2: 1.4.1 - micromatch: 4.0.8 - fast-json-stable-stringify@2.1.0: {} fast-levenshtein@2.0.6: {} - fastq@1.19.1: - dependencies: - reusify: 1.1.0 - fdir@6.5.0(picomatch@4.0.3): optionalDependencies: picomatch: 4.0.3 @@ -3490,10 +3427,6 @@ snapshots: dependencies: flat-cache: 4.0.1 - fill-range@7.1.1: - dependencies: - to-regex-range: 5.0.1 - find-up@5.0.0: dependencies: locate-path: 6.0.0 @@ -3513,10 +3446,6 @@ snapshots: get-nonce@1.0.1: {} - glob-parent@5.1.2: - dependencies: - is-glob: 4.0.3 - glob-parent@6.0.2: dependencies: is-glob: 4.0.3 @@ -3527,8 +3456,6 @@ snapshots: graceful-fs@4.2.11: {} - graphemer@1.4.0: {} - has-flag@4.0.0: {} hermes-estree@0.25.1: {} @@ -3554,8 +3481,6 @@ snapshots: dependencies: is-extglob: 2.1.1 - is-number@7.0.0: {} - isexe@2.0.0: {} jiti@2.6.1: {} @@ -3644,21 +3569,14 @@ snapshots: dependencies: yallist: 3.1.1 - lucide-react@0.554.0(react@19.2.0): + lucide-react@0.559.0(react@19.2.1): dependencies: - react: 19.2.0 + react: 19.2.1 magic-string@0.30.21: dependencies: '@jridgewell/sourcemap-codec': 1.5.5 - merge2@1.4.1: {} - - micromatch@4.0.8: - dependencies: - braces: 3.0.3 - picomatch: 2.3.1 - minimatch@3.1.2: dependencies: brace-expansion: 1.1.12 @@ -3673,10 +3591,10 @@ snapshots: natural-compare@1.4.0: {} - next-themes@0.4.6(react-dom@19.2.0(react@19.2.0))(react@19.2.0): + next-themes@0.4.6(react-dom@19.2.1(react@19.2.1))(react@19.2.1): dependencies: - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) node-releases@2.0.27: {} @@ -3707,8 +3625,6 @@ snapshots: picocolors@1.1.1: {} - picomatch@2.3.1: {} - picomatch@4.0.3: {} postcss@8.5.6: @@ -3721,48 +3637,44 @@ snapshots: punycode@2.3.1: {} - queue-microtask@1.2.3: {} - - react-dom@19.2.0(react@19.2.0): + react-dom@19.2.1(react@19.2.1): dependencies: - react: 19.2.0 + react: 19.2.1 scheduler: 0.27.0 react-refresh@0.18.0: {} - react-remove-scroll-bar@2.3.8(@types/react@19.2.6)(react@19.2.0): + react-remove-scroll-bar@2.3.8(@types/react@19.2.7)(react@19.2.1): dependencies: - react: 19.2.0 - react-style-singleton: 2.2.3(@types/react@19.2.6)(react@19.2.0) + react: 19.2.1 + react-style-singleton: 2.2.3(@types/react@19.2.7)(react@19.2.1) tslib: 2.8.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - react-remove-scroll@2.7.1(@types/react@19.2.6)(react@19.2.0): + react-remove-scroll@2.7.2(@types/react@19.2.7)(react@19.2.1): dependencies: - react: 19.2.0 - react-remove-scroll-bar: 2.3.8(@types/react@19.2.6)(react@19.2.0) - react-style-singleton: 2.2.3(@types/react@19.2.6)(react@19.2.0) + react: 19.2.1 + react-remove-scroll-bar: 2.3.8(@types/react@19.2.7)(react@19.2.1) + react-style-singleton: 2.2.3(@types/react@19.2.7)(react@19.2.1) tslib: 2.8.1 - use-callback-ref: 1.3.3(@types/react@19.2.6)(react@19.2.0) - use-sidecar: 1.1.3(@types/react@19.2.6)(react@19.2.0) + use-callback-ref: 1.3.3(@types/react@19.2.7)(react@19.2.1) + use-sidecar: 1.1.3(@types/react@19.2.7)(react@19.2.1) optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - react-style-singleton@2.2.3(@types/react@19.2.6)(react@19.2.0): + react-style-singleton@2.2.3(@types/react@19.2.7)(react@19.2.1): dependencies: get-nonce: 1.0.1 - react: 19.2.0 + react: 19.2.1 tslib: 2.8.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - react@19.2.0: {} + react@19.2.1: {} resolve-from@4.0.0: {} - reusify@1.1.0: {} - rollup@4.53.3: dependencies: '@types/estree': 1.0.8 @@ -3791,10 +3703,6 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.53.3 fsevents: 2.3.3 - run-parallel@1.2.0: - dependencies: - queue-microtask: 1.2.3 - scheduler@0.27.0: {} semver@6.3.1: {} @@ -3838,10 +3746,10 @@ snapshots: shebang-regex@3.0.0: {} - sonner@2.0.7(react-dom@19.2.0(react@19.2.0))(react@19.2.0): + sonner@2.0.7(react-dom@19.2.1(react@19.2.1))(react@19.2.1): dependencies: - react: 19.2.0 - react-dom: 19.2.0(react@19.2.0) + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) source-map-js@1.2.1: {} @@ -3862,10 +3770,6 @@ snapshots: fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 - to-regex-range@5.0.1: - dependencies: - is-number: 7.0.0 - ts-api-utils@2.1.0(typescript@5.9.3): dependencies: typescript: 5.9.3 @@ -3878,12 +3782,12 @@ snapshots: dependencies: prelude-ls: 1.2.1 - typescript-eslint@8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3): + typescript-eslint@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.47.0(@typescript-eslint/parser@8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/parser': 8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/typescript-estree': 8.47.0(typescript@5.9.3) - '@typescript-eslint/utils': 8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/eslint-plugin': 8.49.0(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/parser': 8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.49.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) eslint: 9.39.1(jiti@2.6.1) typescript: 5.9.3 transitivePeerDependencies: @@ -3893,9 +3797,9 @@ snapshots: undici-types@7.16.0: {} - update-browserslist-db@1.1.4(browserslist@4.28.0): + update-browserslist-db@1.2.2(browserslist@4.28.1): dependencies: - browserslist: 4.28.0 + browserslist: 4.28.1 escalade: 3.2.0 picocolors: 1.1.1 @@ -3903,22 +3807,22 @@ snapshots: dependencies: punycode: 2.3.1 - use-callback-ref@1.3.3(@types/react@19.2.6)(react@19.2.0): + use-callback-ref@1.3.3(@types/react@19.2.7)(react@19.2.1): dependencies: - react: 19.2.0 + react: 19.2.1 tslib: 2.8.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - use-sidecar@1.1.3(@types/react@19.2.6)(react@19.2.0): + use-sidecar@1.1.3(@types/react@19.2.7)(react@19.2.1): dependencies: detect-node-es: 1.1.0 - react: 19.2.0 + react: 19.2.1 tslib: 2.8.1 optionalDependencies: - '@types/react': 19.2.6 + '@types/react': 19.2.7 - vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(lightningcss@1.30.2): + vite@7.2.7(@types/node@25.0.0)(jiti@2.6.1)(lightningcss@1.30.2): dependencies: esbuild: 0.25.12 fdir: 6.5.0(picomatch@4.0.3) @@ -3927,7 +3831,7 @@ snapshots: rollup: 4.53.3 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 24.10.1 + '@types/node': 25.0.0 fsevents: 2.3.3 jiti: 2.6.1 lightningcss: 1.30.2 diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 445abfe..9441ae2 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -11,6 +11,9 @@ import { getResumableInfo, stateToResponse, mergeTimelines, + saveCursor, + getCursor, + clearCursor, type FetchState, } from "@/lib/fetch-state"; @@ -18,7 +21,7 @@ import { import { TitleBar } from "@/components/TitleBar"; import { Sidebar, type PageType } from "@/components/Sidebar"; import { Header } from "@/components/Header"; -import { SearchBar, type FetchMode, type PrivateType } from "@/components/SearchBar"; +import { SearchBar, type FetchMode, type PrivateType, type FetchType, type MultipleAccount } from "@/components/SearchBar"; import { MediaList } from "@/components/MediaList"; import { DatabaseView } from "@/components/DatabaseView"; import { SettingsPage } from "@/components/SettingsPage"; @@ -27,11 +30,11 @@ import type { HistoryItem } from "@/components/FetchHistory"; import type { TwitterResponse } from "@/types/api"; // Wails bindings -import { ExtractTimeline, ExtractDateRange, SaveAccountToDBWithStatus, CleanupExtractorProcesses } from "../wailsjs/go/main/App"; +import { ExtractTimeline, ExtractDateRange, SaveAccountToDBWithStatus, CleanupExtractorProcesses, GetAllAccountsFromDB } from "../wailsjs/go/main/App"; const HISTORY_KEY = "twitter_media_fetch_history"; const MAX_HISTORY = 10; -const CURRENT_VERSION = "4.0"; +const CURRENT_VERSION = "4.1"; const BATCH_SIZE = 200; // Fetch in batches for progressive display and resume function App() { @@ -44,7 +47,48 @@ function App() { const [releaseDate, setReleaseDate] = useState(null); const [fetchHistory, setFetchHistory] = useState([]); const [resumeInfo, setResumeInfo] = useState<{ canResume: boolean; mediaCount: number } | null>(null); + const [elapsedTime, setElapsedTime] = useState(0); + const [remainingTime, setRemainingTime] = useState(null); + const [newMediaCount, setNewMediaCount] = useState(null); const stopFetchRef = useRef(false); + const fetchStartTimeRef = useRef(null); + const timeoutIntervalRef = useRef(null); + + // Multiple mode state + const [fetchType, setFetchType] = useState("single"); + const [multipleAccounts, setMultipleAccounts] = useState([]); + const [isFetchingAll, setIsFetchingAll] = useState(false); + + // Mode state for SearchBar + const [searchMode, setSearchMode] = useState("public"); + const [searchPrivateType, setSearchPrivateType] = useState("bookmarks"); + const stopAllRef = useRef(false); + const accountTimersRef = useRef>(new Map()); + const accountStartTimesRef = useRef>(new Map()); + const accountStopFlagsRef = useRef>(new Map()); + const accountMediaCountRef = useRef>(new Map()); + const accountTimeoutSecondsRef = useRef>(new Map()); + + // Handle fetch type change + const handleFetchTypeChange = (type: FetchType) => { + setFetchType(type); + if (type === "single") { + // Clear multiple accounts when switching to single + setMultipleAccounts([]); + setIsFetchingAll(false); + stopAllRef.current = true; + // Clear all timers + accountTimersRef.current.forEach((interval) => clearInterval(interval)); + accountTimersRef.current.clear(); + accountStartTimesRef.current.clear(); + accountTimeoutSecondsRef.current.clear(); + accountStopFlagsRef.current.clear(); + accountMediaCountRef.current.clear(); + } else { + // Clear result when switching to multiple + setResult(null); + } + }; useEffect(() => { const settings = getSettings(); @@ -164,7 +208,7 @@ function App() { checkResumable(username); }, [username, checkResumable]); - const handleStopFetch = async () => { + const handleStopFetch = useCallback(async () => { stopFetchRef.current = true; logger.info("Stopping fetch..."); toast.info("Stopping..."); @@ -174,7 +218,48 @@ function App() { } catch { // Ignore cleanup errors } - }; + }, []); + + // Timer effect for fetch timeout + useEffect(() => { + if (loading && fetchStartTimeRef.current !== null) { + const settings = getSettings(); + const timeoutSeconds = settings.fetchTimeout || 60; + + // Update timer every second + timeoutIntervalRef.current = window.setInterval(() => { + if (fetchStartTimeRef.current !== null) { + const elapsed = Math.floor((Date.now() - fetchStartTimeRef.current) / 1000); + setElapsedTime(elapsed); + const remaining = Math.max(0, timeoutSeconds - elapsed); + setRemainingTime(remaining); + + // Auto-stop if timeout reached + if (remaining <= 0) { + stopFetchRef.current = true; + logger.warning("Fetch timeout reached. Stopping..."); + toast.warning("Fetch timeout reached. Stopping..."); + handleStopFetch(); + } + } + }, 1000); + } else { + if (timeoutIntervalRef.current !== null) { + clearInterval(timeoutIntervalRef.current); + timeoutIntervalRef.current = null; + } + setElapsedTime(0); + setRemainingTime(null); + fetchStartTimeRef.current = null; + } + + return () => { + if (timeoutIntervalRef.current !== null) { + clearInterval(timeoutIntervalRef.current); + timeoutIntervalRef.current = null; + } + }; + }, [loading, handleStopFetch]); const handleFetch = async ( useDateRange: boolean, @@ -214,6 +299,14 @@ function App() { setLoading(true); setFetchedMediaType(mediaType || "all"); stopFetchRef.current = false; + fetchStartTimeRef.current = Date.now(); + setElapsedTime(0); + setNewMediaCount(null); + + // Get timeout from settings + const settings = getSettings(); + const timeoutSeconds = settings.fetchTimeout || 60; + setRemainingTime(timeoutSeconds); // Cleanup any leftover processes from previous fetch try { @@ -230,7 +323,7 @@ function App() { : `@${username}`; // Check for resume state - const cleanUsername = isBookmarks ? "bookmarks" : username.trim(); + const cleanUsername = isBookmarks ? "bookmarks" : isLikes ? "likes" : username.trim(); let existingState: FetchState | null = null; let cursor: string | undefined; let allTimeline: TwitterResponse["timeline"] = []; @@ -271,6 +364,21 @@ function App() { if (useDateRange && startDate && endDate && mode === "public") { // Date range mode - single fetch (only for public mode) logger.info(`Using date range: ${startDate} to ${endDate}`); + + // Check timeout before date range fetch + if (fetchStartTimeRef.current !== null) { + const settings = getSettings(); + const timeoutSeconds = settings.fetchTimeout || 60; + const elapsed = Math.floor((Date.now() - fetchStartTimeRef.current) / 1000); + if (elapsed >= timeoutSeconds) { + logger.warning(`Timeout reached (${timeoutSeconds}s). Stopping fetch...`); + stopFetchRef.current = true; + toast.warning("Fetch timeout reached. Stopping..."); + setLoading(false); + return; + } + } + const response = await ExtractDateRange({ username: username.trim(), auth_token: authToken.trim(), @@ -280,6 +388,42 @@ function App() { retweets: retweets || false, }); finalData = JSON.parse(response); + + // Save to database immediately for date range mode + if (finalData && finalData.account_info) { + try { + await SaveAccountToDBWithStatus( + finalData.account_info.name, + finalData.account_info.nick, + finalData.account_info.profile_image, + finalData.total_urls, + JSON.stringify(finalData), + mediaType || "all", + finalData.cursor || "", + finalData.completed ?? true + ); + } catch (err) { + console.error("Failed to save date range data to database:", err); + } + } + + // Save to database immediately for date range mode + if (finalData && finalData.account_info) { + try { + await SaveAccountToDBWithStatus( + finalData.account_info.name, + finalData.account_info.nick, + finalData.account_info.profile_image, + finalData.total_urls, + JSON.stringify(finalData), + mediaType || "all", + finalData.cursor || "", + finalData.completed ?? true + ); + } catch (err) { + console.error("Failed to save date range data to database:", err); + } + } } else { // Timeline mode with batching for progressive display and resume let timelineType = "timeline"; @@ -293,6 +437,19 @@ function App() { let page = 0; while (hasMore && !stopFetchRef.current) { + // Check timeout before each batch + if (fetchStartTimeRef.current !== null) { + const settings = getSettings(); + const timeoutSeconds = settings.fetchTimeout || 60; + const elapsed = Math.floor((Date.now() - fetchStartTimeRef.current) / 1000); + if (elapsed >= timeoutSeconds) { + logger.warning(`Timeout reached (${timeoutSeconds}s). Stopping fetch...`); + stopFetchRef.current = true; + toast.warning("Fetch timeout reached. Stopping..."); + break; + } + } + const batchNum = page + 1; logger.info(`Fetching batch ${batchNum}${cursor ? " (resuming)" : ""}...`); @@ -313,19 +470,38 @@ function App() { if (!accountInfo && data.account_info) { accountInfo = data.account_info; if (isBookmarks) { + // For bookmarks, ensure name is "bookmarks" and nick is "My Bookmarks" accountInfo.name = "bookmarks"; accountInfo.nick = "My Bookmarks"; + } else if (isLikes) { + // For likes, ensure name is "likes" and nick is "My Likes" + accountInfo.name = "likes"; + accountInfo.nick = "My Likes"; } } // Merge new entries (deduplicate) + const previousCount = allTimeline.length; allTimeline = mergeTimelines(allTimeline, data.timeline); + const newCount = allTimeline.length - previousCount; + + // Update new media count for display + if (newCount > 0) { + setNewMediaCount(newCount); + // Clear after 1 second + setTimeout(() => setNewMediaCount(null), 1000); + } // Update cursor for next batch cursor = data.cursor; hasMore = !!data.cursor && !data.completed; page++; + // Save cursor every batch (lightweight, just a string) + if (cursor) { + saveCursor(cleanUsername, cursor); + } + // Update UI progressively - show results immediately if (accountInfo) { setResult({ @@ -349,6 +525,7 @@ function App() { // Save state periodically (every 3 batches) or when stopping // This reduces localStorage writes for better performance + // Note: cursor is already saved every batch above (lightweight) if (page % 3 === 0 || !hasMore || stopFetchRef.current) { saveFetchState({ username: cleanUsername, @@ -362,38 +539,39 @@ function App() { retweets: retweets || false, timelineType: timelineType, }); + } - // Also save to database for persistence (can resume even after app restart) - if (accountInfo) { - const currentResponse: TwitterResponse = { - account_info: accountInfo, - timeline: allTimeline, - total_urls: allTimeline.length, - metadata: { - new_entries: data.timeline.length, - page: page, - batch_size: BATCH_SIZE, - has_more: hasMore, - cursor: cursor, - completed: !hasMore, - }, + // Save to database immediately after each batch for realtime persistence + // This ensures data is saved even if fetch fails mid-way + if (accountInfo) { + const currentResponse: TwitterResponse = { + account_info: accountInfo, + timeline: allTimeline, + total_urls: allTimeline.length, + metadata: { + new_entries: data.timeline.length, + page: page, + batch_size: BATCH_SIZE, + has_more: hasMore, cursor: cursor, completed: !hasMore, - }; - try { - await SaveAccountToDBWithStatus( - accountInfo.name, - accountInfo.nick, - accountInfo.profile_image, - allTimeline.length, - JSON.stringify(currentResponse), - mediaType || "all", - cursor || "", - !hasMore - ); - } catch (err) { - console.error("Failed to save progress to database:", err); - } + }, + cursor: cursor, + completed: !hasMore, + }; + try { + await SaveAccountToDBWithStatus( + accountInfo.name, + accountInfo.nick, + accountInfo.profile_image, + allTimeline.length, + JSON.stringify(currentResponse), + mediaType || "all", + cursor || "", + !hasMore + ); + } catch (err) { + console.error("Failed to save progress to database:", err); } } } @@ -406,6 +584,7 @@ function App() { } else { // Completed - clear state clearFetchState(cleanUsername); + clearCursor(cleanUsername); setResumeInfo(null); } @@ -437,20 +616,26 @@ function App() { addToHistory(finalData, username); } - // Save to database with media type and completion status - try { - await SaveAccountToDBWithStatus( - finalData.account_info.name, - finalData.account_info.nick, - finalData.account_info.profile_image, - finalData.total_urls, - JSON.stringify(finalData), - mediaType || "all", - finalData.cursor || "", - finalData.completed ?? true - ); - } catch (err) { - console.error("Failed to save to database:", err); + // Note: Data is already saved to database after each batch for timeline mode + // and immediately after fetch for date range mode, so we don't need to save again here + // unless it's the final completion status update for timeline mode + if (!useDateRange) { + // For timeline mode, final save is already done in the loop after each batch + // This is just for ensuring final status is correct + try { + await SaveAccountToDBWithStatus( + finalData.account_info.name, + finalData.account_info.nick, + finalData.account_info.profile_image, + finalData.total_urls, + JSON.stringify(finalData), + mediaType || "all", + finalData.cursor || "", + finalData.completed ?? true + ); + } catch (err) { + console.error("Failed to save final status to database:", err); + } } if (!stopFetchRef.current) { @@ -491,6 +676,10 @@ function App() { } } finally { setLoading(false); + // Reset timer when fetch completes or stops + fetchStartTimeRef.current = null; + setElapsedTime(0); + setRemainingTime(null); } }; @@ -514,12 +703,885 @@ function App() { setResult(data); setUsername(loadedUsername); setCurrentPage("main"); + + // Set fetch type to single when loading from database + setFetchType("single"); + + // Determine if account is private (bookmarks or likes) + const isPrivate = loadedUsername === "bookmarks" || loadedUsername === "likes"; + + // Set mode based on account type + if (isPrivate) { + if (loadedUsername === "bookmarks") { + setSearchMode("private"); + setSearchPrivateType("bookmarks"); + } else if (loadedUsername === "likes") { + setSearchMode("private"); + setSearchPrivateType("likes"); + } + } else { + setSearchMode("public"); + } + toast.success(`Loaded @${loadedUsername} from database`); } catch (error) { toast.error("Failed to parse saved data"); } }; + // Parse username from various formats + const parseUsername = (input: string): string => { + let clean = input.trim(); + if (clean.startsWith("@")) { + clean = clean.slice(1); + } + if (clean.includes("x.com/") || clean.includes("twitter.com/")) { + const match = clean.match(/(?:x\.com|twitter\.com)\/([^/?]+)/); + if (match) clean = match[1]; + } + return clean; + }; + + // Handle update selected accounts from database view + const handleUpdateSelected = (usernames: string[]) => { + if (usernames.length === 0) { + toast.error("No accounts selected"); + return; + } + + // Parse usernames (same as handleImportFile) + const accounts: MultipleAccount[] = usernames.map((username) => { + const cleanUsername = parseUsername(username); + return { + id: crypto.randomUUID(), + username: cleanUsername, + status: "pending", + mediaCount: 0, + previousMediaCount: 0, + elapsedTime: 0, + remainingTime: null, + showDiff: false, + }; + }); + + // Merge with existing accounts (avoid duplicates by username) + setMultipleAccounts((prev) => { + const existingUsernames = new Set(prev.map((acc) => acc.username.toLowerCase())); + const newAccounts = accounts.filter( + (acc) => !existingUsernames.has(acc.username.toLowerCase()) + ); + return [...prev, ...newAccounts]; + }); + + // Set fetch type to multiple and navigate to home + setFetchType("multiple"); + setCurrentPage("main"); + toast.success(`Added ${accounts.length} account(s) to multiple fetch`); + }; + + // Handle import txt file + const handleImportFile = () => { + const input = document.createElement("input"); + input.type = "file"; + input.accept = ".txt"; + input.onchange = async (e) => { + const file = (e.target as HTMLInputElement).files?.[0]; + if (!file) return; + + try { + const text = await file.text(); + const lines = text.split("\n").map((line) => line.trim()).filter((line) => line.length > 0); + + if (lines.length === 0) { + toast.error("File is empty"); + return; + } + + const accounts: MultipleAccount[] = lines.map((line) => { + const username = parseUsername(line); + return { + id: crypto.randomUUID(), + username, + status: "pending", + mediaCount: 0, + previousMediaCount: 0, + elapsedTime: 0, + remainingTime: null, + showDiff: false, + }; + }); + + setMultipleAccounts(accounts); + toast.success(`Imported ${accounts.length} account(s)`); + } catch (error) { + toast.error("Failed to read file"); + } + }; + input.click(); + }; + + // Handle fetch all accounts + const handleFetchAll = async () => { + if (multipleAccounts.length === 0) { + toast.error("No accounts to fetch"); + return; + } + + setIsFetchingAll(true); + stopAllRef.current = false; + + // Get auth token from localStorage (same as SearchBar) + const PUBLIC_AUTH_TOKEN_KEY = "twitter_public_auth_token"; + const authToken = localStorage.getItem(PUBLIC_AUTH_TOKEN_KEY) || ""; + if (!authToken.trim()) { + toast.error("Please enter your auth token"); + setIsFetchingAll(false); + return; + } + + // Get timeout from settings + const settings = getSettings(); + const timeoutSeconds = settings.fetchTimeout || 60; + + // Reset all accounts to pending + setMultipleAccounts((prev) => + prev.map((acc) => ({ + ...acc, + status: "pending" as const, + mediaCount: 0, + previousMediaCount: 0, + elapsedTime: 0, + remainingTime: timeoutSeconds, + error: undefined, + showDiff: false, + })) + ); + + // Get current accounts list (use state getter function) + let currentAccounts = [...multipleAccounts]; + + // Fetch each account sequentially + for (let i = 0; i < currentAccounts.length; i++) { + if (stopAllRef.current) { + break; + } + + const account = currentAccounts[i]; + const accountId = account.id; + accountStopFlagsRef.current.set(accountId, false); + + // Update status to fetching + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, status: "fetching" as const } + : acc + ) + ); + + // Start timer for this account (countdown) + const settings = getSettings(); + const timeoutSeconds = settings.fetchTimeout || 60; + accountStartTimesRef.current.set(accountId, Date.now()); + accountTimeoutSecondsRef.current.set(accountId, timeoutSeconds); + + // Initialize with timeout + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, elapsedTime: 0, remainingTime: timeoutSeconds } + : acc + ) + ); + + const timerInterval = window.setInterval(() => { + const startTime = accountStartTimesRef.current.get(accountId); + const timeoutSecs = accountTimeoutSecondsRef.current.get(accountId) || timeoutSeconds; + if (startTime) { + const elapsed = Math.floor((Date.now() - startTime) / 1000); + const remaining = Math.max(0, timeoutSecs - elapsed); + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, elapsedTime: elapsed, remainingTime: remaining } + : acc + ) + ); + + // Auto-stop if timeout reached + if (remaining <= 0) { + accountStopFlagsRef.current.set(accountId, true); + clearInterval(timerInterval); + accountTimersRef.current.delete(accountId); + accountStartTimesRef.current.delete(accountId); + accountTimeoutSecondsRef.current.delete(accountId); + + // Check if any media was fetched using ref (most up-to-date value) + const mediaCount = accountMediaCountRef.current.get(accountId) || 0; + setMultipleAccounts((prev) => + prev.map((acc) => { + if (acc.id === accountId) { + // If no media was fetched at all, mark as failed + // Otherwise mark as incomplete + const status = mediaCount === 0 ? ("failed" as const) : ("incomplete" as const); + return { ...acc, status, remainingTime: 0, mediaCount }; + } + return acc; + }) + ); + CleanupExtractorProcesses().catch(() => {}); + } + } + }, 1000); + accountTimersRef.current.set(accountId, timerInterval); + + try { + // Check if account should be stopped + if (stopAllRef.current) { + clearInterval(timerInterval); + accountTimersRef.current.delete(accountId); + accountStartTimesRef.current.delete(accountId); + accountTimeoutSecondsRef.current.delete(accountId); + // Check if any media was fetched + setMultipleAccounts((prev) => + prev.map((acc) => { + if (acc.id === accountId) { + const status = acc.mediaCount === 0 ? ("failed" as const) : ("incomplete" as const); + return { ...acc, status }; + } + return acc; + }) + ); + continue; + } + + // Fetch account + const cleanUsername = account.username.trim(); + let allTimeline: TwitterResponse["timeline"] = []; + let accountInfo: TwitterResponse["account_info"] | null = null; + let cursor: string | undefined; + let hasMore = true; + let page = 0; + let previousMediaCount = account.mediaCount || 0; + + while (hasMore && !stopAllRef.current) { + // Check if this specific account should be stopped + if (accountStopFlagsRef.current.get(accountId)) { + break; + } + + const response = await ExtractTimeline({ + username: cleanUsername, + auth_token: authToken.trim(), + timeline_type: "timeline", + batch_size: BATCH_SIZE, + page: page, + media_type: fetchedMediaType || "all", + retweets: false, + cursor: cursor, + }); + + const data: TwitterResponse = JSON.parse(response); + + if (!accountInfo && data.account_info) { + accountInfo = data.account_info; + } + + allTimeline = mergeTimelines(allTimeline, data.timeline); + + cursor = data.cursor; + hasMore = !!data.cursor && !data.completed; + page++; + + // Save cursor every batch (lightweight, just a string) + if (cursor) { + saveCursor(cleanUsername, cursor); + } + + // Update account with progress + const currentMediaCount = allTimeline.length; + accountMediaCountRef.current.set(accountId, currentMediaCount); + const hasNewItems = currentMediaCount > previousMediaCount; + + setMultipleAccounts((prev) => + prev.map((acc) => { + if (acc.id === accountId) { + return { + ...acc, + accountInfo: accountInfo || undefined, + previousMediaCount: previousMediaCount, + mediaCount: currentMediaCount, + showDiff: hasNewItems, + cursor: cursor, // Save cursor for retry + }; + } + return acc; + }) + ); + + // Clear diff after 1 second + if (hasNewItems) { + setTimeout(() => { + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId ? { ...acc, showDiff: false } : acc + ) + ); + }, 1000); + } + + // Update previous count for next iteration + previousMediaCount = currentMediaCount; + + // Save to database after each batch + if (accountInfo) { + try { + await SaveAccountToDBWithStatus( + accountInfo.name, + accountInfo.nick, + accountInfo.profile_image, + allTimeline.length, + JSON.stringify({ + account_info: accountInfo, + timeline: allTimeline, + total_urls: allTimeline.length, + metadata: { + new_entries: data.timeline.length, + page: page, + batch_size: BATCH_SIZE, + has_more: hasMore, + cursor: cursor, + completed: !hasMore, + }, + cursor: cursor, + completed: !hasMore, + }), + fetchedMediaType || "all", + cursor || "", + !hasMore + ); + } catch (err) { + console.error("Failed to save progress to database:", err); + } + } + } + + // Clear timer + clearInterval(timerInterval); + accountTimersRef.current.delete(accountId); + accountStartTimesRef.current.delete(accountId); + accountTimeoutSecondsRef.current.delete(accountId); + + // Update final status - check if media was fetched + const finalMediaCount = allTimeline.length; + accountMediaCountRef.current.set(accountId, finalMediaCount); + + // Check if stopped due to timeout (accountStopFlags was set by timeout handler) + const wasTimeout = accountStopFlagsRef.current.get(accountId); + + if (wasTimeout) { + // Timeout: incomplete if media was fetched, failed if no media + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, status: finalMediaCount === 0 ? ("failed" as const) : ("incomplete" as const) } + : acc + ) + ); + } else if (stopAllRef.current) { + // Stopped by user: incomplete if media was fetched, failed if no media + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, status: finalMediaCount === 0 ? ("failed" as const) : ("incomplete" as const) } + : acc + ) + ); + } else if (hasMore) { + // Has more but stopped (e.g., API error): incomplete if media was fetched, failed if no media + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, status: finalMediaCount === 0 ? ("failed" as const) : ("incomplete" as const) } + : acc + ) + ); + } else { + // Completed successfully + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, status: "completed" as const } + : acc + ) + ); + } + } catch (error) { + // Clear timer on error + const timerInterval = accountTimersRef.current.get(accountId); + if (timerInterval) { + clearInterval(timerInterval); + accountTimersRef.current.delete(accountId); + } + accountStartTimesRef.current.delete(accountId); + accountTimeoutSecondsRef.current.delete(accountId); + + const errorMsg = error instanceof Error ? error.message : String(error); + + // Check if any media was fetched before the error + const mediaCount = accountMediaCountRef.current.get(accountId) || 0; + + // Check if error is auth token related (401, unauthorized, invalid, expired) + const isAuthError = errorMsg.toLowerCase().includes("401") || + errorMsg.toLowerCase().includes("unauthorized") || + errorMsg.toLowerCase().includes("auth token may be invalid") || + errorMsg.toLowerCase().includes("auth token may be expired") || + errorMsg.toLowerCase().includes("invalid or expired"); + + // Determine status: + // - If auth error: always "failed" (even if media was fetched, it's likely incomplete data) + // - If not auth error and media was fetched: "incomplete" + // - If not auth error and no media: "failed" + const status = isAuthError || mediaCount === 0 ? ("failed" as const) : ("incomplete" as const); + + accountMediaCountRef.current.delete(accountId); + + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { + ...acc, + status, + error: errorMsg, + mediaCount, + } + : acc + ) + ); + logger.error(`Failed to fetch @${account.username}: ${errorMsg}`); + } + } + + setIsFetchingAll(false); + if (!stopAllRef.current) { + toast.success("All accounts fetched"); + } + }; + + // Handle stop all + const handleStopAll = () => { + stopAllRef.current = true; + setIsFetchingAll(false); + + // Stop all timers + accountTimersRef.current.forEach((interval) => clearInterval(interval)); + accountTimersRef.current.clear(); + accountStartTimesRef.current.clear(); + accountTimeoutSecondsRef.current.clear(); + // Keep accountMediaCountRef for status checking + + // Update all fetching accounts - check if they have media using ref (most up-to-date value) + setMultipleAccounts((prev) => + prev.map((acc) => { + if (acc.status === "fetching") { + // If no media was fetched, mark as failed; otherwise incomplete + const mediaCount = accountMediaCountRef.current.get(acc.id) || acc.mediaCount || 0; + const status = mediaCount === 0 ? ("failed" as const) : ("incomplete" as const); + return { ...acc, status, mediaCount }; + } + return acc; + }) + ); + + // Cleanup processes + CleanupExtractorProcesses().catch(() => {}); + toast.info("Stopped all fetches"); + }; + + // Handle stop specific account + const handleStopAccount = (accountId: string) => { + // Set stop flag for this account + accountStopFlagsRef.current.set(accountId, true); + + // Check if any media was fetched before marking status using ref (most up-to-date value) + setMultipleAccounts((prev) => + prev.map((acc) => { + if (acc.id === accountId && acc.status === "fetching") { + // If no media was fetched, mark as failed; otherwise incomplete + const mediaCount = accountMediaCountRef.current.get(accountId) || acc.mediaCount || 0; + const status = mediaCount === 0 ? ("failed" as const) : ("incomplete" as const); + return { ...acc, status, mediaCount }; + } + return acc; + }) + ); + + // Clear timer for this account + const timerInterval = accountTimersRef.current.get(accountId); + if (timerInterval) { + clearInterval(timerInterval); + accountTimersRef.current.delete(accountId); + } + accountStartTimesRef.current.delete(accountId); + accountTimeoutSecondsRef.current.delete(accountId); + + // Cleanup processes + CleanupExtractorProcesses().catch(() => {}); + toast.info("Stopped account fetch"); + }; + + // Handle retry specific account + const handleRetryAccount = async (accountId: string) => { + const account = multipleAccounts.find((acc) => acc.id === accountId); + if (!account) return; + + // Get auth token from localStorage + const PUBLIC_AUTH_TOKEN_KEY = "twitter_public_auth_token"; + const authToken = localStorage.getItem(PUBLIC_AUTH_TOKEN_KEY) || ""; + if (!authToken.trim()) { + toast.error("Please enter your auth token"); + return; + } + + // Check if we have a saved cursor (like resume in single fetch) + const cleanUsername = account.username.trim(); + let existingState: FetchState | null = null; + let cursor: string | undefined = account.cursor; // Use saved cursor from account state + let allTimeline: TwitterResponse["timeline"] = []; + let accountInfo: TwitterResponse["account_info"] | null = null; + let previousMediaCount = account.mediaCount || 0; + + // Try to load from fetch state (like single fetch resume) + existingState = getFetchState(cleanUsername); + if (existingState && existingState.cursor && !existingState.completed) { + cursor = existingState.cursor; + allTimeline = existingState.timeline; + if (existingState.accountInfo) { + accountInfo = existingState.accountInfo; + } + previousMediaCount = existingState.timeline.length; + logger.info(`Resuming @${cleanUsername} from ${allTimeline.length} items...`); + } else { + // Try to get cursor from lightweight storage (localStorage) + if (!cursor) { + const savedCursor = getCursor(cleanUsername); + if (savedCursor) { + cursor = savedCursor; + previousMediaCount = account.mediaCount || 0; + logger.info(`Retrying @${cleanUsername} from cursor (${previousMediaCount} items)...`); + } else { + // Fallback: try to get cursor from database + try { + const accounts = await GetAllAccountsFromDB(); + const dbAccount = accounts.find( + (acc) => acc.username.toLowerCase() === cleanUsername.toLowerCase() + ); + if (dbAccount?.cursor) { + cursor = dbAccount.cursor; + previousMediaCount = account.mediaCount || 0; + logger.info(`Retrying @${cleanUsername} from database cursor (${previousMediaCount} items)...`); + } else { + // Fresh retry - clear any existing state + clearFetchState(cleanUsername); + clearCursor(cleanUsername); + logger.info(`Retrying @${cleanUsername} from beginning...`); + } + } catch (dbError) { + console.error("Failed to get cursor from database:", dbError); + clearFetchState(cleanUsername); + clearCursor(cleanUsername); + logger.info(`Retrying @${cleanUsername} from beginning...`); + } + } + } else { + previousMediaCount = account.mediaCount || 0; + logger.info(`Retrying @${cleanUsername} from cursor (${previousMediaCount} items)...`); + } + } + + // Update account status to fetching (preserve existing data) + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { + ...acc, + status: "fetching" as const, + elapsedTime: 0, + remainingTime: null, + error: undefined, + showDiff: false, + mediaCount: previousMediaCount, // Preserve existing count + previousMediaCount: previousMediaCount, + } + : acc + ) + ); + + accountStopFlagsRef.current.set(accountId, false); + + // Start timer for this account + const settings = getSettings(); + const timeoutSeconds = settings.fetchTimeout || 60; + accountStartTimesRef.current.set(accountId, Date.now()); + accountTimeoutSecondsRef.current.set(accountId, timeoutSeconds); + + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, elapsedTime: 0, remainingTime: timeoutSeconds } + : acc + ) + ); + + const timerInterval = window.setInterval(() => { + const startTime = accountStartTimesRef.current.get(accountId); + const timeoutSecs = accountTimeoutSecondsRef.current.get(accountId) || timeoutSeconds; + if (startTime) { + const elapsed = Math.floor((Date.now() - startTime) / 1000); + const remaining = Math.max(0, timeoutSecs - elapsed); + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, elapsedTime: elapsed, remainingTime: remaining } + : acc + ) + ); + + // Auto-stop if timeout reached + if (remaining <= 0) { + accountStopFlagsRef.current.set(accountId, true); + clearInterval(timerInterval); + accountTimersRef.current.delete(accountId); + accountStartTimesRef.current.delete(accountId); + accountTimeoutSecondsRef.current.delete(accountId); + + // Check if any media was fetched using ref (most up-to-date value) + const mediaCount = accountMediaCountRef.current.get(accountId) || 0; + setMultipleAccounts((prev) => + prev.map((acc) => { + if (acc.id === accountId) { + const status = mediaCount === 0 ? ("failed" as const) : ("incomplete" as const); + return { ...acc, status, remainingTime: 0, mediaCount }; + } + return acc; + }) + ); + CleanupExtractorProcesses().catch(() => {}); + } + } + }, 1000); + accountTimersRef.current.set(accountId, timerInterval); + + try { + let hasMore = true; + let page = 0; + + while (hasMore && !stopAllRef.current) { + // Check if this specific account should be stopped + if (accountStopFlagsRef.current.get(accountId)) { + break; + } + + const response = await ExtractTimeline({ + username: cleanUsername, + auth_token: authToken.trim(), + timeline_type: "timeline", + batch_size: BATCH_SIZE, + page: page, + media_type: fetchedMediaType || "all", + retweets: false, + cursor: cursor, + }); + + const data: TwitterResponse = JSON.parse(response); + + if (!accountInfo && data.account_info) { + accountInfo = data.account_info; + } + + allTimeline = mergeTimelines(allTimeline, data.timeline); + + cursor = data.cursor; + hasMore = !!data.cursor && !data.completed; + page++; + + // Save cursor every batch (lightweight, just a string) + if (cursor) { + saveCursor(cleanUsername, cursor); + } + + // Update account with progress + const currentMediaCount = allTimeline.length; + accountMediaCountRef.current.set(accountId, currentMediaCount); + const hasNewItems = currentMediaCount > previousMediaCount; + + setMultipleAccounts((prev) => + prev.map((acc) => { + if (acc.id === accountId) { + return { + ...acc, + accountInfo: accountInfo || undefined, + previousMediaCount: previousMediaCount, + mediaCount: currentMediaCount, + showDiff: hasNewItems, + cursor: cursor, // Save cursor for next retry + }; + } + return acc; + }) + ); + + // Save state periodically (like single fetch) for resume capability + if (page % 3 === 0 || !hasMore || accountStopFlagsRef.current.get(accountId)) { + saveFetchState({ + username: cleanUsername, + cursor: cursor || "", + timeline: allTimeline, + accountInfo: accountInfo, + totalFetched: allTimeline.length, + completed: !hasMore, + authToken: authToken.trim(), + mediaType: fetchedMediaType || "all", + retweets: false, + timelineType: "timeline", + }); + } + + // Clear diff after 1 second + if (hasNewItems) { + setTimeout(() => { + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId ? { ...acc, showDiff: false } : acc + ) + ); + }, 1000); + } + + // Update previous count for next iteration + previousMediaCount = currentMediaCount; + + // Save to database after each batch + if (accountInfo) { + try { + await SaveAccountToDBWithStatus( + accountInfo.name, + accountInfo.nick, + accountInfo.profile_image, + allTimeline.length, + JSON.stringify({ + account_info: accountInfo, + timeline: allTimeline, + total_urls: allTimeline.length, + metadata: { + new_entries: data.timeline.length, + page: page, + batch_size: BATCH_SIZE, + has_more: hasMore, + cursor: cursor, + completed: !hasMore, + }, + cursor: cursor, + completed: !hasMore, + }), + fetchedMediaType || "all", + cursor || "", + !hasMore + ); + } catch (err) { + console.error("Failed to save progress to database:", err); + } + } + } + + // Clear timer + clearInterval(timerInterval); + accountTimersRef.current.delete(accountId); + accountStartTimesRef.current.delete(accountId); + accountTimeoutSecondsRef.current.delete(accountId); + + // Update final status + const finalMediaCount = allTimeline.length; + accountMediaCountRef.current.set(accountId, finalMediaCount); + + const wasTimeout = accountStopFlagsRef.current.get(accountId); + + if (wasTimeout) { + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, status: finalMediaCount === 0 ? ("failed" as const) : ("incomplete" as const) } + : acc + ) + ); + } else if (stopAllRef.current) { + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, status: finalMediaCount === 0 ? ("failed" as const) : ("incomplete" as const) } + : acc + ) + ); + } else if (hasMore) { + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { ...acc, status: finalMediaCount === 0 ? ("failed" as const) : ("incomplete" as const) } + : acc + ) + ); + } else { + // Completed successfully - clear fetch state and cursor + clearFetchState(cleanUsername); + clearCursor(cleanUsername); + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId ? { ...acc, status: "completed" as const, cursor: undefined } : acc + ) + ); + } + } catch (error) { + // Clear timer on error + const timerInterval = accountTimersRef.current.get(accountId); + if (timerInterval) { + clearInterval(timerInterval); + accountTimersRef.current.delete(accountId); + } + accountStartTimesRef.current.delete(accountId); + accountTimeoutSecondsRef.current.delete(accountId); + + const errorMsg = error instanceof Error ? error.message : String(error); + + // Check if any media was fetched before the error + const mediaCount = accountMediaCountRef.current.get(accountId) || 0; + + // Check if error is auth token related + const isAuthError = errorMsg.toLowerCase().includes("401") || + errorMsg.toLowerCase().includes("unauthorized") || + errorMsg.toLowerCase().includes("auth token may be invalid") || + errorMsg.toLowerCase().includes("auth token may be expired") || + errorMsg.toLowerCase().includes("invalid or expired"); + + const status = isAuthError || mediaCount === 0 ? ("failed" as const) : ("incomplete" as const); + + accountMediaCountRef.current.delete(accountId); + + setMultipleAccounts((prev) => + prev.map((acc) => + acc.id === accountId + ? { + ...acc, + status, + error: errorMsg, + mediaCount, + } + : acc + ) + ); + logger.error(`Failed to fetch @${account.username}: ${errorMsg}`); + } + }; + const renderPage = () => { switch (currentPage) { case "settings": @@ -531,6 +1593,7 @@ function App() { setCurrentPage("main")} onLoadAccount={handleLoadFromDB} + onUpdateSelected={handleUpdateSelected} /> ); default: @@ -555,15 +1618,35 @@ function App() { onHistorySelect={handleHistorySelect} onHistoryRemove={removeFromHistory} hasResult={!!result} + elapsedTime={elapsedTime} + remainingTime={remainingTime} + fetchType={fetchType} + onFetchTypeChange={handleFetchTypeChange} + multipleAccounts={multipleAccounts} + onImportFile={handleImportFile} + onFetchAll={handleFetchAll} + onStopAll={handleStopAll} + onStopAccount={handleStopAccount} + onRetryAccount={handleRetryAccount} + isFetchingAll={isFetchingAll} + mode={searchMode} + privateType={searchPrivateType} + onModeChange={(mode, privateType) => { + setSearchMode(mode); + if (privateType) { + setSearchPrivateType(privateType); + } + }} /> - {result && ( + {result && fetchType === "single" && (
)} diff --git a/frontend/src/components/DatabaseView.tsx b/frontend/src/components/DatabaseView.tsx index c486bf3..79dd372 100644 --- a/frontend/src/components/DatabaseView.tsx +++ b/frontend/src/components/DatabaseView.tsx @@ -28,16 +28,22 @@ import { } from "@/components/ui/tooltip"; import { Checkbox } from "@/components/ui/checkbox"; import { Spinner } from "@/components/ui/spinner"; -import { Trash2, Eye, FileInput, FileOutput, Pencil, Tag, Shuffle, X, Download, StopCircle, Globe, Lock, Bookmark, Heart, Image, Images, Video, Film, FileText, Filter, AlertCircle } from "lucide-react"; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuTrigger, +} from "@/components/ui/dropdown-menu"; +import { Trash2, FileInput, FileOutput, Pencil, Tag, Shuffle, X, Download, StopCircle, Globe, Lock, Bookmark, Heart, Image, Images, Video, Film, FileText, Filter, AlertCircle, MoreVertical, FileBraces, CloudBackup } from "lucide-react"; import { toastWithSound as toast } from "@/lib/toast-with-sound"; import { getSettings } from "@/lib/settings"; import { GetAllAccountsFromDB, GetAccountFromDB, DeleteAccountFromDB, - ClearAllAccountsFromDB, SaveAccountToDB, ExportAccountJSON, + ExportAccountsTXT, UpdateAccountGroup, GetAllGroups, DownloadMediaWithMetadata, @@ -96,11 +102,12 @@ interface GroupInfo { interface DatabaseViewProps { onBack: () => void; onLoadAccount: (responseJSON: string, username: string) => void; + onUpdateSelected?: (usernames: string[]) => void; } const ITEMS_PER_PAGE = 10; -export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { +export function DatabaseView({ onLoadAccount, onUpdateSelected }: DatabaseViewProps) { const [accounts, setAccounts] = useState([]); const [loading, setLoading] = useState(true); const [selectedIds, setSelectedIds] = useState>(new Set()); @@ -230,25 +237,59 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { } const settings = getSettings(); + // Check if it's bookmarks or likes by checking account_info.nick or username (for backward compatibility) + const isBookmarks = data.account_info?.nick === "My Bookmarks" || username === "bookmarks"; + const isLikes = data.account_info?.nick === "My Likes" || username === "likes"; + let outputDir = settings.downloadPath; + if (isBookmarks) { + const separator = settings.downloadPath.includes("/") ? "/" : "\\"; + outputDir = `${settings.downloadPath}${separator}My Bookmarks`; + } else if (isLikes) { + const separator = settings.downloadPath.includes("/") ? "/" : "\\"; + outputDir = `${settings.downloadPath}${separator}My Likes`; + } + // Use actual username from account_info if available, otherwise use stored username + const actualUsername = data.account_info?.name || username; + setIsDownloading(true); setDownloadingAccountId(id); setDownloadProgress({ current: 0, total: timeline.length, percent: 0 }); const request = new main.DownloadMediaWithMetadataRequest({ - items: timeline.map((item: { url: string; date: string; tweet_id: string; type: string }) => new main.MediaItemRequest({ + items: timeline.map((item: { url: string; date: string; tweet_id: string; type: string; original_filename?: string; author_username?: string }) => new main.MediaItemRequest({ url: item.url, date: item.date, tweet_id: item.tweet_id, type: item.type, + original_filename: item.original_filename || "", + author_username: item.author_username || "", })), - output_dir: settings.downloadPath, - username: username, + output_dir: outputDir, + username: actualUsername, + proxy: settings.proxy || "", }); const response = await DownloadMediaWithMetadata(request); if (response.success) { - toast.success(`Downloaded ${response.downloaded} files for @${username}`); + const parts: string[] = []; + if (response.downloaded > 0) { + parts.push(`${response.downloaded} file${response.downloaded !== 1 ? 's' : ''} downloaded`); + } + if (response.skipped > 0) { + parts.push(`${response.skipped} file${response.skipped !== 1 ? 's' : ''} already exist${response.skipped !== 1 ? '' : 's'}`); + } + if (response.failed > 0) { + parts.push(`${response.failed} failed`); + } + const message = parts.length > 0 ? `${parts.join(', ')} for @${username}` : `Download completed for @${username}`; + + // Use info toast if only skipped files (no downloaded, no failed) + if (response.downloaded === 0 && response.failed === 0 && response.skipped > 0) { + toast.info(message); + } else { + toast.success(message); + } } else { toast.error(response.message || "Download failed"); } @@ -287,6 +328,7 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { const settings = getSettings(); let totalDownloaded = 0; + let totalSkipped = 0; let downloadedAccounts = 0; for (let i = 0; i < idsToDownload.length; i++) { @@ -318,20 +360,38 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { setDownloadProgress({ current: 0, total: timeline.length, percent: 0 }); + // Check if it's bookmarks or likes by checking account_info.nick or username (for backward compatibility) + const isBookmarks = data.account_info?.nick === "My Bookmarks" || account.username === "bookmarks"; + const isLikes = data.account_info?.nick === "My Likes" || account.username === "likes"; + let outputDir = settings.downloadPath; + if (isBookmarks) { + const separator = settings.downloadPath.includes("/") ? "/" : "\\"; + outputDir = `${settings.downloadPath}${separator}My Bookmarks`; + } else if (isLikes) { + const separator = settings.downloadPath.includes("/") ? "/" : "\\"; + outputDir = `${settings.downloadPath}${separator}My Likes`; + } + // Use actual username from account_info if available, otherwise use stored username + const actualUsername = data.account_info?.name || account.username; + const request = new main.DownloadMediaWithMetadataRequest({ - items: timeline.map((item: { url: string; date: string; tweet_id: string; type: string }) => new main.MediaItemRequest({ + items: timeline.map((item: { url: string; date: string; tweet_id: string; type: string; author_username?: string; original_filename?: string }) => new main.MediaItemRequest({ url: item.url, date: item.date, tweet_id: item.tweet_id, type: item.type, + author_username: item.author_username || "", + original_filename: item.original_filename || "", })), - output_dir: settings.downloadPath, - username: account.username, + output_dir: outputDir, + username: actualUsername, + proxy: settings.proxy || "", }); const response = await DownloadMediaWithMetadata(request); if (response.success) { totalDownloaded += response.downloaded; + totalSkipped += response.skipped || 0; downloadedAccounts++; } } catch (error) { @@ -345,8 +405,22 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { setBulkDownloadCurrent(0); setBulkDownloadTotal(0); - if (totalDownloaded > 0 && !stopBulkDownloadRef.current) { - toast.success(`Downloaded ${totalDownloaded} files from ${downloadedAccounts} accounts`); + if ((totalDownloaded > 0 || totalSkipped > 0) && !stopBulkDownloadRef.current) { + const parts: string[] = []; + if (totalDownloaded > 0) { + parts.push(`${totalDownloaded} file${totalDownloaded !== 1 ? 's' : ''} downloaded`); + } + if (totalSkipped > 0) { + parts.push(`${totalSkipped} file${totalSkipped !== 1 ? 's' : ''} already exist${totalSkipped !== 1 ? '' : 's'}`); + } + const message = parts.length > 0 ? `${parts.join(', ')} from ${downloadedAccounts} account${downloadedAccounts !== 1 ? 's' : ''}` : `Download completed from ${downloadedAccounts} account${downloadedAccounts !== 1 ? 's' : ''}`; + + // Use info toast if only skipped files (no downloaded) + if (totalDownloaded === 0 && totalSkipped > 0) { + toast.info(message); + } else { + toast.success(message); + } } }; @@ -375,7 +449,7 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { } }; - const handleExport = async () => { + const handleExportJSON = async () => { const idsToExport = selectedIds.size > 0 ? Array.from(selectedIds) : accounts.map((a) => a.id); if (idsToExport.length === 0) { @@ -398,6 +472,34 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { } }; + const handleExportTXT = async () => { + const idsToExport = selectedIds.size > 0 ? Array.from(selectedIds) : accounts.map((a) => a.id); + + if (idsToExport.length === 0) { + toast.error("No accounts to export"); + return; + } + + const settings = getSettings(); + const outputDir = settings.downloadPath || ""; + + try { + await ExportAccountsTXT(idsToExport, outputDir); + toast.success(`Exported ${idsToExport.length} account(s) to ${outputDir}\\twitterxmediabatchdownloader_backups\\twitterxmediabatchdownloader_multiple.txt`); + } catch (error) { + toast.error("Failed to export"); + } + }; + + // Check if any selected accounts are private (bookmarks/likes) + const hasPrivateAccountSelected = () => { + if (selectedIds.size === 0) return false; + return Array.from(selectedIds).some((id) => { + const account = accounts.find((a) => a.id === id); + return account && isPrivateAccount(account.username); + }); + }; + const handleImport = () => { const input = document.createElement("input"); input.type = "file"; @@ -522,29 +624,29 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) {

Saved Accounts

{/* Public/Private Toggle */} -
+
@@ -558,13 +660,62 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { Import JSON + + + + + + + + Export Selected ({selectedIds.size}) + + + + + Export JSON + + + + Export TXT + + + - - Export Selected + Update Selected ({selectedIds.size}) {isBulkDownloading ? ( @@ -589,12 +740,12 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { - - Clear All + Clear All {viewMode === "public" ? "Public" : "Private"}
@@ -608,9 +759,9 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) {
- Clear All Accounts? + Clear All {viewMode === "public" ? "Public" : "Private"} Accounts? - This will permanently delete all {formatNumberWithComma(accounts.length)} saved accounts. This action cannot be undone. + This will permanently delete all {formatNumberWithComma(baseAccounts.length)} {viewMode === "public" ? "public" : "private"} saved accounts. This action cannot be undone. @@ -618,8 +769,12 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { variant="destructive" onClick={async () => { try { - await ClearAllAccountsFromDB(); - toast.success("All accounts deleted"); + // Delete only accounts matching the current view mode + const accountsToDelete = baseAccounts.map((acc) => acc.id); + for (const id of accountsToDelete) { + await DeleteAccountFromDB(id); + } + toast.success(`All ${viewMode === "public" ? "public" : "private"} accounts deleted`); setClearAllDialogOpen(false); loadAccounts(); } catch (error) { @@ -627,7 +782,7 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { } }} > - Delete All + Delete All {viewMode === "public" ? "Public" : "Private"}
@@ -754,7 +909,10 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { {(currentPage - 1) * ITEMS_PER_PAGE + index + 1} {isPrivateAccount(account.username) ? ( -
+
handleView(account.id, account.username)} + > {account.username === "bookmarks" ? ( ) : ( @@ -765,7 +923,8 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { {account.name} handleView(account.id, account.username)} /> )}
@@ -809,57 +968,14 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { )}
-
@{account.username}
+ {!isPrivateAccount(account.username) && ( +
@{account.username}
+ )}
{account.last_fetched} {getRelativeTime(account.last_fetched)}
- - - - - Edit Group - - - - - - View - - - - - - Export JSON - {downloadingAccountId === account.id ? ( @@ -892,41 +1008,75 @@ export function DatabaseView({ onLoadAccount }: DatabaseViewProps) { Download All Media )} - + - - - + - Delete + More Options - -
+ + handleEditGroup(account)}> + + Edit Group + + { + const settings = getSettings(); + const outputDir = settings.downloadPath || ""; + try { + await ExportAccountJSON(account.id, outputDir); + toast.success(`Exported @${account.username} to ${outputDir}\\twitterxmediabatchdownloader_backups`); + } catch (error) { + toast.error("Failed to export"); + } + }} + > + + Export JSON + + - + { + e.preventDefault(); + }} + className="text-destructive focus:text-destructive" + > + + Delete + -
- - Delete @{account.username}? - - This will permanently delete the saved data for this account. - - - - - -
-
+ +
+ + + +
+ + Delete @{account.username}? + + This will permanently delete the saved data for this account. + + + + + +
+ + +
{/* Progress bar for this account */} diff --git a/frontend/src/components/DebugLogger.tsx b/frontend/src/components/DebugLogger.tsx deleted file mode 100644 index dd3ea32..0000000 --- a/frontend/src/components/DebugLogger.tsx +++ /dev/null @@ -1,132 +0,0 @@ -import { useState, useEffect, useRef } from "react"; -import { Bug, Trash2, X, Copy, Check } from "lucide-react"; -import { Button } from "@/components/ui/button"; -import { - Dialog, - DialogContent, - DialogTitle, - DialogTrigger, -} from "@/components/ui/dialog"; -import { logger, type LogEntry } from "@/lib/logger"; - -const levelColors: Record = { - info: "text-blue-500", - success: "text-green-500", - warning: "text-yellow-500", - error: "text-red-500", - debug: "text-gray-500", -}; - -function formatTime(date: Date): string { - return date.toLocaleTimeString("en-US", { - hour12: false, - hour: "2-digit", - minute: "2-digit", - second: "2-digit", - }); -} - -export function DebugLogger() { - const [open, setOpen] = useState(false); - const [logs, setLogs] = useState([]); - const [copied, setCopied] = useState(false); - const scrollRef = useRef(null); - - useEffect(() => { - const unsubscribe = logger.subscribe(() => { - setLogs(logger.getLogs()); - }); - setLogs(logger.getLogs()); - return () => { - unsubscribe(); - }; - }, []); - - useEffect(() => { - if (scrollRef.current) { - scrollRef.current.scrollTop = scrollRef.current.scrollHeight; - } - }, [logs]); - - const handleClear = () => { - logger.clear(); - }; - - const handleCopy = async () => { - const logText = logs - .map((log) => `[${formatTime(log.timestamp)}] [${log.level}] ${log.message}`) - .join("\n"); - - try { - await navigator.clipboard.writeText(logText); - setCopied(true); - setTimeout(() => setCopied(false), 500); - } catch (err) { - console.error("Failed to copy logs:", err); - } - }; - - return ( - - - - - - Debug Logs -
- - - -
-
- {logs.length === 0 ? ( -

no logs yet...

- ) : ( - logs.map((log, i) => ( -
- - [{formatTime(log.timestamp)}] - - - [{log.level}] - - {log.message} -
- )) - )} -
-
-
- ); -} diff --git a/frontend/src/components/MediaList.tsx b/frontend/src/components/MediaList.tsx index 603b3f3..e470b39 100644 --- a/frontend/src/components/MediaList.tsx +++ b/frontend/src/components/MediaList.tsx @@ -72,21 +72,33 @@ interface MediaListProps { timeline: TimelineEntry[]; totalUrls: number; fetchedMediaType?: string; + newMediaCount?: number | null; } function getThumbnailUrl(url: string): string { + // For animated_gif: video.twimg.com/tweet_video/XXX.mp4 -> pbs.twimg.com/tweet_video_thumb/XXX?format=jpg&name=360x360 + if (url.includes("video.twimg.com/tweet_video/")) { + // Extract filename from URL (e.g., GzstJyDbIAAPuX9.mp4 -> GzstJyDbIAAPuX9) + const match = url.match(/tweet_video\/([^\/]+)\.mp4/); + if (match && match[1]) { + const filename = match[1]; + return `https://pbs.twimg.com/tweet_video_thumb/${filename}?format=jpg&name=360x360`; + } + } + + // For photos: pbs.twimg.com/media/XXX -> use 360x360 for consistency if (url.includes("pbs.twimg.com/media/")) { if (url.includes("?format=")) { if (url.includes("&name=")) { const parts = url.split("&name="); - return parts[0] + "&name=thumb"; + return parts[0] + "&name=360x360"; } - return url + "&name=thumb"; + return url + "&name=360x360"; } if (url.includes("?")) { - return url + "&name=thumb"; + return url + "&name=360x360"; } - return url + "?format=jpg&name=thumb"; + return url + "?format=jpg&name=360x360"; } return url; } @@ -209,6 +221,7 @@ export function MediaList({ timeline, totalUrls, fetchedMediaType = "all", + newMediaCount = null, }: MediaListProps) { const [selectedItems, setSelectedItems] = useState>(new Set()); const [sortBy, setSortBy] = useState("date-desc"); @@ -227,6 +240,9 @@ export function MediaList({ const [failedItems, setFailedItems] = useState>(new Set()); const [skippedItems, setSkippedItems] = useState>(new Set()); const [downloadingItem, setDownloadingItem] = useState(null); + // Lazy loading: start with 10 thumbnails, load more on scroll + const [visibleCount, setVisibleCount] = useState(10); + const loadMoreRef = useRef(null); // Listen for scroll to show/hide scroll-to-top button useEffect(() => { @@ -237,6 +253,69 @@ export function MediaList({ return () => window.removeEventListener("scroll", handleScroll); }, []); + // Filter and sort timeline + const filteredTimeline = useMemo(() => { + let filtered = [...timeline]; + + // Filter by media type + if (filterType !== "all") { + filtered = filtered.filter((item) => { + if (filterType === "photo") return item.type === "photo"; + if (filterType === "video") return item.type === "video"; + if (filterType === "gif") return item.type === "animated_gif" || item.type === "gif"; + if (filterType === "text") return item.type === "text"; + return true; + }); + } + + // Sort + filtered.sort((a, b) => { + if (sortBy === "date-desc") { + return new Date(b.date).getTime() - new Date(a.date).getTime(); + } else if (sortBy === "date-asc") { + return new Date(a.date).getTime() - new Date(b.date).getTime(); + } else if (sortBy === "tweet-id-desc") { + return Number(b.tweet_id) - Number(a.tweet_id); + } else if (sortBy === "tweet-id-asc") { + return Number(a.tweet_id) - Number(b.tweet_id); + } + return 0; + }); + + return filtered; + }, [timeline, filterType, sortBy]); + + // Reset visible count when filtered timeline changes + useEffect(() => { + setVisibleCount(10); + }, [filteredTimeline.length]); + + // Intersection Observer for lazy loading thumbnails + useEffect(() => { + if (!loadMoreRef.current) return; + + const observer = new IntersectionObserver( + (entries) => { + if (entries[0].isIntersecting) { + setVisibleCount((prev) => { + // Load 10 more items at a time + const filteredLength = filteredTimeline.length; + return Math.min(prev + 10, filteredLength); + }); + } + }, + { threshold: 0.1 } + ); + + observer.observe(loadMoreRef.current); + + return () => { + if (loadMoreRef.current) { + observer.unobserve(loadMoreRef.current); + } + }; + }, [filteredTimeline.length]); + const scrollToTop = () => { window.scrollTo({ top: 0, behavior: "smooth" }); }; @@ -328,31 +407,6 @@ export function MediaList({ }; }, []); - // Filter and sort timeline - const filteredTimeline = useMemo(() => { - let filtered = [...timeline]; - - // Filter by media type - if (filterType !== "all") { - filtered = filtered.filter((item) => { - if (filterType === "photo") return item.type === "photo"; - if (filterType === "video") return item.type === "video"; - if (filterType === "gif") return item.type === "gif" || item.type === "animated_gif"; - if (filterType === "text") return item.type === "text"; - return true; - }); - } - - // Sort - if (sortBy === "date-asc") { - filtered.sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime()); - } else { - filtered.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()); - } - - return filtered; - }, [timeline, sortBy, filterType]); - const goToPrevious = () => { if (previewIndex !== null && previewIndex > 0) { setPreviewIndex(previewIndex - 1); @@ -407,9 +461,21 @@ export function MediaList({ setSelectedItems(newSelected); }; - const handleDownload = async () => { + // Helper function to get output directory (adds "My Bookmarks" or "My Likes" folder) + const getOutputDir = (): string => { const settings = getSettings(); - + const isBookmarks = accountInfo.nick === "My Bookmarks"; + const isLikes = accountInfo.nick === "My Likes"; + if (isBookmarks || isLikes) { + // Use path separator that backend will normalize (filepath.Join handles both / and \) + const separator = settings.downloadPath.includes("/") ? "/" : "\\"; + const folderName = isBookmarks ? "My Bookmarks" : "My Likes"; + return `${settings.downloadPath}${separator}${folderName}`; + } + return settings.downloadPath; + }; + + const handleDownload = async () => { // Get items with their original indices in filteredTimeline const itemsWithIndices = selectedItems.size > 0 ? Array.from(selectedItems).map((i) => ({ item: filteredTimeline[i], originalIndex: i })) @@ -432,6 +498,7 @@ export function MediaList({ logger.info(`Starting download of ${itemsWithIndices.length} files...`); try { + const settings = getSettings(); const request = new main.DownloadMediaWithMetadataRequest({ items: itemsWithIndices.map(({ item }) => new main.MediaItemRequest({ url: item.url, @@ -439,15 +506,36 @@ export function MediaList({ tweet_id: item.tweet_id, type: item.type, content: item.content || "", + original_filename: item.original_filename || "", + author_username: item.author_username || "", })), - output_dir: settings.downloadPath, + output_dir: getOutputDir(), username: accountInfo.name, + proxy: settings.proxy || "", }); const response = await DownloadMediaWithMetadata(request); if (response.success) { - logger.success(`Downloaded ${response.downloaded} files`); - toast.success(`${response.downloaded} files downloaded`); + const parts: string[] = []; + if (response.downloaded > 0) { + parts.push(`${response.downloaded} file${response.downloaded !== 1 ? 's' : ''} downloaded`); + } + if (response.skipped > 0) { + parts.push(`${response.skipped} file${response.skipped !== 1 ? 's' : ''} already exist${response.skipped !== 1 ? '' : 's'}`); + } + if (response.failed > 0) { + parts.push(`${response.failed} failed`); + } + const message = parts.length > 0 ? parts.join(', ') : 'Download completed'; + + // Use info toast if only skipped files (no downloaded, no failed) + if (response.downloaded === 0 && response.failed === 0 && response.skipped > 0) { + logger.info(message); + toast.info(message); + } else { + logger.success(message); + toast.success(message); + } setHasDownloaded(true); // Check if there are GIFs and FFmpeg is installed @@ -486,10 +574,22 @@ export function MediaList({ const handleOpenFolder = async () => { const settings = getSettings(); - // Build path - backend will handle path separators with filepath.Clean - const folderPath = settings.downloadPath - ? `${settings.downloadPath}/${accountInfo.name}` - : accountInfo.name; + const isBookmarks = accountInfo.nick === "My Bookmarks"; + const isLikes = accountInfo.nick === "My Likes"; + + // Build path - for bookmarks/likes, use the folder structure + let folderPath: string; + if (isBookmarks || isLikes) { + const separator = settings.downloadPath.includes("/") ? "/" : "\\"; + const folderName = isBookmarks ? "My Bookmarks" : "My Likes"; + folderPath = settings.downloadPath + ? `${settings.downloadPath}${separator}${folderName}` + : folderName; + } else { + folderPath = settings.downloadPath + ? `${settings.downloadPath}/${accountInfo.name}` + : accountInfo.name; + } try { await OpenFolder(folderPath); @@ -508,8 +608,18 @@ export function MediaList({ const handleConvertGifs = async () => { const settings = getSettings(); - // Use forward slash for cross-platform compatibility (Go's filepath.Join handles it) - const folderPath = `${settings.downloadPath}/${accountInfo.name}`; + const isBookmarks = accountInfo.nick === "My Bookmarks"; + const isLikes = accountInfo.nick === "My Likes"; + + // Build path - for bookmarks/likes, use the folder structure + let folderPath: string; + if (isBookmarks || isLikes) { + const separator = settings.downloadPath.includes("/") ? "/" : "\\"; + const folderName = isBookmarks ? "My Bookmarks" : "My Likes"; + folderPath = `${settings.downloadPath}${separator}${folderName}`; + } else { + folderPath = `${settings.downloadPath}/${accountInfo.name}`; + } setIsConverting(true); logger.info("Converting GIFs..."); @@ -542,20 +652,28 @@ export function MediaList({ return (
{/* Account Info Card */} - {accountInfo.name === "bookmarks" ? ( - // Bookmarks mode - simple card without account info + {accountInfo.name === "bookmarks" || accountInfo.name === "likes" ? ( + // Bookmarks/Likes mode - simple card without account info
- + {accountInfo.name === "bookmarks" ? ( + + ) : ( + + )}
-

My Bookmarks

-

- Your saved tweets from various accounts -

+

{accountInfo.nick}

-
{formatNumberWithComma(totalUrls)}
+
+ {newMediaCount !== null && newMediaCount > 0 && ( +
+ {formatNumberWithComma(newMediaCount)}+ +
+ )} +
{formatNumberWithComma(totalUrls)}
+
items found
@@ -594,7 +712,14 @@ export function MediaList({
-
{formatNumberWithComma(totalUrls)}
+
+ {newMediaCount !== null && newMediaCount > 0 && ( +
+ {formatNumberWithComma(newMediaCount)}+ +
+ )} +
{formatNumberWithComma(totalUrls)}
+
items found
@@ -745,7 +870,7 @@ export function MediaList({ {/* Media Grid/List */} {viewMode === "list" ? (
- {filteredTimeline.map((item, index) => { + {filteredTimeline.slice(0, visibleCount).map((item, index) => { const isSelected = selectedItems.has(index); const itemKey = getItemKey(item); const isItemDownloaded = downloadedItems.has(itemKey); @@ -770,7 +895,7 @@ export function MediaList({ className="w-16 h-16 rounded overflow-hidden bg-muted shrink-0 cursor-pointer hover:opacity-80 transition-opacity" onClick={() => openPreview(index)} > - {item.type === "photo" ? ( + {item.type === "photo" || item.type === "animated_gif" || item.type === "gif" ? ( { - const settings = getSettings(); setDownloadingItem(itemKey); currentDownloadingItemKeyRef.current = itemKey; try { + const settings = getSettings(); const request = new main.DownloadMediaWithMetadataRequest({ items: [new main.MediaItemRequest({ url: item.url, @@ -839,9 +964,12 @@ export function MediaList({ tweet_id: item.tweet_id, type: item.type, content: item.content || "", + original_filename: item.original_filename || "", + author_username: item.author_username || "", })], - output_dir: settings.downloadPath, + output_dir: getOutputDir(), username: accountInfo.name, + proxy: settings.proxy || "", }); const response = await DownloadMediaWithMetadata(request); if (response.success) { @@ -903,7 +1031,7 @@ export function MediaList({
) : (
- {filteredTimeline.map((item, index) => { + {filteredTimeline.slice(0, visibleCount).map((item, index) => { const isSelected = selectedItems.has(index); const itemKey = getItemKey(item); const isItemDownloaded = downloadedItems.has(itemKey); @@ -923,7 +1051,7 @@ export function MediaList({ className="aspect-square bg-muted relative cursor-pointer" onClick={() => openPreview(index)} > - {item.type === "photo" ? ( + {item.type === "photo" || item.type === "animated_gif" || item.type === "gif" ? ( { e.stopPropagation(); - const settings = getSettings(); setDownloadingItem(itemKey); currentDownloadingItemKeyRef.current = itemKey; try { + const settings = getSettings(); const request = new main.DownloadMediaWithMetadataRequest({ items: [new main.MediaItemRequest({ url: item.url, @@ -957,9 +1085,11 @@ export function MediaList({ tweet_id: item.tweet_id, type: item.type, content: item.content || "", + author_username: item.author_username || "", })], - output_dir: settings.downloadPath, + output_dir: getOutputDir(), username: accountInfo.name, + proxy: settings.proxy || "", }); const response = await DownloadMediaWithMetadata(request); if (response.success) { @@ -1075,6 +1205,13 @@ export function MediaList({
)} + {/* Sentinel for lazy loading - only show if there are more items to load */} + {visibleCount < filteredTimeline.length && ( +
+ +
+ )} + {/* Media Preview Overlay */} {previewIndex !== null && filteredTimeline[previewIndex] && (
{ - const settings = getSettings(); setDownloadingItem(itemKey); currentDownloadingItemKeyRef.current = itemKey; try { + const settings = getSettings(); const request = new main.DownloadMediaWithMetadataRequest({ items: [new main.MediaItemRequest({ url: item.url, @@ -1204,9 +1341,12 @@ export function MediaList({ tweet_id: item.tweet_id, type: item.type, content: item.content || "", + original_filename: item.original_filename || "", + author_username: item.author_username || "", })], - output_dir: settings.downloadPath, + output_dir: getOutputDir(), username: accountInfo.name, + proxy: settings.proxy || "", }); const response = await DownloadMediaWithMetadata(request); if (response.success) { diff --git a/frontend/src/components/SearchBar.tsx b/frontend/src/components/SearchBar.tsx index 7bbdb9b..36efa7b 100644 --- a/frontend/src/components/SearchBar.tsx +++ b/frontend/src/components/SearchBar.tsx @@ -3,7 +3,6 @@ import { Button } from "@/components/ui/button"; import { InputWithContext } from "@/components/ui/input-with-context"; import { Label } from "@/components/ui/label"; import { - Search, XCircle, Calendar, StopCircle, @@ -19,6 +18,14 @@ import { Info, RotateCcw, Trash2, + Clock, + CloudDownload, + User, + Users, + FileText, + Hourglass, + CheckCircle, + AlertCircle, } from "lucide-react"; import { Spinner } from "@/components/ui/spinner"; import { Checkbox } from "@/components/ui/checkbox"; @@ -41,11 +48,30 @@ import { cn } from "@/lib/utils"; export type FetchMode = "public" | "private"; export type PrivateType = "bookmarks" | "likes"; +export type FetchType = "single" | "multiple"; // Local storage keys for auth tokens const PUBLIC_AUTH_TOKEN_KEY = "twitter_public_auth_token"; const PRIVATE_AUTH_TOKEN_KEY = "twitter_private_auth_token"; +export interface MultipleAccount { + id: string; + username: string; + status: "pending" | "fetching" | "completed" | "incomplete" | "failed"; + accountInfo?: { + name: string; + nick: string; + profile_image: string; + }; + mediaCount: number; + previousMediaCount: number; + elapsedTime: number; + remainingTime: number | null; + error?: string; + showDiff?: boolean; + cursor?: string; +} + interface SearchBarProps { username: string; loading: boolean; @@ -69,6 +95,22 @@ interface SearchBarProps { onHistorySelect: (item: HistoryItem) => void; onHistoryRemove: (id: string) => void; hasResult: boolean; + elapsedTime?: number; + remainingTime?: number | null; + // Multiple mode props + fetchType?: FetchType; + onFetchTypeChange?: (type: FetchType) => void; + multipleAccounts?: MultipleAccount[]; + onImportFile?: () => void; + onFetchAll?: () => void; + onStopAll?: () => void; + onStopAccount?: (accountId: string) => void; + onRetryAccount?: (accountId: string) => void; + isFetchingAll?: boolean; + // Mode control + mode?: FetchMode; + privateType?: PrivateType; + onModeChange?: (mode: FetchMode, privateType?: PrivateType) => void; } export function SearchBar({ @@ -84,14 +126,41 @@ export function SearchBar({ onHistorySelect, onHistoryRemove, hasResult, + elapsedTime = 0, + remainingTime = null, + fetchType = "single", + onFetchTypeChange, + multipleAccounts = [], + onImportFile, + onFetchAll, + onStopAll, + onStopAccount, + onRetryAccount, + isFetchingAll = false, + mode: externalMode, + privateType: externalPrivateType, + onModeChange, }: SearchBarProps) { const [useDateRange, setUseDateRange] = useState(false); const [startDate, setStartDate] = useState(""); const [endDate, setEndDate] = useState(""); const [mediaType, setMediaType] = useState("all"); const [retweets, setRetweets] = useState(false); - const [mode, setMode] = useState("public"); - const [privateType, setPrivateType] = useState("bookmarks"); + const [mode, setMode] = useState(externalMode || "public"); + const [privateType, setPrivateType] = useState(externalPrivateType || "bookmarks"); + + // Sync with external mode if provided + useEffect(() => { + if (externalMode !== undefined) { + setMode(externalMode); + } + }, [externalMode]); + + useEffect(() => { + if (externalPrivateType !== undefined) { + setPrivateType(externalPrivateType); + } + }, [externalPrivateType]); const [showAuthInput, setShowAuthInput] = useState(false); const [showAdvanced, setShowAdvanced] = useState(false); @@ -138,42 +207,150 @@ export function SearchBar({ const isLikesMode = mode === "private" && privateType === "likes"; const isBookmarksMode = mode === "private" && privateType === "bookmarks"; + const formatTime = (seconds: number): string => { + const mins = Math.floor(seconds / 60); + const secs = seconds % 60; + return `${mins}:${String(secs).padStart(2, "0")}`; + }; + return (
- {/* Mode Toggle */} -
-
+ {/* Fetch Type and Mode Toggle (Single/Multiple and Public/Private in one line) */} +
+
+ {fetchType === "single" && ( +
+ + +
+ )}
- {/* Username Input - for public mode and likes mode */} - {(mode === "public" || isLikesMode) && ( + {/* Multiple Mode UI - Import and Fetch All Buttons */} + {fetchType === "multiple" && ( +
+
+ + + + + + +

+ One username per line, example: +
+ masteraoko +
+ xbatchdemo +
+ takomayuyi +

+
+
+
+
+ + + {isFetchingAll && ( + + )} +
+
+ )} + + {/* Username Input - for public mode and likes mode, only in single mode */} + {fetchType === "single" && (mode === "public" || isLikesMode) && (
{loading && ( - + <> + {/* Timer Display */} + {(remainingTime !== null || elapsedTime > 0) && ( +
+ + + {remainingTime !== null && remainingTime >= 0 + ? `${Math.floor(remainingTime / 60)}:${String(remainingTime % 60).padStart(2, "0")}` + : `${Math.floor(elapsedTime / 60)}:${String(elapsedTime % 60).padStart(2, "0")}`} + +
+ )} + + )} {/* Resume button - show when there's resumable data */} {!loading && resumeInfo?.canResume && mode === "public" && ( @@ -235,7 +425,7 @@ export function SearchBar({ ) : ( <> - {isLikesMode ? : } + {isLikesMode ? : } {isLikesMode ? "Fetch Likes" : "Fetch"} )} @@ -270,11 +460,14 @@ export function SearchBar({ {/* Private Mode Options - My Bookmarks / My Likes */} - {mode === "private" && ( + {mode === "private" && fetchType === "single" && ( <> + <> + {/* Timer Display */} + {(remainingTime !== null || elapsedTime > 0) && ( +
+ + + {remainingTime !== null && remainingTime >= 0 + ? `${Math.floor(remainingTime / 60)}:${String(remainingTime % 60).padStart(2, "0")}` + : `${Math.floor(elapsedTime / 60)}:${String(elapsedTime % 60).padStart(2, "0")}`} + +
+ )} + + )}
)} - {!hasResult && mode === "public" && ( + {/* Statistics for Multiple Fetch - below auth token and advanced settings */} + {fetchType === "multiple" && multipleAccounts.length > 0 && ( +
+
+
+ + Completed: + + {multipleAccounts.filter((acc) => acc.status === "completed").length} + +
+
+ + Incomplete: + + {multipleAccounts.filter((acc) => acc.status === "incomplete").length} + +
+
+ + Failed: + + {multipleAccounts.filter((acc) => acc.status === "failed").length} + +
+
+ Total: + + {multipleAccounts.filter((acc) => + acc.status === "completed" || acc.status === "incomplete" || acc.status === "failed" + ).length}/{multipleAccounts.length} + +
+
+
+ )} + + {/* Account List - below auth token and advanced settings */} + {fetchType === "multiple" && multipleAccounts.length > 0 && ( +
+

Accounts to Fetch ({multipleAccounts.length})

+
+ {multipleAccounts.map((account) => ( +
+
+ {account.accountInfo ? ( + {account.accountInfo.nick} + ) : ( +
+ +
+ )} +
+ {account.accountInfo ? ( + <> +
+ {account.accountInfo.nick} + @{account.accountInfo.name} +
+
+ + {account.mediaCount.toLocaleString()} items found + + {account.showDiff && account.previousMediaCount > 0 && account.mediaCount > account.previousMediaCount && ( + + +{account.mediaCount - account.previousMediaCount} + + )} +
+ + ) : ( +
+ @{account.username} +
+ )} +
+
+ {account.status === "fetching" && ( + <> +
+ + + {account.remainingTime !== null && account.remainingTime >= 0 + ? formatTime(account.remainingTime) + : formatTime(account.elapsedTime)} + +
+ + + )} + {account.status === "pending" && ( + + + Pending + + )} + {account.status === "completed" && ( + + + Completed + + )} + {account.status === "incomplete" && ( + <> + + + Incomplete + + + + )} + {account.status === "failed" && ( + <> + + + Failed + + + + )} +
+
+
+ ))} +
+
+ )} + + {!hasResult && mode === "public" && fetchType === "single" && ( (getSettings()); - const [tempSettings, setTempSettings] = useState(savedSettings); - const [, setIsLoadingDefaults] = useState(false); - const [isDark, setIsDark] = useState(document.documentElement.classList.contains('dark')); - const [ffmpegInstalled, setFfmpegInstalled] = useState(false); - const [downloadingFFmpeg, setDownloadingFFmpeg] = useState(false); - - useEffect(() => { - applyThemeMode(savedSettings.themeMode); - applyTheme(savedSettings.theme); - - const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)"); - const handleChange = () => { - if (savedSettings.themeMode === "auto") { - applyThemeMode("auto"); - applyTheme(savedSettings.theme); - } - }; - - mediaQuery.addEventListener("change", handleChange); - return () => mediaQuery.removeEventListener("change", handleChange); - }, [savedSettings.themeMode, savedSettings.theme]); - - useEffect(() => { - if (open) { - applyThemeMode(tempSettings.themeMode); - applyTheme(tempSettings.theme); - - setTimeout(() => { - setIsDark(document.documentElement.classList.contains('dark')); - }, 0); - - const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)"); - const handleChange = () => { - if (tempSettings.themeMode === "auto") { - applyThemeMode("auto"); - applyTheme(tempSettings.theme); - setTimeout(() => { - setIsDark(document.documentElement.classList.contains('dark')); - }, 0); - } - }; - - mediaQuery.addEventListener("change", handleChange); - return () => mediaQuery.removeEventListener("change", handleChange); - } - }, [open, tempSettings.themeMode, tempSettings.theme]); - - useEffect(() => { - const loadDefaults = async () => { - if (!savedSettings.downloadPath) { - setIsLoadingDefaults(true); - const settingsWithDefaults = await getSettingsWithDefaults(); - setSavedSettings(settingsWithDefaults); - setTempSettings(settingsWithDefaults); - setIsLoadingDefaults(false); - } - }; - loadDefaults(); - - // Check FFmpeg status - IsFFmpegInstalled().then(setFfmpegInstalled); - }, []); - - useEffect(() => { - if (open) { - setTempSettings(savedSettings); - } - }, [open, savedSettings]); - - const handleSave = () => { - saveSettings(tempSettings); - setSavedSettings(tempSettings); - setOpen(false); - }; - - const handleReset = async () => { - const defaultSettings = await resetToDefaultSettings(); - setTempSettings(defaultSettings); - setSavedSettings(defaultSettings); - applyThemeMode(defaultSettings.themeMode); - applyTheme(defaultSettings.theme); - }; - - const handleCancel = () => { - applyThemeMode(savedSettings.themeMode); - applyTheme(savedSettings.theme); - setTempSettings(savedSettings); - setOpen(false); - }; - - const handleOpenChange = (newOpen: boolean) => { - if (!newOpen) { - applyThemeMode(savedSettings.themeMode); - applyTheme(savedSettings.theme); - setTempSettings(savedSettings); - } - setOpen(newOpen); - }; - - const handleBrowseFolder = async () => { - try { - const selectedPath = await SelectFolder(tempSettings.downloadPath || ""); - if (selectedPath && selectedPath.trim() !== "") { - setTempSettings((prev) => ({ ...prev, downloadPath: selectedPath })); - } - } catch (error) { - console.error("Error selecting folder:", error); - } - }; - - const handleDownloadFFmpeg = async () => { - setDownloadingFFmpeg(true); - try { - await DownloadFFmpeg(); - setFfmpegInstalled(true); - toast.success("FFmpeg downloaded successfully"); - } catch (error) { - toast.error("Failed to download FFmpeg"); - console.error("Error downloading FFmpeg:", error); - } finally { - setDownloadingFFmpeg(false); - } - }; - - return ( - - - - - -
- -
- Settings - - {/* 2 Column Grid Layout */} -
- {/* LEFT COLUMN */} - {/* Download Path */} -
- -
- setTempSettings((prev) => ({ ...prev, downloadPath: e.target.value }))} - placeholder="C:\Users\YourUsername\Pictures" - /> - - - - - Browse Folder - -
-
- - {/* LEFT: Mode */} -
- - -
- - {/* RIGHT: GIF Conversion */} -
- -
- {ffmpegInstalled ? ( -
- - Installed -
- ) : ( - - )} -
-
- - {/* LEFT: Accent */} -
- - -
- - {/* RIGHT: Sound Effects */} -
- -
- setTempSettings(prev => ({ ...prev, sfxEnabled: checked }))} - /> -
-
-
- - -
- - -
-
-
-
- ); -} diff --git a/frontend/src/components/SettingsPage.tsx b/frontend/src/components/SettingsPage.tsx index 42927ec..c398afb 100644 --- a/frontend/src/components/SettingsPage.tsx +++ b/frontend/src/components/SettingsPage.tsx @@ -15,7 +15,7 @@ import { Spinner } from "@/components/ui/spinner"; import { Switch } from "@/components/ui/switch"; import { getSettings, getSettingsWithDefaults, saveSettings, resetToDefaultSettings, applyThemeMode, applyFont, FONT_OPTIONS, type Settings as SettingsType, type FontFamily, type GifQuality, type GifResolution } from "@/lib/settings"; import { themes, applyTheme } from "@/lib/themes"; -import { SelectFolder, IsFFmpegInstalled, DownloadFFmpeg } from "../../wailsjs/go/main/App"; +import { SelectFolder, IsFFmpegInstalled, DownloadFFmpeg, IsExifToolInstalled, DownloadExifTool } from "../../wailsjs/go/main/App"; import { toastWithSound as toast } from "@/lib/toast-with-sound"; export function SettingsPage() { @@ -24,6 +24,8 @@ export function SettingsPage() { const [isDark, setIsDark] = useState(document.documentElement.classList.contains('dark')); const [ffmpegInstalled, setFfmpegInstalled] = useState(false); const [downloadingFFmpeg, setDownloadingFFmpeg] = useState(false); + const [exiftoolInstalled, setExiftoolInstalled] = useState(false); + const [downloadingExifTool, setDownloadingExifTool] = useState(false); useEffect(() => { applyThemeMode(savedSettings.themeMode); @@ -60,8 +62,9 @@ export function SettingsPage() { }; loadDefaults(); - // Check FFmpeg status + // Check FFmpeg and ExifTool status IsFFmpegInstalled().then(setFfmpegInstalled); + IsExifToolInstalled().then(setExiftoolInstalled); }, []); const handleSave = () => { @@ -106,6 +109,20 @@ export function SettingsPage() { } }; + const handleDownloadExifTool = async () => { + setDownloadingExifTool(true); + try { + await DownloadExifTool(); + setExiftoolInstalled(true); + toast.success("ExifTool downloaded successfully"); + } catch (error) { + toast.error("Failed to download ExifTool"); + console.error("Error downloading ExifTool:", error); + } finally { + setDownloadingExifTool(false); + } + }; + return (

Settings

@@ -210,6 +227,49 @@ export function SettingsPage() { {/* Right Column */}
+ {/* Metadata Embedding */} +
+ +
+ {exiftoolInstalled ? ( +
+ + Installed +
+ ) : ( + + )} +
+
+ {/* GIF Conversion */}
diff --git a/frontend/src/components/ui/dropdown-menu.tsx b/frontend/src/components/ui/dropdown-menu.tsx new file mode 100644 index 0000000..6927edf --- /dev/null +++ b/frontend/src/components/ui/dropdown-menu.tsx @@ -0,0 +1,200 @@ +import * as React from "react" +import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu" +import { CheckIcon, ChevronRightIcon } from "lucide-react" + +import { cn } from "@/lib/utils" + +const DropdownMenu = DropdownMenuPrimitive.Root + +const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger + +const DropdownMenuGroup = DropdownMenuPrimitive.Group + +const DropdownMenuPortal = DropdownMenuPrimitive.Portal + +const DropdownMenuSub = DropdownMenuPrimitive.Sub + +const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup + +const DropdownMenuSubTrigger = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef & { + inset?: boolean + } +>(({ className, inset, children, ...props }, ref) => ( + + {children} + + +)) +DropdownMenuSubTrigger.displayName = + DropdownMenuPrimitive.SubTrigger.displayName + +const DropdownMenuSubContent = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +DropdownMenuSubContent.displayName = + DropdownMenuPrimitive.SubContent.displayName + +const DropdownMenuContent = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, sideOffset = 4, ...props }, ref) => ( + + + +)) +DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName + +const DropdownMenuItem = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef & { + inset?: boolean + } +>(({ className, inset, ...props }, ref) => ( + +)) +DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName + +const DropdownMenuCheckboxItem = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, children, checked, ...props }, ref) => ( + + + + + + + {children} + +)) +DropdownMenuCheckboxItem.displayName = + DropdownMenuPrimitive.CheckboxItem.displayName + +const DropdownMenuRadioItem = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, children, ...props }, ref) => ( + + + + + + + {children} + +)) +DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName + +const DropdownMenuLabel = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef & { + inset?: boolean + } +>(({ className, inset, ...props }, ref) => ( + +)) +DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName + +const DropdownMenuSeparator = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName + +const DropdownMenuShortcut = ({ + className, + ...props +}: React.HTMLAttributes) => { + return ( + + ) +} +DropdownMenuShortcut.displayName = "DropdownMenuShortcut" + +export { + DropdownMenu, + DropdownMenuTrigger, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuCheckboxItem, + DropdownMenuRadioItem, + DropdownMenuLabel, + DropdownMenuSeparator, + DropdownMenuShortcut, + DropdownMenuGroup, + DropdownMenuPortal, + DropdownMenuSub, + DropdownMenuSubContent, + DropdownMenuSubTrigger, + DropdownMenuRadioGroup, +} + + diff --git a/frontend/src/lib/fetch-state.ts b/frontend/src/lib/fetch-state.ts index a75f674..d7332f3 100644 --- a/frontend/src/lib/fetch-state.ts +++ b/frontend/src/lib/fetch-state.ts @@ -6,6 +6,7 @@ import type { TwitterResponse, TimelineEntry, AccountInfo } from "@/types/api"; const FETCH_STATE_KEY = "twitter_fetch_state"; +const CURSOR_STATE_KEY = "twitter_cursor_state"; // Lightweight cursor-only storage export interface FetchState { username: string; @@ -166,6 +167,63 @@ export function stateToResponse(state: FetchState): TwitterResponse | null { }; } +/** + * Save cursor only (lightweight, can be called every batch) + */ +export function saveCursor(username: string, cursor: string): void { + try { + const allCursors = getAllCursors(); + allCursors[username.toLowerCase()] = { + cursor, + lastUpdated: Date.now(), + }; + localStorage.setItem(CURSOR_STATE_KEY, JSON.stringify(allCursors)); + } catch (error) { + console.error("Failed to save cursor:", error); + } +} + +/** + * Get cursor for username from localStorage (lightweight, synchronous) + */ +export function getCursor(username: string): string | null { + try { + const allCursors = getAllCursors(); + return allCursors[username.toLowerCase()]?.cursor || null; + } catch (error) { + console.error("Failed to get cursor:", error); + return null; + } +} + +/** + * Get all cursors + */ +function getAllCursors(): Record { + try { + const stored = localStorage.getItem(CURSOR_STATE_KEY); + if (stored) { + return JSON.parse(stored); + } + } catch (error) { + console.error("Failed to parse cursors:", error); + } + return {}; +} + +/** + * Clear cursor for username + */ +export function clearCursor(username: string): void { + try { + const allCursors = getAllCursors(); + delete allCursors[username.toLowerCase()]; + localStorage.setItem(CURSOR_STATE_KEY, JSON.stringify(allCursors)); + } catch (error) { + console.error("Failed to clear cursor:", error); + } +} + /** * Merge new timeline entries with existing (deduplicate by tweet_id) */ diff --git a/frontend/src/lib/settings.ts b/frontend/src/lib/settings.ts index bb0aab6..1abf2c0 100644 --- a/frontend/src/lib/settings.ts +++ b/frontend/src/lib/settings.ts @@ -12,6 +12,8 @@ export interface Settings { sfxEnabled: boolean; gifQuality: GifQuality; gifResolution: GifResolution; + proxy: string; // Proxy URL (e.g., http://proxy:port or socks5://proxy:port). Empty to use system proxy or no proxy. + fetchTimeout: number; // Fetch timeout in seconds. Default: 60 seconds. } export const DEFAULT_SETTINGS: Settings = { @@ -22,6 +24,8 @@ export const DEFAULT_SETTINGS: Settings = { sfxEnabled: true, gifQuality: "fast", gifResolution: "high", + proxy: "", + fetchTimeout: 60, // Default: 60 seconds }; export const FONT_OPTIONS: { value: FontFamily; label: string; fontFamily: string }[] = [ diff --git a/frontend/src/types/api.ts b/frontend/src/types/api.ts index f0b96f1..b647a5a 100644 --- a/frontend/src/types/api.ts +++ b/frontend/src/types/api.ts @@ -27,6 +27,8 @@ export interface TimelineEntry { reply_count?: number; source?: string; verified?: boolean; + original_filename?: string; // Original filename from API + author_username?: string; // Username of tweet author (for bookmarks and likes) } export interface ExtractMetadata { diff --git a/helper/BUILD.md b/helper/BUILD.md index 624ad49..63d8987 100644 --- a/helper/BUILD.md +++ b/helper/BUILD.md @@ -51,12 +51,4 @@ python -m nuitka --onefile --output-filename=extractor.exe --include-package=gal ### Output Location - PyInstaller: `dist/extractor` or `dist/extractor.exe` -- Nuitka: `extractor` or `extractor.exe` (in current directory) - ---- - -## Notes - -- The main application automatically manages the binary (extracts, updates, and uses it) -- Manual building is only needed if you're developing or customizing the extractor -- The pre-built binary is kept in sync with the application version \ No newline at end of file +- Nuitka: `extractor` or `extractor.exe` (in current directory) \ No newline at end of file diff --git a/helper/USAGE.md b/helper/USAGE.md index 7af0a10..bf49cce 100644 --- a/helper/USAGE.md +++ b/helper/USAGE.md @@ -1,29 +1,7 @@ -# twitter_cli.py — Usage Guide +# Usage Guide CLI tool for extracting media and metadata from Twitter/X using gallery-dl extractor. -## Quickstart - -1. **Set up environment** - ```powershell - cd helper - python -m venv .venv - .\.venv\Scripts\Activate.ps1 - pip install -r requirements.txt - ``` - -2. **Verify gallery-dl** - ```powershell - python -c "import gallery_dl; print(gallery_dl.__version__)" - ``` - -3. **Quick test** (using demo account): - ```powershell - python twitter_cli.py https://x.com/xbatchdemo/media --limit 1 --json --guest - ``` - ---- - ## Command Line Arguments ### Required @@ -277,34 +255,6 @@ Use in search URLs: --- -## Authentication - -### Getting Your Auth Token - -1. Open Twitter/X in your browser -2. Open Developer Tools (F12) -3. Go to Application/Storage → Cookies -4. Find cookie named `auth_token` -5. Copy its value - -### Security Notes - -- Use a dummy/secondary account for scraping -- Don't share your auth token -- Excessive usage may cause account suspension -- Guest mode has stricter rate limits - ---- - -## Rate Limits - -- **Guest mode**: Lower limits, may hit rate limit faster -- **Authenticated**: Higher limits but still restricted -- **Rate limit hit**: Script will wait and retry automatically -- **Best practice**: Use `--limit` to control fetch size - ---- - ## Tips & Tricks ### 1. Progressive Fetch with Resume diff --git a/version.json b/version.json index a7cc0dc..5c7425e 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "4.0" + "version": "4.1" } diff --git a/wails.json b/wails.json index cb94bdb..628cdf6 100644 --- a/wails.json +++ b/wails.json @@ -11,7 +11,7 @@ }, "info": { "productName": "Twitter/X Media Batch Downloader", - "productVersion": "4.0" + "productVersion": "4.1" }, "wailsjsdir": "./frontend", "assetdir": "./frontend/dist",