From 120d6ec7d837eac2825de3edb870d63bd0493853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <fred@miniflux.net>
Date: Sat, 30 Nov 2019 22:46:12 -0800
Subject: [PATCH] Do no rewrite Youtube description twice in
 "add_youtube_video" rule

This is already done before in <media:description>.
---
 reader/rewrite/rewrite_functions.go | 2 +-
 reader/rewrite/rewriter_test.go     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/reader/rewrite/rewrite_functions.go b/reader/rewrite/rewrite_functions.go
index 8988cc5a..8f83aa95 100644
--- a/reader/rewrite/rewrite_functions.go
+++ b/reader/rewrite/rewrite_functions.go
@@ -143,7 +143,7 @@ func addYoutubeVideo(entryURL, entryContent string) string {
 
 	if len(matches) == 2 {
 		video := `<iframe width="650" height="350" frameborder="0" src="https://www.youtube-nocookie.com/embed/` + matches[1] + `" allowfullscreen></iframe>`
-		return video + "<p>" + replaceLineFeeds(replaceTextLinks(entryContent)) + "</p>"
+		return video + `<br>` + entryContent
 	}
 	return entryContent
 }
diff --git a/reader/rewrite/rewriter_test.go b/reader/rewrite/rewriter_test.go
index 27cf4257..8c0db6cf 100644
--- a/reader/rewrite/rewriter_test.go
+++ b/reader/rewrite/rewriter_test.go
@@ -36,8 +36,8 @@ func TestRewriteWithNoMatchingRule(t *testing.T) {
 }
 
 func TestRewriteWithYoutubeLink(t *testing.T) {
-	output := Rewriter("https://www.youtube.com/watch?v=1234", "Video Description\nhttp://example.org/path", ``)
-	expected := `<iframe width="650" height="350" frameborder="0" src="https://www.youtube-nocookie.com/embed/1234" allowfullscreen></iframe><p>Video Description<br><a href="http://example.org/path">http://example.org/path</a></p>`
+	output := Rewriter("https://www.youtube.com/watch?v=1234", "Video Description", ``)
+	expected := `<iframe width="650" height="350" frameborder="0" src="https://www.youtube-nocookie.com/embed/1234" allowfullscreen></iframe><br>Video Description`
 
 	if expected != output {
 		t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)