Merge be2d507a9d into fb075b60b5

internal/reader/processor/processor.go

@@ -38,9 +38,6 @@ var (
 func ProcessFeedEntries(store *storage.Storage, feed *model.Feed, user *model.User, forceRefresh bool) {
 	var filteredEntries model.Entries
 
-	minifier := minify.New()
-	minifier.AddFunc("text/html", html.Minify)
-
 	// Process older entries first
 	for i := len(feed.Entries) - 1; i >= 0; i-- {
 		entry := feed.Entries[i]
@@ -107,11 +104,7 @@ func ProcessFeedEntries(store *storage.Storage, feed *model.Feed, user *model.Us
 				)
 			} else if content != "" {
 				// We replace the entry content only if the scraper doesn't return any error.
-				if minifiedHTML, err := minifier.String("text/html", content); err == nil {
-					entry.Content = minifiedHTML
-				} else {
-					entry.Content = content
-				}
+				entry.Content = minifyEntryContent(content)
 			}
 		}
 
@@ -189,9 +182,6 @@ func isAllowedEntry(feed *model.Feed, entry *model.Entry) bool {
 
 // ProcessEntryWebPage downloads the entry web page and apply rewrite rules.
 func ProcessEntryWebPage(feed *model.Feed, entry *model.Entry, user *model.User) error {
-	minifier := minify.New()
-	minifier.AddFunc("text/html", html.Minify)
-
 	startTime := time.Now()
 	websiteURL := getUrlFromEntry(feed, entry)
 
@@ -223,11 +213,7 @@ func ProcessEntryWebPage(feed *model.Feed, entry *model.Entry, user *model.User)
 	}
 
 	if content != "" {
-		if minifiedHTML, err := minifier.String("text/html", content); err == nil {
-			entry.Content = minifiedHTML
-		} else {
-			entry.Content = content
-		}
+		entry.Content = minifyEntryContent(content)
 		if user.ShowReadingTime {
 			entry.ReadingTime = readingtime.EstimateReadingTime(entry.Content, user.DefaultReadingSpeed, user.CJKReadingSpeed)
 		}
@@ -439,3 +425,19 @@ func isRecentEntry(entry *model.Entry) bool {
 	}
 	return false
 }
+
+func minifyEntryContent(entryContent string) string {
+	m := minify.New()
+
+	// Options required to avoid breaking the HTML content.
+	m.Add("text/html", &html.Minifier{
+		KeepEndTags: true,
+		KeepQuotes:  true,
+	})
+
+	if minifiedHTML, err := m.String("text/html", entryContent); err == nil {
+		entryContent = minifiedHTML
+	}
+
+	return entryContent
+}

internal/reader/processor/processor_test.go

@@ -117,3 +117,12 @@ func TestIsRecentEntry(t *testing.T) {
 		}
 	}
 }
+
+func TestMinifyEntryContent(t *testing.T) {
+	input := `<p>    Some text with a <a href="http://example.org/"> link   </a>    </p>`
+	expected := `<p>Some text with a <a href="http://example.org/">link</a></p>`
+	result := minifyEntryContent(input)
+	if expected != result {
+		t.Errorf(`Unexpected result, got %q`, result)
+	}
+}

internal/template/templates/common/layout.html

@@ -6,7 +6,7 @@
     <title>{{template "title" .}} - Miniflux</title>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-title" content="Miniflux">
     <link rel="manifest" href="{{ route "webManifest" }}" crossorigin="use-credentials">