Merge branch 'main' into delay_lang

miniflux · Dec 9, 2024 · c64639f · c64639f
2 parents d1633b9 + d5cfcf8
commit c64639f
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 48 deletions.
diff --git a/go.mod b/go.mod
@@ -12,7 +12,6 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/prometheus/client_golang v1.20.5
 	github.com/tdewolff/minify/v2 v2.21.2
-	github.com/yuin/goldmark v1.7.8
 	golang.org/x/crypto v0.30.0
 	golang.org/x/net v0.32.0
 	golang.org/x/oauth2 v0.24.0

diff --git a/go.sum b/go.sum
@@ -66,8 +66,6 @@ github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcY
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
-github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=

diff --git a/internal/locale/catalog_test.go b/internal/locale/catalog_test.go
@@ -90,6 +90,26 @@ func TestMissingTranslations(t *testing.T) {
 }
 
 func TestTranslationFilePluralForms(t *testing.T) {
+	var numberOfPluralFormsPerLanguage = map[string]int{
+		"en_US": 2,
+		"es_ES": 2,
+		"fr_FR": 2,
+		"de_DE": 2,
+		"pl_PL": 3,
+		"pt_BR": 2,
+		"zh_CN": 1,
+		"zh_TW": 1,
+		"nl_NL": 2,
+		"ru_RU": 3,
+		"it_IT": 2,
+		"ja_JP": 1,
+		"tr_TR": 2,
+		"el_EL": 2,
+		"fi_FI": 2,
+		"hi_IN": 2,
+		"uk_UA": 3,
+		"id_ID": 1,
+	}
 	for language := range AvailableLanguages {
 		messages, err := loadTranslationFile(language)
 		if err != nil {

diff --git a/internal/locale/locale.go b/internal/locale/locale.go
@@ -3,27 +3,6 @@
 
 package locale // import "miniflux.app/v2/internal/locale"
 
-var numberOfPluralFormsPerLanguage = map[string]int{
-	"en_US": 2,
-	"es_ES": 2,
-	"fr_FR": 2,
-	"de_DE": 2,
-	"pl_PL": 3,
-	"pt_BR": 2,
-	"zh_CN": 1,
-	"zh_TW": 1,
-	"nl_NL": 2,
-	"ru_RU": 3,
-	"it_IT": 2,
-	"ja_JP": 1,
-	"tr_TR": 2,
-	"el_EL": 2,
-	"fi_FI": 2,
-	"hi_IN": 2,
-	"uk_UA": 3,
-	"id_ID": 1,
-}
-
 // AvailableLanguages is the list of available languages.
 var AvailableLanguages = map[string]string{
 	"en_US": "English",

diff --git a/internal/locale/translations/zh_CN.json b/internal/locale/translations/zh_CN.json
@@ -211,7 +211,7 @@
     "page.settings.webauthn.last_seen_on": "最后使用时间",
     "page.settings.webauthn.register": "注册 Passkey",
     "page.settings.webauthn.register.error": "无法注册 Passkey",
-    "page.login.webauthn_login.help": "Please enter your username if you're using a security key. This is not required if you are using a Passkey (discoverable credentials).",
+    "page.login.webauthn_login.help": "如果您正在使用安全密钥，请输入您的用户名。如果您正在使用通行密钥（可发现凭证），则无需输入用户名。",
     "page.settings.webauthn.delete": [
         "删除 %d 个 Passkey"
     ],

diff --git a/internal/reader/rewrite/rewrite_functions.go b/internal/reader/rewrite/rewrite_functions.go
@@ -17,8 +17,6 @@ import (
 	nethtml "golang.org/x/net/html"
 
 	"github.com/PuerkitoBio/goquery"
-	"github.com/yuin/goldmark"
-	goldmarkhtml "github.com/yuin/goldmark/renderer/html"
 )
 
 var (
@@ -410,21 +408,6 @@ func addHackerNewsLinksUsing(entryContent, app string) string {
 	return entryContent
 }
 
-func parseMarkdown(entryContent string) string {
-	var sb strings.Builder
-	md := goldmark.New(
-		goldmark.WithRendererOptions(
-			goldmarkhtml.WithUnsafe(),
-		),
-	)
-
-	if err := md.Convert([]byte(entryContent), &sb); err != nil {
-		return entryContent
-	}
-
-	return sb.String()
-}
-
 func removeTables(entryContent string) string {
 	doc, err := goquery.NewDocumentFromReader(strings.NewReader(entryContent))
 	if err != nil {

diff --git a/internal/reader/rewrite/rewriter.go b/internal/reader/rewrite/rewriter.go
@@ -91,8 +91,6 @@ func (rule rule) applyRule(entryURL string, entry *model.Entry) {
 		entry.Content = addHackerNewsLinksUsing(entry.Content, "hack")
 	case "add_hn_links_using_opener":
 		entry.Content = addHackerNewsLinksUsing(entry.Content, "opener")
-	case "parse_markdown":
-		entry.Content = parseMarkdown(entry.Content)
 	case "remove_tables":
 		entry.Content = removeTables(entry.Content)
 	case "remove_clickbait":

diff --git a/internal/reader/rewrite/rules.go b/internal/reader/rewrite/rules.go
@@ -35,7 +35,6 @@ var predefinedRules = map[string]string{
 	"treelobsters.com":       "add_image_title",
 	"webtoons.com":           `add_dynamic_image,replace("webtoon"|"swebtoon")`,
 	"www.qwantz.com":         "add_image_title,add_mailto_subject",
-	"www.recalbox.com":       "parse_markdown",
 	"xkcd.com":               "add_image_title",
 	"youtube.com":            "add_youtube_video",
 }

diff --git a/internal/reader/sanitizer/sanitizer.go b/internal/reader/sanitizer/sanitizer.go
@@ -4,7 +4,6 @@
 package sanitizer // import "miniflux.app/v2/internal/reader/sanitizer"
 
 import (
-	"fmt"
 	"io"
 	"regexp"
 	"slices"
@@ -19,7 +18,7 @@ import (
 )
 
 var (
-	youtubeEmbedRegex = regexp.MustCompile(`//(?:www\.)?youtube\.com/embed/(.+)$`)
+	youtubeEmbedRegex = regexp.MustCompile(`^(?:https?:)?//(?:www\.)?youtube\.com/embed/(.+)$`)
 	tagAllowList      = map[string][]string{
 		"a":          {"href", "title", "id"},
 		"abbr":       {"title"},
@@ -221,7 +220,7 @@ func sanitizeAttributes(baseURL, tagName string, attributes []html.Attribute) ([
 		}
 
 		attrNames = append(attrNames, attribute.Key)
-		htmlAttrs = append(htmlAttrs, fmt.Sprintf(`%s=%q`, attribute.Key, html.EscapeString(value)))
+		htmlAttrs = append(htmlAttrs, attribute.Key+`="`+html.EscapeString(value)+`"`)
 	}
 
 	if !isAnchorLink {