release 5.3.5

chore(deps): update linguijs monorepo to v5 (major)

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [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)

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.3/schema.json",
+    "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
     "formatter": {
         "indentStyle": "space",
         "indentWidth": 4,

commafeed-client/package.json

@@ -15,20 +15,19 @@
         "i18n:extract": "lingui extract --clean"
     },
     "dependencies": {
-        "@emotion/react": "^11.13.3",
+        "@emotion/react": "^11.13.5",
         "@fontsource/open-sans": "^5.1.0",
-        "@lingui/core": "^4.11.4",
-        "@lingui/macro": "^4.11.4",
-        "@lingui/react": "^4.11.4",
-        "@mantine/core": "^7.13.2",
-        "@mantine/form": "^7.13.2",
-        "@mantine/hooks": "^7.13.2",
-        "@mantine/modals": "^7.13.2",
-        "@mantine/notifications": "^7.13.2",
-        "@mantine/spotlight": "^7.13.2",
+        "@lingui/core": "^5.0.0",
+        "@lingui/react": "^5.0.0",
+        "@mantine/core": "^7.14.3",
+        "@mantine/form": "^7.14.3",
+        "@mantine/hooks": "^7.14.3",
+        "@mantine/modals": "^7.14.3",
+        "@mantine/notifications": "^7.14.3",
+        "@mantine/spotlight": "^7.14.3",
         "@monaco-editor/react": "^4.6.0",
-        "@reduxjs/toolkit": "^2.2.7",
-        "axios": "^1.7.7",
+        "@reduxjs/toolkit": "^2.4.0",
+        "axios": "^1.7.8",
         "dayjs": "^1.11.13",
         "escape-string-regexp": "^5.0.0",
         "interweave": "^13.1.0",
@@ -45,35 +44,37 @@
         "react-icons": "^5.3.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-router-dom": "^7.0.1",
+        "react-swipeable": "^7.0.2",
+        "redoc": "^2.2.0",
+        "style-to-object": "^1.0.8",
         "throttle-debounce": "^5.0.2",
         "tinycon": "^0.6.8",
         "tss-react": "^4.9.13",
         "websocket-heartbeat-js": "^1.1.3"
     },
     "devDependencies": {
-        "@biomejs/biome": "^1.9.3",
-        "@lingui/cli": "^4.11.4",
-        "@lingui/vite-plugin": "^4.11.4",
+        "@biomejs/biome": "^1.9.4",
+        "@lingui/babel-plugin-lingui-macro": "^5.0.0",
+        "@lingui/cli": "^5.0.0",
+        "@lingui/vite-plugin": "^5.0.0",
         "@types/mousetrap": "^1.6.15",
-        "@types/react": "^18.3.11",
-        "@types/react-dom": "^18.3.0",
+        "@types/react": "^18.3.12",
+        "@types/react-dom": "^18.3.1",
         "@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.2",
+        "@types/tinycon": "^0.6.7",
+        "@vitejs/plugin-react": "^4.3.4",
         "babel-plugin-macros": "^3.1.0",
         "jsdom": "^25.0.1",
         "rollup-plugin-visualizer": "^5.12.0",
-        "typescript": "^5.6.2",
-        "vite": "^5.4.8",
+        "typescript": "^5.7.2",
+        "vite": "^5.4.11",
         "vite-plugin-checker": "^0.8.0",
-        "vite-tsconfig-paths": "^5.0.1",
-        "vitest": "^2.1.2",
+        "vite-tsconfig-paths": "^5.1.3",
+        "vitest": "^2.1.6",
         "vitest-mock-extended": "^2.0.2"
     }
 }

commafeed-client/pom.xml

@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.3.1</version>
+		<version>5.3.5</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>
 
 	<properties>
 		<!-- renovate: datasource=node-version depName=node -->
-		<node.version>v20.18.0</node.version>
+		<node.version>v22.11.0</node.version>
 		<!-- renovate: datasource=npm depName=npm -->
