fix: resolve WhatsApp media copy paths

Author: steipete

CHANGELOG.md

@@ -10,6 +10,10 @@
 
 - Update `crawlkit` to v0.7.0.
 
+### Fixed
+
+- Resolve WhatsApp Desktop `Media/...` paths through `Message/Media` before copying archive media (#9, thanks @pasogott).
+
 ## [0.2.5] - 2026-05-15
 
 ### Changed

internal/whatsappdb/desktop.go

@@ -576,7 +576,7 @@ order by m.ZMESSAGEDATE asc, m.Z_PK asc`)
 		m.MediaType = mediaType(m.RawType)
 		m.MediaTitle = firstNonEmpty(mediaTitle, vcardName)
 		if mediaPath != "" {
-			m.MediaPath = filepath.Join(sourceRoot, filepath.FromSlash(mediaPath))
+			m.MediaPath = resolveDesktopMediaPath(sourceRoot, mediaPath)
 		}
 		m.MediaURL = mediaURL
 		m.SenderJID, m.SenderName = sender(m.FromMe, m.ChatJID, fromJID, toJID, pushName, memberJID, memberName, memberFirst, names)
@@ -591,6 +591,57 @@ order by m.ZMESSAGEDATE asc, m.Z_PK asc`)
 	return out, mediaCount, rows.Err()
 }
 
+func resolveDesktopMediaPath(sourceRoot, dbPath string) string {
+	dbPath = strings.TrimSpace(dbPath)
+	if dbPath == "" {
+		return ""
+	}
+	rel := cleanDesktopMediaRel(filepath.FromSlash(dbPath))
+	if rel == "" {
+		return ""
+	}
+	primary := filepath.Join(sourceRoot, rel)
+	if firstPathElement(rel) != "Media" {
+		return primary
+	}
+	messageMedia := filepath.Join(sourceRoot, "Message", rel)
+	if _, err := os.Stat(messageMedia); err == nil {
+		return messageMedia
+	}
+	if _, err := os.Stat(primary); err == nil {
+		return primary
+	}
+	return messageMedia
+}
+
+func cleanDesktopMediaRel(path string) string {
+	rel := filepath.Clean(path)
+	if filepath.IsAbs(rel) {
+		rel = strings.TrimLeft(rel, string(os.PathSeparator))
+		rel = filepath.Clean(rel)
+	}
+	if rel == "." || rel == ".." {
+		return ""
+	}
+	if strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
+		rel = filepath.Base(rel)
+		if rel == "." || rel == ".." {
+			return ""
+		}
+	}
+	return rel
+}
+
+func firstPathElement(path string) string {
+	if path == "." || path == "" {
+		return ""
+	}
+	if i := strings.IndexRune(path, os.PathSeparator); i >= 0 {
+		return path[:i]
+	}
+	return path
+}
+
 func sender(fromMe bool, chatJID, fromJID, toJID, pushName, memberJID, memberName, memberFirst string, names map[string]string) (string, string) {
 	if fromMe {
 		return firstNonEmpty(toJID), "me"

internal/whatsappdb/desktop_test.go

@@ -191,7 +191,7 @@ func TestImportDesktopCopyMedia(t *testing.T) {
 	ctx := context.Background()
 	source := t.TempDir()
 	createFixtureDBs(t, source)
-	mediaPath := filepath.Join(source, "Media", "123@g.us", "a", "test.jpg")
+	mediaPath := filepath.Join(source, "Message", "Media", "123@g.us", "a", "test.jpg")
 	if err := os.MkdirAll(filepath.Dir(mediaPath), 0o700); err != nil {
 		t.Fatal(err)
 	}
@@ -239,19 +239,60 @@ insert into ZWAMESSAGE values (5, 2, 1, 2, 'missing-media', 0, 700000004, 'missi
 			missingPath = msg.MediaPath
 		}
 	}
-	wantCopied := filepath.Join(filepath.Dir(archivePath), "media", "Media", "123@g.us", "a", "test.jpg")
+	wantCopied := filepath.Join(filepath.Dir(archivePath), "media", "Message", "Media", "123@g.us", "a", "test.jpg")
 	if copiedPath != wantCopied {
 		t.Fatalf("copied media path = %q, want %q", copiedPath, wantCopied)
 	}
 	if data, err := os.ReadFile(copiedPath); err != nil || string(data) != "image" { // #nosec G304 -- copiedPath is asserted against the expected temp archive path above.
 		t.Fatalf("copied media content = %q err=%v", data, err)
 	}
-	wantMissing := filepath.Join(source, "Media", "123@g.us", "a", "missing.jpg")
+	wantMissing := filepath.Join(source, "Message", "Media", "123@g.us", "a", "missing.jpg")
 	if missingPath != wantMissing {
 		t.Fatalf("missing media path = %q, want original %q", missingPath, wantMissing)
 	}
 }
 
+func TestResolveDesktopMediaPathPrefersMessageMedia(t *testing.T) {
+	source := t.TempDir()
+	messageMedia := filepath.Join(source, "Message", "Media", "chat", "photo.jpg")
+	if err := os.MkdirAll(filepath.Dir(messageMedia), 0o700); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(messageMedia, []byte("image"), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	if got := resolveDesktopMediaPath(source, "Media/chat/photo.jpg"); got != messageMedia {
+		t.Fatalf("resolved media path = %q, want %q", got, messageMedia)
+	}
+
+	legacyMedia := filepath.Join(source, "Media", "chat", "legacy.jpg")
+	if err := os.MkdirAll(filepath.Dir(legacyMedia), 0o700); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(legacyMedia, []byte("image"), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	if got := resolveDesktopMediaPath(source, "Media/chat/legacy.jpg"); got != legacyMedia {
+		t.Fatalf("legacy media path = %q, want %q", got, legacyMedia)
+	}
+
+	missing := filepath.Join(source, "Message", "Media", "chat", "missing.jpg")
+	if got := resolveDesktopMediaPath(source, "Media/chat/missing.jpg"); got != missing {
+		t.Fatalf("missing media path = %q, want %q", got, missing)
+	}
+
+	absolute := filepath.Join(string(os.PathSeparator), "tmp", "outside.jpg")
+	confined := filepath.Join(source, "tmp", "outside.jpg")
+	if got := resolveDesktopMediaPath(source, absolute); got != confined {
+		t.Fatalf("absolute media path = %q, want confined %q", got, confined)
+	}
+
+	traversal := filepath.Join(source, "outside.jpg")
+	if got := resolveDesktopMediaPath(source, "../outside.jpg"); got != traversal {
+		t.Fatalf("traversal media path = %q, want confined %q", got, traversal)
+	}
+}
+
 func TestCopyArchiveMediaDeduplicatesAndConfinesPaths(t *testing.T) {
 	source := t.TempDir()
 	mediaRoot := filepath.Join(t.TempDir(), "media")