release 5.6.0

PRs and renovate now build the docker images regardless of the branch/tag
PRs now build the docker images but don't push them
2025-02-16 14:14:30 +01:00 · 2025-02-15 10:20:39 +01:00 · 2025-02-15 10:18:16 +01:00 · 2025-02-14 16:20:04 +01:00 · 2025-02-14 16:16:07 +01:00 · 2025-02-14 16:16:07 +01:00
24 changed files with 910 additions and 282 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
    strategy:
      matrix:
-        os: [ "ubuntu-latest", "ubuntu-24.04-arm", "windows-latest" ]
+        os: [ "ubuntu-latest", "ubuntu-22.04-arm", "windows-latest" ]
        database: [ "h2", "postgresql", "mysql", "mariadb" ]
    runs-on: ${{ matrix.os }}
@@ -32,7 +32,7 @@ jobs:
      # Setup
      - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@aafbedb8d382ed0ca6167d3a051415f20c859274 # v1
+        uses: graalvm/setup-graalvm@b0cb26a8da53cb3e97cdc0c827d8e3071240e730 # v1
        with:
          java-version: ${{ env.JAVA_VERSION }}
          distribution: "graalvm"
@@ -63,7 +63,8 @@ jobs:
  docker:
    runs-on: ubuntu-latest
    needs: build
-    if: ${{ github.ref_type == 'tag' || github.ref_name == 'master' }}
+    env:
      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
    strategy:
      matrix:
@@ -110,18 +111,36 @@ jobs:
      # Docker
      - name: Login to Container Registry
        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
        if: ${{ env.DOCKERHUB_USERNAME != '' }}
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      ## tags
+      ## build but don't push for PRs and renovate
      - name: Docker build - native
        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
        with:
          context: .
          file: commafeed-server/src/main/docker/Dockerfile.native
          push: false
          platforms: linux/amd64,linux/arm64/v8
      - name: Docker build - jvm
        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
        with:
          context: .
          file: commafeed-server/src/main/docker/Dockerfile.jvm
          push: false
          platforms: linux/amd64,linux/arm64/v8
      ## build and push tag
      - name: Docker build and push tag - native
        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
        if: ${{ github.ref_type == 'tag' }}
        with:
          context: .
          file: commafeed-server/src/main/docker/Dockerfile.native
-          push: true
+          push: ${{ env.DOCKERHUB_USERNAME != '' }}
          platforms: linux/amd64,linux/arm64/v8
          tags: |
            athou/commafeed:latest-${{ matrix.database }}
@@ -133,20 +152,20 @@ jobs:
        with:
          context: .
          file: commafeed-server/src/main/docker/Dockerfile.jvm
-          push: true
+          push: ${{ env.DOCKERHUB_USERNAME != '' }}
          platforms: linux/amd64,linux/arm64/v8
          tags: |
            athou/commafeed:latest-${{ matrix.database }}-jvm
            athou/commafeed:${{ github.ref_name }}-${{ matrix.database }}-jvm
-      ## master
+      ## build and push master
      - name: Docker build and push master - native
        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
        if: ${{ github.ref_name == 'master' }}
        with:
          context: .
          file: commafeed-server/src/main/docker/Dockerfile.native
-          push: true
+          push: ${{ env.DOCKERHUB_USERNAME != '' }}
          platforms: linux/amd64,linux/arm64/v8
          tags: athou/commafeed:master-${{ matrix.database }}
@@ -156,7 +175,7 @@ jobs:
        with:
          context: .
          file: commafeed-server/src/main/docker/Dockerfile.jvm
-          push: true
+          push: ${{ env.DOCKERHUB_USERNAME != '' }}
          platforms: linux/amd64,linux/arm64/v8
          tags: athou/commafeed:master-${{ matrix.database }}-jvm
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 ## [5.6.0]
 - To better respect the bandwidth of feed owners, the default value of `commafeed.feed-refresh.interval-empirical` is now true. This means feeds no longer refresh exactly every 5 minutes (the default value of `commafeed.feed-refresh.interval`) but between 5 minutes and 4 hours (the default value of the new `commafeed.feed-refresh.max-interval` setting). The interval is calculated based on feed activity, so highly active feeds refresh more often (#1677)
 - Many previously hardcoded values used in feed refresh interval calculation are now exposed as settings (#1677)
 - Access to local addresses is now blocked to mitigate server-side request forgery (SSRF) attacks, which could potentially expose internal resources. You might want to disable the new `commafeed.http-client.block-local-addresses` setting if you subscribe to feeds only available on your local network and you trust all your users
 - If a feed responds with a "429 - Too many requests" response, a backoff mechanism is triggered when the response does not contain a "Retry-After" header
 ## [5.5.0]
 - CommaFeed now honors the Retry-After response header and will not try to refresh a feed sooner than the value of this header
--- a/commafeed-client/package-lock.json
+++ b/commafeed-client/package-lock.json
@@ -18,12 +18,12 @@
                "@mantine/modals": "^7.16.3",
                "@mantine/notifications": "^7.16.3",
                "@mantine/spotlight": "^7.16.3",
-                "@monaco-editor/react": "^4.7.0-rc.0",
+                "@monaco-editor/react": "^4.7.0",
                "@reduxjs/toolkit": "^2.5.1",
                "axios": "^1.7.9",
                "dayjs": "^1.11.13",
                "escape-string-regexp": "^5.0.0",
-                "interweave": "^13.1.0",
+                "interweave": "^13.1.1",
                "monaco-editor": "^0.52.2",
                "mousetrap": "^1.6.5",
                "react": "^19.0.0",
@@ -118,9 +118,9 @@
            }
        },
        "node_modules/@babel/compat-data": {
-            "version": "7.26.5",
+            "version": "7.26.8",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
-            "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==",
+            "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
            "devOptional": true,
            "license": "MIT",
            "engines": {
@@ -128,22 +128,23 @@
            }
        },
        "node_modules/@babel/core": {
-            "version": "7.26.7",
+            "version": "7.26.8",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.8.tgz",
-            "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==",
+            "integrity": "sha512-l+lkXCHS6tQEc5oUpK28xBOZ6+HwaH7YwoYQbLFiYb4nS2/l1tKnZEtEWkD0GuiYdvArf9qBS0XlQGXzPMsNqQ==",
            "devOptional": true,
            "license": "MIT",
            "dependencies": {
                "@ampproject/remapping": "^2.2.0",
                "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.26.5",
+                "@babel/generator": "^7.26.8",
                "@babel/helper-compilation-targets": "^7.26.5",
                "@babel/helper-module-transforms": "^7.26.0",
                "@babel/helpers": "^7.26.7",
-                "@babel/parser": "^7.26.7",
+                "@babel/parser": "^7.26.8",
-                "@babel/template": "^7.25.9",
+                "@babel/template": "^7.26.8",
-                "@babel/traverse": "^7.26.7",
+                "@babel/traverse": "^7.26.8",
-                "@babel/types": "^7.26.7",
+                "@babel/types": "^7.26.8",
                "@types/gensync": "^1.0.0",
                "convert-source-map": "^2.0.0",
                "debug": "^4.1.0",
                "gensync": "^1.0.0-beta.2",
@@ -166,13 +167,13 @@
            "license": "MIT"
        },
        "node_modules/@babel/generator": {
-            "version": "7.26.5",
+            "version": "7.26.8",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.8.tgz",
-            "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
+            "integrity": "sha512-ef383X5++iZHWAXX0SXQR6ZyQhw/0KtTkrTz61WXRhFM6dhpHulO/RJz79L8S6ugZHJkOOkUrUdxgdF2YiPFnA==",
            "license": "MIT",
            "dependencies": {
-                "@babel/parser": "^7.26.5",
+                "@babel/parser": "^7.26.8",
-                "@babel/types": "^7.26.5",
+                "@babel/types": "^7.26.8",
                "@jridgewell/gen-mapping": "^0.3.5",
                "@jridgewell/trace-mapping": "^0.3.25",
                "jsesc": "^3.0.2"
@@ -282,12 +283,12 @@
            }
        },
        "node_modules/@babel/parser": {
-            "version": "7.26.7",
+            "version": "7.26.8",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.8.tgz",
-            "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
+            "integrity": "sha512-TZIQ25pkSoaKEYYaHbbxkfL36GNsQ6iFiBbeuzAkLnXayKR1yP1zFe+NxuZWWsUyvt8icPU9CCq0sgWGXR1GEw==",
            "license": "MIT",
            "dependencies": {
-                "@babel/types": "^7.26.7"
+                "@babel/types": "^7.26.8"
            },
            "bin": {
                "parser": "bin/babel-parser.js"
@@ -341,30 +342,30 @@
            }
        },
        "node_modules/@babel/template": {
-            "version": "7.25.9",
+            "version": "7.26.8",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.8.tgz",
-            "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+            "integrity": "sha512-iNKaX3ZebKIsCvJ+0jd6embf+Aulaa3vNBqZ41kM7iTWjx5qzWKXGHiJUW3+nTpQ18SG11hdF8OAzKrpXkb96Q==",
            "license": "MIT",
            "dependencies": {
-                "@babel/code-frame": "^7.25.9",
+                "@babel/code-frame": "^7.26.2",
-                "@babel/parser": "^7.25.9",
+                "@babel/parser": "^7.26.8",
-                "@babel/types": "^7.25.9"
+                "@babel/types": "^7.26.8"
            },
            "engines": {
                "node": ">=6.9.0"
            }
        },
        "node_modules/@babel/traverse": {
-            "version": "7.26.7",
+            "version": "7.26.8",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.8.tgz",
-            "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==",
+            "integrity": "sha512-nic9tRkjYH0oB2dzr/JoGIm+4Q6SuYeLEiIiZDwBscRMYFJ+tMAz98fuel9ZnbXViA2I0HVSSRRK8DW5fjXStA==",
            "license": "MIT",
            "dependencies": {
                "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.26.5",
+                "@babel/generator": "^7.26.8",
-                "@babel/parser": "^7.26.7",
+                "@babel/parser": "^7.26.8",
-                "@babel/template": "^7.25.9",
+                "@babel/template": "^7.26.8",
-                "@babel/types": "^7.26.7",
+                "@babel/types": "^7.26.8",
                "debug": "^4.3.1",
                "globals": "^11.1.0"
            },
@@ -373,9 +374,9 @@
            }
        },
        "node_modules/@babel/types": {
-            "version": "7.26.7",
+            "version": "7.26.8",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.8.tgz",
-            "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
+            "integrity": "sha512-eUuWapzEGWFEpHFxgEaBG8e3n6S8L3MSu0oda755rOfabWPnh0Our1AozNFVUxGFIhbKgd1ksprsoDGMinTOTA==",
            "license": "MIT",
            "dependencies": {
                "@babel/helper-string-parser": "^7.25.9",
@@ -1799,24 +1800,21 @@
            }
        },
        "node_modules/@monaco-editor/loader": {
-            "version": "1.4.0",
+            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.4.0.tgz",
+            "resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.5.0.tgz",
-            "integrity": "sha512-00ioBig0x642hytVspPl7DbQyaSWRaolYie/UFNjoTdvoKPzo6xrXLhTk9ixgIKcLH5b5vDOjVNiGyY+uDCUlg==",
+            "integrity": "sha512-hKoGSM+7aAc7eRTRjpqAZucPmoNOC4UUbknb/VNoTkEIkCPhqV8LfbsgM1webRM7S/z21eHEx9Fkwx8Z/C/+Xw==",
            "license": "MIT",
            "dependencies": {
                "state-local": "^1.0.6"
            },
            "peerDependencies": {
                "monaco-editor": ">= 0.21.0 < 1"
            }
        },
        "node_modules/@monaco-editor/react": {
-            "version": "4.7.0-rc.0",
+            "version": "4.7.0",
-            "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.7.0-rc.0.tgz",
+            "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.7.0.tgz",
-            "integrity": "sha512-YfjXkDK0bcwS0zo8PXptvQdCQfOPPtzGsAzmIv7PnoUGFdIohsR+NVDyjbajMddF+3cWUm/3q9NzP/DUke9a+w==",
+            "integrity": "sha512-cyzXQCtO47ydzxpQtCGSQGOC8Gk3ZUeBXFAxD+CWXYFo5OqZyZUonFl0DwUlTyAfRHntBfw2p3w4s9R6oe1eCA==",
            "license": "MIT",
            "dependencies": {
-                "@monaco-editor/loader": "^1.4.0"
+                "@monaco-editor/loader": "^1.5.0"
            },
            "peerDependencies": {
                "monaco-editor": ">= 0.25.0 < 1",
@@ -1885,9 +1883,9 @@
            "license": "MIT"
        },
        "node_modules/@redocly/openapi-core": {
-            "version": "1.28.0",
+            "version": "1.28.5",
-            "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.28.0.tgz",
+            "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.28.5.tgz",
-            "integrity": "sha512-jnUsOFnz8w71l14Ww34Iswlj0AI4e/R0C5+K2W4v4GaY/sUkpH/145gHLJYlG4XV0neET4lNIptd4I8+yLyEHQ==",
+            "integrity": "sha512-eAuL+x1oBbodJksPm4UpFU57A6z1n1rx9JNpD87CObwtbRf5EzW29Ofd0t057bPGcHc8cYZtZzJ69dcRQ9xGdg==",
            "license": "MIT",
            "dependencies": {
                "@redocly/ajv": "^8.11.2",
@@ -1902,7 +1900,7 @@
            },
            "engines": {
                "node": ">=18.17.0",
-                "npm": ">=10.8.2"
+                "npm": ">=9.5.0"
            }
        },
        "node_modules/@redocly/openapi-core/node_modules/minimatch": {
@@ -1942,9 +1940,9 @@
            }
        },
        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.6.tgz",