-		<npm.version>10.9.0</npm.version>
+		<npm.version>10.9.1</npm.version>
 	</properties>
 
 	<build>

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/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,4 +1,4 @@
-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"

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"

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,

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/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,690 +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]##link:#commafeed-server_commafeed-hide-from-web-crawlers[`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]##link:#commafeed-server_commafeed-image-proxy-enabled[`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]##link:#commafeed-server_commafeed-password-recovery-enabled[`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]##link:#commafeed-server_commafeed-announcement[`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]##link:#commafeed-server_commafeed-google-analytics-tracking-code[`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]##link:#commafeed-server_commafeed-google-auth-key[`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]##link:#commafeed-server_section_commafeed-http-client[HTTP client configuration]##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-http-client-user-agent]] [.property-path]##link:#commafeed-server_commafeed-http-client-user-agent[`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]##link:#commafeed-server_commafeed-http-client-connect-timeout[`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]##link:#commafeed-server_commafeed-http-client-ssl-handshake-timeout[`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]##link:#commafeed-server_commafeed-http-client-socket-timeout[`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]##link:#commafeed-server_commafeed-http-client-response-timeout[`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]##link:#commafeed-server_commafeed-http-client-connection-time-to-live[`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]##link:#commafeed-server_commafeed-http-client-idle-connections-eviction-interval[`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]##link:#commafeed-server_commafeed-http-client-max-response-size[`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]##link:#commafeed-server_section_commafeed-http-client-cache[HTTP client cache configuration]##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-http-client-cache-enabled]] [.property-path]##link:#commafeed-server_commafeed-http-client-cache-enabled[`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]##link:#commafeed-server_commafeed-http-client-cache-maximum-memory-size[`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]##link:#commafeed-server_commafeed-http-client-cache-expiration[`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]##link:#commafeed-server_section_commafeed-feed-refresh[Feed refresh engine settings]##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-feed-refresh-interval]] [.property-path]##link:#commafeed-server_commafeed-feed-refresh-interval[`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]##link:#commafeed-server_commafeed-feed-refresh-interval-empirical[`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]##link:#commafeed-server_commafeed-feed-refresh-http-threads[`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]##link:#commafeed-server_commafeed-feed-refresh-database-threads[`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]##link:#commafeed-server_commafeed-feed-refresh-user-inactivity-period[`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]##link:#commafeed-server_commafeed-feed-refresh-filtering-expression-evaluation-timeout[`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`
-
-a| [[commafeed-server_commafeed-feed-refresh-force-refresh-cooldown-duration]] [.property-path]##link:#commafeed-server_commafeed-feed-refresh-force-refresh-cooldown-duration[`commafeed.feed-refresh.force-refresh-cooldown-duration`]##
-
-[.description]
---
-Duration after which the "Fetch all my feeds now" action is available again after use to avoid spamming feeds.
-
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++COMMAFEED_FEED_REFRESH_FORCE_REFRESH_COOLDOWN_DURATION+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++COMMAFEED_FEED_REFRESH_FORCE_REFRESH_COOLDOWN_DURATION+++`
-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]] [.section-name.section-level0]##link:#commafeed-server_section_commafeed-database[Database settings]##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-database-query-timeout]] [.property-path]##link:#commafeed-server_commafeed-database-query-timeout[`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]##link:#commafeed-server_section_commafeed-database-cleanup[Database cleanup settings]##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-database-cleanup-entries-max-age]] [.property-path]##link:#commafeed-server_commafeed-database-cleanup-entries-max-age[`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]##link:#commafeed-server_commafeed-database-cleanup-statuses-max-age[`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]##link:#commafeed-server_commafeed-database-cleanup-max-feed-capacity[`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]##link:#commafeed-server_commafeed-database-cleanup-max-feeds-per-user[`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]##link:#commafeed-server_commafeed-database-cleanup-batch-size[`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]##link:#commafeed-server_section_commafeed-users[Users settings]##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-users-allow-registrations]] [.property-path]##link:#commafeed-server_commafeed-users-allow-registrations[`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]##link:#commafeed-server_commafeed-users-strict-password-policy[`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]##link:#commafeed-server_commafeed-users-create-demo-account[`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]##link:#commafeed-server_section_commafeed-websocket[Websocket settings]##
-h|Type
-h|Default
-
-a| [[commafeed-server_commafeed-websocket-enabled]] [.property-path]##link:#commafeed-server_commafeed-websocket-enabled[`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]##link:#commafeed-server_commafeed-websocket-ping-interval[`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]##link:#commafeed-server_commafeed-websocket-tree-reload-interval[`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.3.1</version>
+		<version>5.3.5</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
 
 	<properties>
-		<quarkus.version>3.15.1</quarkus.version>
-		<querydsl.version>6.8</querydsl.version>
+		<quarkus.version>3.17.2</quarkus.version>
+		<querydsl.version>6.9</querydsl.version>
 		<rome.version>2.1.0</rome.version>
