release 5.4.0

chore(deps): update dependency vitest to v3

.github/workflows/ci.yml

@@ -7,8 +7,57 @@ env:
   DOCKER_BUILD_SUMMARY: false
 
 jobs:
-  build-linux:
+  build:
+    strategy:
+      matrix:
+        os: [ "ubuntu-latest", "ubuntu-24.04-arm", "windows-latest" ]
+        database: [ "h2", "postgresql", "mysql", "mariadb" ]
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      # Checkout
+      - name: Configure git to checkout as-is
+        run: git config --global core.autocrlf false
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Setup
+      - name: Set up GraalVM
+        uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: "graalvm"
+          cache: "maven"
+
+      - name: Install Playwright dependencies
+        run: sudo apt-get install -y libgbm1
+        if: matrix.os != 'windows-latest'
+
+      # Build & Test
+      - name: Build with Maven
+        run: mvn --batch-mode --no-transfer-progress install -Pnative -P${{ matrix.database }} -DskipTests=${{ matrix.os == 'windows-latest' && matrix.database != 'h2' }}
+
+      # Upload artifacts
+      - name: Upload cross-platform app
+        uses: actions/upload-artifact@v4
+        with:
+          name: commafeed-${{ matrix.database }}-jvm
+          path: commafeed-server/target/commafeed-*.zip
+          overwrite: true
+
+      - name: Upload native executable
+        uses: actions/upload-artifact@v4
+        with:
+          name: commafeed-${{ matrix.database }}-${{ runner.os }}-${{ runner.arch }}
+          path: commafeed-server/target/commafeed-*-runner*
+
+  docker:
+    needs: build
     runs-on: ubuntu-latest
+
     strategy:
       matrix:
         database: [ "h2", "postgresql", "mysql", "mariadb" ]
@@ -27,29 +76,29 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: "graalvm"
-          cache: "maven"
+      - name: Install required packages
+        run: sudo apt-get install -y rename unzip
 
-      # Build & Test
-      - name: Build with Maven
-        run: mvn --batch-mode --no-transfer-progress install -Pnative -P${{ matrix.database }}
-
-      # Upload artifacts
-      - name: Upload cross-platform app
-        uses: actions/upload-artifact@v4
+      # Prepare artifacts
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
         with:
-          name: commafeed-${{ matrix.database }}-jvm
-          path: commafeed-server/target/commafeed-*.zip
+          pattern: commafeed-${{ matrix.database }}-*
+          path: ./artifacts
+          merge-multiple: true
 
-      - name: Upload native executable
-        uses: actions/upload-artifact@v4
-        with:
-          name: commafeed-${{ matrix.database }}-${{ runner.os }}-${{ runner.arch }}
-          path: commafeed-server/target/commafeed-*-runner
+      - name: Set the exec flag on the native executables
+        run: chmod +x artifacts/*-runner
+
+      - name: Rename native executables to match buildx TARGETARCH
+        run: |
+          rename 's/x86_64/amd64/g' artifacts/*
+          rename 's/aarch_64/arm64/g' artifacts/*
+
+      - name: Unzip jvm package
+        run: |
+          unzip artifacts/*-jvm.zip -d artifacts/extracted-jvm-package
+          rename 's/commafeed-.*/quarkus-app/g' artifacts/extracted-jvm-package/*
 
       # Docker
       - name: Login to Container Registry
@@ -67,7 +116,7 @@ jobs:
           context: .
           file: commafeed-server/src/main/docker/Dockerfile.native
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64/v8
           tags: |
             athou/commafeed:latest-${{ matrix.database }}
             athou/commafeed:${{ github.ref_name }}-${{ matrix.database }}
@@ -92,7 +141,7 @@ jobs:
           context: .
           file: commafeed-server/src/main/docker/Dockerfile.native
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64/v8
           tags: athou/commafeed:master-${{ matrix.database }}
 
       - name: Docker build and push master - jvm
@@ -105,46 +154,10 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
           tags: athou/commafeed:master-${{ matrix.database }}-jvm
 
-  build-windows:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        database: [ "h2", "postgresql", "mysql", "mariadb" ]
-
-    steps:
-      # Checkout
-      - name: Configure git to checkout as-is
-        run: git config --global core.autocrlf false
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      # Setup
-      - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: "graalvm"
-          cache: "maven"
-
-      # Build & Test
-      - name: Build with Maven
-        run: mvn --batch-mode --no-transfer-progress install -Pnative -P${{ matrix.database }} -DskipTests=${{ matrix.database != 'h2' }}
-
-      # Upload artifacts
-      - name: Upload native executable
-        uses: actions/upload-artifact@v4
-        with:
-          name: commafeed-${{ matrix.database }}-${{ runner.os }}-${{ runner.arch }}
-          path: commafeed-server/target/commafeed-*-runner.exe
-
   release:
     runs-on: ubuntu-latest
     needs:
-      - build-linux
-      - build-windows
+      - build
     if: github.ref_type == 'tag'
 
     steps:
@@ -160,6 +173,9 @@ jobs:
           path: ./artifacts
           merge-multiple: true
 