-            "integrity": "sha512-kwctwVlswSEsr4ljpmxKrRKp1eG1v2NAhlzFzDf1x1OdYaMjBYjDCbHkzWm57ZXzTwqn8stMXgROrnMw8dJK3w==",
+            "integrity": "sha512-+GcCXtOQoWuC7hhX1P00LqjjIiS/iOouHXhMdiDSnq/1DGTox4SpUvO52Xm+div6+106r+TcvOeo/cxvyEyTgg==",
            "cpu": [
                "arm"
            ],
@@ -1956,9 +1954,9 @@
            ]
        },
        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.6.tgz",
-            "integrity": "sha512-4H5ZtZitBPlbPsTv6HBB8zh1g5d0T8TzCmpndQdqq20Ugle/nroOyDMf9p7f88Gsu8vBLU78/cuh8FYHZqdXxw==",
+            "integrity": "sha512-E8+2qCIjciYUnCa1AiVF1BkRgqIGW9KzJeesQqVfyRITGQN+dFuoivO0hnro1DjT74wXLRZ7QF8MIbz+luGaJA==",
            "cpu": [
                "arm64"
            ],
@@ -1970,9 +1968,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.6.tgz",
-            "integrity": "sha512-f2AJ7Qwx9z25hikXvg+asco8Sfuc5NCLg8rmqQBIOUoWys5sb/ZX9RkMZDPdnnDevXAMJA5AWLnRBmgdXGEUiA==",
+            "integrity": "sha512-z9Ib+OzqN3DZEjX7PDQMHEhtF+t6Mi2z/ueChQPLS/qUMKY7Ybn5A2ggFoKRNRh1q1T03YTQfBTQCJZiepESAg==",
            "cpu": [
                "arm64"
            ],
@@ -1984,9 +1982,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.6.tgz",
-            "integrity": "sha512-+/2JBrRfISCsWE4aEFXxd+7k9nWGXA8+wh7ZUHn/u8UDXOU9LN+QYKKhd57sIn6WRcorOnlqPMYFIwie/OHXWw==",
+            "integrity": "sha512-PShKVY4u0FDAR7jskyFIYVyHEPCPnIQY8s5OcXkdU8mz3Y7eXDJPdyM/ZWjkYdR2m0izD9HHWA8sGcXn+Qrsyg==",
            "cpu": [
                "x64"
            ],
@@ -1998,9 +1996,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.6.tgz",
-            "integrity": "sha512-SUeB0pYjIXwT2vfAMQ7E4ERPq9VGRrPR7Z+S4AMssah5EHIilYqjWQoTn5dkDtuIJUSTs8H+C9dwoEcg3b0sCA==",
+            "integrity": "sha512-YSwyOqlDAdKqs0iKuqvRHLN4SrD2TiswfoLfvYXseKbL47ht1grQpq46MSiQAx6rQEN8o8URtpXARCpqabqxGQ==",
            "cpu": [
                "arm64"
            ],
@@ -2012,9 +2010,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.6.tgz",
-            "integrity": "sha512-L3T66wAZiB/ooiPbxz0s6JEX6Sr2+HfgPSK+LMuZkaGZFAFCQAHiP3dbyqovYdNaiUXcl9TlgnIbcsIicAnOZg==",
+            "integrity": "sha512-HEP4CgPAY1RxXwwL5sPFv6BBM3tVeLnshF03HMhJYCNc6kvSqBgTMmsEjb72RkZBAWIqiPUyF1JpEBv5XT9wKQ==",
            "cpu": [
                "x64"
            ],
@@ -2026,9 +2024,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.6.tgz",
-            "integrity": "sha512-UBXdQ4+ATARuFgsFrQ+tAsKvBi/Hly99aSVdeCUiHV9dRTTpMU7OrM3WXGys1l40wKVNiOl0QYY6cZQJ2xhKlQ==",
+            "integrity": "sha512-88fSzjC5xeH9S2Vg3rPgXJULkHcLYMkh8faix8DX4h4TIAL65ekwuQMA/g2CXq8W+NJC43V6fUpYZNjaX3+IIg==",
            "cpu": [
                "arm"
            ],
@@ -2040,9 +2038,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.6.tgz",
-            "integrity": "sha512-m/yfZ25HGdcCSwmopEJm00GP7xAUyVcBPjttGLRAqZ60X/bB4Qn6gP7XTwCIU6bITeKmIhhwZ4AMh2XLro+4+w==",
+            "integrity": "sha512-wM4ztnutBqYFyvNeR7Av+reWI/enK9tDOTKNF+6Kk2Q96k9bwhDDOlnCUNRPvromlVXo04riSliMBs/Z7RteEg==",
            "cpu": [
                "arm"
            ],
@@ -2054,9 +2052,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.6.tgz",
-            "integrity": "sha512-Wy+cUmFuvziNL9qWRRzboNprqSQ/n38orbjRvd6byYWridp5TJ3CD+0+HUsbcWVSNz9bxkDUkyASGP0zS7GAvg==",
+            "integrity": "sha512-9RyprECbRa9zEjXLtvvshhw4CMrRa3K+0wcp3KME0zmBe1ILmvcVHnypZ/aIDXpRyfhSYSuN4EPdCCj5Du8FIA==",
            "cpu": [
                "arm64"
            ],
@@ -2068,9 +2066,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.6.tgz",
-            "integrity": "sha512-CQ3MAGgiFmQW5XJX5W3wnxOBxKwFlUAgSXFA2SwgVRjrIiVt5LHfcQLeNSHKq5OEZwv+VCBwlD1+YKCjDG8cpg==",
+            "integrity": "sha512-qTmklhCTyaJSB05S+iSovfo++EwnIEZxHkzv5dep4qoszUMX5Ca4WM4zAVUMbfdviLgCSQOu5oU8YoGk1s6M9Q==",
            "cpu": [
                "arm64"
            ],
@@ -2082,9 +2080,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.6.tgz",
-            "integrity": "sha512-rSzb1TsY4lSwH811cYC3OC2O2mzNMhM13vcnA7/0T6Mtreqr3/qs6WMDriMRs8yvHDI54qxHgOk8EV5YRAHFbw==",
+            "integrity": "sha512-4Qmkaps9yqmpjY5pvpkfOerYgKNUGzQpFxV6rnS7c/JfYbDSU0y6WpbbredB5cCpLFGJEqYX40WUmxMkwhWCjw==",
            "cpu": [
                "loong64"
            ],
@@ -2096,9 +2094,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.6.tgz",
-            "integrity": "sha512-fwr0n6NS0pG3QxxlqVYpfiY64Fd1Dqd8Cecje4ILAV01ROMp4aEdCj5ssHjRY3UwU7RJmeWd5fi89DBqMaTawg==",
+            "integrity": "sha512-Zsrtux3PuaxuBTX/zHdLaFmcofWGzaWW1scwLU3ZbW/X+hSsFbz9wDIp6XvnT7pzYRl9MezWqEqKy7ssmDEnuQ==",
            "cpu": [
                "ppc64"
            ],
@@ -2110,9 +2108,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.6.tgz",
-            "integrity": "sha512-4uJb9qz7+Z/yUp5RPxDGGGUcoh0PnKF33QyWgEZ3X/GocpWb6Mb+skDh59FEt5d8+Skxqs9mng6Swa6B2AmQZg==",
+            "integrity": "sha512-aK+Zp+CRM55iPrlyKiU3/zyhgzWBxLVrw2mwiQSYJRobCURb781+XstzvA8Gkjg/hbdQFuDw44aUOxVQFycrAg==",
            "cpu": [
                "riscv64"
            ],
@@ -2124,9 +2122,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.6.tgz",
-            "integrity": "sha512-QlIo8ndocWBEnfmkYqj8vVtIUpIqJjfqKggjy7IdUncnt8BGixte1wDON7NJEvLg3Kzvqxtbo8tk+U1acYEBlw==",
+            "integrity": "sha512-WoKLVrY9ogmaYPXwTH326+ErlCIgMmsoRSx6bO+l68YgJnlOXhygDYSZe/qbUJCSiCiZAQ+tKm88NcWuUXqOzw==",
            "cpu": [
                "s390x"
            ],
@@ -2138,9 +2136,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.6.tgz",
-            "integrity": "sha512-hzpleiKtq14GWjz3ahWvJXgU1DQC9DteiwcsY4HgqUJUGxZThlL66MotdUEK9zEo0PK/2ADeZGM9LIondE302A==",
+            "integrity": "sha512-Sht4aFvmA4ToHd2vFzwMFaQCiYm2lDFho5rPcvPBT5pCdC+GwHG6CMch4GQfmWTQ1SwRKS0dhDYb54khSrjDWw==",
            "cpu": [
                "x64"
            ],
@@ -2152,9 +2150,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.6.tgz",
-            "integrity": "sha512-jqtKrO715hDlvUcEsPn55tZt2TEiBvBtCMkUuU0R6fO/WPT7lO9AONjPbd8II7/asSiNVQHCMn4OLGigSuxVQA==",
+            "integrity": "sha512-zmmpOQh8vXc2QITsnCiODCDGXFC8LMi64+/oPpPx5qz3pqv0s6x46ps4xoycfUiVZps5PFn1gksZzo4RGTKT+A==",
            "cpu": [
                "x64"
            ],
@@ -2166,9 +2164,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.6.tgz",
-            "integrity": "sha512-RnHy7yFf2Wz8Jj1+h8klB93N0NHNHXFhNwAmiy9zJdpY7DE01VbEVtPdrK1kkILeIbHGRJjvfBDBhnxBr8kD4g==",
+            "integrity": "sha512-3/q1qUsO/tLqGBaD4uXsB6coVGB3usxw3qyeVb59aArCgedSF66MPdgRStUd7vbZOsko/CgVaY5fo2vkvPLWiA==",
            "cpu": [
                "arm64"
            ],
@@ -2180,9 +2178,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.6.tgz",
-            "integrity": "sha512-i7aT5HdiZIcd7quhzvwQ2oAuX7zPYrYfkrd1QFfs28Po/i0q6kas/oRrzGlDhAEyug+1UfUtkWdmoVlLJj5x9Q==",
+            "integrity": "sha512-oLHxuyywc6efdKVTxvc0135zPrRdtYVjtVD5GUm55I3ODxhU/PwkQFD97z16Xzxa1Fz0AEe4W/2hzRtd+IfpOA==",
            "cpu": [
                "ia32"
            ],