-		<swagger.version>2.2.25</swagger.version>
+		<swagger.version>2.2.26</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.2</version>
+						<version>10.20.2</version>
 					</dependency>
 				</dependencies>
 				<executions>
@@ -294,14 +297,14 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>5.3.1</version>
+			<version>5.3.5</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.28</version>
+			<version>4.2.29</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.4</version>
+			<version>5.4.1</version>
 		</dependency>
 		<!-- add brotli support for httpclient5 -->
 		<dependency>
@@ -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,4 +1,4 @@
-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

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

@@ -1,4 +1,4 @@
-FROM debian:12.7
+FROM debian:12.8
 EXPOSE 8082
 
 RUN mkdir -p /commafeed/data

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

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,8 +125,13 @@ 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 {
@@ -147,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(CacheControlDelegate.INSTANCE::fromString)
+					.orElse(null);
+
 			String contentType = Optional.ofNullable(resp.getEntity()).map(HttpEntity::getContentType).orElse(null);
 			String urlAfterRedirect = Optional.ofNullable(context.getRedirectLocations())
 					.map(RedirectLocations::getAll)
@@ -154,7 +172,7 @@ 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);
 		});
 	}
 
@@ -191,6 +209,7 @@ public class HttpGetter {
 				.setDefaultTlsConfig(TlsConfig.custom().setHandshakeTimeout(Timeout.of(config.httpClient().sslHandshakeTimeout())).build())
 				.setMaxConnPerRoute(poolSize)
 				.setMaxConnTotal(poolSize)
+				.setDnsResolver(new InternationalizedDomainNameToAsciiDnsResolver(SystemDefaultDnsResolver.INSTANCE))
 				.build();
 
 	}