+      - name: Set the exec flag on the native executables
+        run: chmod +x artifacts/*-runner
+
       - name: Extract Changelog Entry
         uses: mindsers/changelog-reader-action@v2
         id: changelog_reader

CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## [5.4.0]
+
+- An arm64 native executable is now available for download on the releases page
+- The native executable Docker image now supports arm64
+- Fixed an issue with feeds that declared an invalid DOCTYPE (#1260)
+
+## [5.3.6]
+
+- Ignore invalid Cache-Control header values (#1619)
+
+## [5.3.5]
+
+- Fixed an issue with the aspect ratio of images of some feeds (#1595)
+- CommaFeed now honors the Cache-Control response header and will not try to refresh a feed sooner than its max-age property (#1615)
+- Added support for compilation with JDK 23+. If you're building CommaFeed from sources with a JDK 17 or 21, you may need to update it to the most recent patch version to support `-proc:full` (#1618)
+
+## [5.3.4]
+
+- Added support for Internationalized Domain Names (#1588)
+
+## [5.3.3]
+
+- Removed image bottom margins (#1587)
+
+## [5.3.2]
+
+- Fixed an issue that could cause some images from not being rendered correctly (#1587)
+
+## [5.3.1]
+
+- Fixed an issue that could cause some HTTP feeds to return a 400 error (#1572)
+
+## [5.3.0]
+
+- Added a setting to set a cooldown on the "fetch all my feeds" action, disabled by default (#1556)
+- Fixed an issue that could cause entries to not correctly load when using the "next" header button (#1557)
+
 ## [5.2.0]
 
 - Added an option to keep a number of entries above the selected entry when scrolling

README.md

@@ -100,7 +100,7 @@ There are multiple ways to configure CommaFeed:
 
 The properties file is recommended because CommaFeed will be able to warn about invalid properties and typos.
 
-All [CommaFeed settings](commafeed-server/doc/commafeed.adoc) are optional and have sensible default values.
+All [CommaFeed settings](commafeed-server/doc/commafeed.md) are optional and have sensible default values.
 
 When logging in, credentials are stored in an encrypted cookie. The encryption key is randomly generated at startup,
 meaning that you will have to log back in after each restart of the application. To prevent this, you can set the
@@ -114,18 +114,18 @@ The default user is `admin` and the default password is `admin`.
 
 When CommaFeed is up and running, you can subscribe to [this feed](https://github.com/Athou/commafeed/releases.atom) to be notified of new releases.
 
-### Memory management (`jvm` package only)
+### Memory management
 
 The Java Virtual Machine (JVM) is rather greedy by default and will not release unused memory to the
 operating system. This is because acquiring memory from the operating system is a relatively expensive operation.
 This can be problematic on systems with limited memory.
 
-#### Hard limit
+#### Hard limit (`native` and `jvm` packages)
 
 The JVM can be configured to use a maximum amount of memory with the `-Xmx` parameter.
 For example, to limit the JVM to 256MB of memory, use `-Xmx256m`.
 
-#### Dynamic sizing
+#### Dynamic sizing (`jvm` package)
 
 In addition to the previous setting, the JVM can be configured to release unused memory to the operating system with the
 following parameters:
@@ -137,7 +137,7 @@ and [here](https://docs.oracle.com/en/java/javase/17/gctuning/factors-affecting-
 more
 information.
 
-#### OpenJ9
+#### OpenJ9 (`jvm` package)
 
 The [OpenJ9](https://eclipse.dev/openj9/) JVM is a more memory-efficient alternative to the HotSpot JVM, at the cost of
 slightly slower throughput.

commafeed-client/biome.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://biomejs.dev/schemas/1.9.1/schema.json",
+    "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
     "formatter": {
         "indentStyle": "space",
         "indentWidth": 4,

commafeed-client/package.json

@@ -15,24 +15,23 @@
         "i18n:extract": "lingui extract --clean"
     },
     "dependencies": {
-        "@emotion/react": "^11.13.3",
-        "@fontsource/open-sans": "^5.1.0",
-        "@lingui/core": "^4.11.4",
-        "@lingui/macro": "^4.11.4",
-        "@lingui/react": "^4.11.4",
-        "@mantine/core": "^7.12.2",
-        "@mantine/form": "^7.12.2",
-        "@mantine/hooks": "^7.12.2",
-        "@mantine/modals": "^7.12.2",
-        "@mantine/notifications": "^7.12.2",
-        "@mantine/spotlight": "^7.12.2",
+        "@emotion/react": "^11.14.0",
+        "@fontsource/open-sans": "^5.1.1",
+        "@mantine/core": "^7.16.0",
+        "@mantine/form": "^7.16.0",
+        "@mantine/hooks": "^7.16.0",
+        "@mantine/modals": "^7.16.0",
+        "@mantine/notifications": "^7.16.0",
+        "@mantine/spotlight": "^7.16.0",
+        "@lingui/core": "^5.1.2",
+        "@lingui/react": "^5.1.2",
         "@monaco-editor/react": "^4.6.0",
-        "@reduxjs/toolkit": "^2.2.7",
-        "axios": "^1.7.7",
+        "@reduxjs/toolkit": "^2.5.0",
+        "axios": "^1.7.9",
         "dayjs": "^1.11.13",
         "escape-string-regexp": "^5.0.0",
         "interweave": "^13.1.0",
-        "monaco-editor": "^0.51.0",
+        "monaco-editor": "^0.52.2",
         "mousetrap": "^1.6.5",
         "react": "^18.3.1",
         "react-async-hook": "^4.0.0",
@@ -42,38 +41,40 @@
         "react-draggable": "^4.4.6",
         "react-ga4": "^2.1.0",
         "react-helmet": "^6.1.0",
-        "react-icons": "^5.3.0",
+        "react-icons": "^5.4.0",
         "react-infinite-scroller": "^1.2.6",
-        "react-redux": "^9.1.2",
-        "react-router-dom": "^6.26.2",
-        "react-swipeable": "^7.0.1",
-        "redoc": "^2.1.5",
+        "react-redux": "^9.2.0",
+        "react-router-dom": "^7.1.2",
+        "react-swipeable": "^7.0.2",
+        "redoc": "^2.3.0",
+        "style-to-object": "^1.0.8",
         "throttle-debounce": "^5.0.2",
         "tinycon": "^0.6.8",
-        "tss-react": "^4.9.13",
+        "tss-react": "^4.9.14",
         "websocket-heartbeat-js": "^1.1.3"
     },
     "devDependencies": {
-        "@biomejs/biome": "^1.9.1",
-        "@lingui/cli": "^4.11.4",
-        "@lingui/vite-plugin": "^4.11.4",
+        "@biomejs/biome": "^1.9.4",
+        "@lingui/babel-plugin-lingui-macro": "^5.1.2",
+        "@lingui/cli": "^5.1.2",
+        "@lingui/vite-plugin": "^5.1.2",
         "@types/mousetrap": "^1.6.15",
-        "@types/react": "^18.3.7",
-        "@types/react-dom": "^18.3.0",
+        "@types/react": "^18.3.18",
+        "@types/react-dom": "^18.3.5",
         "@types/react-helmet": "^6.1.11",
         "@types/react-infinite-scroller": "^1.2.5",
         "@types/swagger-ui-react": "^4.18.3",
         "@types/throttle-debounce": "^5.0.2",
-        "@types/tinycon": "^0.6.5",
-        "@vitejs/plugin-react": "^4.3.1",
+        "@types/tinycon": "^0.6.7",
+        "@vitejs/plugin-react": "^4.3.4",
         "babel-plugin-macros": "^3.1.0",
-        "jsdom": "^25.0.0",
-        "rollup-plugin-visualizer": "^5.12.0",
-        "typescript": "^5.6.2",
-        "vite": "^5.4.6",
+        "jsdom": "^26.0.0",
+        "rollup-plugin-visualizer": "^5.13.1",
+        "typescript": "^5.7.3",
+        "vite": "^6.0.7",
         "vite-plugin-checker": "^0.8.0",
-        "vite-tsconfig-paths": "^5.0.1",
-        "vitest": "^2.1.1",
+        "vite-tsconfig-paths": "^5.1.4",
+        "vitest": "^3.0.1",
         "vitest-mock-extended": "^2.0.2"
     }
 }

commafeed-client/pom.xml

@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.2.0</version>
+		<version>5.4.0</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>
 
 	<properties>
 		<!-- renovate: datasource=node-version depName=node -->
-		<node.version>v20.17.0</node.version>
+		<node.version>v22.13.0</node.version>
 		<!-- renovate: datasource=npm depName=npm -->
-		<npm.version>10.8.3</npm.version>
+		<npm.version>11.0.0</npm.version>
 	</properties>
 
 	<build>
@@ -23,7 +23,7 @@
 			<plugin>
 				<groupId>com.github.eirslett</groupId>
 				<artifactId>frontend-maven-plugin</artifactId>
-				<version>1.15.0</version>
+				<version>1.15.1</version>
 				<?m2e ignore?>
 				<executions>
 					<execution>

commafeed-client/src/app/constants.ts

@@ -1,4 +1,4 @@
-import { t } from "@lingui/macro"
+import { t } from "@lingui/core/macro"
 import type { IconType } from "react-icons"
 import { FaAt } from "react-icons/fa"
 import { SiBuffer, SiFacebook, SiGmail, SiInstapaper, SiPocket, SiTumblr, SiX } from "react-icons/si"

commafeed-client/src/app/entries/thunks.ts

@@ -230,7 +230,7 @@ export const selectPreviousEntry = createAppAsyncThunk(
 )
 export const selectNextEntry = createAppAsyncThunk(
     "entries/entry/selectNext",
-    (
+    async (
         arg: {
             expand: boolean
             markAsRead: boolean
@@ -239,12 +239,20 @@ export const selectNextEntry = createAppAsyncThunk(
         thunkApi
     ) => {
         const state = thunkApi.getState()
-        const { entries } = state.entries
+        const { entries, hasMore, loading } = state.entries
         const nextIndex = entries.findIndex(e => e.id === state.entries.selectedEntryId) + 1
-        if (nextIndex < entries.length) {
+
+        // load more entries if needed
+        // this can happen if the last entry is too large to fit on the screen and the infinite loader doesn't trigger
+        if (nextIndex >= entries.length && hasMore && !loading) {
+            await thunkApi.dispatch(loadMoreEntries())
+        }
+
+        const entriesAfterLoading = thunkApi.getState().entries.entries
+        if (nextIndex < entriesAfterLoading.length) {
             thunkApi.dispatch(
                 selectEntry({
-                    entry: entries[nextIndex],
+                    entry: entriesAfterLoading[nextIndex],
                     expand: arg.expand,
                     markAsRead: arg.markAsRead,
                     scrollToEntry: arg.scrollToEntry,

commafeed-client/src/app/types.ts

@@ -220,6 +220,7 @@ export interface ServerInfo {
     websocketEnabled: boolean
     websocketPingInterval: number
     treeReloadInterval: number
+    forceRefreshCooldownDuration: number
 }
 
 export interface SharingSettings {
@@ -287,6 +288,7 @@ export interface UserModel {
     created: number
     lastLogin?: number
     admin: boolean
+    lastForceRefresh?: number
 }
 
 export interface AdminSaveUserRequest {

commafeed-client/src/app/user/slice.ts

@@ -1,4 +1,4 @@
-import { t } from "@lingui/macro"
+import { t } from "@lingui/core/macro"
 import { showNotification } from "@mantine/notifications"
 import { type PayloadAction, createSlice, isAnyOf } from "@reduxjs/toolkit"
 import type { LocalSettings, Settings, UserModel, ViewMode } from "app/types"

commafeed-client/src/components/Alert.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Box, Alert as MantineAlert } from "@mantine/core"
 import { Fragment } from "react"
 import { TbAlertCircle, TbAlertTriangle, TbCircleCheck } from "react-icons/tb"

commafeed-client/src/components/AnnouncementDialog.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Box, Dialog, Text } from "@mantine/core"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { setAnnouncementHash } from "app/user/slice"

commafeed-client/src/components/ImageWithPlaceholderWhileLoading.tsx

@@ -9,6 +9,7 @@ interface ImageWithPlaceholderWhileLoadingProps {
     title?: string
     width?: number
     height?: number | "auto"
+    style?: React.CSSProperties
     placeholderWidth?: number
     placeholderHeight?: number
     placeholderBackgroundColor?: string
@@ -42,6 +43,7 @@ export function ImageWithPlaceholderWhileLoading({
     src,
     title,
     width,
+    style,
 }: ImageWithPlaceholderWhileLoadingProps) {
     const { classes } = useStyles({
         placeholderWidth,
@@ -68,7 +70,11 @@ export function ImageWithPlaceholderWhileLoading({
                 width={width}
                 height={height}
                 onLoad={() => setLoading(false)}
-                style={{ display: loading ? "none" : "block" }}
+                style={{
+                    ...style,
+                    display: loading ? "none" : (style?.display ?? "initial"),
+                    height: style?.width ? "auto" : style?.height,
+                }}
             />
         </>
     )

commafeed-client/src/components/KeyboardShortcutsHelp.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Anchor, Box, Kbd, Stack, Table } from "@mantine/core"
 import { useOs } from "@mantine/hooks"
 import { Constants } from "app/constants"

commafeed-client/src/components/RelativeDate.tsx

@@ -1,15 +1,11 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Tooltip } from "@mantine/core"
 import { Constants } from "app/constants"
 import dayjs from "dayjs"
-import { useEffect, useState } from "react"
+import { useNow } from "hooks/useNow"
 
 export function RelativeDate(props: { date: Date | number | undefined }) {
-    const [now, setNow] = useState(new Date())
-    useEffect(() => {
-        const interval = setInterval(() => setNow(new Date()), 60 * 1000)
-        return () => clearInterval(interval)
-    }, [])
+    const now = useNow(60 * 1000)
 
     if (!props.date) return <Trans>N/A</Trans>
     const date = dayjs(props.date)

commafeed-client/src/components/admin/UserEdit.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Box, Button, Checkbox, Group, PasswordInput, Stack, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"

commafeed-client/src/components/content/BasicHtmlStyles.tsx

@@ -1,11 +1,24 @@
 import { TypographyStylesProvider } from "@mantine/core"
 import type { ReactNode } from "react"
+import { tss } from "tss"
 
 /**
  * This component is used to provide basic styles to html typography elements.
  *
  * see https://mantine.dev/core/typography-styles-provider/
  */
+
+const useStyles = tss.create(() => ({
+    // override mantine default typography styles
+    content: {
+        paddingLeft: 0,
+        "& img": {
+            marginBottom: 0,
+        },
+    },
+}))
+
 export const BasicHtmlStyles = (props: { children: ReactNode }) => {
-    return <TypographyStylesProvider pl={0}>{props.children}</TypographyStylesProvider>
+    const { classes } = useStyles()
+    return <TypographyStylesProvider className={classes.content}>{props.children}</TypographyStylesProvider>
 }

commafeed-client/src/components/content/Content.tsx

@@ -6,6 +6,7 @@ import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
 import escapeStringRegexp from "escape-string-regexp"
 import { type ChildrenNode, Interweave, type MatchResponse, Matcher, type Node, type TransformCallback } from "interweave"
 import React from "react"
