From 30c2e09a56fa8a2e9e0d1f5d3575527cd0884701 Mon Sep 17 00:00:00 2001 From: Gabe Cook Date: Fri, 22 Nov 2024 00:55:12 -0600 Subject: [PATCH 1/4] chore: remove `blog.laravel.com` rewrite rule --- internal/reader/rewrite/rules.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/reader/rewrite/rules.go b/internal/reader/rewrite/rules.go index 418f7db8d2d..f21821b32aa 100644 --- a/internal/reader/rewrite/rules.go +++ b/internal/reader/rewrite/rules.go @@ -12,7 +12,6 @@ var predefinedRules = map[string]string{ "abstrusegoose.com": "add_image_title", "amazingsuperpowers.com": "add_image_title", "blog.cloudflare.com": `add_image_title,remove("figure.kg-image-card figure.kg-image + img")`, - "blog.laravel.com": "parse_markdown", "cowbirdsinlove.com": "add_image_title", "drawingboardcomic.com": "add_image_title", "exocomics.com": "add_image_title", From b2e702218d58b9aecd3dbbaf0a993838f1bd3943 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:13:12 +0000 Subject: [PATCH 2/4] build(deps): bump github.com/tdewolff/minify/v2 from 2.21.1 to 2.21.2 Bumps [github.com/tdewolff/minify/v2](https://github.com/tdewolff/minify) from 2.21.1 to 2.21.2. - [Release notes](https://github.com/tdewolff/minify/releases) - [Commits](https://github.com/tdewolff/minify/compare/v2.21.1...v2.21.2) --- updated-dependencies: - dependency-name: github.com/tdewolff/minify/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 54186ecb17a..c87be6417b2 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/gorilla/mux v1.8.1 github.com/lib/pq v1.10.9 github.com/prometheus/client_golang v1.20.5 - github.com/tdewolff/minify/v2 v2.21.1 + github.com/tdewolff/minify/v2 v2.21.2 github.com/yuin/goldmark v1.7.8 golang.org/x/crypto v0.29.0 golang.org/x/net v0.31.0 @@ -39,7 +39,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/tdewolff/parse/v2 v2.7.18 // indirect + github.com/tdewolff/parse/v2 v2.7.19 // indirect github.com/x448/float16 v0.8.4 // indirect golang.org/x/sys v0.27.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/go.sum b/go.sum index 6571924b78f..91190b9c6c2 100644 --- a/go.sum +++ b/go.sum @@ -54,10 +54,10 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tdewolff/minify/v2 v2.21.1 h1:AAf5iltw6+KlUvjRNPAPrANIXl3XEJNBBzuZom5iCAM= -github.com/tdewolff/minify/v2 v2.21.1/go.mod h1:PoqFH8ugcuTUvKqVM9vOqXw4msxvuhL/DTmV5ZXhSCI= -github.com/tdewolff/parse/v2 v2.7.18 h1:uSqjEMT2lwCj5oifBHDcWU2kN1pbLrRENgFWDJa57eI= -github.com/tdewolff/parse/v2 v2.7.18/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= +github.com/tdewolff/minify/v2 v2.21.2 h1:VfTvmGVtBYhMTlUAeHtXM7XOsW0JT/6uMwUPPqgUs9k= +github.com/tdewolff/minify/v2 v2.21.2/go.mod h1:Olje3eHdBnrMjINKffDsil/3NV98Iv7MhWf7556WQVg= +github.com/tdewolff/parse/v2 v2.7.19 h1:7Ljh26yj+gdLFEq/7q9LT4SYyKtwQX4ocNrj45UCePg= +github.com/tdewolff/parse/v2 v2.7.19/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= From 3a966c6ce5664a3b78f83120529e2662bba7484a Mon Sep 17 00:00:00 2001 From: Anshul Gupta Date: Mon, 18 Nov 2024 16:04:05 -0800 Subject: [PATCH 3/4] fix: replace timezone function call with view The `pg_timezone_names` view was added in 8.2. It should be equivalent to the function query. See: https://pgpedia.info/p/pg_timezone_names.html This small change allows `miniflux` to run on postgres-compatible databases like CockroachDB, which don't have this function. --- internal/storage/timezone.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/storage/timezone.go b/internal/storage/timezone.go index 263dae1e5da..f37487352c6 100644 --- a/internal/storage/timezone.go +++ b/internal/storage/timezone.go @@ -11,7 +11,7 @@ import ( // Timezones returns all timezones supported by the database. func (s *Storage) Timezones() (map[string]string, error) { timezones := make(map[string]string) - rows, err := s.db.Query(`SELECT name FROM pg_timezone_names() ORDER BY name ASC`) + rows, err := s.db.Query(`SELECT name FROM pg_timezone_names ORDER BY name ASC`) if err != nil { return nil, fmt.Errorf(`store: unable to fetch timezones: %v`, err) } From b1fb8be1851f99e82d2ea1a2e7597c00ab97feb7 Mon Sep 17 00:00:00 2001 From: Mohit Raj Date: Sun, 1 Dec 2024 22:06:29 +0530 Subject: [PATCH 4/4] feat(locale): update translations to clarify readeck url instead of readeck api endpoint --- internal/locale/translations/en_US.json | 2 +- internal/locale/translations/hi_IN.json | 2 +- internal/locale/translations/uk_UA.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/locale/translations/en_US.json b/internal/locale/translations/en_US.json index b9bc8be9e36..4ca46332d86 100644 --- a/internal/locale/translations/en_US.json +++ b/internal/locale/translations/en_US.json @@ -488,7 +488,7 @@ "form.integration.raindrop_collection_id": "Collection ID", "form.integration.raindrop_tags": "Tags (comma-separated)", "form.integration.readeck_activate": "Save entries to readeck", - "form.integration.readeck_endpoint": "Readeck API Endpoint", + "form.integration.readeck_endpoint": "Readeck URL", "form.integration.readeck_api_key": "Readeck API key", "form.integration.readeck_labels": "Readeck Labels", "form.integration.readeck_only_url": "Send only URL (instead of full content)", diff --git a/internal/locale/translations/hi_IN.json b/internal/locale/translations/hi_IN.json index ca6a163e679..39eeb4bb908 100644 --- a/internal/locale/translations/hi_IN.json +++ b/internal/locale/translations/hi_IN.json @@ -490,7 +490,7 @@ "form.integration.raindrop_collection_id": "Collection ID", "form.integration.raindrop_tags": "Tags (comma-separated)", "form.integration.readeck_activate": "Readeck में विषयवस्तु सहेजें", - "form.integration.readeck_endpoint": "Readeck·एपीआई·समापन·बिंदु", + "form.integration.readeck_endpoint": "Readeck यूआरएल", "form.integration.readeck_api_key": "Readeck एपीआई कुंजी", "form.integration.readeck_labels": "Readeck Labels", "form.integration.readeck_only_url": "केवल URL भेजें (पूर्ण सामग्री के बजाय)", diff --git a/internal/locale/translations/uk_UA.json b/internal/locale/translations/uk_UA.json index f211dddc220..1c3f932e739 100644 --- a/internal/locale/translations/uk_UA.json +++ b/internal/locale/translations/uk_UA.json @@ -500,7 +500,7 @@ "form.integration.raindrop_collection_id": "Collection ID", "form.integration.raindrop_tags": "Tags (comma-separated)", "form.integration.readeck_activate": "Зберігати статті до Readeck", - "form.integration.readeck_endpoint": "Readeck API Endpoint", + "form.integration.readeck_endpoint": "Readeck URL", "form.integration.readeck_api_key": "Ключ API Readeck", "form.integration.readeck_labels": "Readeck Labels", "form.integration.readeck_only_url": "Надіслати лише URL (замість повного вмісту)",