@@ -227,6 +246,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;
@@ -293,6 +324,7 @@ public class HttpGetter {
 		int code;
 		String lastModifiedHeader;
 		String eTagHeader;
+		CacheControl cacheControl;
 		byte[] content;
 		String contentType;
 		String urlAfterRedirect;
@@ -305,6 +337,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/frontend/resource/UserREST.java

@@ -337,7 +337,7 @@ public class UserREST {
 			return Response.status(Status.UNAUTHORIZED).entity("token expired.").build();
 		}
 
-		String passwd = RandomStringUtils.randomAlphanumeric(10);
+		String passwd = RandomStringUtils.secure().nextAlphanumeric(10);
 		byte[] encryptedPassword = encryptionService.getEncryptedPassword(passwd, user.getSalt());
 		user.setPassword(encryptedPassword);
 		if (StringUtils.isNotBlank(user.getApiKey())) {

commafeed-server/src/main/java/com/commafeed/security/mechanism/CookieMaxAgeFormAuthenticationMechanism.java

@@ -1,44 +0,0 @@
-package com.commafeed.security.mechanism;
-
-import io.quarkus.security.identity.IdentityProviderManager;
-import io.quarkus.security.identity.SecurityIdentity;
-import io.quarkus.vertx.http.runtime.HttpConfiguration;
-import io.quarkus.vertx.http.runtime.security.FormAuthenticationMechanism;
-import io.quarkus.vertx.http.runtime.security.HttpAuthenticationMechanism;
-import io.smallrye.mutiny.Uni;
-import io.vertx.core.http.Cookie;
-import io.vertx.core.http.impl.ServerCookie;
-import io.vertx.ext.web.RoutingContext;
-import jakarta.annotation.Priority;
-import jakarta.inject.Singleton;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.Delegate;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * HttpAuthenticationMechanism that wraps FormAuthenticationMechanism and sets a Max-Age on the cookie because it has no value by default.
- *
- * This is a workaround for https://github.com/quarkusio/quarkus/issues/42463
- */
-@Priority(1)
-@RequiredArgsConstructor
-@Singleton
-@Slf4j
-public class CookieMaxAgeFormAuthenticationMechanism implements HttpAuthenticationMechanism {
-
-	@Delegate
-	private final FormAuthenticationMechanism delegate;
-	private final HttpConfiguration config;
-
-	@Override
-	public Uni<SecurityIdentity> authenticate(RoutingContext context, IdentityProviderManager identityProviderManager) {
-		context.addHeadersEndHandler(v -> {
-			Cookie cookie = context.request().getCookie(config.auth.form.cookieName);
-			if (cookie instanceof ServerCookie sc && sc.isChanged()) {
-				cookie.setMaxAge(config.auth.form.timeout.toSeconds());
-			}
-		});
-
-		return delegate.authenticate(context, identityProviderManager);
-	}
-}

commafeed-server/src/main/resources/application.properties

@@ -15,6 +15,7 @@ quarkus.http.auth.basic=true
 quarkus.http.auth.form.enabled=true
 quarkus.http.auth.form.http-only-cookie=true
 quarkus.http.auth.form.timeout=P30d
+quarkus.http.auth.form.cookie-max-age=P30d
 quarkus.http.auth.form.landing-page=
 quarkus.http.auth.form.login-page=
 quarkus.http.auth.form.error-page=

commafeed-server/src/test/java/com/commafeed/CommaFeedConfigurationTest.java

@@ -11,10 +11,10 @@ import org.junit.jupiter.api.Test;
 class CommaFeedConfigurationTest {
 
 	@Test
-	void verifyAsciiDocIsUpToDate() throws IOException {
-		String versionedDocumentationFile = FileUtils.readFileToString(new File("doc/commafeed.adoc"), StandardCharsets.UTF_8);
-		String generatedDocumentationFile = FileUtils
-				.readFileToString(new File("target/quarkus-generated-doc/config/commafeed-server.adoc"), StandardCharsets.UTF_8);
+	void verifyMarkdownDocIsUpToDate() throws IOException {
+		String versionedDocumentationFile = FileUtils.readFileToString(new File("doc/commafeed.md"), StandardCharsets.UTF_8);
+		String generatedDocumentationFile = FileUtils.readFileToString(new File("target/quarkus-generated-doc/config/commafeed-server.md"),
+				StandardCharsets.UTF_8);
 
 		Assertions.assertLinesMatch(versionedDocumentationFile.lines(), generatedDocumentationFile.lines());
 	}

commafeed-server/src/test/java/com/commafeed/backend/HttpGetterTest.java

@@ -93,13 +93,15 @@ class HttpGetterTest {
 						.withBody(feedContent)
 						.withContentType(MediaType.APPLICATION_ATOM_XML)
 						.withHeader(HttpHeaders.LAST_MODIFIED, "123456")
-						.withHeader(HttpHeaders.ETAG, "78910"));
+						.withHeader(HttpHeaders.ETAG, "78910")
+						.withHeader(HttpHeaders.CACHE_CONTROL, "max-age=60"));
 
 		HttpResult result = getter.get(this.feedUrl);
 		Assertions.assertArrayEquals(feedContent, result.getContent());
 		Assertions.assertEquals(MediaType.APPLICATION_ATOM_XML.toString(), result.getContentType());
 		Assertions.assertEquals("123456", result.getLastModifiedSince());
 		Assertions.assertEquals("78910", result.getETag());
+		Assertions.assertEquals(Duration.ofSeconds(60), result.getValidFor());
 		Assertions.assertEquals(this.feedUrl, result.getUrlAfterRedirect());
 	}
 

commafeed-server/src/test/java/com/commafeed/backend/feed/FeedFetcherTest.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.feed;
 
+import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
 
@@ -46,7 +47,7 @@ class FeedFetcherTest {
 		String lastContentHash = Digests.sha1Hex(content);
 
 		Mockito.when(getter.get(HttpGetter.HttpRequest.builder(url).lastModified(lastModified).eTag(etag).build()))
-				.thenReturn(new HttpResult(content, "content-type", "last-modified-2", "etag-2", null));
+				.thenReturn(new HttpResult(content, "content-type", "last-modified-2", "etag-2", null, Duration.ZERO));
 
 		NotModifiedException e = Assertions.assertThrows(NotModifiedException.class,
 				() -> fetcher.fetch(url, false, lastModified, etag, Instant.now(), lastContentHash));

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>5.3.1</version>
+	<version>5.3.5</version>
 	<name>CommaFeed</name>
 	<packaging>pom</packaging>
 
@@ -27,6 +27,9 @@
 					<!-- https://stackoverflow.com/a/33823355/ -->
 					<showWarnings>true</showWarnings>
 					<compilerArgs>
+						<!-- enable annotation processing -->
+						<arg>-proc:full</arg>
+
 						<!-- disable the "processing" linter because we have annotations that are processed at runtime -->
 						<!-- https://stackoverflow.com/a/76126981/ -->
 						<!-- disable the "classfile" linter because it generates "file missing" warnings about annotations with the "provided" scope -->