@@ -2194,9 +2192,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.6.tgz",
-            "integrity": "sha512-k3MVFD9Oq+laHkw2N2v7ILgoa9017ZMF/inTtHzyTVZjYs9cSH18sdyAf6spBAJIGwJ5UaC7et2ZH1WCdlhkMw==",
+            "integrity": "sha512-0PVwmgzZ8+TZ9oGBmdZoQVXflbvuwzN/HRclujpl4N/q3i+y0lqLw8n1bXA8ru3sApDjlmONaNAuYr38y1Kr9w==",
            "cpu": [
                "x64"
            ],
@@ -2272,6 +2270,13 @@
            "dev": true,
            "license": "MIT"
        },
        "node_modules/@types/gensync": {
            "version": "1.0.4",
            "resolved": "https://registry.npmjs.org/@types/gensync/-/gensync-1.0.4.tgz",
            "integrity": "sha512-C3YYeRQWp2fmq9OryX+FoDy8nXS6scQ7dPptD8LnFDAUNcKWJjXQKDNJD3HVm+kOUsXhTOkpi69vI4EuAr95bA==",
            "devOptional": true,
            "license": "MIT"
        },
        "node_modules/@types/istanbul-lib-coverage": {
            "version": "2.0.6",
            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
@@ -2313,9 +2318,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "22.13.0",
+            "version": "22.13.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.0.tgz",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz",
-            "integrity": "sha512-ClIbNe36lawluuvq3+YYhnIN2CELi+6q8NpnM7PYp4hBn/TatfboPgVSm2rwKRfnV2M+Ty9GWDFI64KEe+kysA==",
+            "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==",
            "devOptional": true,
            "license": "MIT",
            "dependencies": {
@@ -2885,9 +2890,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001696",
+            "version": "1.0.30001699",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001699.tgz",
-            "integrity": "sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==",
+            "integrity": "sha512-b+uH5BakXZ9Do9iK+CkDmctUSEqZl+SP056vc5usa0PL+ev5OHw003rZXcnjNDv3L8P5j6rwT6C0BPKSikW08w==",
            "devOptional": true,
            "funding": [
                {
@@ -3391,9 +3396,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.90",
+            "version": "1.5.96",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.90.tgz",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.96.tgz",
-            "integrity": "sha512-C3PN4aydfW91Natdyd449Kw+BzhLmof6tzy5W1pFC5SpQxVXT+oyiyOG9AgYYSN9OdA/ik3YkCrpwqI8ug5Tug==",
+            "integrity": "sha512-8AJUW6dh75Fm/ny8+kZKJzI1pgoE8bKLZlzDU2W1ENd+DXKJrx7I7l9hb8UWR4ojlnb5OlixMt00QWiYJoVw1w==",
            "devOptional": true,
            "license": "ISC"
        },
@@ -4024,9 +4029,9 @@
            }
        },
        "node_modules/interweave": {
-            "version": "13.1.0",
+            "version": "13.1.1",
-            "resolved": "https://registry.npmjs.org/interweave/-/interweave-13.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/interweave/-/interweave-13.1.1.tgz",
-            "integrity": "sha512-JIDq0+2NYg0cgL7AB26fBcV0yZdiJvPDBp+aF6k8gq6Cr1kH5Gd2/Xqn7j8z+TGb8jCWZn739jzalCz+nPYwcA==",
+            "integrity": "sha512-5GdAavzK1i2BeeLTPzj0o6/zJMfLqQZq/2Q4c3ALT8ByEWf1syzl2MlQMTUoWzETy1x1/cAkZjiqOlulaoDRxw==",
            "license": "MIT",
            "dependencies": {
                "escape-html": "^1.0.3"
@@ -4036,7 +4041,7 @@
                "url": "https://ko-fi.com/milesjohnson"
            },
            "peerDependencies": {
-                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
            }
        },
        "node_modules/is-arrayish": {
@@ -5226,9 +5231,9 @@
            }
        },
        "node_modules/postcss": {
-            "version": "8.4.38",
+            "version": "8.4.49",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-            "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+            "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
            "funding": [
                {
                    "type": "opencollective",
@@ -5247,8 +5252,8 @@
            "peer": true,
            "dependencies": {
                "nanoid": "^3.3.7",
-                "picocolors": "^1.0.0",
+                "picocolors": "^1.1.1",
-                "source-map-js": "^1.2.0"
+                "source-map-js": "^1.2.1"
            },
            "engines": {
                "node": "^10 || ^12 || >=14"
@@ -5733,6 +5738,7 @@
            "version": "2.4.0",
            "resolved": "https://registry.npmjs.org/redoc/-/redoc-2.4.0.tgz",
            "integrity": "sha512-rFlfzFVWS9XJ6aYAs/bHnLhHP5FQEhwAHDBVgwb9L2FqDQ8Hu8rQ1G84iwaWXxZfPP9UWn7JdWkxI6MXr2ZDjw==",
            "license": "MIT",
            "dependencies": {
                "@redocly/openapi-core": "^1.4.0",
                "classnames": "^2.3.2",
@@ -5884,9 +5890,9 @@
            }
        },
        "node_modules/rollup": {
-            "version": "4.34.1",
+            "version": "4.34.6",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.1.tgz",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.6.tgz",
-            "integrity": "sha512-iYZ/+PcdLYSGfH3S+dGahlW/RWmsqDhLgj1BT9DH/xXJ0ggZN7xkdP9wipPNjjNLczI+fmMLmTB9pye+d2r4GQ==",
+            "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -5900,25 +5906,25 @@
                "npm": ">=8.0.0"
            },
            "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.34.1",
+                "@rollup/rollup-android-arm-eabi": "4.34.6",
-                "@rollup/rollup-android-arm64": "4.34.1",
+                "@rollup/rollup-android-arm64": "4.34.6",
-                "@rollup/rollup-darwin-arm64": "4.34.1",
+                "@rollup/rollup-darwin-arm64": "4.34.6",
-                "@rollup/rollup-darwin-x64": "4.34.1",
+                "@rollup/rollup-darwin-x64": "4.34.6",
-                "@rollup/rollup-freebsd-arm64": "4.34.1",
+                "@rollup/rollup-freebsd-arm64": "4.34.6",
-                "@rollup/rollup-freebsd-x64": "4.34.1",
+                "@rollup/rollup-freebsd-x64": "4.34.6",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.34.1",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.34.6",
-                "@rollup/rollup-linux-arm-musleabihf": "4.34.1",
+                "@rollup/rollup-linux-arm-musleabihf": "4.34.6",
-                "@rollup/rollup-linux-arm64-gnu": "4.34.1",
+                "@rollup/rollup-linux-arm64-gnu": "4.34.6",
-                "@rollup/rollup-linux-arm64-musl": "4.34.1",
+                "@rollup/rollup-linux-arm64-musl": "4.34.6",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.34.1",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.34.6",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.34.1",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.34.6",
-                "@rollup/rollup-linux-riscv64-gnu": "4.34.1",
+                "@rollup/rollup-linux-riscv64-gnu": "4.34.6",
-                "@rollup/rollup-linux-s390x-gnu": "4.34.1",
+                "@rollup/rollup-linux-s390x-gnu": "4.34.6",
-                "@rollup/rollup-linux-x64-gnu": "4.34.1",
+                "@rollup/rollup-linux-x64-gnu": "4.34.6",
-                "@rollup/rollup-linux-x64-musl": "4.34.1",
+                "@rollup/rollup-linux-x64-musl": "4.34.6",
-                "@rollup/rollup-win32-arm64-msvc": "4.34.1",
+                "@rollup/rollup-win32-arm64-msvc": "4.34.6",
-                "@rollup/rollup-win32-ia32-msvc": "4.34.1",
+                "@rollup/rollup-win32-ia32-msvc": "4.34.6",
-                "@rollup/rollup-win32-x64-msvc": "4.34.1",
+                "@rollup/rollup-win32-x64-msvc": "4.34.6",
                "fsevents": "~2.3.2"
            }
        },
@@ -6338,9 +6344,9 @@
            }
        },
        "node_modules/styled-components": {
-            "version": "6.1.14",
+            "version": "6.1.15",
-            "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.14.tgz",
+            "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.15.tgz",
-            "integrity": "sha512-KtfwhU5jw7UoxdM0g6XU9VZQFV4do+KrM8idiVCH5h4v49W+3p3yMe0icYwJgZQZepa5DbH04Qv8P0/RdcLcgg==",
+            "integrity": "sha512-PpOTEztW87Ua2xbmLa7yssjNyUF9vE7wdldRfn1I2E6RTkqknkBYpj771OxM/xrvRGinLy2oysa7GOd7NcZZIA==",
            "license": "MIT",
            "peer": true,
            "dependencies": {
@@ -6349,7 +6355,7 @@
                "@types/stylis": "4.2.5",
                "css-to-react-native": "3.2.0",
                "csstype": "3.1.3",
-                "postcss": "8.4.38",
+                "postcss": "8.4.49",
                "shallowequal": "1.1.0",
                "stylis": "4.3.2",
                "tslib": "2.6.2"
@@ -6541,22 +6547,22 @@
            }
        },
        "node_modules/tldts": {
-            "version": "6.1.76",
+            "version": "6.1.77",
-            "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.76.tgz",
+            "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.77.tgz",
-            "integrity": "sha512-6U2ti64/nppsDxQs9hw8ephA3nO6nSQvVVfxwRw8wLQPFtLI1cFI1a1eP22g+LUP+1TA2pKKjUTwWB+K2coqmQ==",
+            "integrity": "sha512-lBpoWgy+kYmuXWQ83+R7LlJCnsd9YW8DGpZSHhrMl4b8Ly/1vzOie3OdtmUJDkKxcgRGOehDu5btKkty+JEe+g==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "tldts-core": "^6.1.76"
+                "tldts-core": "^6.1.77"
            },
            "bin": {
                "tldts": "bin/cli.js"
            }
        },
        "node_modules/tldts-core": {
-            "version": "6.1.76",
+            "version": "6.1.77",
-            "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.76.tgz",
+            "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.77.tgz",
-            "integrity": "sha512-uzhJ02RaMzgQR3yPoeE65DrcHI6LoM4saUqXOt/b5hmb3+mc4YWpdSeAQqVqRUlQ14q8ZuLRWyBR1ictK1dzzg==",
+            "integrity": "sha512-bCaqm24FPk8OgBkM0u/SrEWJgHnhBWYqeBo6yUmcZJDCHt/IfyWBb+14CXdGi4RInMv4v7eUAin15W0DoA+Ytg==",
            "dev": true,
            "license": "MIT"
        },