+import styleToObject from "style-to-object"
 import { tss } from "tss"
 
 export interface ContentProps {
@@ -42,6 +43,7 @@ const transform: TransformCallback = node => {
         const nodeHeight = node.getAttribute("height")
         const width = nodeWidth ? Number.parseInt(nodeWidth, 10) : undefined
         const height = nodeHeight ? Number.parseInt(nodeHeight, 10) : undefined
+        const style = styleToObject(node.getAttribute("style") ?? "") ?? undefined
         const placeholderSize = calculatePlaceholderSize({
             width,
             height,
@@ -55,6 +57,7 @@ const transform: TransformCallback = node => {
                 title={title}
                 width={width}
                 height="auto"
+                style={style}
                 placeholderWidth={placeholderSize.width}
                 placeholderHeight={placeholderSize.height}
             />

commafeed-client/src/components/content/FeedEntries.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Box } from "@mantine/core"
 import { openModal } from "@mantine/modals"
 import { Constants } from "app/constants"
@@ -128,36 +128,28 @@ export function FeedEntries() {
     }, [dispatch, entries, viewMode, scrollMarks, scrollingToEntry])
 
     useMousetrap("r", async () => await dispatch(reloadEntries()))
-    useMousetrap("j", async () => {
-        // load more entries if needed
-        // this can happen if the last entry is too large to fit on the screen and the infinite loader doesn't trigger
-        if (hasMore && !loading && selectedEntry === entries[entries.length - 1]) {
-            await dispatch(loadMoreEntries())
-        }
-
-        await dispatch(
-            selectNextEntry({
-                expand: true,
-                markAsRead: true,
-                scrollToEntry: true,
-            })
-        )
-    })
-    useMousetrap("n", async () => {
-        // load more entries if needed
-        // this can happen if the last entry is too large to fit on the screen and the infinite loader doesn't trigger
-        if (hasMore && !loading && selectedEntry === entries[entries.length - 1]) {
-            await dispatch(loadMoreEntries())
-        }
-
-        await dispatch(
-            selectNextEntry({
-                expand: false,
-                markAsRead: false,
-                scrollToEntry: true,
-            })
-        )
-    })
+    useMousetrap(
+        "j",
+        async () =>
+            await dispatch(
+                selectNextEntry({
+                    expand: true,
+                    markAsRead: true,
+                    scrollToEntry: true,
+                })
+            )
+    )
+    useMousetrap(
+        "n",
+        async () =>
+            await dispatch(
+                selectNextEntry({
+                    expand: false,
+                    markAsRead: false,
+                    scrollToEntry: true,
+                })
+            )
+    )
     useMousetrap(
         "k",
         async () =>

commafeed-client/src/components/content/FeedEntryContextMenu.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Group } from "@mantine/core"
 import { Constants } from "app/constants"
 import { markEntriesUpToEntry, markEntry, starEntry } from "app/entries/thunks"

commafeed-client/src/components/content/FeedEntryFooter.tsx

@@ -1,4 +1,4 @@
-import { msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
 import { Group, Indicator, Popover, TagsInput } from "@mantine/core"
 import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "app/entries/thunks"

commafeed-client/src/components/content/ShareButtons.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { ActionIcon, Box, CopyButton, Divider, SimpleGrid } from "@mantine/core"
 import { Constants } from "app/constants"
 import { useAppSelector } from "app/store"

commafeed-client/src/components/content/add/AddCategory.tsx

@@ -1,5 +1,6 @@
-import { Trans, msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
 import { Box, Button, Group, Stack, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"

commafeed-client/src/components/content/add/CategorySelect.tsx

@@ -1,4 +1,4 @@
-import { msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
 import { Select, type SelectProps } from "@mantine/core"
 import type { ComboboxItem } from "@mantine/core/lib/components/Combobox/Combobox.types"

commafeed-client/src/components/content/add/ImportOpml.tsx

@@ -1,5 +1,6 @@
-import { Trans, msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
 import { Box, Button, FileInput, Group, Stack } from "@mantine/core"
 import { isNotEmpty, useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"

commafeed-client/src/components/content/add/Subscribe.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Box, Button, Group, Stack, Stepper, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"

commafeed-client/src/components/content/header/OpenExternalLink.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { ActionIcon, Anchor, Tooltip } from "@mantine/core"
 import { Constants } from "app/constants"
 import { markEntry } from "app/entries/thunks"

commafeed-client/src/components/content/header/Star.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { ActionIcon, Tooltip } from "@mantine/core"
 import { Constants } from "app/constants"
 import { starEntry } from "app/entries/thunks"

commafeed-client/src/components/header/Header.tsx

@@ -1,4 +1,4 @@
-import { msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
 import { Box, Center, CloseButton, Divider, Group, Indicator, Popover, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"

commafeed-client/src/components/header/MarkAllAsReadButton.tsx

@@ -1,4 +1,5 @@
-import { Trans, msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
+import { Trans } from "@lingui/react/macro"
 
 import { Button, Code, Group, Modal, Slider, Stack, Text } from "@mantine/core"
 import { markAllEntries } from "app/entries/thunks"

commafeed-client/src/components/header/ProfileMenu.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import {
     Box,
     Divider,
@@ -15,6 +15,9 @@ import { redirectToAbout, redirectToAdminUsers, redirectToDonate, redirectToMetr
 import { useAppDispatch, useAppSelector } from "app/store"
 import type { ViewMode } from "app/types"
 import { setViewMode } from "app/user/slice"
+import { reloadProfile } from "app/user/thunks"
+import dayjs from "dayjs"
+import { useNow } from "hooks/useNow"
 import { type ReactNode, useState } from "react"
 import {
     TbChartLine,
@@ -92,12 +95,19 @@ const viewModeData: ViewModeControlItem[] = [
 
 export function ProfileMenu(props: ProfileMenuProps) {
     const [opened, setOpened] = useState(false)
+    const now = useNow()
     const profile = useAppSelector(state => state.user.profile)
     const admin = useAppSelector(state => state.user.profile?.admin)
     const viewMode = useAppSelector(state => state.user.localSettings.viewMode)
+    const forceRefreshCooldownDuration = useAppSelector(state => state.server.serverInfos?.forceRefreshCooldownDuration)
     const dispatch = useAppDispatch()
     const { colorScheme, setColorScheme } = useMantineColorScheme()
 
+    const nextAvailableForceRefresh = profile?.lastForceRefresh
+        ? profile.lastForceRefresh + (forceRefreshCooldownDuration ?? 0)
+        : now.getTime()
+    const forceRefreshEnabled = nextAvailableForceRefresh <= now.getTime()
+
     const logout = () => {
         window.location.href = "logout"
     }
@@ -118,18 +128,32 @@ export function ProfileMenu(props: ProfileMenuProps) {
                 </Menu.Item>
                 <Menu.Item
                     leftSection={<TbWorldDownload size={iconSize} />}
-                    onClick={async () =>
-                        await client.feed.refreshAll().then(() => {
+                    disabled={!forceRefreshEnabled}
+                    onClick={async () => {
+                        setOpened(false)
+
+                        try {
+                            await client.feed.refreshAll()
+
+                            // reload profile to update last force refresh timestamp
+                            await dispatch(reloadProfile())
+
                             showNotification({
                                 message: <Trans>Your feeds have been queued for refresh.</Trans>,
                                 color: "green",
                                 autoClose: 1000,
                             })
-                            setOpened(false)
-                        })
-                    }
+                        } catch (error) {
+                            showNotification({
+                                message: <Trans>Force fetching feeds is not yet available.</Trans>,
+                                color: "red",
+                                autoClose: 2000,
+                            })
+                        }
+                    }}
                 >
                     <Trans>Fetch all my feeds now</Trans>
+                    {!forceRefreshEnabled && <span> ({dayjs.duration(nextAvailableForceRefresh - now.getTime()).format("HH:mm:ss")})</span>}
                 </Menu.Item>
 
                 <Divider />

commafeed-client/src/components/settings/CustomCodeSettings.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Box, Button, Group, Stack } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"

commafeed-client/src/components/settings/DisplaySettings.tsx

@@ -1,5 +1,6 @@
-import { Trans, msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
 import { Divider, Group, NumberInput, Radio, Select, SimpleGrid, Stack, Switch } from "@mantine/core"
 import type { ComboboxData } from "@mantine/core/lib/components/Combobox/Combobox.types"
 import { Constants } from "app/constants"

commafeed-client/src/components/settings/ProfileSettings.tsx

@@ -1,5 +1,6 @@
-import { Trans, msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
 import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { openConfirmModal } from "@mantine/modals"

commafeed-client/src/components/sidebar/Tree.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Box, Stack } from "@mantine/core"
 import { Constants } from "app/constants"
 import {

commafeed-client/src/components/sidebar/TreeSearch.tsx

@@ -1,5 +1,6 @@
-import { Trans, msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
 import { TextInput } from "@mantine/core"
 import { Spotlight, type SpotlightActionData, spotlight } from "@mantine/spotlight"
 import { redirectToFeed } from "app/redirect/thunks"

commafeed-client/src/hooks/useAppLoading.ts

@@ -1,4 +1,4 @@
-import { msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
 import { useAppSelector } from "app/store"
 

commafeed-client/src/hooks/useNow.ts

@@ -0,0 +1,10 @@
+import { useEffect, useState } from "react"
+
+export const useNow = (interval = 1000): Date => {
+    const [time, setTime] = useState(new Date())
+    useEffect(() => {
+        const t = setInterval(() => setTime(new Date()), interval)
+        return () => clearInterval(t)
+    }, [interval])
+    return time
+}

commafeed-client/src/locales/ar/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "تصفية التعبير"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "هل نسيت كلمة المرور؟"

commafeed-client/src/locales/ca/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Expressió de filtratge"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Heu oblidat la contrasenya?"

commafeed-client/src/locales/cs/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrování výrazu"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Zapomněli jste heslo?"

commafeed-client/src/locales/cy/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Hidlo mynegiant"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Wedi anghofio cyfrinair?"

commafeed-client/src/locales/da/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrerende udtryk"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Glemt adgangskode?"

commafeed-client/src/locales/de/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filterausdruck"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Passwort vergessen?"

commafeed-client/src/locales/en/messages.po

@@ -376,6 +376,10 @@ msgstr "Fever API URL"
 msgid "Filtering expression"
 msgstr "Filtering expression"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr "Force fetching feeds is not yet available."
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Forgot password?"

commafeed-client/src/locales/es/messages.po

@@ -377,6 +377,10 @@ msgstr "URL de la API de Fever"
 msgid "Filtering expression"
 msgstr "Expresión de filtrado"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "¿Olvidaste la contraseña?"

commafeed-client/src/locales/fa/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "بیان فیلتر"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "رمز عبور را فراموش کرده اید؟"

commafeed-client/src/locales/fi/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Suodattava lauseke"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Unohditko salasanan?"

commafeed-client/src/locales/fr/messages.po

@@ -323,7 +323,7 @@ msgstr "Entrez votre mot de passe actuel pour changer les paramètres du profil"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entries to keep above the selected entry when scrolling"
-msgstr ""
+msgstr "Nombre d'entrées à conserver au-dessus de l'entrée sélectionnée lors d'un défilement"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entry headers"
@@ -376,6 +376,10 @@ msgstr "URL API Fever"
 msgid "Filtering expression"
 msgstr "Expression de filtrage"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr "La récupération forcée des flux n'est pas encore disponible."
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Mot de passe oublié ?"
@@ -614,7 +618,7 @@ msgstr "Sur mobile, afficher les boutons d'action en bas de l'écran"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Only applies to compact, cozy and detailed modes"
-msgstr ""
+msgstr "Ne fonctionne que dans les modes Compact, Cozy, et Vue détaillée"
 
 #: src/pages/ErrorPage.tsx
 msgid "Oops!"

commafeed-client/src/locales/gl/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Expresión de filtrado"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Esqueceches o contrasinal?"

commafeed-client/src/locales/hu/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Szűrő kifejezés"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Elfelejtette a jelszavát?"

commafeed-client/src/locales/id/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Memfilter ekspresi"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Lupa kata sandi?"

commafeed-client/src/locales/it/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Espressione filtrante"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Password dimenticata?"

commafeed-client/src/locales/ja/messages.po

@@ -58,7 +58,7 @@ msgstr "ユーザー追加"
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Admin"
-msgstr "管理人"
+msgstr "管理者"
 
 #: src/app/constants.ts
 #: src/components/content/add/CategorySelect.tsx
@@ -323,7 +323,7 @@ msgstr "プロファイル設定を変更するには、現在のパスワード
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entries to keep above the selected entry when scrolling"
-msgstr ""
+msgstr "エントリーを選択したとき、読みやすさに応じたスクロール調整を行います。"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entry headers"
@@ -376,6 +376,10 @@ msgstr "Fever API URL"
 msgid "Filtering expression"
 msgstr "フィルタリング式"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr "フィードの強制フェッチはまだ利用できません。"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "パスワードをお忘れですか？"
@@ -398,7 +402,7 @@ msgstr "生成されたフィードURL"
 
 #: src/components/content/FeedEntryContextMenu.tsx
 msgid "Go to {0}"
-msgstr "Go to {0}"
+msgstr "{0} に移動"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Go to the All view"
@@ -418,11 +422,11 @@ msgstr "ID"
 
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-msgstr "空でない場合は、'true' または 'false' に評価される式。 'false' の場合、このフィードの新しいエントリは自動的に既読としてマークされます。"
+msgstr "空でない場合は、'true' または 'false' に評価される式。 'false' の場合、このフィードの新しいエントリーは自動的に既読としてマークされます。"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "If the entry doesn't entirely fit on the screen"
-msgstr "エントリが画面に完全に収まらない場合"
+msgstr "エントリーが画面に完全に収まらない場合"
 
 #: src/pages/app/AboutPage.tsx
 msgid "If you encounter an issue, please report it on the issues page of the GitHub project."
@@ -614,7 +618,7 @@ msgstr "モバイルでは、画面の下部にアクションボタンを表示
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Only applies to compact, cozy and detailed modes"
-msgstr ""
+msgstr "これはコンパクト/cozy/詳細モードでのみ適用されます"
 
 #: src/pages/ErrorPage.tsx
 msgid "Oops!"
@@ -751,7 +755,7 @@ msgstr "保存"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Scroll selected entry to the top of the page"
-msgstr "選択されたエントリーをページの上部にスクロールする"
+msgstr "エントリーを選択したときのスクロール調整"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Scroll smoothly when navigating between entries"
@@ -774,11 +778,11 @@ msgstr "検索には少なくとも3文字が必要です"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on next entry without opening it"
-msgstr "次のエントリーを開かずにフォーカスを設定する"
+msgstr "次のエントリーを開かずにフォーカスする"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on previous entry without opening it"
-msgstr "前のエントリーを開かずにフォーカスを設定する"
+msgstr "前のエントリーを開かずにフォーカスする"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Settings"

commafeed-client/src/locales/ko/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "필터링 표현식"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "비밀번호를 잊으셨나요?"

commafeed-client/src/locales/ms/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Ungkapan penapisan"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Lupa kata laluan?"

commafeed-client/src/locales/nb/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrerende uttrykk"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Glemt passord?"

commafeed-client/src/locales/nl/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Uitdrukking filteren"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Wachtwoord vergeten?"

commafeed-client/src/locales/nn/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrerende uttrykk"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Glemt passord?"

commafeed-client/src/locales/pl/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Wyrażenie filtrujące"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Zapomniałeś hasła?"

commafeed-client/src/locales/pt/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrando expressão"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Esqueceu a senha?"

commafeed-client/src/locales/ru/messages.po

@@ -376,6 +376,10 @@ msgstr "Ссылка Fever API"
 msgid "Filtering expression"
 msgstr "Выражение фильтрации"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Забыли пароль?"

commafeed-client/src/locales/sk/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrovanie výrazu"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Zabudli ste heslo?"

commafeed-client/src/locales/sv/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrerande uttryck"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Glömt lösenord?"

commafeed-client/src/locales/tr/messages.po

@@ -376,6 +376,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtreleme ifadesi"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Parolanızı mı unuttunuz?"

commafeed-client/src/locales/zh/messages.po

@@ -142,7 +142,7 @@ msgstr "浏览器扩展"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
-msgstr ""
+msgstr "浏览器标签页"
 
 #: src/components/admin/UserEdit.tsx
 #: src/components/content/add/AddCategory.tsx
@@ -323,7 +323,7 @@ msgstr "输入您当前的密码以更改配置文件设置"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entries to keep above the selected entry when scrolling"
-msgstr ""
+msgstr "滚动时固定在顶部的条目"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entry headers"
@@ -376,6 +376,10 @@ msgstr "Fever API 网址"
 msgid "Filtering expression"
 msgstr "过滤表达式"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Force fetching feeds is not yet available."
+msgstr "强制获取订阅源功能不可用。"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "忘记密码？"
@@ -840,11 +844,11 @@ msgstr "显示星标图标"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show unread count in tab favicon"
-msgstr ""
+msgstr "在标签页图标上显示未读数量"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show unread count in tab title"
-msgstr ""
+msgstr "在标签页标题中显示未读数量"
 
 #: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx

commafeed-client/src/main.tsx

@@ -6,11 +6,13 @@ import "react-contexify/ReactContexify.css"
 import { App } from "App"
 import { store } from "app/store"
 import dayjs from "dayjs"
+import duration from "dayjs/plugin/duration"
 import relativeTime from "dayjs/plugin/relativeTime"
 import ReactDOM from "react-dom/client"
 import { Provider } from "react-redux"
 
 dayjs.extend(relativeTime)
+dayjs.extend(duration)
 
 const root = document.getElementById("root")
 root &&

commafeed-client/src/pages/ErrorPage.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Box, Button, Container, Group, Text, Title } from "@mantine/core"
 import { TbRefresh } from "react-icons/tb"
 import { tss } from "tss"

commafeed-client/src/pages/WelcomePage.tsx

@@ -1,4 +1,4 @@
-import { msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { Anchor, Box, Center, Container, Divider, Group, Image, Space, Title, useMantineColorScheme } from "@mantine/core"
 import { client } from "app/client"
 import { redirectToApiDocumentation, redirectToLogin, redirectToRegistration, redirectToRootCategory } from "app/redirect/thunks"

commafeed-client/src/pages/admin/AdminUsersPage.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { ActionIcon, Box, Code, Container, Group, Table, Text, Title, useMantineTheme } from "@mantine/core"
 import { closeAllModals, openConfirmModal, openModal } from "@mantine/modals"
 import { client, errorToStrings } from "app/client"

commafeed-client/src/pages/app/AboutPage.tsx

@@ -1,5 +1,6 @@
-import { Trans, msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
 import { Anchor, Box, Container, List, NativeSelect, SimpleGrid, Title } from "@mantine/core"
 import { Constants } from "app/constants"
 import { redirectToApiDocumentation } from "app/redirect/thunks"

commafeed-client/src/pages/app/AddPage.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Container, Tabs } from "@mantine/core"
 import { AddCategory } from "components/content/add/AddCategory"
 import { ImportOpml } from "components/content/add/ImportOpml"

commafeed-client/src/pages/app/CategoryDetailsPage.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Anchor, Box, Button, Code, Container, Divider, Group, Input, NumberInput, Stack, Text, TextInput, Title } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { openConfirmModal } from "@mantine/modals"

commafeed-client/src/pages/app/DonatePage.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Anchor, Box, Code, Container, Group, List, Title } from "@mantine/core"
 import { Constants } from "app/constants"
 import React from "react"

commafeed-client/src/pages/app/FeedDetailsPage.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Anchor, Box, Button, Code, Container, Divider, Group, Input, NumberInput, Stack, Text, TextInput, Title } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { openConfirmModal } from "@mantine/modals"

commafeed-client/src/pages/app/FeedEntriesPage.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { ActionIcon, Box, Center, Divider, Group, Title, useMantineTheme } from "@mantine/core"
 import { useViewportSize } from "@mantine/hooks"
 import { Constants } from "app/constants"

commafeed-client/src/pages/app/Layout.tsx

@@ -1,4 +1,4 @@
-import { msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { ActionIcon, AppShell, Box, Center, Group, ScrollArea, Title, useMantineTheme } from "@mantine/core"
 import { Constants } from "app/constants"
 import { redirectToAdd, redirectToRootCategory } from "app/redirect/thunks"

commafeed-client/src/pages/app/SettingsPage.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Container, Tabs } from "@mantine/core"
 import { CustomCodeSettings } from "components/settings/CustomCodeSettings"
 import { DisplaySettings } from "components/settings/DisplaySettings"

commafeed-client/src/pages/app/TagDetailsPage.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 
 import { Anchor, Box, Button, Container, Group, Input, Stack, Title } from "@mantine/core"
 import { Constants } from "app/constants"

commafeed-client/src/pages/auth/LoginPage.tsx

@@ -1,5 +1,6 @@
-import { Trans, msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
 import { Anchor, Box, Button, Center, Container, Group, Paper, PasswordInput, Stack, TextInput, Title } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"

commafeed-client/src/pages/auth/PasswordRecoveryPage.tsx

@@ -1,5 +1,6 @@
-import { Trans, msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
 import { Anchor, Box, Button, Center, Container, Group, Paper, Stack, TextInput, Title } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"

commafeed-client/src/pages/auth/RegistrationPage.tsx

@@ -1,5 +1,6 @@
-import { Trans, msg } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
 import { Anchor, Box, Button, Center, Container, Group, Paper, PasswordInput, Stack, TextInput, Title } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"

commafeed-client/vite.config.ts

@@ -10,8 +10,7 @@ export default defineConfig(() => ({
     plugins: [
         react({
             babel: {
-                // babel-macro is needed for lingui
-                plugins: ["macros"],
+                plugins: ["@lingui/babel-plugin-lingui-macro"],
             },
         }),
         lingui(),

commafeed-server/doc/commafeed.adoc

@@ -1,673 +0,0 @@
-:summaryTableId: commafeed-server_commafeed
-[.configuration-legend]
-icon:lock[title=Fixed at build time] Configuration property fixed at build time - All other configuration properties are overridable at runtime
-[.configuration-reference.searchable, cols="80,.^10,.^10"]
-|===
-
-h|[.header-title]##Configuration property##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-hide-from-web-crawlers]] [.property-path]##`commafeed.hide-from-web-crawlers`##
-
-[.description]
---
-Whether to expose a robots.txt file that disallows web crawlers and search engine indexers.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HIDE_FROM_WEB_CRAWLERS+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HIDE_FROM_WEB_CRAWLERS+++`
-endif::add-copy-button-to-env-var[]
---
-|boolean
-|`true`
-
-a| [[commafeed-server_commafeed-image-proxy-enabled]] [.property-path]##`commafeed.image-proxy-enabled`##
-
-[.description]
---
-If enabled, images in feed entries will be proxied through the server instead of accessed directly by the browser. This is useful if commafeed is accessed through a restricting proxy that blocks some feeds that are followed.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_IMAGE_PROXY_ENABLED+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_IMAGE_PROXY_ENABLED+++`
-endif::add-copy-button-to-env-var[]
---
-|boolean
-|`false`
-
-a| [[commafeed-server_commafeed-password-recovery-enabled]] [.property-path]##`commafeed.password-recovery-enabled`##
-
-[.description]
---
-Enable password recovery via email. Quarkus mailer will need to be configured.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_PASSWORD_RECOVERY_ENABLED+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_PASSWORD_RECOVERY_ENABLED+++`
-endif::add-copy-button-to-env-var[]
---
-|boolean
-|`false`
-
-a| [[commafeed-server_commafeed-announcement]] [.property-path]##`commafeed.announcement`##
-
-[.description]
---
-Message displayed in a notification at the bottom of the page.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_ANNOUNCEMENT+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_ANNOUNCEMENT+++`
-endif::add-copy-button-to-env-var[]
---
-|string
-|
-
-a| [[commafeed-server_commafeed-google-analytics-tracking-code]] [.property-path]##`commafeed.google-analytics-tracking-code`##
-
-[.description]
---
-Google Analytics tracking code.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_GOOGLE_ANALYTICS_TRACKING_CODE+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_GOOGLE_ANALYTICS_TRACKING_CODE+++`
-endif::add-copy-button-to-env-var[]
---
-|string
-|
-
-a| [[commafeed-server_commafeed-google-auth-key]] [.property-path]##`commafeed.google-auth-key`##
-
-[.description]
---
-Google Auth key for fetching Youtube channel favicons.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_GOOGLE_AUTH_KEY+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_GOOGLE_AUTH_KEY+++`
-endif::add-copy-button-to-env-var[]
---
-|string
-|
-
-h|[[commafeed-server_section_commafeed-http-client]] [.section-name.section-level0]##HTTP client configuration##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-http-client-user-agent]] [.property-path]##`commafeed.http-client.user-agent`##
-
-[.description]
---
-User-Agent string that will be used by the http client, leave empty for the default one.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HTTP_CLIENT_USER_AGENT+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HTTP_CLIENT_USER_AGENT+++`
-endif::add-copy-button-to-env-var[]
---
-|string
-|
-
-a| [[commafeed-server_commafeed-http-client-connect-timeout]] [.property-path]##`commafeed.http-client.connect-timeout`##
-
-[.description]
---
-Time to wait for a connection to be established.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HTTP_CLIENT_CONNECT_TIMEOUT+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HTTP_CLIENT_CONNECT_TIMEOUT+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`5S`
-
-a| [[commafeed-server_commafeed-http-client-ssl-handshake-timeout]] [.property-path]##`commafeed.http-client.ssl-handshake-timeout`##
-
-[.description]
---
-Time to wait for SSL handshake to complete.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HTTP_CLIENT_SSL_HANDSHAKE_TIMEOUT+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HTTP_CLIENT_SSL_HANDSHAKE_TIMEOUT+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`5S`
-
-a| [[commafeed-server_commafeed-http-client-socket-timeout]] [.property-path]##`commafeed.http-client.socket-timeout`##
-
-[.description]
---
-Time to wait between two packets before timeout.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HTTP_CLIENT_SOCKET_TIMEOUT+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HTTP_CLIENT_SOCKET_TIMEOUT+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`10S`
-
-a| [[commafeed-server_commafeed-http-client-response-timeout]] [.property-path]##`commafeed.http-client.response-timeout`##
-
-[.description]
---
-Time to wait for the full response to be received.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HTTP_CLIENT_RESPONSE_TIMEOUT+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HTTP_CLIENT_RESPONSE_TIMEOUT+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`10S`
-
-a| [[commafeed-server_commafeed-http-client-connection-time-to-live]] [.property-path]##`commafeed.http-client.connection-time-to-live`##
-
-[.description]
---
-Time to live for a connection in the pool.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HTTP_CLIENT_CONNECTION_TIME_TO_LIVE+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HTTP_CLIENT_CONNECTION_TIME_TO_LIVE+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`30S`
-
-a| [[commafeed-server_commafeed-http-client-idle-connections-eviction-interval]] [.property-path]##`commafeed.http-client.idle-connections-eviction-interval`##
-
-[.description]
---
-Time between eviction runs for idle connections.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HTTP_CLIENT_IDLE_CONNECTIONS_EVICTION_INTERVAL+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HTTP_CLIENT_IDLE_CONNECTIONS_EVICTION_INTERVAL+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`1M`
-
-a| [[commafeed-server_commafeed-http-client-max-response-size]] [.property-path]##`commafeed.http-client.max-response-size`##
-
-[.description]
---
-If a feed is larger than this, it will be discarded to prevent memory issues while parsing the feed.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HTTP_CLIENT_MAX_RESPONSE_SIZE+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HTTP_CLIENT_MAX_RESPONSE_SIZE+++`
-endif::add-copy-button-to-env-var[]
---
-|MemorySize link:#memory-size-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the MemorySize format]]
-|`5M`
-
-h|[[commafeed-server_section_commafeed-http-client-cache]] [.section-name.section-level1]##HTTP client cache configuration##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-http-client-cache-enabled]] [.property-path]##`commafeed.http-client.cache.enabled`##
-
-[.description]
---
-Whether to enable the cache. This cache is used to avoid spamming feeds in short bursts (e.g. when subscribing to a feed for the first time or when clicking "fetch all my feeds now").
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HTTP_CLIENT_CACHE_ENABLED+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HTTP_CLIENT_CACHE_ENABLED+++`
-endif::add-copy-button-to-env-var[]
---
-|boolean
-|`true`
-
-a| [[commafeed-server_commafeed-http-client-cache-maximum-memory-size]] [.property-path]##`commafeed.http-client.cache.maximum-memory-size`##
-
-[.description]
---
-Maximum amount of memory the cache can use.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HTTP_CLIENT_CACHE_MAXIMUM_MEMORY_SIZE+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HTTP_CLIENT_CACHE_MAXIMUM_MEMORY_SIZE+++`
-endif::add-copy-button-to-env-var[]
---
-|MemorySize link:#memory-size-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the MemorySize format]]
-|`10M`
-
-a| [[commafeed-server_commafeed-http-client-cache-expiration]] [.property-path]##`commafeed.http-client.cache.expiration`##
-
-[.description]
---
-Duration after which an entry is removed from the cache.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_HTTP_CLIENT_CACHE_EXPIRATION+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_HTTP_CLIENT_CACHE_EXPIRATION+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`1M`
-
-
-
-h|[[commafeed-server_section_commafeed-feed-refresh]] [.section-name.section-level0]##Feed refresh engine settings##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-feed-refresh-interval]] [.property-path]##`commafeed.feed-refresh.interval`##
-
-[.description]
---
-Amount of time CommaFeed will wait before refreshing the same feed.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_FEED_REFRESH_INTERVAL+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_FEED_REFRESH_INTERVAL+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`5M`
-
-a| [[commafeed-server_commafeed-feed-refresh-interval-empirical]] [.property-path]##`commafeed.feed-refresh.interval-empirical`##
-
-[.description]
---
-If true, 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 somewhere between the default refresh interval and 24h. See `FeedRefreshIntervalCalculator` for details.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_FEED_REFRESH_INTERVAL_EMPIRICAL+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_FEED_REFRESH_INTERVAL_EMPIRICAL+++`
-endif::add-copy-button-to-env-var[]
---
-|boolean
-|`false`
-
-a| [[commafeed-server_commafeed-feed-refresh-http-threads]] [.property-path]##`commafeed.feed-refresh.http-threads`##
-
-[.description]
---
-Amount of http threads used to fetch feeds.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_FEED_REFRESH_HTTP_THREADS+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_FEED_REFRESH_HTTP_THREADS+++`
-endif::add-copy-button-to-env-var[]
---
-|int
-|`3`
-
-a| [[commafeed-server_commafeed-feed-refresh-database-threads]] [.property-path]##`commafeed.feed-refresh.database-threads`##
-
-[.description]
---
-Amount of threads used to insert new entries in the database.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_FEED_REFRESH_DATABASE_THREADS+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_FEED_REFRESH_DATABASE_THREADS+++`
-endif::add-copy-button-to-env-var[]
---
-|int
-|`1`
-
-a| [[commafeed-server_commafeed-feed-refresh-user-inactivity-period]] [.property-path]##`commafeed.feed-refresh.user-inactivity-period`##
-
-[.description]
---
-Duration after which a user is considered inactive. Feeds for inactive users are not refreshed until they log in again. 0 to disable.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_FEED_REFRESH_USER_INACTIVITY_PERIOD+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_FEED_REFRESH_USER_INACTIVITY_PERIOD+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`0S`
-
-a| [[commafeed-server_commafeed-feed-refresh-filtering-expression-evaluation-timeout]] [.property-path]##`commafeed.feed-refresh.filtering-expression-evaluation-timeout`##
-
-[.description]
---
-Duration after which the evaluation of a filtering expresion to mark an entry as read is considered to have timed out.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_FEED_REFRESH_FILTERING_EXPRESSION_EVALUATION_TIMEOUT+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_FEED_REFRESH_FILTERING_EXPRESSION_EVALUATION_TIMEOUT+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`500MS`
-
-
-h|[[commafeed-server_section_commafeed-database]] [.section-name.section-level0]##Database settings##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-database-query-timeout]] [.property-path]##`commafeed.database.query-timeout`##
-
-[.description]
---
-Timeout applied to all database queries. 0 to disable.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_DATABASE_QUERY_TIMEOUT+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_DATABASE_QUERY_TIMEOUT+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`0S`
-
-h|[[commafeed-server_section_commafeed-database-cleanup]] [.section-name.section-level1]##Database cleanup settings##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-database-cleanup-entries-max-age]] [.property-path]##`commafeed.database.cleanup.entries-max-age`##
-
-[.description]
---
-Maximum age of feed entries in the database. Older entries will be deleted. 0 to disable.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_DATABASE_CLEANUP_ENTRIES_MAX_AGE+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_DATABASE_CLEANUP_ENTRIES_MAX_AGE+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`365D`
-
-a| [[commafeed-server_commafeed-database-cleanup-statuses-max-age]] [.property-path]##`commafeed.database.cleanup.statuses-max-age`##
-
-[.description]
---
-Maximum age of feed entry statuses (read/unread) in the database. Older statuses will be deleted. 0 to disable.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_DATABASE_CLEANUP_STATUSES_MAX_AGE+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_DATABASE_CLEANUP_STATUSES_MAX_AGE+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`0S`
-
-a| [[commafeed-server_commafeed-database-cleanup-max-feed-capacity]] [.property-path]##`commafeed.database.cleanup.max-feed-capacity`##
-
-[.description]
---
-Maximum number of entries per feed to keep in the database. 0 to disable.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_DATABASE_CLEANUP_MAX_FEED_CAPACITY+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_DATABASE_CLEANUP_MAX_FEED_CAPACITY+++`
-endif::add-copy-button-to-env-var[]
---
-|int
-|`500`
-
-a| [[commafeed-server_commafeed-database-cleanup-max-feeds-per-user]] [.property-path]##`commafeed.database.cleanup.max-feeds-per-user`##
-
-[.description]
---
-Limit the number of feeds a user can subscribe to. 0 to disable.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_DATABASE_CLEANUP_MAX_FEEDS_PER_USER+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_DATABASE_CLEANUP_MAX_FEEDS_PER_USER+++`
-endif::add-copy-button-to-env-var[]
---
-|int
-|`0`
-
-a| [[commafeed-server_commafeed-database-cleanup-batch-size]] [.property-path]##`commafeed.database.cleanup.batch-size`##
-
-[.description]
---
-Rows to delete per query while cleaning up old entries.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_DATABASE_CLEANUP_BATCH_SIZE+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_DATABASE_CLEANUP_BATCH_SIZE+++`
-endif::add-copy-button-to-env-var[]
---
-|int
-|`100`
-
-
-
-h|[[commafeed-server_section_commafeed-users]] [.section-name.section-level0]##Users settings##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-users-allow-registrations]] [.property-path]##`commafeed.users.allow-registrations`##
-
-[.description]
---
-Whether to let users create accounts for themselves.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_USERS_ALLOW_REGISTRATIONS+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_USERS_ALLOW_REGISTRATIONS+++`
-endif::add-copy-button-to-env-var[]
---
-|boolean
-|`false`
-
-a| [[commafeed-server_commafeed-users-strict-password-policy]] [.property-path]##`commafeed.users.strict-password-policy`##
-
-[.description]
---
-Whether to enable strict password validation (1 uppercase char, 1 lowercase char, 1 digit, 1 special char).
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_USERS_STRICT_PASSWORD_POLICY+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_USERS_STRICT_PASSWORD_POLICY+++`
-endif::add-copy-button-to-env-var[]
---
-|boolean
-|`true`
-
-a| [[commafeed-server_commafeed-users-create-demo-account]] [.property-path]##`commafeed.users.create-demo-account`##
-
-[.description]
---
-Whether to create a demo account the first time the app starts.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_USERS_CREATE_DEMO_ACCOUNT+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_USERS_CREATE_DEMO_ACCOUNT+++`
-endif::add-copy-button-to-env-var[]
---
-|boolean
-|`false`
-
-
-h|[[commafeed-server_section_commafeed-websocket]] [.section-name.section-level0]##Websocket settings##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-websocket-enabled]] [.property-path]##`commafeed.websocket.enabled`##
-
-[.description]
---
-Enable websocket connection so the server can notify web clients that there are new entries for feeds.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_WEBSOCKET_ENABLED+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_WEBSOCKET_ENABLED+++`
-endif::add-copy-button-to-env-var[]
---
-|boolean
-|`true`
-
-a| [[commafeed-server_commafeed-websocket-ping-interval]] [.property-path]##`commafeed.websocket.ping-interval`##
-
-[.description]
---
-Interval at which the client will send a ping message on the websocket to keep the connection alive.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_WEBSOCKET_PING_INTERVAL+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_WEBSOCKET_PING_INTERVAL+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`15M`
-
-a| [[commafeed-server_commafeed-websocket-tree-reload-interval]] [.property-path]##`commafeed.websocket.tree-reload-interval`##
-
-[.description]
---
-If the websocket connection is disabled or the connection is lost, the client will reload the feed tree at this interval.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_WEBSOCKET_TREE_RELOAD_INTERVAL+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_WEBSOCKET_TREE_RELOAD_INTERVAL+++`
-endif::add-copy-button-to-env-var[]
---
-|link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html[Duration] link:#duration-note-anchor-{summaryTableId}[icon:question-circle[title=More information about the Duration format]]
-|`30S`
-
-
-|===
-
-ifndef::no-duration-note[]
-[NOTE]
-[id=duration-note-anchor-commafeed-server_commafeed]
-.About the Duration format
-====
-To write duration values, use the standard `java.time.Duration` format.
-See the link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html#parse(java.lang.CharSequence)[Duration#parse() Java API documentation] for more information.
-
-You can also use a simplified format, starting with a number:
-
-* If the value is only a number, it represents time in seconds.
-* If the value is a number followed by `ms`, it represents time in milliseconds.
-
-In other cases, the simplified format is translated to the `java.time.Duration` format for parsing:
-
-* If the value is a number followed by `h`, `m`, or `s`, it is prefixed with `PT`.
-* If the value is a number followed by `d`, it is prefixed with `P`.
-====
-endif::no-duration-note[]
-ifndef::no-memory-size-note[]
-[NOTE]
-[id=memory-size-note-anchor-commafeed-server_commafeed]
-.About the MemorySize format
-====
-A size configuration option recognizes strings in this format (shown as a regular expression): `[0-9]+[KkMmGgTtPpEeZzYy]?`.
-
-If no suffix is given, assume bytes.
-====
-ifndef::no-memory-size-note[]
-
-:!summaryTableId:

commafeed-server/doc/commafeed.md

@@ -0,0 +1,799 @@
+🔒: Configuration property fixed at build time - All other configuration properties are overridable at runtime
+
+<table>
+<thead>
+<tr>
+<th align="left">Configuration property</th>
+<th>Type</th>
+<th>Default</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>
+
+`commafeed.hide-from-web-crawlers`
+
+Whether to expose a robots.txt file that disallows web crawlers and search engine indexers.
+
+
+
+Environment variable: `COMMAFEED_HIDE_FROM_WEB_CRAWLERS`</td>
+<td>
+
+boolean
+</td>
+<td>
+
+`true`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.image-proxy-enabled`
+
+If enabled, images in feed entries will be proxied through the server instead of accessed directly by the browser.
+
+This is useful if commafeed is accessed through a restricting proxy that blocks some feeds that are followed.
+
+
+
+Environment variable: `COMMAFEED_IMAGE_PROXY_ENABLED`</td>
+<td>
+
+boolean
+</td>
+<td>
+
+`false`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.password-recovery-enabled`
+
+Enable password recovery via email.
+
+Quarkus mailer will need to be configured.
+
+
+
+Environment variable: `COMMAFEED_PASSWORD_RECOVERY_ENABLED`</td>
+<td>
+
+boolean
+</td>
+<td>
+
+`false`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.announcement`
+
+Message displayed in a notification at the bottom of the page.
+
+
+
+Environment variable: `COMMAFEED_ANNOUNCEMENT`</td>
+<td>
+
+string
+</td>
+<td>
+
+
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.google-analytics-tracking-code`
+
+Google Analytics tracking code.
+
+
+
+Environment variable: `COMMAFEED_GOOGLE_ANALYTICS_TRACKING_CODE`</td>
+<td>
+
+string
+</td>
+<td>
+
+
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.google-auth-key`
+
+Google Auth key for fetching Youtube channel favicons.
+
+
+
+Environment variable: `COMMAFEED_GOOGLE_AUTH_KEY`</td>
+<td>
+
+string
+</td>
+<td>
+
+
+</td>
+</tr>
+<thead>
+<tr>
+<th align="left" colspan="3">
+HTTP client configuration
+</th>
+</tr>
+</thead>
+
+<tr>
+<td>
+
+`commafeed.http-client.user-agent`
+
+User-Agent string that will be used by the http client, leave empty for the default one.
+
+
+
+Environment variable: `COMMAFEED_HTTP_CLIENT_USER_AGENT`</td>
+<td>
+
+string
+</td>
+<td>
+
+
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.http-client.connect-timeout`
+
+Time to wait for a connection to be established.
+
+
+
+Environment variable: `COMMAFEED_HTTP_CLIENT_CONNECT_TIMEOUT`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`5S`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.http-client.ssl-handshake-timeout`
+
+Time to wait for SSL handshake to complete.
+
+
+
+Environment variable: `COMMAFEED_HTTP_CLIENT_SSL_HANDSHAKE_TIMEOUT`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`5S`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.http-client.socket-timeout`
+
+Time to wait between two packets before timeout.
+
+
+
+Environment variable: `COMMAFEED_HTTP_CLIENT_SOCKET_TIMEOUT`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`10S`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.http-client.response-timeout`
+
+Time to wait for the full response to be received.
+
+
+
+Environment variable: `COMMAFEED_HTTP_CLIENT_RESPONSE_TIMEOUT`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`10S`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.http-client.connection-time-to-live`
+
+Time to live for a connection in the pool.
+
+
+
+Environment variable: `COMMAFEED_HTTP_CLIENT_CONNECTION_TIME_TO_LIVE`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`30S`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.http-client.idle-connections-eviction-interval`
+
+Time between eviction runs for idle connections.
+
+
+
+Environment variable: `COMMAFEED_HTTP_CLIENT_IDLE_CONNECTIONS_EVICTION_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>
+
+`1M`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.http-client.max-response-size`
+
+If a feed is larger than this, it will be discarded to prevent memory issues while parsing the feed.
+
+
+
+Environment variable: `COMMAFEED_HTTP_CLIENT_MAX_RESPONSE_SIZE`</td>
+<td>
+
+MemorySize [🛈](#memory-size-note-anchor)
+</td>
+<td>
+
+`5M`
+</td>
+</tr>
+<thead>
+<tr>
+<th align="left" colspan="3">
+&nbsp;&nbsp;&nbsp;&nbsp;HTTP client cache configuration
+</th>
+</tr>
+</thead>
+
+<tr>
+<td>
+
+`commafeed.http-client.cache.enabled`
+
+Whether to enable the cache. This cache is used to avoid spamming feeds in short bursts (e.g. when subscribing to a feed for the
+first time or when clicking "fetch all my feeds now").
+
+
+
+Environment variable: `COMMAFEED_HTTP_CLIENT_CACHE_ENABLED`</td>
+<td>
+
+boolean
+</td>
+<td>
+
+`true`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.http-client.cache.maximum-memory-size`
+
+Maximum amount of memory the cache can use.
+
+
+
+Environment variable: `COMMAFEED_HTTP_CLIENT_CACHE_MAXIMUM_MEMORY_SIZE`</td>
+<td>
+
+MemorySize [🛈](#memory-size-note-anchor)
+</td>
+<td>
+
+`10M`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.http-client.cache.expiration`
+
+Duration after which an entry is removed from the cache.
+
+
+
+Environment variable: `COMMAFEED_HTTP_CLIENT_CACHE_EXPIRATION`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`1M`
+</td>
+</tr>
+<thead>
+<tr>
+<th align="left" colspan="3">
+Feed refresh engine settings
+</th>
+</tr>
+</thead>
+
+<tr>
+<td>
+
+`commafeed.feed-refresh.interval`
+
+Amount of time CommaFeed will wait before refreshing the same feed.
+
+
+
+Environment variable: `COMMAFEED_FEED_REFRESH_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>
+
+`5M`
+</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
+last entry was published. The interval will be somewhere between the default refresh interval and 24h.
+
+See <code>FeedRefreshIntervalCalculator</code> for details.
+
+
+
+Environment variable: `COMMAFEED_FEED_REFRESH_INTERVAL_EMPIRICAL`</td>
+<td>
+
+boolean
+</td>
+<td>
+
+`false`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.feed-refresh.http-threads`
+
+Amount of http threads used to fetch feeds.
+
+
+
+Environment variable: `COMMAFEED_FEED_REFRESH_HTTP_THREADS`</td>
+<td>
+
+int
+</td>
+<td>
+
+`3`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.feed-refresh.database-threads`
+
+Amount of threads used to insert new entries in the database.
+
+
+
+Environment variable: `COMMAFEED_FEED_REFRESH_DATABASE_THREADS`</td>
+<td>
+
+int
+</td>
+<td>
+
+`1`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.feed-refresh.user-inactivity-period`
+
+Duration after which a user is considered inactive. Feeds for inactive users are not refreshed until they log in again.
+
+0 to disable.
+
+
+
+Environment variable: `COMMAFEED_FEED_REFRESH_USER_INACTIVITY_PERIOD`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`0S`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.feed-refresh.filtering-expression-evaluation-timeout`
+
+Duration after which the evaluation of a filtering expresion to mark an entry as read is considered to have timed out.
+
+
+
+Environment variable: `COMMAFEED_FEED_REFRESH_FILTERING_EXPRESSION_EVALUATION_TIMEOUT`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`500MS`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.feed-refresh.force-refresh-cooldown-duration`
+
+Duration after which the "Fetch all my feeds now" action is available again after use to avoid spamming feeds.
+
+
+
+Environment variable: `COMMAFEED_FEED_REFRESH_FORCE_REFRESH_COOLDOWN_DURATION`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`0S`
+</td>
+</tr>
+<thead>
+<tr>
+<th align="left" colspan="3">
+Database settings
+</th>
+</tr>
+</thead>
+
+<tr>
+<td>
+
+`commafeed.database.query-timeout`
+
+Timeout applied to all database queries.
+
+0 to disable.
+
+
+
+Environment variable: `COMMAFEED_DATABASE_QUERY_TIMEOUT`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`0S`
+</td>
+</tr>
+<thead>
+<tr>
+<th align="left" colspan="3">
+&nbsp;&nbsp;&nbsp;&nbsp;Database cleanup settings
+</th>
+</tr>
+</thead>
+
+<tr>
+<td>
+
+`commafeed.database.cleanup.entries-max-age`
+
+Maximum age of feed entries in the database. Older entries will be deleted.
+
+0 to disable.
+
+
+
+Environment variable: `COMMAFEED_DATABASE_CLEANUP_ENTRIES_MAX_AGE`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`365D`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.database.cleanup.statuses-max-age`
+
+Maximum age of feed entry statuses (read/unread) in the database. Older statuses will be deleted.
+
+0 to disable.
+
+
+
+Environment variable: `COMMAFEED_DATABASE_CLEANUP_STATUSES_MAX_AGE`</td>
+<td>
+
+[Duration](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html) [🛈](#duration-note-anchor)
+</td>
+<td>
+
+`0S`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.database.cleanup.max-feed-capacity`
+
+Maximum number of entries per feed to keep in the database.
+
+0 to disable.
+
+
+
+Environment variable: `COMMAFEED_DATABASE_CLEANUP_MAX_FEED_CAPACITY`</td>
+<td>
+
+int
+</td>
+<td>
+
+`500`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.database.cleanup.max-feeds-per-user`
+
+Limit the number of feeds a user can subscribe to.
+
+0 to disable.
+
+
+
+Environment variable: `COMMAFEED_DATABASE_CLEANUP_MAX_FEEDS_PER_USER`</td>
+<td>
+
+int
+</td>
+<td>
+
+`0`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.database.cleanup.batch-size`
+
+Rows to delete per query while cleaning up old entries.
+
+
+
+Environment variable: `COMMAFEED_DATABASE_CLEANUP_BATCH_SIZE`</td>
+<td>
+
+int
+</td>
+<td>
+
+`100`
+</td>
+</tr>
+<thead>
+<tr>
+<th align="left" colspan="3">
+Users settings
+</th>
+</tr>
+</thead>
+
+<tr>
+<td>
+
+`commafeed.users.allow-registrations`
+
+Whether to let users create accounts for themselves.
+
+
+
+Environment variable: `COMMAFEED_USERS_ALLOW_REGISTRATIONS`</td>
+<td>
+
+boolean
+</td>
+<td>
+
+`false`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.users.strict-password-policy`
+
+Whether to enable strict password validation (1 uppercase char, 1 lowercase char, 1 digit, 1 special char).
+
+
+
+Environment variable: `COMMAFEED_USERS_STRICT_PASSWORD_POLICY`</td>
+<td>
+
+boolean
+</td>
+<td>
+
+`true`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.users.create-demo-account`
+
+Whether to create a demo account the first time the app starts.
+
+
+
+Environment variable: `COMMAFEED_USERS_CREATE_DEMO_ACCOUNT`</td>
+<td>
+
+boolean
+</td>
+<td>
+
+`false`
+</td>
+</tr>
+<thead>
+<tr>
+<th align="left" colspan="3">
+Websocket settings
+</th>
+</tr>
+</thead>
+
+<tr>
+<td>
+
+`commafeed.websocket.enabled`
+
+Enable websocket connection so the server can notify web clients that there are new entries for feeds.
+
+
+
+Environment variable: `COMMAFEED_WEBSOCKET_ENABLED`</td>
+<td>
+
+boolean
+</td>
+<td>
+
+`true`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.websocket.ping-interval`
+
+Interval at which the client will send a ping message on the websocket to keep the connection alive.
+
+
+
+Environment variable: `COMMAFEED_WEBSOCKET_PING_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>
+
+`15M`
+</td>
+</tr>
+<tr>
+<td>
+
+`commafeed.websocket.tree-reload-interval`
+
+If the websocket connection is disabled or the connection is lost, the client will reload the feed tree at this interval.
+
+
+
+Environment variable: `COMMAFEED_WEBSOCKET_TREE_RELOAD_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>
+
+`30S`
+</td>
+</tr>
+</tbody>
+</table>
+
+<a name="duration-note-anchor"></a>
+
+> [!NOTE]
+> ### About the Duration format
+> 
+> To write duration values, use the standard `java.time.Duration` format.
+> See the [Duration#parse()](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html#parse(java.lang.CharSequence)) Java API documentation] for more information.
+> 
+> You can also use a simplified format, starting with a number:
+> 
+> * If the value is only a number, it represents time in seconds.
+> * If the value is a number followed by `ms`, it represents time in milliseconds.
+> 
+> In other cases, the simplified format is translated to the `java.time.Duration` format for parsing:
+> 
+> * If the value is a number followed by `h`, `m`, or `s`, it is prefixed with `PT`.
+> * If the value is a number followed by `d`, it is prefixed with `P`.
+<a name="memory-size-note-anchor"></a>
+
+> [!NOTE]
+> ### About the MemorySize format
+> 
+> A size configuration option recognizes strings in this format (shown as a regular expression): `[0-9]+[KkMmGgTtPpEeZzYy]?`.
+> 
+> If no suffix is given, assume bytes.

commafeed-server/pom.xml

@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.2.0</version>
+		<version>5.4.0</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
 
 	<properties>
-		<quarkus.version>3.14.4</quarkus.version>
-		<querydsl.version>6.7</querydsl.version>
+		<quarkus.version>3.17.7</quarkus.version>
+		<querydsl.version>6.10.1</querydsl.version>
 		<rome.version>2.1.0</rome.version>
-		<swagger.version>2.2.23</swagger.version>
+		<swagger.version>2.2.28</swagger.version>
 
 		<build.database>h2</build.database>
 	</properties>
@@ -43,7 +43,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-help-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.5.1</version>
 				<executions>
 					<execution>
 						<phase>initialize</phase>
@@ -104,11 +104,14 @@
 				<extensions>true</extensions>
 				<executions>
 					<execution>
-						<id>default-generate-asciidoc</id>
+						<id>default-generate-config-doc</id>
 						<phase>process-test-resources</phase>
 						<goals>
-							<goal>generate-asciidoc</goal>
+							<goal>generate-config-doc</goal>
 						</goals>
+						<configuration>
+							<format>markdown</format>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -135,7 +138,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.5.2</version>
 				<configuration>
 					<systemPropertyVariables>
 						<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
@@ -146,7 +149,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.5.2</version>
 				<executions>
 					<execution>
 						<goals>
@@ -233,12 +236,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.6.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>com.puppycrawl.tools</groupId>
 						<artifactId>checkstyle</artifactId>
-						<version>10.18.1</version>
+						<version>10.21.1</version>
 					</dependency>
 				</dependencies>
 				<executions>
@@ -267,7 +270,7 @@
 			<plugin>
 				<groupId>com.diffplug.spotless</groupId>
 				<artifactId>spotless-maven-plugin</artifactId>
-				<version>2.43.0</version>
+				<version>2.44.2</version>
 				<?m2e ignore?>
 				<executions>
 					<execution>
@@ -294,14 +297,14 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>5.2.0</version>
+			<version>5.4.0</version>
 		</dependency>
 
 		<!-- compile-time processors -->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.34</version>
+			<version>1.18.36</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -358,7 +361,7 @@
 		<dependency>
 			<groupId>io.dropwizard.metrics</groupId>
 			<artifactId>metrics-json</artifactId>
-			<version>4.2.27</version>
+			<version>4.2.30</version>
 		</dependency>
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
@@ -405,7 +408,7 @@
 		<dependency>
 			<groupId>org.passay</groupId>
 			<artifactId>passay</artifactId>
-			<version>1.6.5</version>
+			<version>1.6.6</version>
 		</dependency>
 		<dependency>
 			<groupId>com.rometools</groupId>
@@ -430,12 +433,12 @@
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
-			<version>1.18.1</version>
+			<version>1.18.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
-			<version>75.1</version>
+			<version>76.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.cssparser</groupId>
@@ -450,7 +453,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.3.1</version>
+			<version>5.4.1</version>
 		</dependency>
 		<!-- add brotli support for httpclient5 -->
 		<dependency>
@@ -461,7 +464,7 @@
 		<dependency>
 			<groupId>io.github.hakky54</groupId>
 			<artifactId>sslcontext-kickstart-for-apache5</artifactId>
-			<version>8.3.6</version>
+			<version>9.0.0</version>
 		</dependency>
 
 		<!-- test dependencies -->
@@ -489,7 +492,7 @@
 		<dependency>
 			<groupId>com.microsoft.playwright</groupId>
 			<artifactId>playwright</artifactId>
-			<version>1.47.0</version>
+			<version>1.49.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

commafeed-server/src/main/docker/Dockerfile.jvm

@@ -1,10 +1,10 @@
-FROM ibm-semeru-runtimes:open-21.0.4_7-jre
+FROM ibm-semeru-runtimes:open-21.0.5_11-jre
 EXPOSE 8082
 
 RUN mkdir -p /commafeed/data
 VOLUME /commafeed/data
 
-COPY commafeed-server/target/quarkus-app/ /commafeed
+COPY artifacts/extracted-jvm-package/quarkus-app/ /commafeed
 WORKDIR /commafeed
 
 CMD ["java", \

commafeed-server/src/main/docker/Dockerfile.native

@@ -1,10 +1,12 @@
-FROM debian:12.7
+FROM debian:12.9
+ARG TARGETARCH
+
 EXPOSE 8082
 
 RUN mkdir -p /commafeed/data
 VOLUME /commafeed/data
 
-COPY commafeed-server/target/commafeed-*-runner /commafeed/application
+COPY artifacts/commafeed-*-${TARGETARCH}-runner /commafeed/application
 WORKDIR /commafeed
 
 CMD ["./application"]

commafeed-server/src/main/docker/README.md

@@ -68,7 +68,7 @@ CommaFeed also supports:
 
 ## Configuration
 
-All [CommaFeed settings](https://github.com/Athou/commafeed/blob/master/commafeed-server/doc/commafeed.adoc) are
+All [CommaFeed settings](https://github.com/Athou/commafeed/blob/master/commafeed-server/doc/commafeed.md) are
 optional and have sensible default values.
 
 Settings are overrideable with environment variables. For instance, `commafeed.feed-refresh.interval-empirical` can be
@@ -92,5 +92,4 @@ Tags are of the form `<version>-<database>[-jvm]` where:
     - `latest` (always points to the latest version)
     - `master` (always points to the latest git commit)
 - `<database>` is the database to use (`h2`, `postgresql`, `mysql` or `mariadb`)
-- `-jvm` is optional and indicates that CommaFeed is running on a JVM, and not compiled natively. This image supports
-  the arm64 platform which is not yet supported by the native image.
+- `-jvm` is optional and indicates that CommaFeed is running on a JVM, and not compiled natively.

commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java

@@ -209,6 +209,12 @@ public interface CommaFeedConfiguration {
 		 */
 		@WithDefault("500ms")
 		Duration filteringExpressionEvaluationTimeout();
+
+		/**
+		 * Duration after which the "Fetch all my feeds now" action is available again after use to avoid spamming feeds.
+		 */
+		@WithDefault("0")
+		Duration forceRefreshCooldownDuration();
 	}
 
 	interface Database {

commafeed-server/src/main/java/com/commafeed/JacksonCustomizer.java

@@ -18,7 +18,8 @@ public class JacksonCustomizer implements ObjectMapperCustomizer {
 		objectMapper.registerModule(new JavaTimeModule());
 
 		// read and write instants as milliseconds instead of nanoseconds
-		objectMapper.configure(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS, false)
+		objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, true)
+				.configure(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS, false)
 				.configure(DeserializationFeature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS, false);
 
 		// add support for serializing metrics

commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java

@@ -2,7 +2,10 @@ package com.commafeed.backend;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.IDN;
+import java.net.InetAddress;
 import java.net.URI;
+import java.net.UnknownHostException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -10,6 +13,8 @@ import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 
 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;
@@ -29,6 +34,7 @@ import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
+import org.jboss.resteasy.reactive.common.headers.CacheControlDelegate;
 
 import com.codahale.metrics.MetricRegistry;
 import com.commafeed.CommaFeedConfiguration;
@@ -41,6 +47,7 @@ import com.google.common.io.ByteStreams;
 import com.google.common.net.HttpHeaders;
 
 import jakarta.inject.Singleton;
+import jakarta.ws.rs.core.CacheControl;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -118,15 +125,26 @@ public class HttpGetter {
 			throw new NotModifiedException("eTagHeader is the same");
 		}
 
+		Duration validFor = Optional.ofNullable(response.getCacheControl())
+				.filter(cc -> cc.getMaxAge() >= 0)
+				.map(cc -> Duration.ofSeconds(cc.getMaxAge()))
+				.orElse(Duration.ZERO);
+
 		return new HttpResult(response.getContent(), response.getContentType(), lastModifiedHeader, eTagHeader,
-				response.getUrlAfterRedirect());
+				response.getUrlAfterRedirect(), validFor);
 	}
 
 	private HttpResponse invoke(HttpRequest request) throws IOException {
 		log.debug("fetching {}", request.getUrl());
 
 		HttpClientContext context = HttpClientContext.create();
-		context.setRequestConfig(RequestConfig.custom().setResponseTimeout(Timeout.of(config.httpClient().responseTimeout())).build());
+		context.setRequestConfig(RequestConfig.custom()
+				.setResponseTimeout(Timeout.of(config.httpClient().responseTimeout()))
+				// causes issues with some feeds
+				// see https://github.com/Athou/commafeed/issues/1572
+				// and https://issues.apache.org/jira/browse/HTTPCLIENT-2344
+				.setProtocolUpgradeEnabled(false)
+				.build());
 
 		return client.execute(request.toClassicHttpRequest(), context, resp -> {
 			byte[] content = resp.getEntity() == null ? null
@@ -141,6 +159,12 @@ public class HttpGetter {
 					.map(StringUtils::trimToNull)
 					.orElse(null);
 
+			CacheControl cacheControl = Optional.ofNullable(resp.getFirstHeader(HttpHeaders.CACHE_CONTROL))
+					.map(NameValuePair::getValue)
+					.map(StringUtils::trimToNull)
+					.map(HttpGetter::toCacheControl)
+					.orElse(null);
+
 			String contentType = Optional.ofNullable(resp.getEntity()).map(HttpEntity::getContentType).orElse(null);
 			String urlAfterRedirect = Optional.ofNullable(context.getRedirectLocations())
 					.map(RedirectLocations::getAll)
@@ -148,10 +172,19 @@ public class HttpGetter {
 					.map(URI::toString)
 					.orElse(request.getUrl());
 
-			return new HttpResponse(code, lastModifiedHeader, eTagHeader, content, contentType, urlAfterRedirect);
+			return new HttpResponse(code, lastModifiedHeader, eTagHeader, cacheControl, content, contentType, urlAfterRedirect);
 		});
 	}
 
+	private static CacheControl toCacheControl(String headerValue) {
+		try {
+			return CacheControlDelegate.INSTANCE.fromString(headerValue);
+		} catch (Exception e) {
+			log.debug("Invalid Cache-Control header: {}", headerValue);
+			return null;
+		}
+	}
+
 	private static byte[] toByteArray(HttpEntity entity, long maxBytes) throws IOException {
 		if (entity.getContentLength() > maxBytes) {
 			throw new IOException(
@@ -176,7 +209,7 @@ public class HttpGetter {
 
 		int poolSize = config.feedRefresh().httpThreads();
 		return PoolingHttpClientConnectionManagerBuilder.create()
-				.setSSLSocketFactory(Apache5SslUtils.toSocketFactory(sslFactory))
+				.setTlsSocketStrategy(Apache5SslUtils.toTlsSocketStrategy(sslFactory))
 				.setDefaultConnectionConfig(ConnectionConfig.custom()
 						.setConnectTimeout(Timeout.of(config.httpClient().connectTimeout()))
 						.setSocketTimeout(Timeout.of(config.httpClient().socketTimeout()))
@@ -185,6 +218,7 @@ public class HttpGetter {
 				.setDefaultTlsConfig(TlsConfig.custom().setHandshakeTimeout(Timeout.of(config.httpClient().sslHandshakeTimeout())).build())
 				.setMaxConnPerRoute(poolSize)
 				.setMaxConnTotal(poolSize)
+				.setDnsResolver(new InternationalizedDomainNameToAsciiDnsResolver(SystemDefaultDnsResolver.INSTANCE))
 				.build();
 
 	}
@@ -221,6 +255,18 @@ public class HttpGetter {
 				.build();
 	}
 
+	private record InternationalizedDomainNameToAsciiDnsResolver(DnsResolver delegate) implements DnsResolver {
+		@Override
+		public InetAddress[] resolve(String host) throws UnknownHostException {
+			return delegate.resolve(IDN.toASCII(host));
+		}
+
+		@Override
+		public String resolveCanonicalHostname(String host) throws UnknownHostException {
+			return delegate.resolveCanonicalHostname(IDN.toASCII(host));
+		}
+	}
+
 	@Getter
 	public static class NotModifiedException extends Exception {
 		private static final long serialVersionUID = 1L;
@@ -287,6 +333,7 @@ public class HttpGetter {
 		int code;
 		String lastModifiedHeader;
 		String eTagHeader;
+		CacheControl cacheControl;
 		byte[] content;
 		String contentType;
 		String urlAfterRedirect;
@@ -299,6 +346,7 @@ public class HttpGetter {
 		String lastModifiedSince;
 		String eTag;
 		String urlAfterRedirect;
+		Duration validFor;
 	}
 
 }

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedFetcher.java

@@ -2,6 +2,7 @@ package com.commafeed.backend.feed;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
 
@@ -87,7 +88,8 @@ public class FeedFetcher {
 					etagHeaderValueChanged ? result.getETag() : null);
 		}
 
-		return new FeedFetcherResult(parserResult, result.getUrlAfterRedirect(), result.getLastModifiedSince(), result.getETag(), hash);
+		return new FeedFetcherResult(parserResult, result.getUrlAfterRedirect(), result.getLastModifiedSince(), result.getETag(), hash,
+				result.getValidFor());
 	}
 
 	private static String extractFeedUrl(List<FeedURLProvider> urlProviders, String url, String urlContent) {
@@ -102,7 +104,7 @@ public class FeedFetcher {
 	}
 
 	public record FeedFetcherResult(FeedParserResult feed, String urlAfterRedirect, String lastModifiedHeader, String lastETagHeader,
-			String contentHash) {
+			String contentHash, Duration validFor) {
 	}
 
 }

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java

@@ -6,6 +6,7 @@ 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;
@@ -76,8 +77,9 @@ public class FeedRefreshWorker {
 
 			feed.setErrorCount(0);
 			feed.setMessage(null);
-			feed.setDisabledUntil(
-					refreshIntervalCalculator.onFetchSuccess(result.feed().lastPublishedDate(), result.feed().averageEntryInterval()));
+			feed.setDisabledUntil(ObjectUtils.max(
+					refreshIntervalCalculator.onFetchSuccess(result.feed().lastPublishedDate(), result.feed().averageEntryInterval()),
+					Instant.now().plus(result.validFor())));
 
 			return new FeedRefreshWorkerResult(feed, entries);
 		} catch (NotModifiedException e) {

commafeed-server/src/main/java/com/commafeed/backend/feed/parser/FeedCleaner.java

@@ -1,6 +1,7 @@
 package com.commafeed.backend.feed.parser;
 
 import java.util.Collection;
+import java.util.regex.Pattern;
 
 import org.ahocorasick.trie.Emit;
 import org.ahocorasick.trie.Trie;
@@ -11,6 +12,8 @@ import jakarta.inject.Singleton;
 @Singleton
 class FeedCleaner {
 
+	private static final Pattern DOCTYPE_PATTERN = Pattern.compile("<!DOCTYPE[^>]*>", Pattern.CASE_INSENSITIVE);
+
 	public String trimInvalidXmlCharacters(String xml) {
 		if (StringUtils.isBlank(xml)) {
 			return null;
@@ -60,4 +63,8 @@ class FeedCleaner {
 		return sb.toString();
 	}
 
+	public String removeDoctypeDeclarations(String xml) {
+		return DOCTYPE_PATTERN.matcher(xml).replaceAll("");
+	}
+
 }

commafeed-server/src/main/java/com/commafeed/backend/feed/parser/FeedParser.java

@@ -64,6 +64,7 @@ public class FeedParser {
 				throw new FeedException("Input string is null for url " + feedUrl);
 			}
 			xmlString = feedCleaner.replaceHtmlEntitiesWithNumericEntities(xmlString);
+			xmlString = feedCleaner.removeDoctypeDeclarations(xmlString);
 
 			InputSource source = new InputSource(new StringReader(xmlString));
 			SyndFeed feed = new SyndFeedInput().build(source);

commafeed-server/src/main/java/com/commafeed/backend/model/User.java

@@ -52,4 +52,7 @@ public class User extends AbstractModel {
 
 	@Column
 	private Instant recoverPasswordTokenDate;
+
+	@Column
+	private Instant lastForceRefresh;
 }

commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java

@@ -98,12 +98,19 @@ public class FeedSubscriptionService {
 		}
 	}
 
-	public void refreshAll(User user) {
+	public void refreshAll(User user) throws ForceFeedRefreshTooSoonException {
+		Instant lastForceRefresh = user.getLastForceRefresh();
+		if (lastForceRefresh != null && lastForceRefresh.plus(config.feedRefresh().forceRefreshCooldownDuration()).isAfter(Instant.now())) {
+			throw new ForceFeedRefreshTooSoonException();
+		}
+
 		List<FeedSubscription> subs = feedSubscriptionDAO.findAll(user);
 		for (FeedSubscription sub : subs) {
 			Feed feed = sub.getFeed();
 			feedRefreshEngine.refreshImmediately(feed);
 		}
+
+		user.setLastForceRefresh(Instant.now());
 	}
 
 	public void refreshAllUpForRefresh(User user) {
@@ -130,4 +137,11 @@ public class FeedSubscriptionService {
 		}
 	}
 
+	@SuppressWarnings("serial")
+	public static class ForceFeedRefreshTooSoonException extends Exception {
+		private ForceFeedRefreshTooSoonException() {
+			super();
+		}
+	}
+
 }

commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java

@@ -43,4 +43,7 @@ public class ServerInfo implements Serializable {
 	@Schema(requiredMode = RequiredMode.REQUIRED)
 	private long treeReloadInterval;
 
+	@Schema(requiredMode = RequiredMode.REQUIRED)
+	private long forceRefreshCooldownDuration;
+
 }