@@ -6587,9 +6593,9 @@
            }
        },
        "node_modules/tough-cookie": {
-            "version": "5.1.0",
+            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.1.tgz",
-            "integrity": "sha512-rvZUv+7MoBYTiDmFPBrhL7Ujx9Sk+q9wwm22x8c8T5IJaR+Wsyc7TNxbVxo84kZoRJZZMazowFLqpankBEQrGg==",
+            "integrity": "sha512-Ek7HndSVkp10hmHP9V4qZO1u+pn1RU5sI0Fw+jCU3lyvuMZcgqsNgc6CmJJZyByK4Vm/qotGRJlfgAX8q+4JiA==",
            "dev": true,
            "license": "BSD-3-Clause",
            "dependencies": {
@@ -6628,9 +6634,9 @@
            }
        },
        "node_modules/tsconfck": {
-            "version": "3.1.4",
+            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.4.tgz",
+            "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.5.tgz",
-            "integrity": "sha512-kdqWFGVJqe+KGYvlSO9NIaWn9jT1Ny4oKVzAJsKii5eoE9snzTJzL4+MMVOMn+fikWGFmKEylcXL710V/kIPJQ==",
+            "integrity": "sha512-CLDfGgUp7XPswWnezWwsCRxNmgQjhYq3VXHM0/XIRxhVrKw0M1if9agzryh1QS3nxjCROvV+xWxoJO1YctzzWg==",
            "dev": true,
            "license": "MIT",
            "bin": {
@@ -6687,9 +6693,9 @@
            "license": "ISC"
        },
        "node_modules/type-fest": {
-            "version": "4.33.0",
+            "version": "4.34.1",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.33.0.tgz",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.34.1.tgz",
-            "integrity": "sha512-s6zVrxuyKbbAsSAD5ZPTB77q4YIdRctkTbJ2/Dqlinwz+8ooH2gd+YA7VA6Pa93KML9GockVvoxjZ2vHP+mu8g==",
+            "integrity": "sha512-6kSc32kT0rbwxD6QL1CYe8IqdzN/J/ILMrNK+HMQCKH3insCDRY/3ITb0vcBss0a3t72fzh2YSzj8ko1HgwT3g==",
            "license": "(MIT OR CC0-1.0)",
            "engines": {
                "node": ">=16"
@@ -7709,9 +7715,9 @@
            }
        },
        "node_modules/vscode-languageclient/node_modules/semver": {
-            "version": "7.7.0",
+            "version": "7.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-            "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
+            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
            "dev": true,
            "license": "ISC",
            "bin": {
@@ -7760,9 +7766,9 @@
            "license": "MIT"
        },
        "node_modules/vscode-uri": {
-            "version": "3.0.8",
+            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
-            "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==",
+            "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
            "dev": true,
            "license": "MIT"
        },
--- a/commafeed-client/package.json
+++ b/commafeed-client/package.json
@@ -25,12 +25,12 @@
        "@mantine/spotlight": "^7.16.3",
        "@lingui/core": "^5.2.0",
        "@lingui/react": "^5.2.0",
-        "@monaco-editor/react": "^4.7.0-rc.0",
+        "@monaco-editor/react": "^4.7.0",
        "@reduxjs/toolkit": "^2.5.1",
        "axios": "^1.7.9",
        "dayjs": "^1.11.13",
        "escape-string-regexp": "^5.0.0",
-        "interweave": "^13.1.0",
+        "interweave": "^13.1.1",
        "monaco-editor": "^0.52.2",
        "mousetrap": "^1.6.5",
        "react": "^19.0.0",
@@ -75,9 +75,6 @@
        "vitest-mock-extended": "^2.0.2"
    },
    "overrides": {
        "interweave": {
            "react": "^19.0.0"
        },
        "react-infinite-scroller": {
            "react": "^19.0.0"
        }
--- a/commafeed-client/pom.xml
+++ b/commafeed-client/pom.xml
@@ -6,14 +6,14 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.5.0</version>
+		<version>5.6.0</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>
 	<properties>
 		<!-- renovate: datasource=node-version depName=node -->
-		<node.version>v22.13.1</node.version>
+		<node.version>v22.14.0</node.version>
 		<!-- renovate: datasource=npm depName=npm -->
 		<npm.version>11.1.0</npm.version>
 	</properties>
--- a/commafeed-client/src/app/entries/thunks.ts
+++ b/commafeed-client/src/app/entries/thunks.ts
@@ -11,6 +11,7 @@ import { flushSync } from "react-dom"
 const getEndpoint = (sourceType: EntrySourceType) =>
    sourceType === "category" || sourceType === "tag" ? client.category.getEntries : client.feed.getEntries
 export const loadEntries = createAppAsyncThunk(
    "entries/load",
    async (
@@ -28,6 +29,7 @@ export const loadEntries = createAppAsyncThunk(
        return result.data
    }
 )
 export const loadMoreEntries = createAppAsyncThunk("entries/loadMore", async (_, thunkApi) => {
    const state = thunkApi.getState()
    const { source } = state.entries
@@ -37,6 +39,7 @@ export const loadMoreEntries = createAppAsyncThunk("entries/loadMore", async (_,
    const result = await endpoint(buildGetEntriesPaginatedRequest(state, source, offset))
    return result.data
 })
 const buildGetEntriesPaginatedRequest = (state: RootState, source: EntrySource, offset: number) => ({
    id: source.type === "tag" ? Constants.categories.all.id : source.id,
    order: state.user.settings?.readingOrder,
@@ -46,15 +49,18 @@ const buildGetEntriesPaginatedRequest = (state: RootState, source: EntrySource,
    tag: source.type === "tag" ? source.id : undefined,
    keywords: state.entries.search,
 })
 export const reloadEntries = createAppAsyncThunk("entries/reload", (arg, thunkApi) => {
    const state = thunkApi.getState()
    thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
 })
 export const search = createAppAsyncThunk("entries/search", (arg: string, thunkApi) => {
    const state = thunkApi.getState()
    thunkApi.dispatch(setSearch(arg))
    thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
 })
 export const markEntry = createAppAsyncThunk(
    "entries/entry/mark",
    (arg: { entry: Entry; read: boolean }) => {
@@ -67,6 +73,7 @@ export const markEntry = createAppAsyncThunk(
        condition: arg => arg.entry.markable && arg.entry.read !== arg.read,
    }
 )
 export const markMultipleEntries = createAppAsyncThunk(
    "entries/entry/markMultiple",
    async (
@@ -84,6 +91,7 @@ export const markMultipleEntries = createAppAsyncThunk(
        thunkApi.dispatch(reloadTree())
    }
 )
 export const markEntriesUpToEntry = createAppAsyncThunk("entries/entry/upToEntry", (arg: Entry, thunkApi) => {
    const state = thunkApi.getState()
    const { entries } = state.entries
@@ -98,6 +106,7 @@ export const markEntriesUpToEntry = createAppAsyncThunk("entries/entry/upToEntry
        })
    )
 })
 export const markAllEntries = createAppAsyncThunk(
    "entries/entry/markAll",
    async (
@@ -113,6 +122,7 @@ export const markAllEntries = createAppAsyncThunk(
        thunkApi.dispatch(reloadTree())
    }
 )
 export const starEntry = createAppAsyncThunk(
    "entries/entry/star",
    (arg: { entry: Entry; starred: boolean }) => {
@@ -126,6 +136,7 @@ export const starEntry = createAppAsyncThunk(
        condition: arg => arg.entry.markable && arg.entry.starred !== arg.starred,
    }
 )
 export const selectEntry = createAppAsyncThunk(
    "entries/entry/select",
    (
@@ -191,6 +202,7 @@ export const selectEntry = createAppAsyncThunk(
        }
    }
 )
 const scrollToEntry = (entryElement: HTMLElement, margin: number, scrollSpeed: number | undefined, onScrollEnded: () => void) => {
    const header = document.getElementById(Constants.dom.headerId)?.getBoundingClientRect()
    const offset = (header?.bottom ?? 0) + margin
@@ -228,6 +240,7 @@ export const selectPreviousEntry = createAppAsyncThunk(
        }
    }
 )
 export const selectNextEntry = createAppAsyncThunk(
    "entries/entry/selectNext",
    async (
@@ -261,6 +274,7 @@ export const selectNextEntry = createAppAsyncThunk(
        }
    }
 )
 export const tagEntry = createAppAsyncThunk("entries/entry/tag", async (arg: TagRequest, thunkApi) => {
    await client.entry.tag(arg)
    thunkApi.dispatch(reloadTags())
--- a/commafeed-client/src/app/redirect/thunks.ts
+++ b/commafeed-client/src/app/redirect/thunks.ts
@@ -3,43 +3,55 @@ import { Constants } from "app/constants"
 import { redirectTo } from "app/redirect/slice"
 export const redirectToLogin = createAppAsyncThunk("redirect/login", (_, thunkApi) => thunkApi.dispatch(redirectTo("/login")))
 export const redirectToRegistration = createAppAsyncThunk("redirect/register", (_, thunkApi) => thunkApi.dispatch(redirectTo("/register")))
-export const redirectToPasswordRecovery = createAppAsyncThunk("redirect/passwordRecovery", (_, thunkApi) =>
+
    thunkApi.dispatch(redirectTo("/passwordRecovery"))
 )
 export const redirectToApiDocumentation = createAppAsyncThunk("redirect/api", (_, thunkApi) => thunkApi.dispatch(redirectTo("/api")))
 export const redirectToSelectedSource = createAppAsyncThunk("redirect/selectedSource", (_, thunkApi) => {
    const { source } = thunkApi.getState().entries
    thunkApi.dispatch(redirectTo(`/app/${source.type}/${source.id}`))
 })
 export const redirectToCategory = createAppAsyncThunk("redirect/category", (id: string, thunkApi) =>
    thunkApi.dispatch(redirectTo(`/app/category/${id}`))
 )
 export const redirectToRootCategory = createAppAsyncThunk(
    "redirect/category/root",
    async (_, thunkApi) => await thunkApi.dispatch(redirectToCategory(Constants.categories.all.id))
 )
 export const redirectToCategoryDetails = createAppAsyncThunk("redirect/category/details", (id: string, thunkApi) =>
    thunkApi.dispatch(redirectTo(`/app/category/${id}/details`))
 )
 export const redirectToFeed = createAppAsyncThunk("redirect/feed", (id: string | number, thunkApi) =>
    thunkApi.dispatch(redirectTo(`/app/feed/${id}`))
 )
 export const redirectToFeedDetails = createAppAsyncThunk("redirect/feed/details", (id: string, thunkApi) =>
    thunkApi.dispatch(redirectTo(`/app/feed/${id}/details`))
 )
 export const redirectToTag = createAppAsyncThunk("redirect/tag", (id: string, thunkApi) => thunkApi.dispatch(redirectTo(`/app/tag/${id}`)))
 export const redirectToTagDetails = createAppAsyncThunk("redirect/tag/details", (id: string, thunkApi) =>
    thunkApi.dispatch(redirectTo(`/app/tag/${id}/details`))
 )
 export const redirectToAdd = createAppAsyncThunk("redirect/add", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/add")))
 export const redirectToSettings = createAppAsyncThunk("redirect/settings", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/settings")))
 export const redirectToAdminUsers = createAppAsyncThunk("redirect/admin/users", (_, thunkApi) =>
    thunkApi.dispatch(redirectTo("/app/admin/users"))
 )
 export const redirectToMetrics = createAppAsyncThunk("redirect/admin/metrics", (_, thunkApi) =>
    thunkApi.dispatch(redirectTo("/app/admin/metrics"))
 )
 export const redirectToDonate = createAppAsyncThunk("redirect/donate", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/donate")))
 export const redirectToAbout = createAppAsyncThunk("redirect/about", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/about")))
--- a/commafeed-client/src/app/tree/thunks.ts
+++ b/commafeed-client/src/app/tree/thunks.ts
@@ -1,9 +1,35 @@
 import { createAppAsyncThunk } from "app/async-thunk"
 import { client } from "app/client"
 import { incrementUnreadCount } from "app/tree/slice"
 import type { CollapseRequest } from "app/types"
 import { flattenCategoryTree } from "app/utils"
 export const reloadTree = createAppAsyncThunk("tree/reload", async () => await client.category.getRoot().then(r => r.data))
 export const collapseTreeCategory = createAppAsyncThunk(
    "tree/category/collapse",
    async (req: CollapseRequest) => await client.category.collapse(req)
 )
 export const newFeedEntriesDiscovered = createAppAsyncThunk(
    "tree/new-feed-entries-discovered",
    async ({ feedId, amount }: { feedId: number; amount: number }, thunkApi) => {
        const root = thunkApi.getState().tree.rootCategory
        if (!root) return
        const feed = flattenCategoryTree(root)
            .flatMap(c => c.feeds)
            .some(f => f.id === feedId)
        if (!feed) {
            // feed not found in the tree, reload the tree completely
            thunkApi.dispatch(reloadTree())
        } else {
            thunkApi.dispatch(
                incrementUnreadCount({
                    feedId,
                    amount,
                })
            )
        }
    }
 )
--- a/commafeed-client/src/app/user/thunks.ts
+++ b/commafeed-client/src/app/user/thunks.ts
@@ -4,45 +4,55 @@ import { reloadEntries } from "app/entries/thunks"
 import type { IconDisplayMode, ReadingMode, ReadingOrder, ScrollMode, SharingSettings } from "app/types"
 export const reloadSettings = createAppAsyncThunk("settings/reload", async () => await client.user.getSettings().then(r => r.data))
 export const reloadProfile = createAppAsyncThunk("profile/reload", async () => await client.user.getProfile().then(r => r.data))
 export const reloadTags = createAppAsyncThunk("entries/tags", async () => await client.entry.getTags().then(r => r.data))
 export const changeReadingMode = createAppAsyncThunk("settings/readingMode", (readingMode: ReadingMode, thunkApi) => {
    const { settings } = thunkApi.getState().user
    if (!settings) return
    client.user.saveSettings({ ...settings, readingMode })
    thunkApi.dispatch(reloadEntries())
 })
 export const changeReadingOrder = createAppAsyncThunk("settings/readingOrder", (readingOrder: ReadingOrder, thunkApi) => {
    const { settings } = thunkApi.getState().user
    if (!settings) return
    client.user.saveSettings({ ...settings, readingOrder })
    thunkApi.dispatch(reloadEntries())
 })
 export const changeLanguage = createAppAsyncThunk("settings/language", (language: string, thunkApi) => {
    const { settings } = thunkApi.getState().user
    if (!settings) return
    client.user.saveSettings({ ...settings, language })
 })
 export const changeScrollSpeed = createAppAsyncThunk("settings/scrollSpeed", (speed: boolean, thunkApi) => {
    const { settings } = thunkApi.getState().user
    if (!settings) return
    client.user.saveSettings({ ...settings, scrollSpeed: speed ? 400 : 0 })
 })
 export const changeShowRead = createAppAsyncThunk("settings/showRead", (showRead: boolean, thunkApi) => {
    const { settings } = thunkApi.getState().user
    if (!settings) return
    client.user.saveSettings({ ...settings, showRead })
 })
 export const changeScrollMarks = createAppAsyncThunk("settings/scrollMarks", (scrollMarks: boolean, thunkApi) => {
    const { settings } = thunkApi.getState().user
    if (!settings) return
    client.user.saveSettings({ ...settings, scrollMarks })
 })
 export const changeScrollMode = createAppAsyncThunk("settings/scrollMode", (scrollMode: ScrollMode, thunkApi) => {
    const { settings } = thunkApi.getState().user
    if (!settings) return
    client.user.saveSettings({ ...settings, scrollMode })
 })
 export const changeEntriesToKeepOnTopWhenScrolling = createAppAsyncThunk(
    "settings/entriesToKeepOnTopWhenScrolling",
    (entriesToKeepOnTopWhenScrolling: number, thunkApi) => {
@@ -51,6 +61,7 @@ export const changeEntriesToKeepOnTopWhenScrolling = createAppAsyncThunk(
        client.user.saveSettings({ ...settings, entriesToKeepOnTopWhenScrolling })
    }
 )
 export const changeStarIconDisplayMode = createAppAsyncThunk(
    "settings/starIconDisplayMode",
    (starIconDisplayMode: IconDisplayMode, thunkApi) => {
@@ -59,6 +70,7 @@ export const changeStarIconDisplayMode = createAppAsyncThunk(
        client.user.saveSettings({ ...settings, starIconDisplayMode })
    }
 )
 export const changeExternalLinkIconDisplayMode = createAppAsyncThunk(
    "settings/externalLinkIconDisplayMode",
    (externalLinkIconDisplayMode: IconDisplayMode, thunkApi) => {
@@ -67,6 +79,7 @@ export const changeExternalLinkIconDisplayMode = createAppAsyncThunk(
        client.user.saveSettings({ ...settings, externalLinkIconDisplayMode })
    }
 )
 export const changeMarkAllAsReadConfirmation = createAppAsyncThunk(
    "settings/markAllAsReadConfirmation",
    (markAllAsReadConfirmation: boolean, thunkApi) => {
@@ -75,26 +88,31 @@ export const changeMarkAllAsReadConfirmation = createAppAsyncThunk(
        client.user.saveSettings({ ...settings, markAllAsReadConfirmation })
    }
 )
 export const changeCustomContextMenu = createAppAsyncThunk("settings/customContextMenu", (customContextMenu: boolean, thunkApi) => {
    const { settings } = thunkApi.getState().user
    if (!settings) return
    client.user.saveSettings({ ...settings, customContextMenu })
 })
 export const changeMobileFooter = createAppAsyncThunk("settings/mobileFooter", (mobileFooter: boolean, thunkApi) => {
    const { settings } = thunkApi.getState().user
    if (!settings) return
    client.user.saveSettings({ ...settings, mobileFooter })
 })
 export const changeUnreadCountTitle = createAppAsyncThunk("settings/unreadCountTitle", (unreadCountTitle: boolean, thunkApi) => {
    const { settings } = thunkApi.getState().user
    if (!settings) return
    client.user.saveSettings({ ...settings, unreadCountTitle })
 })
 export const changeUnreadCountFavicon = createAppAsyncThunk("settings/unreadCountFavicon", (unreadCountFavicon: boolean, thunkApi) => {
    const { settings } = thunkApi.getState().user
    if (!settings) return
    client.user.saveSettings({ ...settings, unreadCountFavicon })
 })
 export const changeSharingSetting = createAppAsyncThunk(
    "settings/sharingSetting",
    (
--- a/commafeed-client/src/components/content/add/Subscribe.tsx
+++ b/commafeed-client/src/components/content/add/Subscribe.tsx
@@ -39,8 +39,8 @@ export function Subscribe() {
        },
    })
    const subscribe = useAsyncCallback(client.feed.subscribe, {
-        onSuccess: sub => {
+        onSuccess: async sub => {
-            dispatch(reloadTree())
+            await dispatch(reloadTree())
            dispatch(redirectToFeed(sub.data))
        },
    })
--- a/commafeed-client/src/hooks/useWebSocket.ts
+++ b/commafeed-client/src/hooks/useWebSocket.ts
@@ -1,6 +1,6 @@
 import { setWebSocketConnected } from "app/server/slice"
 import { type AppDispatch, useAppDispatch, useAppSelector } from "app/store"
-import { incrementUnreadCount } from "app/tree/slice"
+import { newFeedEntriesDiscovered } from "app/tree/thunks"
 import { useEffect } from "react"
 import WebsocketHeartbeatJs from "websocket-heartbeat-js"
@@ -9,7 +9,7 @@ const handleMessage = (dispatch: AppDispatch, message: string) => {
    const type = parts[0]
    if (type === "new-feed-entries") {
        dispatch(
-            incrementUnreadCount({
+            newFeedEntriesDiscovered({
                feedId: +parts[1],
                amount: +parts[2],
            })
--- a/commafeed-server/doc/commafeed.md
+++ b/commafeed-server/doc/commafeed.md
@@ -287,6 +287,29 @@ MemorySize [🛈](#memory-size-note-anchor)
 `5M`
 </td>
 </tr>
 <tr>
 <td>
 `commafeed.http-client.block-local-addresses`
 Prevent access to local addresses to mitigate server-side request forgery (SSRF) attacks, which could potentially expose internal
 resources.
 You may want to disable this if you subscribe to feeds that are only available on your local network and you trust all users of
 your CommaFeed instance.
 Environment variable: `COMMAFEED_HTTP_CLIENT_BLOCK_LOCAL_ADDRESSES`</td>
 <td>
 boolean
 </td>
 <td>
 `true`
 </td>
 </tr>
 <thead>
 <tr>
 <th align="left" colspan="3">
@@ -366,7 +389,7 @@ Feed refresh engine settings
 `commafeed.feed-refresh.interval`
-Amount of time CommaFeed will wait before refreshing the same feed.
+Default amount of time CommaFeed will wait before refreshing a feed.
@@ -383,10 +406,36 @@ Environment variable: `COMMAFEED_FEED_REFRESH_INTERVAL`</td>
 <tr>
 <td>
 `commafeed.feed-refresh.max-interval`
 Maximum amount of time CommaFeed will wait before refreshing a feed. This is used as an upper bound when:
 <ul>
 <li>an error occurs while refreshing a feed and we're backing off exponentially</li>
 <li>we receive a Cache-Control header from the feed</li>
 <li>we receive a Retry-After header from the feed</li>
 </ul>
 Environment variable: `COMMAFEED_FEED_REFRESH_MAX_INTERVAL`</td>
 <td>
 [Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
 </td>
 <td>
 `4H`
 </td>
 </tr>
 <tr>
 <td>
 `commafeed.feed-refresh.interval-empirical`
-If true, CommaFeed will calculate the next refresh time based on the feed's average time between entries and the time since the
+If enabled, CommaFeed will calculate the next refresh time based on the feed's average time between entries and the time since
-last entry was published. The interval will be somewhere between the default refresh interval and 24h.
+the last entry was published. The interval will be sometimes between the default refresh interval
 (`commafeed.feed-refresh.interval`) and the maximum refresh interval (`commafeed.feed-refresh.max-interval`).
 See <code>FeedRefreshIntervalCalculator</code> for details.
@@ -399,7 +448,7 @@ boolean
 </td>
 <td>
-`false`
+`true`
 </td>
 </tr>
 <tr>
@@ -502,6 +551,52 @@ Environment variable: `COMMAFEED_FEED_REFRESH_FORCE_REFRESH_COOLDOWN_DURATION`</
 <thead>
 <tr>
 <th align="left" colspan="3">
 &nbsp;&nbsp;&nbsp;&nbsp;Feed refresh engine error handling settings
 </th>
 </tr>
 </thead>
 <tr>
 <td>
 `commafeed.feed-refresh.errors.retries-before-backoff`
 Number of retries before backoff is applied.
 Environment variable: `COMMAFEED_FEED_REFRESH_ERRORS_RETRIES_BEFORE_BACKOFF`</td>
 <td>
 int
 </td>
 <td>
 `3`
 </td>
 </tr>
 <tr>
 <td>
 `commafeed.feed-refresh.errors.backoff-interval`
 Duration to wait before retrying after an error. Will be multiplied by the number of errors since the last successful fetch.
 Environment variable: `COMMAFEED_FEED_REFRESH_ERRORS_BACKOFF_INTERVAL`</td>
 <td>
 [Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
 </td>
 <td>
 `1H`
 </td>
 </tr>
 <thead>
 <tr>
 <th align="left" colspan="3">
 Database settings
 </th>
 </tr>
--- a/commafeed-server/pom.xml
+++ b/commafeed-server/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.5.0</version>
+		<version>5.6.0</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
 	<properties>
-		<quarkus.version>3.18.2</quarkus.version>
+		<quarkus.version>3.18.3</quarkus.version>
 		<querydsl.version>6.10.1</querydsl.version>
 		<rome.version>2.1.0</rome.version>
 		<swagger.version>2.2.28</swagger.version>
@@ -297,7 +297,7 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>5.5.0</version>
+			<version>5.6.0</version>
 		</dependency>
 		<!-- compile-time processors -->
--- a/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java
+++ b/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java
@@ -138,6 +138,16 @@ public interface CommaFeedConfiguration {
 		@WithDefault("5M")
 		MemorySize maxResponseSize();
 		/**
 		 * Prevent access to local addresses to mitigate server-side request forgery (SSRF) attacks, which could potentially expose internal
 		 * resources.
 		 *
 		 * You may want to disable this if you subscribe to feeds that are only available on your local network and you trust all users of
 		 * your CommaFeed instance.
 		 */
 		@WithDefault("true")
 		boolean blockLocalAddresses();
 		/**
 		 * HTTP client cache configuration
 		 */
@@ -168,20 +178,39 @@ public interface CommaFeedConfiguration {
 	interface FeedRefresh {
 		/**
-		 * Amount of time CommaFeed will wait before refreshing the same feed.
+		 * Default amount of time CommaFeed will wait before refreshing a feed.
 		 */
 		@WithDefault("5m")
 		Duration interval();
 		/**
-		 * If true, CommaFeed will calculate the next refresh time based on the feed's average time between entries and the time since the
+		 * Maximum amount of time CommaFeed will wait before refreshing a feed. This is used as an upper bound when:
-		 * last entry was published. The interval will be somewhere between the default refresh interval and 24h.
+		 *
 		 * <ul>
 		 * <li>an error occurs while refreshing a feed and we're backing off exponentially</li>
 		 * <li>we receive a Cache-Control header from the feed</li>
 		 * <li>we receive a Retry-After header from the feed</li>
 		 * </ul>
 		 */
 		@WithDefault("4h")
 		Duration maxInterval();
 		/**
 		 * If enabled, CommaFeed will calculate the next refresh time based on the feed's average time between entries and the time since
 		 * the last entry was published. The interval will be sometimes between the default refresh interval
 		 * (`commafeed.feed-refresh.interval`) and the maximum refresh interval (`commafeed.feed-refresh.max-interval`).
 		 * 
 		 * See {@link FeedRefreshIntervalCalculator} for details.
 		 */
-		@WithDefault("false")
+		@WithDefault("true")
 		boolean intervalEmpirical();
 		/**
 		 * Feed refresh engine error handling settings.
 		 */
 		@ConfigDocSection
 		FeedRefreshErrorHandling errors();
 		/**
 		 * Amount of http threads used to fetch feeds.
 		 */
@@ -217,6 +246,21 @@ public interface CommaFeedConfiguration {
 		Duration forceRefreshCooldownDuration();
 	}
 	interface FeedRefreshErrorHandling {
 		/**
 		 * Number of retries before backoff is applied.
 		 */
 		@Min(0)
 		@WithDefault("3")
 		int retriesBeforeBackoff();
 		/**
 		 * Duration to wait before retrying after an error. Will be multiplied by the number of errors since the last successful fetch.
 		 */
 		@WithDefault("1h")
 		Duration backoffInterval();
 	}
 	interface Database {
 		/**
 		 * Timeout applied to all database queries.
--- a/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java
@@ -2,7 +2,9 @@ package com.commafeed.backend;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.URI;
 import java.net.UnknownHostException;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.InstantSource;
@@ -10,8 +12,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Stream;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.client5.http.DnsResolver;
 import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.config.TlsConfig;
@@ -66,6 +71,7 @@ public class HttpGetter {
 	private final InstantSource instantSource;
 	private final CloseableHttpClient client;
 	private final Cache<HttpRequest, HttpResponse> cache;
 	private final DnsResolver dnsResolver = SystemDefaultDnsResolver.INSTANCE;
 	public HttpGetter(CommaFeedConfiguration config, InstantSource instantSource, CommaFeedVersion version, MetricRegistry metrics) {
 		this.config = config;
@@ -89,11 +95,20 @@ public class HttpGetter {
 				() -> cache == null ? 0 : cache.asMap().values().stream().mapToInt(e -> e.content != null ? e.content.length : 0).sum());
 	}
-	public HttpResult get(String url) throws IOException, NotModifiedException, TooManyRequestsException {
+	public HttpResult get(String url)
 			throws IOException, NotModifiedException, TooManyRequestsException, SchemeNotAllowedException, HostNotAllowedException {
 		return get(HttpRequest.builder(url).build());
 	}
-	public HttpResult get(HttpRequest request) throws IOException, NotModifiedException, TooManyRequestsException {
+	public HttpResult get(HttpRequest request)
 			throws IOException, NotModifiedException, TooManyRequestsException, SchemeNotAllowedException, HostNotAllowedException {
 		URI uri = URI.create(request.getUrl());
 		ensureHttpScheme(uri.getScheme());
 		if (config.httpClient().blockLocalAddresses()) {
 			ensurePublicAddress(uri.getHost());
 		}
 		final HttpResponse response;
 		if (cache == null) {
 			response = invoke(request);
@@ -141,6 +156,28 @@ public class HttpGetter {
 				response.getUrlAfterRedirect(), validFor);
 	}
 	private void ensureHttpScheme(String scheme) throws SchemeNotAllowedException {
 		if (!"http".equals(scheme) && !"https".equals(scheme)) {
 			throw new SchemeNotAllowedException(scheme);
 		}
 	}
 	private void ensurePublicAddress(String host) throws HostNotAllowedException, UnknownHostException {
 		if (host == null) {
 			throw new HostNotAllowedException(null);
 		}
 		InetAddress[] addresses = dnsResolver.resolve(host);
 		if (Stream.of(addresses).anyMatch(this::isPrivateAddress)) {
 			throw new HostNotAllowedException(host);
 		}
 	}
 	private boolean isPrivateAddress(InetAddress address) {
 		return address.isSiteLocalAddress() || address.isAnyLocalAddress() || address.isLinkLocalAddress() || address.isLoopbackAddress()
 				|| address.isMulticastAddress();
 	}
 	private HttpResponse invoke(HttpRequest request) throws IOException {
 		log.debug("fetching {}", request.getUrl());
@@ -229,7 +266,7 @@ public class HttpGetter {
 		}
 	}
-	private static PoolingHttpClientConnectionManager newConnectionManager(CommaFeedConfiguration config) {
+	private PoolingHttpClientConnectionManager newConnectionManager(CommaFeedConfiguration config) {
 		SSLFactory sslFactory = SSLFactory.builder().withUnsafeTrustMaterial().withUnsafeHostnameVerifier().build();
 		int poolSize = config.feedRefresh().httpThreads();
@@ -243,6 +280,7 @@ public class HttpGetter {
 				.setDefaultTlsConfig(TlsConfig.custom().setHandshakeTimeout(Timeout.of(config.httpClient().sslHandshakeTimeout())).build())
 				.setMaxConnPerRoute(poolSize)
 				.setMaxConnTotal(poolSize)
 				.setDnsResolver(dnsResolver)
 				.build();
 	}
@@ -279,6 +317,22 @@ public class HttpGetter {
 				.build();
 	}
 	public static class SchemeNotAllowedException extends Exception {
 		private static final long serialVersionUID = 1L;
 		public SchemeNotAllowedException(String scheme) {
 			super("Scheme not allowed: " + scheme);
 		}
 	}
 	public static class HostNotAllowedException extends Exception {
 		private static final long serialVersionUID = 1L;
 		public HostNotAllowedException(String host) {
 			super("Host not allowed: " + host);
 		}
 	}
 	@Getter
 	public static class NotModifiedException extends Exception {
 		private static final long serialVersionUID = 1L;
--- a/commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java
@@ -11,8 +11,10 @@ import org.apache.hc.core5.net.URIBuilder;
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HostNotAllowedException;
 import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.HttpGetter.NotModifiedException;
 import com.commafeed.backend.HttpGetter.SchemeNotAllowedException;
 import com.commafeed.backend.HttpGetter.TooManyRequestsException;
 import com.commafeed.backend.model.Feed;
 import com.fasterxml.jackson.core.JsonPointer;
@@ -92,7 +94,8 @@ public class YoutubeFaviconFetcher extends AbstractFaviconFetcher {
 		return new Favicon(bytes, contentType);
 	}
-	private byte[] fetchForUser(String googleAuthKey, String userId) throws IOException, NotModifiedException, TooManyRequestsException {
+	private byte[] fetchForUser(String googleAuthKey, String userId)
 			throws IOException, NotModifiedException, TooManyRequestsException, HostNotAllowedException, SchemeNotAllowedException {
 		URI uri = UriBuilder.fromUri("https://www.googleapis.com/youtube/v3/channels")
 				.queryParam("part", "snippet")
 				.queryParam("key", googleAuthKey)
@@ -102,7 +105,7 @@ public class YoutubeFaviconFetcher extends AbstractFaviconFetcher {
 	}
 	private byte[] fetchForChannel(String googleAuthKey, String channelId)
-			throws IOException, NotModifiedException, TooManyRequestsException {
+			throws IOException, NotModifiedException, TooManyRequestsException, HostNotAllowedException, SchemeNotAllowedException {
 		URI uri = UriBuilder.fromUri("https://www.googleapis.com/youtube/v3/channels")
 				.queryParam("part", "snippet")
 				.queryParam("key", googleAuthKey)
@@ -112,7 +115,7 @@ public class YoutubeFaviconFetcher extends AbstractFaviconFetcher {
 	}
 	private byte[] fetchForPlaylist(String googleAuthKey, String playlistId)
-			throws IOException, NotModifiedException, TooManyRequestsException {
+			throws IOException, NotModifiedException, TooManyRequestsException, HostNotAllowedException, SchemeNotAllowedException {
 		URI uri = UriBuilder.fromUri("https://www.googleapis.com/youtube/v3/playlists")
 				.queryParam("part", "snippet")
 				.queryParam("key", googleAuthKey)
--- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedFetcher.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedFetcher.java
@@ -10,9 +10,11 @@ import org.apache.commons.lang3.StringUtils;
 import com.commafeed.backend.Digests;
 import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HostNotAllowedException;
 import com.commafeed.backend.HttpGetter.HttpRequest;
 import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.HttpGetter.NotModifiedException;
 import com.commafeed.backend.HttpGetter.SchemeNotAllowedException;
 import com.commafeed.backend.HttpGetter.TooManyRequestsException;
 import com.commafeed.backend.feed.parser.FeedParser;
 import com.commafeed.backend.feed.parser.FeedParserResult;
@@ -41,8 +43,8 @@ public class FeedFetcher {
 	}
 	public FeedFetcherResult fetch(String feedUrl, boolean extractFeedUrlFromHtml, String lastModified, String eTag,
-			Instant lastPublishedDate, String lastContentHash)
+			Instant lastPublishedDate, String lastContentHash) throws FeedException, IOException, NotModifiedException,
-			throws FeedException, IOException, NotModifiedException, TooManyRequestsException {
+			TooManyRequestsException, SchemeNotAllowedException, HostNotAllowedException {
 		log.debug("Fetching feed {}", feedUrl);
 		HttpResult result = getter.get(HttpRequest.builder(feedUrl).lastModified(lastModified).eTag(eTag).build());
--- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshIntervalCalculator.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshIntervalCalculator.java
@@ -2,89 +2,83 @@ package com.commafeed.backend.feed;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.InstantSource;
 import java.time.temporal.ChronoUnit;
 import org.apache.commons.lang3.ObjectUtils;
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.CommaFeedConfiguration.FeedRefreshErrorHandling;
 import com.google.common.primitives.Longs;
 import jakarta.inject.Singleton;
@Singleton
 public class FeedRefreshIntervalCalculator {
-	private final Duration refreshInterval;
+	private final Duration interval;
-	private final boolean empiricalInterval;
+	private final Duration maxInterval;
 	private final boolean empirical;
 	private final FeedRefreshErrorHandling errorHandling;
 	private final InstantSource instantSource;
-	public FeedRefreshIntervalCalculator(CommaFeedConfiguration config) {
+	public FeedRefreshIntervalCalculator(CommaFeedConfiguration config, InstantSource instantSource) {
-		this.refreshInterval = config.feedRefresh().interval();
+		this.interval = config.feedRefresh().interval();
-		this.empiricalInterval = config.feedRefresh().intervalEmpirical();
+		this.maxInterval = config.feedRefresh().maxInterval();
 		this.empirical = config.feedRefresh().intervalEmpirical();
 		this.errorHandling = config.feedRefresh().errors();
 		this.instantSource = instantSource;
 	}
-	public Instant onFetchSuccess(Instant publishedDate, Long averageEntryInterval) {
+	public Instant onFetchSuccess(Instant publishedDate, Long averageEntryInterval, Duration validFor) {
-		Instant defaultRefreshInterval = getDefaultRefreshInterval();
+		Instant instant = empirical ? computeEmpiricalRefreshInterval(publishedDate, averageEntryInterval)
-		return empiricalInterval ? computeEmpiricalRefreshInterval(publishedDate, averageEntryInterval, defaultRefreshInterval)
+				: instantSource.instant().plus(interval);
-				: defaultRefreshInterval;
+		return constrainToBounds(ObjectUtils.max(instant, instantSource.instant().plus(validFor)));
 	}
 	public Instant onFeedNotModified(Instant publishedDate, Long averageEntryInterval) {
-		return onFetchSuccess(publishedDate, averageEntryInterval);
+		return onFetchSuccess(publishedDate, averageEntryInterval, Duration.ZERO);
 	}
-	public Instant onTooManyRequests(Instant retryAfter) {
+	public Instant onTooManyRequests(Instant retryAfter, int errorCount) {
-		Instant defaultRefreshInterval = getDefaultRefreshInterval();
+		return constrainToBounds(ObjectUtils.max(retryAfter, onFetchError(errorCount)));
 		if (retryAfter == null) {
 			return defaultRefreshInterval;
 		}
 		return ObjectUtils.max(retryAfter, defaultRefreshInterval);
 	}
 	public Instant onFetchError(int errorCount) {
-		int retriesBeforeDisable = 3;
+		if (errorCount < errorHandling.retriesBeforeBackoff()) {
-		if (errorCount < retriesBeforeDisable || !empiricalInterval) {
+			return constrainToBounds(instantSource.instant().plus(interval));
 			return getDefaultRefreshInterval();
 		}
-		int disabledHours = Math.min(24 * 7, errorCount - retriesBeforeDisable + 1);
+		Duration retryInterval = errorHandling.backoffInterval().multipliedBy(errorCount - errorHandling.retriesBeforeBackoff() + 1L);
-		return Instant.now().plus(Duration.ofHours(disabledHours));
+		return constrainToBounds(instantSource.instant().plus(retryInterval));
 	}
-	private Instant getDefaultRefreshInterval() {
+	private Instant computeEmpiricalRefreshInterval(Instant publishedDate, Long averageEntryInterval) {
-		return Instant.now().plus(refreshInterval);
+		Instant now = instantSource.instant();
 	}
 	private Instant computeEmpiricalRefreshInterval(Instant publishedDate, Long averageEntryInterval, Instant defaultRefreshInterval) {
 		Instant now = Instant.now();
 		if (publishedDate == null) {
-			// feed with no entries, recheck in 24 hours
+			return now.plus(maxInterval);
-			return now.plus(Duration.ofHours(24));
+		}
-		} else if (ChronoUnit.DAYS.between(publishedDate, now) >= 30) {
+
-			// older than a month, recheck in 24 hours
+		long daysSinceLastPublication = ChronoUnit.DAYS.between(publishedDate, now);
-			return now.plus(Duration.ofHours(24));
+		if (daysSinceLastPublication >= 30) {
-		} else if (ChronoUnit.DAYS.between(publishedDate, now) >= 14) {
+			return now.plus(maxInterval);
-			// older than two weeks, recheck in 12 hours
+		} else if (daysSinceLastPublication >= 14) {
-			return now.plus(Duration.ofHours(12));
+			return now.plus(maxInterval.dividedBy(2));
-		} else if (ChronoUnit.DAYS.between(publishedDate, now) >= 7) {
+		} else if (daysSinceLastPublication >= 7) {
-			// older than a week, recheck in 6 hours
+			return now.plus(maxInterval.dividedBy(4));
 			return now.plus(Duration.ofHours(6));
 		} else if (averageEntryInterval != null) {
 			// use average time between entries to decide when to refresh next, divided by factor
 			int factor = 2;
-
+			long millis = Longs.constrainToRange(averageEntryInterval / factor, interval.toMillis(), maxInterval.dividedBy(4).toMillis());
-			// not more than 6 hours
+			return now.plusMillis(millis);
 			long date = Math.min(now.plus(Duration.ofHours(6)).toEpochMilli(), now.toEpochMilli() + averageEntryInterval / factor);
 			// not less than default refresh interval
 			date = Math.max(defaultRefreshInterval.toEpochMilli(), date);
 			return Instant.ofEpochMilli(date);
 		} else {
-			// unknown case, recheck in 24 hours
+			// unknown case
-			return now.plus(Duration.ofHours(24));
+			return now.plus(maxInterval);
 		}
 	}
 	private Instant constrainToBounds(Instant instant) {
 		return ObjectUtils.max(ObjectUtils.min(instant, instantSource.instant().plus(maxInterval)), instantSource.instant().plus(interval));
 	}
 }
--- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java
@@ -6,7 +6,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import com.codahale.metrics.Meter;
@@ -78,9 +77,8 @@ public class FeedRefreshWorker {
 			feed.setErrorCount(0);
 			feed.setMessage(null);
-			feed.setDisabledUntil(ObjectUtils.max(
+			feed.setDisabledUntil(refreshIntervalCalculator.onFetchSuccess(result.feed().lastPublishedDate(),
-					refreshIntervalCalculator.onFetchSuccess(result.feed().lastPublishedDate(), result.feed().averageEntryInterval()),
+					result.feed().averageEntryInterval(), result.validFor()));
 					Instant.now().plus(result.validFor())));
 			return new FeedRefreshWorkerResult(feed, entries);
 		} catch (NotModifiedException e) {
@@ -104,7 +102,7 @@ public class FeedRefreshWorker {
 			feed.setErrorCount(feed.getErrorCount() + 1);
 			feed.setMessage("Server indicated that we are sending too many requests");
-			feed.setDisabledUntil(refreshIntervalCalculator.onTooManyRequests(e.getRetryAfter()));
+			feed.setDisabledUntil(refreshIntervalCalculator.onTooManyRequests(e.getRetryAfter(), feed.getErrorCount()));
 			return new FeedRefreshWorkerResult(feed, Collections.emptyList());
 		} catch (Exception e) {
--- a/commafeed-server/src/main/resources/application.properties
+++ b/commafeed-server/src/main/resources/application.properties
@@ -50,6 +50,7 @@ quarkus.native.add-all-charsets=true
 %test.commafeed.users.allow-registrations=true
 %test.commafeed.password-recovery-enabled=true
 %test.commafeed.http-client.cache.enabled=false
 %test.commafeed.http-client.block-local-addresses=false
 %test.commafeed.database.cleanup.entries-max-age=0
 %test.commafeed.feed-refresh.force-refresh-cooldown-duration=1m
--- a/commafeed-server/src/test/java/com/commafeed/backend/HttpGetterTest.java
+++ b/commafeed-server/src/test/java/com/commafeed/backend/HttpGetterTest.java
@@ -236,7 +236,7 @@ class HttpGetterTest {
 	}
 	@Test
-	void cacheSubsequentCalls() throws IOException, NotModifiedException, TooManyRequestsException {
+	void cacheSubsequentCalls() throws Exception {
 		AtomicInteger calls = new AtomicInteger();
 		this.mockServerClient.when(HttpRequest.request().withMethod("GET")).respond(req -> {
@@ -302,17 +302,16 @@ class HttpGetterTest {
 	class Compression {
 		@Test
-		void deflate() throws IOException, NotModifiedException, TooManyRequestsException {
+		void deflate() throws Exception {
 			supportsCompression("deflate", DeflaterOutputStream::new);
 		}
 		@Test
-		void gzip() throws IOException, NotModifiedException, TooManyRequestsException {
+		void gzip() throws Exception {
 			supportsCompression("gzip", GZIPOutputStream::new);
 		}
-		void supportsCompression(String encoding, CompressionOutputStreamFunction compressionOutputStreamFunction)
+		void supportsCompression(String encoding, CompressionOutputStreamFunction compressionOutputStreamFunction) throws Exception {
 				throws IOException, NotModifiedException, TooManyRequestsException {
 			String body = "my body";
 			HttpGetterTest.this.mockServerClient.when(HttpRequest.request().withMethod("GET")).respond(req -> {
@@ -340,4 +339,64 @@ class HttpGetterTest {
 	}
 	@Nested
 	class SchemeNotAllowed {
 		@Test
 		void file() {
 			Assertions.assertThrows(HttpGetter.SchemeNotAllowedException.class, () -> getter.get("file://localhost"));
 		}
 		@Test
 		void ftp() {
 			Assertions.assertThrows(HttpGetter.SchemeNotAllowedException.class, () -> getter.get("ftp://localhost"));
 		}
 	}
 	@Nested
 	class HostNotAllowed {
 		@BeforeEach
 		void init() {
 			Mockito.when(config.httpClient().blockLocalAddresses()).thenReturn(true);
 			getter = new HttpGetter(config, () -> NOW, Mockito.mock(CommaFeedVersion.class), Mockito.mock(MetricRegistry.class));
 		}
 		@Test
 		void localhost() {
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://localhost"));
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://127.0.0.1"));
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://2130706433"));
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://0x7F.0x00.0x00.0X01"));
 		}
 		@Test
 		void zero() {
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://0.0.0.0"));
 		}
 		@Test
 		void linkLocal() {
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://169.254.12.34"));
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://169.254.169.254"));
 		}
 		@Test
 		void multicast() {
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://224.2.3.4"));
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://239.255.255.254"));
 		}
 		@Test
 		void privateIpv4Ranges() {
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://10.0.0.1"));
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://172.16.0.1"));
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://192.168.0.1"));
 		}
 		@Test
 		void privateIpv6Ranges() {
 			Assertions.assertThrows(HttpGetter.HostNotAllowedException.class, () -> getter.get("http://fd12:3456:789a:1::1"));
 		}
 	}
 }
--- a/commafeed-server/src/test/java/com/commafeed/backend/feed/FeedRefreshIntervalCalculatorTest.java
+++ b/commafeed-server/src/test/java/com/commafeed/backend/feed/FeedRefreshIntervalCalculatorTest.java
@@ -0,0 +1,278 @@
 package com.commafeed.backend.feed;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.InstantSource;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.CommaFeedConfiguration.FeedRefreshErrorHandling;
@ExtendWith(MockitoExtension.class)
 class FeedRefreshIntervalCalculatorTest {
 	private static final Instant NOW = Instant.now();
 	private static final Duration DEFAULT_INTERVAL = Duration.ofHours(1);
 	private static final Duration MAX_INTERVAL = Duration.ofDays(1);
 	@Mock
 	private InstantSource instantSource;
 	@Mock
 	private CommaFeedConfiguration config;
 	@Mock
 	private FeedRefreshErrorHandling errorHandling;
 	private FeedRefreshIntervalCalculator calculator;
 	@BeforeEach
 	void setUp() {
 		Mockito.when(instantSource.instant()).thenReturn(NOW);
 		Mockito.when(config.feedRefresh()).thenReturn(Mockito.mock(CommaFeedConfiguration.FeedRefresh.class));
 		Mockito.when(config.feedRefresh().interval()).thenReturn(DEFAULT_INTERVAL);
 		Mockito.when(config.feedRefresh().maxInterval()).thenReturn(MAX_INTERVAL);
 		Mockito.when(config.feedRefresh().errors()).thenReturn(errorHandling);
 		calculator = new FeedRefreshIntervalCalculator(config, instantSource);
 	}
 	@Nested
 	class FetchSuccess {
 		@Nested
 		class EmpiricalDisabled {
 			@ParameterizedTest
 			@ValueSource(longs = { 0, 1, 300, 86400000L })
 			void withoutValidFor(long averageEntryInterval) {
 				// averageEntryInterval is ignored when empirical is disabled
 				Instant result = calculator.onFetchSuccess(NOW.minus(Duration.ofDays(5)), averageEntryInterval, Duration.ZERO);
 				Assertions.assertEquals(NOW.plus(DEFAULT_INTERVAL), result);
 			}
 			@Test
 			void withValidForGreaterThanMaxInterval() {
 				Instant result = calculator.onFetchSuccess(NOW.minus(Duration.ofDays(5)), 1L, MAX_INTERVAL.plusDays(1));
 				Assertions.assertEquals(NOW.plus(MAX_INTERVAL), result);
 			}
 			@Test
 			void withValidForLowerThanMaxInterval() {
 				Instant result = calculator.onFetchSuccess(NOW.minus(Duration.ofDays(5)), 1L, MAX_INTERVAL.minusSeconds(1));
 				Assertions.assertEquals(NOW.plus(MAX_INTERVAL).minusSeconds(1), result);
 			}
 		}
 		@Nested
 		class EmpiricalEnabled {
 			@BeforeEach
 			void setUp() {
 				Mockito.when(config.feedRefresh().intervalEmpirical()).thenReturn(true);
 				calculator = new FeedRefreshIntervalCalculator(config, instantSource);
 			}
 			@Test
 			void withNullPublishedDate() {
 				Instant result = calculator.onFetchSuccess(null, 1L, Duration.ZERO);
 				Assertions.assertEquals(NOW.plus(MAX_INTERVAL), result);
 			}
 			@Test
 			void with31DaysOldPublishedDate() {
 				Instant result = calculator.onFetchSuccess(NOW.minus(Duration.ofDays(31)), 1L, Duration.ZERO);
 				Assertions.assertEquals(NOW.plus(MAX_INTERVAL), result);
 			}
 			@Test
 			void with15DaysOldPublishedDate() {
 				Instant result = calculator.onFetchSuccess(NOW.minus(Duration.ofDays(15)), 1L, Duration.ZERO);
 				Assertions.assertEquals(NOW.plus(MAX_INTERVAL.dividedBy(2)), result);
 			}
 			@Test
 			void with8DaysOldPublishedDate() {
 				Instant result = calculator.onFetchSuccess(NOW.minus(Duration.ofDays(8)), 1L, Duration.ZERO);
 				Assertions.assertEquals(NOW.plus(MAX_INTERVAL.dividedBy(4)), result);
 			}
 			@Nested
 			class FiveDaysOld {
 				@Test
 				void averageBetweenBounds() {
 					Instant result = calculator.onFetchSuccess(NOW.minus(Duration.ofDays(5)), Duration.ofHours(4).toMillis(),
 							Duration.ZERO);
 					Assertions.assertEquals(NOW.plus(Duration.ofHours(2)), result);
 				}
 				@Test
 				void averageBelowMinimum() {
 					Instant result = calculator.onFetchSuccess(NOW.minus(Duration.ofDays(5)), 10L, Duration.ZERO);
 					Assertions.assertEquals(NOW.plus(DEFAULT_INTERVAL), result);
 				}
 				@Test
 				void averageAboveMaximum() {
 					Instant result = calculator.onFetchSuccess(NOW.minus(Duration.ofDays(5)), Long.MAX_VALUE, Duration.ZERO);
 					Assertions.assertEquals(NOW.plus(MAX_INTERVAL.dividedBy(4)), result);
 				}
 				@Test
 				void noAverage() {
 					Instant result = calculator.onFetchSuccess(NOW.minus(Duration.ofDays(5)), null, Duration.ZERO);
 					Assertions.assertEquals(NOW.plus(MAX_INTERVAL), result);
 				}
 			}
 		}
 	}
 	@Nested
 	class FeedNotModified {
 		@Nested
 		class EmpiricalDisabled {
 			@ParameterizedTest
 			@ValueSource(longs = { 0, 1, 300, 86400000L })
 			void withoutValidFor(long averageEntryInterval) {
 				// averageEntryInterval is ignored when empirical is disabled
 				Instant result = calculator.onFeedNotModified(NOW.minus(Duration.ofDays(5)), averageEntryInterval);
 				Assertions.assertEquals(NOW.plus(DEFAULT_INTERVAL), result);
 			}
 		}
 		@Nested
 		class EmpiricalEnabled {
 			@BeforeEach
 			void setUp() {
 				Mockito.when(config.feedRefresh().intervalEmpirical()).thenReturn(true);
 				calculator = new FeedRefreshIntervalCalculator(config, instantSource);
 			}
 			@Test
 			void withNullPublishedDate() {
 				Instant result = calculator.onFeedNotModified(null, 1L);
 				Assertions.assertEquals(NOW.plus(MAX_INTERVAL), result);
 			}
 			@Test
 			void with31DaysOldPublishedDate() {
 				Instant result = calculator.onFeedNotModified(NOW.minus(Duration.ofDays(31)), 1L);
 				Assertions.assertEquals(NOW.plus(MAX_INTERVAL), result);
 			}
 			@Test
 			void with15DaysOldPublishedDate() {
 				Instant result = calculator.onFeedNotModified(NOW.minus(Duration.ofDays(15)), 1L);
 				Assertions.assertEquals(NOW.plus(MAX_INTERVAL.dividedBy(2)), result);
 			}
 			@Test
 			void with8DaysOldPublishedDate() {
 				Instant result = calculator.onFeedNotModified(NOW.minus(Duration.ofDays(8)), 1L);
 				Assertions.assertEquals(NOW.plus(MAX_INTERVAL.dividedBy(4)), result);
 			}
 			@Nested
 			class FiveDaysOld {
 				@Test
 				void averageBetweenBounds() {
 					Instant result = calculator.onFeedNotModified(NOW.minus(Duration.ofDays(5)), Duration.ofHours(4).toMillis());
 					Assertions.assertEquals(NOW.plus(Duration.ofHours(2)), result);
 				}
 				@Test
 				void averageBelowMinimum() {
 					Instant result = calculator.onFeedNotModified(NOW.minus(Duration.ofDays(5)), 10L);
 					Assertions.assertEquals(NOW.plus(DEFAULT_INTERVAL), result);
 				}
 				@Test
 				void averageAboveMaximum() {
 					Instant result = calculator.onFeedNotModified(NOW.minus(Duration.ofDays(5)), Long.MAX_VALUE);
 					Assertions.assertEquals(NOW.plus(MAX_INTERVAL.dividedBy(4)), result);
 				}
 				@Test
 				void noAverage() {
 					Instant result = calculator.onFeedNotModified(NOW.minus(Duration.ofDays(5)), null);
 					Assertions.assertEquals(NOW.plus(MAX_INTERVAL), result);
 				}
 			}
 		}
 	}
 	@Nested
 	class FetchError {
 		@BeforeEach
 		void setUp() {
 			Mockito.when(config.feedRefresh().errors().retriesBeforeBackoff()).thenReturn(3);
 		}
 		@Test
 		void lowErrorCount() {
 			Instant result = calculator.onFetchError(1);
 			Assertions.assertEquals(NOW.plus(DEFAULT_INTERVAL), result);
 		}
 		@Test
 		void highErrorCount() {
 			Mockito.when(config.feedRefresh().errors().backoffInterval()).thenReturn(Duration.ofHours(1));
 			Instant result = calculator.onFetchError(5);
 			Assertions.assertEquals(NOW.plus(Duration.ofHours(3)), result);
 		}
 		@Test
 		void veryHighErrorCount() {
 			Mockito.when(config.feedRefresh().errors().backoffInterval()).thenReturn(Duration.ofHours(1));
 			Instant result = calculator.onFetchError(100000);
 			Assertions.assertEquals(NOW.plus(MAX_INTERVAL), result);
 		}
 	}
 	@Nested
 	class TooManyRequests {
 		@BeforeEach
 		void setUp() {
 			Mockito.when(config.feedRefresh().errors().retriesBeforeBackoff()).thenReturn(3);
 		}
 		@Test
 		void withRetryAfterZero() {
 			Instant result = calculator.onTooManyRequests(NOW, 1);
 			Assertions.assertEquals(NOW.plus(DEFAULT_INTERVAL), result);
 		}
 		@Test
 		void withRetryAfterLowerThanInterval() {
 			Instant retryAfter = NOW.plus(DEFAULT_INTERVAL.minusSeconds(10));
 			Instant result = calculator.onTooManyRequests(retryAfter, 1);
 			Assertions.assertEquals(NOW.plus(DEFAULT_INTERVAL), result);
 		}
 		@Test
 		void withRetryAfterBetweenBounds() {
 			Instant retryAfter = NOW.plus(DEFAULT_INTERVAL.plusSeconds(10));
 			Instant result = calculator.onTooManyRequests(retryAfter, 1);
 			Assertions.assertEquals(retryAfter, result);
 		}
 		@Test
 		void withRetryAfterGreaterThanMaxInterval() {
 			Instant retryAfter = NOW.plus(MAX_INTERVAL.plusSeconds(10));
 			Instant result = calculator.onTooManyRequests(retryAfter, 1);
 			Assertions.assertEquals(NOW.plus(MAX_INTERVAL), result);
 		}
 	}
 }
--- a/commafeed-server/src/test/java/com/commafeed/e2e/ReadingIT.java
+++ b/commafeed-server/src/test/java/com/commafeed/e2e/ReadingIT.java
@@ -3,6 +3,7 @@ package com.commafeed.e2e;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 import org.apache.commons.io.IOUtils;
 import org.apache.hc.core5.http.HttpStatus;
@@ -73,8 +74,8 @@ class ReadingIT {
 		main.getByRole(AriaRole.BUTTON, new Locator.GetByRoleOptions().setName("Next")).click();
 		main.getByRole(AriaRole.BUTTON, new Locator.GetByRoleOptions().setName("Subscribe").setExact(true)).click();
-		// click on subscription, "2" is actually the unread count
+		// click on subscription
-		sidebar.getByText("CommaFeed test feed2").click();
+		sidebar.getByText(Pattern.compile("CommaFeed test feed\\d+")).click();
 		// we have two unread entries
 		PlaywrightAssertions.assertThat(main.getByRole(AriaRole.ARTICLE)).hasCount(2);
@@ -94,8 +95,8 @@ class ReadingIT {
 						.extract()
 						.as(Entries.class), e -> e.getEntries().size() == 1);
-		// click on subscription, "1" is actually the unread count
+		// click on subscription
-		sidebar.getByText("CommaFeed test feed1").click();
+		sidebar.getByText(Pattern.compile("CommaFeed test feed\\d*")).click();
 		// only one unread entry now
 		PlaywrightAssertions.assertThat(main.getByRole(AriaRole.ARTICLE)).hasCount(1);
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>5.5.0</version>
+	<version>5.6.0</version>
 	<name>CommaFeed</name>
 	<packaging>pom</packaging>
Author	SHA1	Message	Date
Athou	54da4e6839	release 5.6.0	2025-02-16 14:14:30 +01:00
Athou	3a6b4c588c	PRs and renovate now build the docker images regardless of the branch/tag	2025-02-15 10:20:39 +01:00
Athou	48071b9fd1	PRs now build the docker images but don't push them	2025-02-15 10:18:16 +01:00
Athou	f519aa039f	block local addresses to prevent SSRF attacks	2025-02-14 16:20:04 +01:00
Athou	dc3e5476a1	reload the tree when we receive a websocket notification about an unknown feed	2025-02-14 16:16:07 +01:00
Athou	903035ecfc	formatting	2025-02-14 16:16:07 +01:00
Athou	13ad57da10	make sure the tree has been reloaded before navigating to the new feed subscription	2025-02-14 16:16:06 +01:00
Athou	44bc24c22a	ubuntu-22.04-arm is supposed to be more stable	2025-02-14 16:16:06 +01:00
Athou	97f90405fc	try to fix flaky IT test	2025-02-14 16:16:06 +01:00
renovate[bot]	0fc2a0b022	fix(deps): update dependency @monaco-editor/react to ^4.7.0	2025-02-13 19:39:46 +00:00
Jérémie Panzer	89eb641704	Merge pull request #1679 from Athou/renovate/graalvm-setup-graalvm-digest chore(deps): update graalvm/setup-graalvm digest to b0cb26a	2025-02-13 06:22:29 +01:00
renovate[bot]	c53da9f631	chore(deps): update graalvm/setup-graalvm digest to b0cb26a	2025-02-12 22:32:09 +00:00
renovate[bot]	998868e63a	fix(deps): update quarkus.version to v3.18.3	2025-02-12 18:26:21 +00:00
Athou	93f22d2351	reduce max interval to 4h	2025-02-12 18:17:39 +01:00
Athou	c3782bd7d2	also constrain to lower bound	2025-02-12 18:04:56 +01:00
Athou	f330349397	update documentation	2025-02-12 17:31:46 +01:00
Athou	99c973c8c2	change the default value of empirical interval calculation (#1677 )	2025-02-12 17:26:38 +01:00
Athou	469420b5bf	feed refresh engine previously hardcoded values are now configurable (#1677 )	2025-02-12 17:08:20 +01:00
Athou	bde556d41f	start to back off when we repeatedly receive a 429	2025-02-12 08:00:27 +01:00
Jérémie Panzer	bf6c2d7beb	Merge pull request #1678 from Athou/renovate/node-22.x chore(deps): update node.js to v22.14.0	2025-02-11 16:03:32 +01:00
renovate[bot]	fa62ca21e0	chore(deps): update node.js to v22.14.0	2025-02-11 11:47:44 +00:00
renovate[bot]	7dcf76da84	fix(deps): update dependency interweave to ^13.1.1	2025-02-10 21:40:32 +01:00
renovate[bot]	3dc80fa762	chore(deps): lock file maintenance	2025-02-10 01:47:04 +00:00