Update dependency @rolldown/plugin-babel to v0.3.0

Update linguijs monorepo to v6.11.0

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ "ubuntu-latest", "ubuntu-22.04-arm", "windows-latest" ]
+        os: [ "ubuntu-24.04", "ubuntu-22.04-arm", "windows-latest" ]
         database: [ "h2", "postgresql", "mysql", "mariadb" ]
 
     runs-on: ${{ matrix.os }}
@@ -29,14 +29,14 @@ jobs:
 
       # Setup
       - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@5298d94fb55a4f185c602eeac5de1b553882abe2 # v1.6.4
+        uses: graalvm/setup-graalvm@f70bc8032f90a104502824a54bcb94b6f01715bc # v1.6.8
         with:
           java-version: ${{ env.JAVA_VERSION }}
-          distribution: "graalvm"
+          distribution: "mandrel"
           cache: "maven"
 
       - name: Set up NodeJS cache
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
         with:
           cache: "npm"
           cache-dependency-path: 'commafeed-client/package-lock.json'
@@ -47,7 +47,7 @@ jobs:
 
       # 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' }}
+        run: mvn --batch-mode --no-transfer-progress install -Pnative -P${{ matrix.database }} -DskipITs=${{ matrix.os == 'windows-latest' && matrix.database != 'h2' }}
 
       # Build pages
       - name: Create pages directory structure
@@ -73,21 +73,21 @@ jobs:
 
       # Upload artifacts
       - name: Upload cross-platform app
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
-        if: matrix.os == 'ubuntu-latest' # we only need to upload the cross-platform artifact once per database
+        if: matrix.os == 'ubuntu-24.04' # we only need to upload the cross-platform artifact once per database
         with:
           name: commafeed-${{ matrix.database }}-jvm
           path: commafeed-server/target/commafeed-*.zip
 
       - name: Upload native executable
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         with:
           name: commafeed-${{ matrix.database }}-${{ runner.os }}-${{ runner.arch }}
           path: commafeed-server/target/commafeed-*-runner*
 
       - name: Upload pages
         uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
-        if: matrix.os == 'ubuntu-latest' && matrix.database == 'h2' # we only need to upload the pages once
+        if: matrix.os == 'ubuntu-24.04' && matrix.database == 'h2' # we only need to upload the pages once
         with:
           path: target/pages
 
@@ -110,17 +110,17 @@ jobs:
 
       # Setup
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
+        uses: docker/setup-qemu-action@99012661954931238ded8c8b007157a8430204e1 # v4.4.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
+        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
 
       - name: Install required packages
         run: sudo apt-get install -y rename unzip
 
       # Prepare artifacts
       - name: Download artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
         with:
           pattern: commafeed-${{ matrix.database }}-*
           path: ./artifacts
@@ -141,7 +141,7 @@ jobs:
 
       # Docker
       - name: Login to Container Registry
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0
         if: ${{ env.DOCKERHUB_USERNAME != '' }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -149,7 +149,7 @@ jobs:
 
       ## build but don't push for PRs and renovate
       - name: Docker build - native
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
         with:
           context: .
           file: commafeed-server/src/main/docker/Dockerfile.native
@@ -157,7 +157,7 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
 
       - name: Docker build - jvm
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
         with:
           context: .
           file: commafeed-server/src/main/docker/Dockerfile.jvm
@@ -166,7 +166,7 @@ jobs:
 
       ## build and push tag
       - name: Docker build and push tag - native
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
         if: ${{ github.ref_type == 'tag' }}
         with:
           context: .
@@ -178,7 +178,7 @@ jobs:
             athou/commafeed:${{ github.ref_name }}-${{ matrix.database }}
 
       - name: Docker build and push tag - jvm
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
         if: ${{ github.ref_type == 'tag' }}
         with:
           context: .
@@ -191,7 +191,7 @@ jobs:
 
       ## build and push master
       - name: Docker build and push master - native
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
         if: ${{ github.ref_name == 'master' }}
         with:
           context: .
@@ -201,7 +201,7 @@ jobs:
           tags: athou/commafeed:master-${{ matrix.database }}
 
       - name: Docker build and push master - jvm
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
         if: ${{ github.ref_name == 'master' }}
         with:
           context: .
@@ -226,7 +226,7 @@ jobs:
           fetch-depth: 0
 
       - name: Download artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
         with:
           pattern: commafeed-*
           path: ./artifacts
@@ -280,5 +280,5 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
 
     steps:
-      - uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
+      - uses: actions/deploy-pages@368f82528645a54fb793d4d04e342629a3f51346 # v5.0.1
         id: deployment

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
 wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.0/apache-maven-3.10.0-bin.zip

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [7.4.1]
+
+- Fix entries being marked as read when scrolling back to an entry that was explicitly marked as unread (#2337)
+- Add a global failsafe timeout to the new HTTP/2 client to prevent it from hanging indefinitely
+- Add OCI source label to container images (#2335)
+
+## [7.4.0]
+
+- Add support for HTTP/2 when fetching feeds (#2317)
+- Send more default headers when fetching feeds, to avoid being rejected by some servers (#2315)
+- Harden the content cleaning of feed entries by only allowing `http`/`https` protocols in `iframe` `src` attributes
+- Fix the header in mobile mode being wrapped/cut off when too wide, even above the mobile breakpoint (#2080)
+- Document how to configure Quarkus host validation when running CommaFeed behind a reverse proxy
+
 ## [7.3.2]
 
 - Prevent users from starring/tagging entries that are not theirs and subsequently reading them (GHSA-prfv-88mm-5gpg)

README.md

@@ -167,6 +167,20 @@ CommaFeed blocks access to local resources by default to prevent [SSRF](https://
 If you want to subscribe to feeds that are only available on your local network, you can disable this security measure by setting the `commafeed.http-client.block-local-addresses` variable to `false`.
 Do this only if you trust all users of your CommaFeed instance not to access private resources.
 
+### Listen on a single network interface
+
+By default, CommaFeed listens on all interfaces. You can restrict it by setting `quarkus.http.host`.
+
+Note that if you set it to a local name like `127.0.0.1` host validation is enabled automatically. This prevents
+access if you're using a reverse proxy like Nginx. To fix, add your actual hostname to `allowed-hosts`:
+
+```
+quarkus.http.host=127.0.0.1
+quarkus.http.proxy.proxy-address-forwarding=true
+quarkus.http.proxy.allow-forwarded=true
+quarkus.http.host-validation.allowed-hosts=commafeed.example.com
+```
+
 ## Translation
 
 Files for internationalization are

commafeed-client/.npmrc

@@ -0,0 +1 @@
+loglevel=warn

commafeed-client/biome.json

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

commafeed-client/package.json

@@ -17,35 +17,35 @@
     "dependencies": {
         "@emotion/react": "11.14.0",
         "@fontsource/open-sans": "5.3.0",
-        "@lingui/core": "6.6.0",
+        "@lingui/core": "6.11.0",
-        "@lingui/react": "6.6.0",
+        "@lingui/react": "6.11.0",
-        "@mantine/core": "9.5.1",
+        "@mantine/core": "9.7.4",
-        "@mantine/dates": "9.5.1",
+        "@mantine/dates": "9.7.4",
-        "@mantine/form": "9.5.1",
+        "@mantine/form": "9.7.4",
-        "@mantine/hooks": "9.5.1",
+        "@mantine/hooks": "9.7.4",
-        "@mantine/modals": "9.5.1",
+        "@mantine/modals": "9.7.4",
-        "@mantine/notifications": "9.5.1",
+        "@mantine/notifications": "9.7.4",
-        "@mantine/spotlight": "9.5.1",
+        "@mantine/spotlight": "9.7.4",
         "@monaco-editor/react": "4.7.0",
-        "@react-querybuilder/mantine": "8.23.0",
+        "@react-querybuilder/mantine": "8.26.0",
-        "@reduxjs/toolkit": "2.12.0",
+        "@reduxjs/toolkit": "2.13.0",
-        "@rolldown/plugin-babel": "0.2.3",
+        "@rolldown/plugin-babel": "0.3.0",
-        "axios": "1.19.0",
+        "axios": "1.21.0",
         "dayjs": "1.11.23",
         "escape-string-regexp": "5.0.0",
         "interweave": "13.1.1",
-        "monaco-editor": "0.56.0",
+        "monaco-editor": "0.57.0",
         "mousetrap": "1.6.5",
-        "react": "19.2.8",
+        "react": "19.3.1",
         "react-async-hook": "4.0.0",
         "react-contexify": "6.0.0",
-        "react-dom": "19.2.8",
+        "react-dom": "19.3.1",
-        "react-draggable": "4.7.1",
+        "react-draggable": "4.7.2",
         "react-icons": "5.7.0",
         "react-infinite-scroller": "1.2.6",
-        "react-querybuilder": "8.23.0",
+        "react-querybuilder": "8.26.0",
-        "react-redux": "9.3.0",
+        "react-redux": "9.3.1",
-        "react-router-dom": "7.18.2",
+        "react-router-dom": "7.18.5",
         "react-swipeable": "7.0.2",
         "style-to-object": "2.0.2",
         "throttle-debounce": "5.0.2",
@@ -54,32 +54,30 @@
         "websocket-heartbeat-js": "1.1.3"
     },
     "devDependencies": {
-        "@babel/types": "^8.0.4",
+        "@biomejs/biome": "2.6.4",
-        "@biomejs/biome": "2.5.9",
+        "@lingui/cli": "6.11.0",
-        "@lingui/babel-plugin-lingui-macro": "6.6.0",
+        "@lingui/vite-plugin": "6.11.0",
-        "@lingui/cli": "6.6.0",
-        "@lingui/vite-plugin": "6.6.0",
         "@testing-library/jest-dom": "7.0.1",
-        "@testing-library/react": "16.3.2",
+        "@testing-library/react": "16.3.3",
-        "@testing-library/user-event": "14.6.5",
+        "@testing-library/user-event": "14.6.8",
         "@types/mousetrap": "1.6.15",
-        "@types/react": "19.2.18",
+        "@types/react": "19.3.0",
-        "@types/react-dom": "19.2.4",
+        "@types/react-dom": "19.3.0",
         "@types/react-infinite-scroller": "1.2.5",
         "@types/throttle-debounce": "5.0.2",
         "@types/tinycon": "0.6.7",
-        "@vitejs/plugin-react": "6.0.5",
+        "@vitejs/plugin-react": "6.1.2",
-        "babel-plugin-react-compiler": "1.0.0",
+        "babel-plugin-react-compiler": "^1.0.0",
-        "jsdom": "30.0.1",
+        "jsdom": "30.1.3",
         "typescript": "7.0.2",
-        "vite": "8.2.1",
+        "vite": "8.3.5",
         "vite-plugin-checker": "0.14.5",
-        "vitest": "4.1.11",
+        "vitest": "5.0.5",
-        "yaml": "2.9.0"
+        "yaml": "2.9.1"
     },
     "overrides": {
         "react-infinite-scroller": {
-            "react": "19.2.8"
+            "react": "19.3.1"
         }
     }
 }

commafeed-client/pom.xml

@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>7.3.2</version>
+		<version>7.4.1</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>
 
 	<properties>
 		<!-- renovate: datasource=node-version depName=node -->
-		<node.version>v24.19.0</node.version>
+		<node.version>v26.13.0</node.version>
 		<!-- renovate: datasource=npm depName=npm -->
-		<npm.version>12.0.2</npm.version>
+		<npm.version>12.2.1</npm.version>
 	</properties>
 
 	<build>
@@ -110,7 +110,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>3.6.3</version>
+						<version>3.6.4</version>
 						<executions>
 							<execution>
 								<id>kill-biome</id>

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

@@ -116,6 +116,30 @@ describe("entries", () => {
         expect(client.entry.mark).toHaveBeenCalledWith({ id: "3", read: true })
     })
 
+    it("flags an entry marked as unread by the user until entries are reloaded", async () => {
+        vi.mocked(client.feed.getEntries).mockResolvedValue({
+            data: {
+                entries: [{ id: "3", read: true, markable: true } as Entry],
+                hasMore: false,
+                name: "my-feed",
+                errorCount: 0,
+                feedLink: "https://mysite.com/feed",
+                timestamp: 123,
+                ignoredReadStatus: false,
+            },
+        } as AxiosResponse<Entries>)
+
+        const store = configureStore({ reducer: reducers })
+        await store.dispatch(loadEntries({ source: { type: "feed", id: "feed-id" }, clearSearch: true }))
+
+        store.dispatch(markEntry({ entry: store.getState().entries.entries[0], read: false }))
+        expect(store.getState().entries.entries[0].keepUnread).toBe(true)
+
+        // reloading the entry list resets the flag
+        await store.dispatch(loadEntries({ source: { type: "feed", id: "feed-id" }, clearSearch: false }))
+        expect(store.getState().entries.entries[0].keepUnread).toBeUndefined()
+    })
+
     it("marks all entries as read", () => {
         const store = configureStore({
             reducer: reducers,

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

@@ -10,7 +10,11 @@ export interface EntrySource {
     id: string
 }
 
-export type ExpendableEntry = Entry & { expanded?: boolean }
+export type ExpendableEntry = Entry & {
+    expanded?: boolean
+    /** set when the user explicitly marks the entry as unread, prevents it from being marked as read again by scrolling in expanded mode until the entry list is reloaded */
+    keepUnread?: boolean
+}
 
 interface EntriesState {
     /** selected source */
@@ -71,11 +75,13 @@ export const entriesSlice = createSlice({
         builder.addCase(markEntry.pending, (state, action) => {
             for (const e of state.entries.filter(e => e.id === action.meta.arg.entry.id)) {
                 e.read = action.meta.arg.read
+                if (!action.meta.arg.read) e.keepUnread = true
             }
         })
         builder.addCase(markMultipleEntries.pending, (state, action) => {
             for (const e of state.entries.filter(e => action.meta.arg.entries.some(e2 => e2.id === e.id))) {
                 e.read = action.meta.arg.read
+                if (!action.meta.arg.read) e.keepUnread = true
             }
         })
         builder.addCase(markAllEntries.pending, (state, action) => {

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

@@ -40,7 +40,7 @@ export const loadMoreEntries = createAppAsyncThunk("entries/loadMore", async (_,
     const state = thunkApi.getState()
     const { source } = state.entries
     const offset =
-        state.user.settings?.readingMode === "all" || (source.type === "category" && source.id === "starred")
+        state.user.settings?.readingMode === "all" || state.entries.search || (source.type === "category" && source.id === "starred")
             ? state.entries.entries.length
             : state.entries.entries.filter(e => !e.read).length
     const endpoint = getEndpoint(state.entries.source.type)
@@ -137,6 +137,7 @@ export const markAllAsReadWithConfirmationIfRequired = createAppAsyncThunk(
         const state = thunkApi.getState()
         const source = state.entries.source
         const entriesTimestamp = state.entries.timestamp ?? Date.now()
+        const search = state.entries.search
         const markAllAsReadConfirmation = state.user.settings?.markAllAsReadConfirmation
         const markAllAsReadNavigateToNextUnread = state.user.settings?.markAllAsReadNavigateToNextUnread
 
@@ -151,6 +152,7 @@ export const markAllAsReadWithConfirmationIfRequired = createAppAsyncThunk(
                         read: true,
                         olderThan: Date.now(),
                         insertedBefore: entriesTimestamp,
+                        keywords: search,
                     },
                 })
             )

commafeed-client/src/components/ActionButton.tsx

@@ -5,14 +5,15 @@ import { forwardRef, type MouseEventHandler, type ReactNode } from "react"
 import { Constants } from "@/app/constants"
 import { useActionButton } from "@/hooks/useActionButton"
 
+export type Mode = "auto" | "mobile" | "desktop"
+
 interface ActionButtonProps {
     icon: ReactNode
     className?: string
     label?: string | MessageDescriptor
     onClick?: MouseEventHandler
     variant?: ActionIconVariant & ButtonVariant
-    hideLabelOnDesktop?: boolean
+    mode?: Mode
-    showLabelOnMobile?: boolean
 }
 
 /**
@@ -25,7 +26,9 @@ export const ActionButton = forwardRef<HTMLDivElement, ActionButtonProps>((props
 
     const label = typeof props.label === "string" ? props.label : props.label && _(props.label)
     const variant = props.variant ?? "subtle"
-    const iconOnly = (mobile && !props.showLabelOnMobile) || (!mobile && props.hideLabelOnDesktop)
+
+    const mode: Mode = props.mode ?? "auto"
+    const iconOnly = mode === "mobile" || (mode === "auto" && mobile)
 
     return (
         <Box ref={ref} className="cf-action-button">

commafeed-client/src/components/MarkAllAsReadConfirmationDialog.tsx

@@ -13,6 +13,7 @@ export function MarkAllAsReadConfirmationDialog() {
     const source = useAppSelector(state => state.entries.source)
     const sourceLabel = useAppSelector(state => state.entries.sourceLabel)
     const entriesTimestamp = useAppSelector(state => state.entries.timestamp) ?? Date.now()
+    const search = useAppSelector(state => state.entries.search)
     const markAllAsReadNavigateToNextUnread = useAppSelector(state => state.user.settings?.markAllAsReadNavigateToNextUnread)
     const dispatch = useAppDispatch()
 
@@ -26,6 +27,7 @@ export function MarkAllAsReadConfirmationDialog() {
                     read: true,
                     olderThan: Date.now() - threshold * 24 * 60 * 60 * 1000,
                     insertedBefore: entriesTimestamp,
+                    keywords: search,
                 },
             })
         )

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

@@ -111,12 +111,13 @@ export function FeedEntries() {
                     const el = document.getElementById(Constants.dom.entryId(e))
                     return el && !Constants.layout.isTopVisible(el)
                 })
-            if (currentEntry) {
+            if (currentEntry && currentEntry.id !== selectedEntryId) {
                 dispatch(
                     selectEntry({
                         entry: currentEntry,
                         expand: false,
-                        markAsRead: !!scrollMarks,
+                        // don't mark as read entries that the user explicitly marked as unread
+                        markAsRead: !!scrollMarks && !currentEntry.keepUnread,
                         scrollToEntry: false,
                     })
                 )
@@ -124,7 +125,7 @@ export function FeedEntries() {
         })
         window.addEventListener("scroll", listener)
         return () => window.removeEventListener("scroll", listener)
-    }, [dispatch, entries, viewMode, scrollMarks, scrollingToEntry])
+    }, [dispatch, entries, viewMode, scrollMarks, scrollingToEntry, selectedEntryId])
 
     useMousetrap("r", async () => await dispatch(reloadEntries()))
     useMousetrap(

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

@@ -2,7 +2,7 @@ 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"
-import { useEffect } from "react"
+import { type ReactNode, useEffect } from "react"
 import {
     TbArrowDown,
     TbArrowUp,
@@ -31,7 +31,7 @@ function HeaderDivider() {
     return <Divider orientation="vertical" />
 }
 
-function HeaderToolbar(props: { children: React.ReactNode }) {
+function HeaderToolbar(props: { children: ReactNode }) {
     const { spacing } = useActionButton()
     const mobile = useMobile("480px")
     return mobile ? (
@@ -47,7 +47,7 @@ function HeaderToolbar(props: { children: React.ReactNode }) {
             {props.children}
         </Box>
     ) : (
-        <Group gap={spacing} className="cf-toolbar">
+        <Group gap={spacing} wrap="nowrap" className="cf-toolbar">
             {props.children}
         </Group>
     )

commafeed-client/src/pages/WelcomePage.tsx

@@ -42,7 +42,7 @@ export function WelcomePage() {
                         icon={<TbClock size={iconSize} />}
                         variant="outline"
                         onClick={async () => await login.execute({ name: "demo", password: "demo" })}
-                        showLabelOnMobile
+                        mode="desktop"
                     />
                 </Center>
             )}
@@ -100,7 +100,7 @@ function Buttons() {
                 icon={<TbKey size={iconSize} />}
                 variant="outline"
                 onClick={async () => await dispatch(redirectToLogin())}
-                showLabelOnMobile
+                mode="desktop"
             />
             {serverInfos?.allowRegistrations && (
                 <ActionButton
@@ -108,7 +108,7 @@ function Buttons() {
                     icon={<TbUserPlus size={iconSize} />}
                     variant="filled"
                     onClick={async () => await dispatch(redirectToRegistration())}
-                    showLabelOnMobile
+                    mode="desktop"
                 />
             )}
 
@@ -116,7 +116,7 @@ function Buttons() {
                 label={dark ? msg`Switch to light theme` : msg`Switch to dark theme`}
                 icon={colorScheme === "dark" ? <TbSun size={18} /> : <TbMoon size={iconSize} />}
                 onClick={() => toggleColorScheme()}
-                hideLabelOnDesktop
+                mode="mobile"
             />
 
             {isBrowserExtensionPopup && (
@@ -124,7 +124,7 @@ function Buttons() {
                     label={msg`Extension options`}
                     icon={<TbSettings size={iconSize} />}
                     onClick={() => openSettingsPage()}
-                    hideLabelOnDesktop
+                    mode="mobile"
                 />
             )}
         </Group>

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

@@ -37,6 +37,9 @@ export function CategoryDetailsPage() {
         category = query.result && flattenCategoryTree(query.result.data).find(c => c.id === id)
     }
 
+    // a category cannot be moved under itself or one of its own descendants
+    const excludedCategoryIds = category ? flattenCategoryTree(category).map(c => c.id) : [id]
+
     const form = useForm<CategoryModificationRequest>()
     const { setValues } = form
 
@@ -125,7 +128,7 @@ export function CategoryDetailsPage() {
                                 label={<Trans>Parent Category</Trans>}
                                 {...form.getInputProps("parentId")}
                                 clearable
-                                withoutCategoryIds={[id]}
+                                withoutCategoryIds={excludedCategoryIds}
                             />
                             <NumberInput label={<Trans>Position</Trans>} {...form.getInputProps("position")} required min={0} />
                         </>

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

@@ -2,7 +2,7 @@ import { Trans } from "@lingui/react/macro"
 import { ActionIcon, Box, Center, Divider, Group, Title, useMantineTheme } from "@mantine/core"
 import { useViewportSize } from "@mantine/hooks"
 import { useEffect } from "react"
-import { TbEdit } from "react-icons/tb"
+import { TbSettings } from "react-icons/tb"
 import { useLocation, useParams } from "react-router-dom"
 import { Constants } from "@/app/constants"
 import type { EntrySourceType } from "@/app/entries/slice"
@@ -138,7 +138,7 @@ export function FeedEntriesPage(props: Readonly<FeedEntriesPageProps>) {
                     </Title>
                 )}
                 <ActionIcon onClick={titleClicked} variant="subtle" color={theme.primaryColor}>
-                    <TbEdit size={18} />
+                    <TbSettings size={18} />
                 </ActionIcon>
                 {showUnreadCount && <UnreadCount unreadCount={unreadCount} showIndicator={hasNewEntries} />}
             </Group>

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

@@ -227,7 +227,7 @@ export default function Layout(props: Readonly<LayoutProps>) {
                 )}
             </OnMobile>
             <OnDesktop>
-                <Group p="md">
+                <Group p="md" wrap="nowrap">
                     <Group justify="space-between" style={{ width: sidebarWidth - 16 }}>
                         <Box>
                             <LogoAndTitle />

commafeed-client/src/setupTests.ts

@@ -1,4 +1,4 @@
-import "@testing-library/jest-dom"
+import "@testing-library/jest-dom/vitest"
 import { vi } from "vitest"
 import { Constants } from "@/app/constants"
 

commafeed-client/vite.config.ts

@@ -7,11 +7,8 @@ import checker from "vite-plugin-checker"
 export default defineConfig(() => ({
     plugins: [
         react(),
-        babel({
+        lingui({ macroTransform: true }),
-            presets: [reactCompilerPreset()],
+        babel({ presets: [reactCompilerPreset()] }),
-            plugins: ["@lingui/babel-plugin-lingui-macro"],
-        }),
-        lingui(),
         checker({
             // temporary disabled until TypeScript 7 exposes a stable api
             // typescript: true,
@@ -44,6 +41,7 @@ export default defineConfig(() => ({
         inconsistentCjsInterop: true,
     },
     test: {
+        isolate: false,
         environment: "jsdom",
         globals: true,
         setupFiles: "./src/setupTests.ts",
@@ -51,6 +49,9 @@ export default defineConfig(() => ({
     build: {
         chunkSizeWarningLimit: 4000,
         rolldownOptions: {
+            checks: {
+                pluginTimings: false,
+            },
             output: {
                 codeSplitting: {
                     groups: [

commafeed-server/pom.xml

@@ -6,18 +6,18 @@
     <parent>
         <groupId>com.commafeed</groupId>
         <artifactId>commafeed</artifactId>
-        <version>7.3.2</version>
+        <version>7.4.1</version>
     </parent>
     <artifactId>commafeed-server</artifactId>
     <name>CommaFeed Server</name>
     <packaging>quarkus</packaging>
 
     <properties>
-        <quarkus.version>3.38.3</quarkus.version>
+        <quarkus.version>3.40.1.1</quarkus.version>
-        <querydsl.version>7.6</querydsl.version>
+        <querydsl.version>7.7</querydsl.version>
         <rome.version>2.1.0</rome.version>
         <!-- renovate: depName=com.google.googlejavaformat:google-java-format -->
-        <google-java-format.version>1.36.1</google-java-format.version>
+        <google-java-format.version>2.0.0</google-java-format.version>
 
         <build.database>h2</build.database>
     </properties>
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
-                <version>4.36.0</version>
+                <version>4.36.2</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -64,7 +64,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
-                <version>1.3.0</version>
+                <version>1.3.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -116,7 +116,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>3.6.3</version>
+                <version>3.6.4</version>
                 <dependencies>
                     <dependency>
                         <groupId>io.quarkus</groupId>
@@ -164,7 +164,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.6</version>
+                <version>3.6.1</version>
                 <configuration>
                     <argLine>@{argLine}</argLine>
                     <systemPropertyVariables>
@@ -176,7 +176,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.6</version>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -221,7 +221,7 @@
             <plugin>
                 <groupId>io.github.git-commit-id</groupId>
                 <artifactId>git-commit-id-maven-plugin</artifactId>
-                <version>10.0.0</version>
+                <version>10.0.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -245,7 +245,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>14.0.0</version>
+                        <version>14.4.0</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -274,7 +274,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>3.10.0</version>
+                <version>3.10.4</version>
                 <?m2e ignore?>
                 <executions>
                     <execution>
@@ -302,14 +302,14 @@
         <dependency>
             <groupId>com.commafeed</groupId>
             <artifactId>commafeed-client</artifactId>
-            <version>7.3.2</version>
+            <version>7.4.1</version>
         </dependency>
 
         <!-- compile-time processors -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.46</version>
+            <version>1.18.48</version>
         </dependency>
         <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>
@@ -322,6 +322,11 @@
             <artifactId>quarkus-extension-processor</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.graalvm.sdk</groupId>
+            <artifactId>nativeimage</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- quarkus dependencies -->
         <dependency>
@@ -368,7 +373,7 @@
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-json</artifactId>
-            <version>4.2.39</version>
+            <version>4.2.40</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign.querydsl</groupId>
@@ -399,7 +404,7 @@
         <dependency>
             <groupId>dev.cel</groupId>
             <artifactId>cel</artifactId>
-            <version>0.14.0</version>
+            <version>0.15.0</version>
         </dependency>
         <dependency>
             <groupId>org.passay</groupId>
@@ -429,12 +434,12 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.23.1</version>
+            <version>1.23.2</version>
         </dependency>
         <dependency>
             <groupId>com.ibm.icu</groupId>
             <artifactId>icu4j</artifactId>
-            <version>78.3</version>
+            <version>79.1</version>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.cssparser</groupId>
@@ -449,17 +454,12 @@
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.6.4</version>
+            <version>5.6.5</version>
         </dependency>
         <dependency>
             <groupId>io.github.hakky54</groupId>
             <artifactId>ayza-for-apache5</artifactId>
-            <version>10.0.6</version>
+            <version>10.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.brotli</groupId>
-            <artifactId>dec</artifactId>
-            <version>0.1.2</version>
         </dependency>
         <dependency>
             <groupId>com.github.seancfoley</groupId>
@@ -476,13 +476,13 @@
         <dependency>
             <groupId>io.quarkiverse.playwright</groupId>
             <artifactId>quarkus-playwright</artifactId>
-            <version>2.3.8</version>
+            <version>2.3.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-junit-jupiter</artifactId>
+            <artifactId>mockserver-junit-jupiter-no-dependencies</artifactId>
-            <version>7.6.0</version>
+            <version>9.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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

@@ -1,4 +1,6 @@
-FROM ibm-semeru-runtimes:open-jdk-25.0.4.0-jre@sha256:524f0d04723aff42ed4142ab2621fa55f22cb691763cd75b59eee86749e2e872
+FROM ibm-semeru-runtimes:open-jdk-25.0.4.15-jre@sha256:c4f8cd5ee9d607addbf957a5066144c46c853c6a81235819f6952e60237904ca
+LABEL org.opencontainers.image.source="https://github.com/Athou/commafeed"
+
 EXPOSE 8082
 
 RUN mkdir -p /commafeed/data

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

@@ -1,4 +1,6 @@
-FROM debian:13.6@sha256:34cd9e9fd437c0a095ec39cb2e73422c9f30821b0d0848ed74fd0d43bae4d958
+FROM debian:13.7@sha256:2dc419c6d7fe3dad0a2f9fd469c34cc90b0f9ba642d8fde837fe3d7d34a0e7f1
+LABEL org.opencontainers.image.source="https://github.com/Athou/commafeed"
+
 ARG TARGETARCH
 
 EXPOSE 8082

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

@@ -6,6 +6,8 @@ import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
@@ -346,4 +348,22 @@ import io.quarkus.runtime.annotations.RegisterForReflection;
             com.rometools.opml.feed.synd.impl.ConverterForOPML10.class,
             com.rometools.opml.feed.synd.impl.ConverterForOPML20.class,
         })
-public class NativeImageClasses {}
+public class NativeImageClasses {
+
+    // disable zstd and brotli runtime detection because it causes native image failure
+    @TargetClass(className = "org.apache.hc.client5.http.impl.ZstdRuntime")
+    static final class ZstdRuntime {
+        @Substitute
+        public static boolean available() {
+            return false;
+        }
+    }
+
+    @TargetClass(className = "org.apache.hc.client5.http.impl.Brotli4jRuntime")
+    static final class Brotli4jRuntime {
+        @Substitute
+        public static boolean available() {
+            return false;
+        }
+    }
+}

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

@@ -19,27 +19,27 @@ import nl.altindag.ssl.apache5.util.Apache5SslUtils;
 
 import org.apache.hc.client5.http.DnsResolver;
 import org.apache.hc.client5.http.SystemDefaultDnsResolver;
+import org.apache.hc.client5.http.async.methods.InflatingAsyncDataConsumer;
+import org.apache.hc.client5.http.async.methods.InflatingGzipDataConsumer;
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.TlsConfig;
-import org.apache.hc.client5.http.entity.DeflateInputStream;
-import org.apache.hc.client5.http.entity.InputStreamFactory;
 import org.apache.hc.client5.http.entity.compress.ContentCoding;
 import org.apache.hc.client5.http.impl.DefaultRedirectStrategy;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
-import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.async.HttpAsyncClients;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
-import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.client5.http.protocol.RedirectStrategy;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.message.BasicHeader;
+import org.apache.hc.core5.http.nio.AsyncDataConsumer;
 import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http2.HttpVersionPolicy;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
-import org.brotli.dec.BrotliInputStream;
 
 import java.net.InetAddress;
 import java.net.URI;
@@ -48,7 +48,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.SequencedMap;
-import java.util.zip.GZIPInputStream;
+import java.util.function.UnaryOperator;
 
 @Singleton
 @RequiredArgsConstructor
@@ -60,56 +60,61 @@ public class HttpClientFactory {
     private final CommaFeedConfiguration config;
     private final CommaFeedVersion version;
 
-    public CloseableHttpClient newClient(int poolSize) {
+    public CloseableHttpAsyncClient newClient(int poolSize) {
-        PoolingHttpClientConnectionManager connectionManager =
+        PoolingAsyncClientConnectionManager connectionManager =
                 newConnectionManager(config, poolSize);
         String userAgent =
                 config.httpClient()
                         .userAgent()
-                        .orElseGet(
+                        .orElseGet(() ->
-                                () ->
+                                String.format(
-                                        String.format(
+                                        "CommaFeed/%s (https://github.com/Athou/commafeed)",
-                                                "CommaFeed/%s (https://github.com/Athou/commafeed)",
+                                        version.getVersion()));
-                                                version.getVersion()));
         return newClient(config, connectionManager, userAgent);
     }
 
-    private CloseableHttpClient newClient(
+    private CloseableHttpAsyncClient newClient(
             CommaFeedConfiguration config,
-            HttpClientConnectionManager connectionManager,
+            PoolingAsyncClientConnectionManager connectionManager,
             String userAgent) {
         List<Header> headers = new ArrayList<>();
         headers.add(new BasicHeader(HttpHeaders.ACCEPT_LANGUAGE, "en"));
         headers.add(new BasicHeader(HttpHeaders.PRAGMA, "No-cache"));
         headers.add(new BasicHeader(HttpHeaders.CACHE_CONTROL, "no-cache"));
+        headers.add(new BasicHeader(HttpHeaders.ACCEPT, "*/*"));
+        headers.add(new BasicHeader(HttpHeaders.SEC_FETCH_MODE, "navigate"));
 
-        SequencedMap<String, InputStreamFactory> contentDecoderMap = new LinkedHashMap<>();
+        SequencedMap<String, UnaryOperator<AsyncDataConsumer>> contentDecoderMap =
-        contentDecoderMap.put(ContentCoding.GZIP.token(), GZIPInputStream::new);
+                new LinkedHashMap<>();
-        contentDecoderMap.put(ContentCoding.DEFLATE.token(), DeflateInputStream::new);
+        contentDecoderMap.put(
-        contentDecoderMap.put(ContentCoding.BROTLI.token(), BrotliInputStream::new);
+                ContentCoding.DEFLATE.token(), d -> new InflatingAsyncDataConsumer(d, null));
+        contentDecoderMap.put(ContentCoding.GZIP.token(), InflatingGzipDataConsumer::new);
 
         RedirectStrategy redirectStrategy =
                 config.httpClient().blockLocalAddresses()
                         ? new BlockLocalAddressesRedirectStrategy(DNS_RESOLVER)
                         : new DefaultRedirectStrategy();
 
-        return HttpClientBuilder.create()
+        CloseableHttpAsyncClient client =
-                .disableConnectionState()
+                HttpAsyncClients.custom()
-                .useSystemProperties()
+                        .disableConnectionState()
-                .disableAutomaticRetries()
+                        .useSystemProperties()
-                .disableCookieManagement()
+                        .disableAutomaticRetries()
-                .setUserAgent(userAgent)
+                        .disableCookieManagement()
-                .setDefaultHeaders(headers)
+                        .setUserAgent(userAgent)
-                .setConnectionManager(connectionManager)
+                        .setDefaultHeaders(headers)
-                .evictExpiredConnections()
+                        .setConnectionManager(connectionManager)
-                .evictIdleConnections(
+                        .evictExpiredConnections()
-                        TimeValue.of(config.httpClient().idleConnectionsEvictionInterval()))
+                        .evictIdleConnections(
-                .setContentDecoderRegistry(new LinkedHashMap<>(contentDecoderMap))
+                                TimeValue.of(config.httpClient().idleConnectionsEvictionInterval()))
-                .setRedirectStrategy(redirectStrategy)
+                        .setContentDecoderMap(new LinkedHashMap<>(contentDecoderMap))
-                .build();
+                        .setRedirectStrategy(redirectStrategy)
+                        .build();
+        client.start();
+        return client;
     }
 
-    private PoolingHttpClientConnectionManager newConnectionManager(
+    private PoolingAsyncClientConnectionManager newConnectionManager(
             CommaFeedConfiguration config, int poolSize) {
         SSLFactory sslFactory =
                 SSLFactory.builder().withUnsafeTrustMaterial().withUnsafeHostnameVerifier().build();
@@ -118,8 +123,8 @@ public class HttpClientFactory {
                         ? new BlockLocalAddressesDnsResolver(DNS_RESOLVER)
                         : DNS_RESOLVER;
 
-        return PoolingHttpClientConnectionManagerBuilder.create()
+        return PoolingAsyncClientConnectionManagerBuilder.create()
-                .setTlsSocketStrategy(Apache5SslUtils.toTlsSocketStrategy(sslFactory))
+                .setTlsStrategy(Apache5SslUtils.toTlsStrategy(sslFactory))
                 .setDefaultConnectionConfig(
                         ConnectionConfig.custom()
                                 .setConnectTimeout(Timeout.of(config.httpClient().connectTimeout()))
@@ -129,6 +134,7 @@ public class HttpClientFactory {
                                 .build())
                 .setDefaultTlsConfig(
                         TlsConfig.custom()
+                                .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
                                 .setHandshakeTimeout(
                                         Timeout.of(config.httpClient().sslHandshakeTimeout()))
                                 .build())

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

@@ -6,7 +6,6 @@ import com.commafeed.CommaFeedConfiguration.HttpClientCache;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Iterables;
-import com.google.common.io.ByteStreams;
 import com.google.common.net.HttpHeaders;
 
 import jakarta.inject.Singleton;
@@ -17,39 +16,53 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Lombok;
 import lombok.RequiredArgsConstructor;
+import lombok.experimental.Delegate;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
+import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
+import org.apache.hc.client5.http.async.methods.SimpleRequestProducer;
 import org.apache.hc.client5.http.config.RequestConfig;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.http.protocol.RedirectLocations;
 import org.apache.hc.client5.http.utils.DateUtils;
-import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.concurrent.FutureCallback;
-import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.Message;
 import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
+import org.apache.hc.core5.http.nio.AsyncEntityConsumer;
-import org.apache.hc.core5.util.Timeout;
+import org.apache.hc.core5.http.nio.AsyncRequestProducer;
+import org.apache.hc.core5.http.nio.AsyncResponseConsumer;
+import org.apache.hc.core5.http.nio.entity.AbstractBinAsyncEntityConsumer;
+import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
 import org.jboss.resteasy.reactive.common.headers.CacheControlDelegate;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URI;
+import java.nio.ByteBuffer;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.InstantSource;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
-/** Smart HTTP getter: handles gzip, ssl, last modified and etag headers */
+/** Smart HTTP getter: handles gzip, ssl, last modified, and etag headers */
 @Singleton
 @Slf4j
 public class HttpGetter {
     private final CommaFeedConfiguration config;
     private final InstantSource instantSource;
-    private final CloseableHttpClient client;
+    private final CloseableHttpAsyncClient client;
     private final Cache<HttpRequest, HttpResponse> cache;
 
     public HttpGetter(
@@ -150,70 +163,96 @@ public class HttpGetter {
         HttpClientContext context = HttpClientContext.create();
         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(
+        long maxResponseSize = config.httpClient().maxResponseSize().asLongValue();
-                request.toClassicHttpRequest(),
+        AsyncRequestProducer req = SimpleRequestProducer.create(request.toSimpleHttpRequest());
-                context,
+        AsyncResponseConsumer<Message<org.apache.hc.core5.http.HttpResponse, byte[]>> resp =
-                resp -> {
+                new BasicResponseConsumer<>(
-                    byte[] content =
+                        new LimitedContentLengthEntityConsumer(
-                            resp.getEntity() == null
+                                new LimitedBytesEntityConsumer(maxResponseSize), maxResponseSize));
-                                    ? null
+        FutureCallback<Message<org.apache.hc.core5.http.HttpResponse, byte[]>> callback =
-                                    : toByteArray(
+                new FutureCallback<>() {
-                                            resp.getEntity(),
+                    @Override
-                                            config.httpClient().maxResponseSize().asLongValue());
+                    public void completed(
-                    int code = resp.getCode();
+                            Message<org.apache.hc.core5.http.HttpResponse, byte[]> result) {}
-                    String lastModifiedHeader =
-                            Optional.ofNullable(resp.getFirstHeader(HttpHeaders.LAST_MODIFIED))
-                                    .map(NameValuePair::getValue)
-                                    .map(StringUtils::trimToNull)
-                                    .orElse(null);
-                    String eTagHeader =
-                            Optional.ofNullable(resp.getFirstHeader(HttpHeaders.ETAG))
-                                    .map(NameValuePair::getValue)
-                                    .map(StringUtils::trimToNull)
-                                    .orElse(null);
 
-                    CacheControl cacheControl =
+                    @Override
-                            Optional.ofNullable(resp.getFirstHeader(HttpHeaders.CACHE_CONTROL))
+                    public void failed(Exception ex) {}
-                                    .map(NameValuePair::getValue)
-                                    .map(StringUtils::trimToNull)
-                                    .map(HttpGetter::toCacheControl)
-                                    .orElse(null);
 
-                    Instant retryAfter =
+                    @Override
-                            Optional.ofNullable(resp.getFirstHeader(HttpHeaders.RETRY_AFTER))
+                    public void cancelled() {}
-                                    .map(NameValuePair::getValue)
+                };
-                                    .map(StringUtils::trimToNull)
+        Future<Message<org.apache.hc.core5.http.HttpResponse, byte[]>> future =
-                                    .map(this::toInstant)
+                client.execute(req, resp, context, callback);
-                                    .orElse(null);
 
-                    String contentType =
+        try {
-                            Optional.ofNullable(resp.getEntity())
+            Message<org.apache.hc.core5.http.HttpResponse, byte[]> message =
-                                    .map(HttpEntity::getContentType)
+                    future.get(config.httpClient().responseTimeout().toSeconds(), TimeUnit.SECONDS);
-                                    .orElse(null);
-                    String urlAfterRedirect =
-                            Optional.ofNullable(context.getRedirectLocations())
-                                    .map(RedirectLocations::getAll)
-                                    .map(l -> Iterables.getLast(l, null))
-                                    .map(URI::toString)
-                                    .orElse(request.getUrl());
 
-                    return new HttpResponse(
+            byte[] content = message.getBody();
-                            code,
+            int code = message.getHead().getCode();
-                            lastModifiedHeader,
+            String lastModifiedHeader =
-                            eTagHeader,
+                    Optional.ofNullable(message.getHead().getFirstHeader(HttpHeaders.LAST_MODIFIED))
-                            cacheControl,
+                            .map(NameValuePair::getValue)
-                            retryAfter,
+                            .map(StringUtils::trimToNull)
-                            content,
+                            .orElse(null);
-                            contentType,
+            String eTagHeader =
-                            urlAfterRedirect);
+                    Optional.ofNullable(message.getHead().getFirstHeader(HttpHeaders.ETAG))
-                });
+                            .map(NameValuePair::getValue)
+                            .map(StringUtils::trimToNull)
+                            .orElse(null);
+
+            CacheControl cacheControl =
+                    Optional.ofNullable(message.getHead().getFirstHeader(HttpHeaders.CACHE_CONTROL))
+                            .map(NameValuePair::getValue)
+                            .map(StringUtils::trimToNull)
+                            .map(HttpGetter::toCacheControl)
+                            .orElse(null);
+
+            Instant retryAfter =
+                    Optional.ofNullable(message.getHead().getFirstHeader(HttpHeaders.RETRY_AFTER))
+                            .map(NameValuePair::getValue)
+                            .map(StringUtils::trimToNull)
+                            .map(this::toInstant)
+                            .orElse(null);
+
+            String contentType =
+                    Optional.ofNullable(message.getHead().getFirstHeader(HttpHeaders.CONTENT_TYPE))
+                            .map(NameValuePair::getValue)
+                            .map(StringUtils::trimToNull)
+                            .orElse(null);
+            String urlAfterRedirect =
+                    Optional.ofNullable(context.getRedirectLocations())
+                            .map(RedirectLocations::getAll)
+                            .map(l -> Iterables.getLast(l, null))
+                            .map(URI::toString)
+                            .orElse(request.getUrl());
+
+            return new HttpResponse(
+                    code,
+                    lastModifiedHeader,
+                    eTagHeader,
+                    cacheControl,
+                    retryAfter,
+                    content,
+                    contentType,
+                    urlAfterRedirect);
+        } catch (InterruptedException e) {
+            future.cancel(true);
+            Thread.currentThread().interrupt();
+            throw new RuntimeException("interrupted while fetching " + request.getUrl(), e);
+        } catch (TimeoutException e) {
+            future.cancel(true);
+            throw new IOException("timed out while fetching " + request.getUrl(), e);
+        } catch (ExecutionException e) {
+            future.cancel(true);
+            throw Lombok.sneakyThrow(e.getCause());
+        }
     }
 
     private static CacheControl toCacheControl(String headerValue) {
@@ -237,28 +276,6 @@ public class HttpGetter {
         return DateUtils.parseStandardDate(headerValue);
     }
 
-    private static byte[] toByteArray(HttpEntity entity, long maxBytes) throws IOException {
-        if (entity.getContentLength() > maxBytes) {
-            throw new IOException(
-                    "Response size (%s bytes) exceeds the maximum allowed size (%s bytes)"
-                            .formatted(entity.getContentLength(), maxBytes));
-        }
-
-        try (InputStream input = entity.getContent()) {
-            if (input == null) {
-                return null;
-            }
-
-            byte[] bytes = ByteStreams.limit(input, maxBytes + 1).readAllBytes();
-            if (bytes.length > maxBytes) {
-                throw new IOException(
-                        "Response size exceeds the maximum allowed size (%s bytes)"
-                                .formatted(maxBytes));
-            }
-            return bytes;
-        }
-    }
-
     private static Cache<HttpRequest, HttpResponse> newCache(CommaFeedConfiguration config) {
         HttpClientCache cacheConfig = config.httpClient().cache();
         if (!cacheConfig.enabled()) {
@@ -266,14 +283,67 @@ public class HttpGetter {
         }
 
         return CacheBuilder.newBuilder()
-                .weigher(
+                .weigher((HttpRequest key, HttpResponse value) ->
-                        (HttpRequest key, HttpResponse value) ->
+                        value.content() != null ? value.content().length : 0)
-                                value.content() != null ? value.content().length : 0)
                 .maximumWeight(cacheConfig.maximumMemorySize().asLongValue())
                 .expireAfterWrite(cacheConfig.expiration())
                 .build();
     }
 
+    private record LimitedContentLengthEntityConsumer(
+            @Delegate AsyncEntityConsumer<byte[]> delegate, long maxBytes)
+            implements AsyncEntityConsumer<byte[]> {
+
+        @Override
+        public void streamStart(EntityDetails entityDetails, FutureCallback<byte[]> resultCallback)
+                throws HttpException, IOException {
+            long contentLength = entityDetails.getContentLength();
+            if (contentLength > maxBytes) {
+                throw new IOException(
+                        "Response size (%s bytes) exceeds the maximum allowed size (%s bytes)"
+                                .formatted(contentLength, maxBytes));
+            }
+            delegate.streamStart(entityDetails, resultCallback);
+        }
+    }
+
+    @RequiredArgsConstructor
+    private static class LimitedBytesEntityConsumer extends AbstractBinAsyncEntityConsumer<byte[]> {
+
+        private final long maxBytes;
+        private final ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        @Override
+        protected void streamStart(ContentType contentType) {}
+
+        @Override
+        protected int capacityIncrement() {
+            return Integer.MAX_VALUE;
+        }
+
+        @Override
+        protected void data(ByteBuffer src, boolean endOfStream) throws IOException {
+            if (out.size() + src.remaining() > maxBytes) {
+                throw new IOException(
+                        "Response size exceeds the maximum allowed size (%s bytes)"
+                                .formatted(maxBytes));
+            }
+            byte[] chunk = new byte[src.remaining()];
+            src.get(chunk);
+            out.write(chunk, 0, chunk.length);
+        }
+
+        @Override
+        protected byte[] generateContent() {
+            return out.toByteArray();
+        }
+
+        @Override
+        public void releaseResources() {
+            out.reset();
+        }
+    }
+
     public static class SchemeNotAllowedException extends Exception {
         private static final long serialVersionUID = 1L;
 
@@ -336,15 +406,15 @@ public class HttpGetter {
             return new HttpRequestBuilder().url(url);
         }
 
-        public ClassicHttpRequest toClassicHttpRequest() {
+        public SimpleHttpRequest toSimpleHttpRequest() {
-            ClassicHttpRequest req = ClassicRequestBuilder.get(url).build();
+            SimpleRequestBuilder builder = SimpleRequestBuilder.get(url);
             if (lastModified != null) {
-                req.addHeader(HttpHeaders.IF_MODIFIED_SINCE, lastModified);
+                builder.addHeader(HttpHeaders.IF_MODIFIED_SINCE, lastModified);
             }
             if (eTag != null) {
-                req.addHeader(HttpHeaders.IF_NONE_MATCH, eTag);
+                builder.addHeader(HttpHeaders.IF_NONE_MATCH, eTag);
             }
-            return req;
+            return builder.build();
         }
     }
 

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.dao;
 
+import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.QFeedCategory;
 import com.commafeed.backend.model.QUser;
@@ -17,8 +18,8 @@ public class FeedCategoryDAO extends GenericDAO<FeedCategory> {
 
     private static final QFeedCategory CATEGORY = QFeedCategory.feedCategory;
 
-    public FeedCategoryDAO(EntityManager entityManager) {
+    public FeedCategoryDAO(EntityManager entityManager, CommaFeedConfiguration config) {
-        super(entityManager, FeedCategory.class);
+        super(entityManager, FeedCategory.class, config);
     }
 
     public List<FeedCategory> findAll(User user) {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.dao;
 
+import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.QFeed;
 import com.commafeed.backend.model.QFeedSubscription;
@@ -20,8 +21,8 @@ public class FeedDAO extends GenericDAO<Feed> {
     private static final QFeed FEED = QFeed.feed;
     private static final QFeedSubscription SUBSCRIPTION = QFeedSubscription.feedSubscription;
 
-    public FeedDAO(EntityManager entityManager) {
+    public FeedDAO(EntityManager entityManager, CommaFeedConfiguration config) {
-        super(entityManager, Feed.class);
+        super(entityManager, Feed.class, config);
     }
 
     public List<Feed> findByIds(List<Long> id) {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.dao;
 
+import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.FeedEntryContent;
 import com.commafeed.backend.model.QFeedEntry;
 import com.commafeed.backend.model.QFeedEntryContent;
@@ -15,8 +16,8 @@ public class FeedEntryContentDAO extends GenericDAO<FeedEntryContent> {
     private static final QFeedEntryContent CONTENT = QFeedEntryContent.feedEntryContent;
     private static final QFeedEntry ENTRY = QFeedEntry.feedEntry;
 
-    public FeedEntryContentDAO(EntityManager entityManager) {
+    public FeedEntryContentDAO(EntityManager entityManager, CommaFeedConfiguration config) {
-        super(entityManager, FeedEntryContent.class);
+        super(entityManager, FeedEntryContent.class, config);
     }
 
     public List<FeedEntryContent> findExisting(String contentHash, String titleHash) {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.dao;
 
+import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.QFeedEntry;
@@ -23,8 +24,8 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
     private static final QFeedEntry ENTRY = QFeedEntry.feedEntry;
     private static final int IN_CLAUSE_BATCH_SIZE = 1000;
 
-    public FeedEntryDAO(EntityManager entityManager) {
+    public FeedEntryDAO(EntityManager entityManager, CommaFeedConfiguration config) {
-        super(entityManager, FeedEntry.class);
+        super(entityManager, FeedEntry.class, config);
     }
 
     public FeedEntry findExisting(String guidHash, Feed feed) {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java

@@ -29,6 +29,7 @@ import org.apache.commons.collections4.CollectionUtils;
 
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -50,7 +51,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
             EntityManager entityManager,
             FeedEntryTagDAO feedEntryTagDAO,
             CommaFeedConfiguration config) {
-        super(entityManager, FeedEntryStatus.class);
+        super(entityManager, FeedEntryStatus.class, config);
         this.feedEntryTagDAO = feedEntryTagDAO;
         this.config = config;
     }
@@ -129,8 +130,6 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
             query.limit(limit);
         }
 
-        setTimeout(query, config.database().queryTimeout());
-
         List<FeedEntryStatus> statuses = query.fetch();
         statuses.forEach(s -> s.setMarkable(true));
         if (includeContent) {
@@ -207,8 +206,6 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
             query.limit(limit);
         }
 
-        setTimeout(query, config.database().queryTimeout());
-
         List<FeedEntryStatus> statuses = new ArrayList<>();
         List<Tuple> tuples = query.fetch();
         for (Tuple tuple : tuples) {
@@ -238,19 +235,41 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
         }
     }
 
-    public UnreadCount getUnreadCount(FeedSubscription sub) {
+    public Map<Long, UnreadCount> getUnreadCounts(List<FeedSubscription> subs) {
+        if (subs.isEmpty()) {
+            return Map.of();
+        }
+
+        Map<Long, List<FeedSubscription>> subsByFeedId =
+                subs.stream().collect(Collectors.groupingBy(s -> s.getFeed().getId()));
+
         JPAQuery<Tuple> query =
-                query().select(ENTRY.count(), ENTRY.published.max())
+                query().select(ENTRY.feed.id, ENTRY.count(), ENTRY.published.max())
                         .from(ENTRY)
                         .leftJoin(ENTRY.statuses, STATUS)
-                        .on(STATUS.subscription.eq(sub))
+                        .on(STATUS.subscription.in(subs))
-                        .where(ENTRY.feed.eq(sub.getFeed()))
+                        .where(ENTRY.feed.id.in(subsByFeedId.keySet()))
-                        .where(buildUnreadPredicate());
+                        .where(buildUnreadPredicate())
+                        .groupBy(ENTRY.feed.id);
 
-        Tuple tuple = query.fetchOne();
+        Map<Long, UnreadCount> result = new HashMap<>();
-        Long count = tuple.get(ENTRY.count());
+        for (Tuple tuple : query.fetch()) {
-        Instant published = tuple.get(ENTRY.published.max());
+            Long feedId = tuple.get(ENTRY.feed.id);
-        return new UnreadCount(sub.getId(), count == null ? 0 : count, published);
+            Long count = tuple.get(ENTRY.count());
+            Instant published = tuple.get(ENTRY.published.max());
+            for (FeedSubscription sub : subsByFeedId.get(feedId)) {
+                result.put(
+                        sub.getId(),
+                        new UnreadCount(sub.getId(), count == null ? 0 : count, published));
+            }
+        }
+
+        // feeds with no unread entries are absent from the query result, default them to zero
+        for (FeedSubscription sub : subs) {
+            result.putIfAbsent(sub.getId(), new UnreadCount(sub.getId(), 0, null));
+        }
+
+        return result;
     }
 
     private BooleanBuilder buildUnreadPredicate() {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.dao;
 
+import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.FeedEntryTag;
 import com.commafeed.backend.model.QFeedEntryTag;
@@ -17,8 +18,8 @@ public class FeedEntryTagDAO extends GenericDAO<FeedEntryTag> {
 
     private static final QFeedEntryTag TAG = QFeedEntryTag.feedEntryTag;
 
-    public FeedEntryTagDAO(EntityManager entityManager) {
+    public FeedEntryTagDAO(EntityManager entityManager, CommaFeedConfiguration config) {
-        super(entityManager, FeedEntryTag.class);
+        super(entityManager, FeedEntryTag.class, config);
     }
 
     public List<String> findByUser(User user) {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.dao;
 
+import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.AbstractModel;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
@@ -31,8 +32,8 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
 
     private final EntityManager entityManager;
 
-    public FeedSubscriptionDAO(EntityManager entityManager) {
+    public FeedSubscriptionDAO(EntityManager entityManager, CommaFeedConfiguration config) {
-        super(entityManager, FeedSubscription.class);
+        super(entityManager, FeedSubscription.class, config);
         this.entityManager = entityManager;
     }
 
@@ -124,10 +125,8 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
         Set<Long> categoryIds =
                 categories.stream().map(AbstractModel::getId).collect(Collectors.toSet());
         return findAll(user).stream()
-                .filter(
+                .filter(s ->
-                        s ->
+                        s.getCategory() != null && categoryIds.contains(s.getCategory().getId()))
-                                s.getCategory() != null
-                                        && categoryIds.contains(s.getCategory().getId()))
                 .toList();
     }
 

commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.dao;
 
+import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.AbstractModel;
 import com.querydsl.core.types.EntityPath;
 import com.querydsl.jpa.impl.JPADeleteClause;
@@ -21,9 +22,15 @@ public abstract class GenericDAO<T extends AbstractModel> {
 
     private final EntityManager entityManager;
     private final Class<T> entityClass;
+    private final CommaFeedConfiguration config;
 
     protected JPAQueryFactory query() {
-        return new JPAQueryFactory(entityManager);
+        return new JPAQueryFactory(entityManager) {
+            @Override
+            public JPAQuery<?> query() {
+                return withTimeout(super.query(), config.database().queryTimeout());
+            }
+        };
     }
 
     protected JPAUpdateClause updateQuery(EntityPath<T> entityPath) {
@@ -57,9 +64,10 @@ public abstract class GenericDAO<T extends AbstractModel> {
         return objects.size();
     }
 
-    protected void setTimeout(JPAQuery<?> query, Duration timeout) {
+    private JPAQuery<?> withTimeout(JPAQuery<?> query, Duration timeout) {
         if (!timeout.isZero()) {
             query.setHint(SpecHints.HINT_SPEC_QUERY_TIMEOUT, Math.toIntExact(timeout.toMillis()));
         }
+        return query;
     }
 }

commafeed-server/src/main/java/com/commafeed/backend/dao/UserDAO.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.dao;
 
+import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.QUser;
 import com.commafeed.backend.model.User;
 
@@ -11,8 +12,8 @@ public class UserDAO extends GenericDAO<User> {
 
     private static final QUser USER = QUser.user;
 
-    public UserDAO(EntityManager entityManager) {
+    public UserDAO(EntityManager entityManager, CommaFeedConfiguration config) {
-        super(entityManager, User.class);
+        super(entityManager, User.class, config);
     }
 
     public User findByName(String name) {

commafeed-server/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.dao;
 
+import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.QUserRole;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserRole;
@@ -17,8 +18,8 @@ public class UserRoleDAO extends GenericDAO<UserRole> {
 
     private static final QUserRole ROLE = QUserRole.userRole;
 
-    public UserRoleDAO(EntityManager entityManager) {
+    public UserRoleDAO(EntityManager entityManager, CommaFeedConfiguration config) {
-        super(entityManager, UserRole.class);
+        super(entityManager, UserRole.class, config);
     }
 
     public List<UserRole> findAll() {

commafeed-server/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.dao;
 
+import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.QUserSettings;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserSettings;
@@ -12,8 +13,8 @@ public class UserSettingsDAO extends GenericDAO<UserSettings> {
 
     private static final QUserSettings SETTINGS = QUserSettings.userSettings;
 
-    public UserSettingsDAO(EntityManager entityManager) {
+    public UserSettingsDAO(EntityManager entityManager, CommaFeedConfiguration config) {
-        super(entityManager, UserSettings.class);
+        super(entityManager, UserSettings.class, config);
     }
 
     public UserSettings findByUser(User user) {

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

@@ -104,56 +104,52 @@ public class FeedRefreshEngine {
 
     private void startFeedProcessingLoop() {
         // take a feed from the queue, process it, rince, repeat
-        feedProcessingLoopExecutor.submit(
+        feedProcessingLoopExecutor.submit(() -> {
-                () -> {
+            while (!feedProcessingLoopExecutor.isShutdown()) {
-                    while (!feedProcessingLoopExecutor.isShutdown()) {
+                try {
-                        try {
+                    // take() is blocking until a feed is available from the queue
-                            // take() is blocking until a feed is available from the queue
+                    Feed feed = queue.take();
-                            Feed feed = queue.take();
 
-                            // send the feed to be processed
+                    // send the feed to be processed
-                            log.debug(
+                    log.debug("got feed {} from the queue, send it for processing", feed.getId());
-                                    "got feed {} from the queue, send it for processing",
+                    processFeedAsync(feed);
-                                    feed.getId());
-                            processFeedAsync(feed);
 
-                            // we removed a feed from the queue, try to refill it as it may now be
+                    // we removed a feed from the queue, try to refill it as it may now be
-                            // empty
+                    // empty
-                            if (queue.isEmpty()) {
+                    if (queue.isEmpty()) {
-                                log.debug("took the last feed from the queue, try to refill");
+                        log.debug("took the last feed from the queue, try to refill");
-                                refillQueueAsync();
+                        refillQueueAsync();
-                            }
-                        } catch (InterruptedException e) {
-                            log.debug("interrupted while waiting for a feed in the queue");
-                            Thread.currentThread().interrupt();
-                        } catch (Exception e) {
-                            log.error(e.getMessage(), e);
-                        }
                     }
-                });
+                } catch (InterruptedException e) {
+                    log.debug("interrupted while waiting for a feed in the queue");
+                    Thread.currentThread().interrupt();
+                } catch (Exception e) {
+                    log.error(e.getMessage(), e);
+                }
+            }
+        });
     }
 
     private void startRefillLoop() {
         // refill the queue at regular intervals if it's empty
-        refillLoopExecutor.submit(
+        refillLoopExecutor.submit(() -> {
-                () -> {
+            while (!refillLoopExecutor.isShutdown()) {
-                    while (!refillLoopExecutor.isShutdown()) {
+                try {
-                        try {
+                    if (queue.isEmpty()) {
-                            if (queue.isEmpty()) {
+                        log.debug("refilling queue");
-                                log.debug("refilling queue");
+                        refillQueueAsync();
-                                refillQueueAsync();
-                            }
-
-                            log.debug("sleeping for 15s");
-                            TimeUnit.SECONDS.sleep(15);
-                        } catch (InterruptedException e) {
-                            log.debug("interrupted while sleeping");
-                            Thread.currentThread().interrupt();
-                        } catch (Exception e) {
-                            log.error(e.getMessage(), e);
-                        }
                     }
-                });
+
+                    log.debug("sleeping for 15s");
+                    TimeUnit.SECONDS.sleep(15);
+                } catch (InterruptedException e) {
+                    log.debug("interrupted while sleeping");
+                    Thread.currentThread().interrupt();
+                } catch (Exception e) {
+                    log.error(e.getMessage(), e);
+                }
+            }
+        });
     }
 
     public void refreshImmediately(Feed feed) {
@@ -184,65 +180,53 @@ public class FeedRefreshEngine {
                             }
                         },
                         refillExecutor)
-                .whenComplete(
+                .whenComplete((data, ex) -> {
-                        (data, ex) -> {
+                    if (ex != null) {
-                            if (ex != null) {
+                        log.error("error while refilling the queue", ex);
-                                log.error("error while refilling the queue", ex);
+                    }
-                            }
+                });
-                        });
     }
 
     private void processFeedAsync(Feed feed) {
         CompletableFuture.supplyAsync(() -> worker.update(feed), workerExecutor)
                 .thenApplyAsync(r -> updater.update(r.feed(), r.entries()), databaseUpdaterExecutor)
-                .thenCompose(
+                .thenCompose(r -> {
-                        r -> {
+                    List<CompletableFuture<Void>> futures =
-                            List<CompletableFuture<Void>> futures =
+                            r.insertedUnreadEntriesBySubscription().entrySet().stream()
-                                    r.insertedUnreadEntriesBySubscription().entrySet().stream()
+                                    .map(e -> {
-                                            .map(
+                                        FeedSubscription sub = e.getKey();
-                                                    e -> {
+                                        List<FeedEntry> entries = e.getValue();
-                                                        FeedSubscription sub = e.getKey();
-                                                        List<FeedEntry> entries = e.getValue();
 
-                                                        notifier.notifyOverWebsocket(sub, entries);
+                                        notifier.notifyOverWebsocket(sub, entries);
-                                                        return CompletableFuture.runAsync(
+                                        return CompletableFuture.runAsync(
-                                                                () ->
+                                                () -> notifier.sendPushNotifications(sub, entries),
-                                                                        notifier
+                                                notifierExecutor);
-                                                                                .sendPushNotifications(
+                                    })
-                                                                                        sub,
+                                    .toList();
-                                                                                        entries),
+                    return CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new));
-                                                                notifierExecutor);
+                })
-                                                    })
+                .exceptionally(ex -> {
-                                            .toList();
+                    log.error("error while processing feed {}", feed.getUrl(), ex);
-                            return CompletableFuture.allOf(
+                    return null;
-                                    futures.toArray(CompletableFuture[]::new));
+                });
-                        })
-                .exceptionally(
-                        ex -> {
-                            log.error("error while processing feed {}", feed.getUrl(), ex);
-                            return null;
-                        });
     }
 
     private List<Feed> getNextUpdatableFeeds(int max) {
-        return unitOfWork.call(
+        return unitOfWork.call(() -> {
-                () -> {
+            Instant lastLoginThreshold =
-                    Instant lastLoginThreshold =
+                    config.feedRefresh().userInactivityPeriod().isZero()
-                            config.feedRefresh().userInactivityPeriod().isZero()
+                            ? null
-                                    ? null
+                            : Instant.now().minus(config.feedRefresh().userInactivityPeriod());
-                                    : Instant.now()
+            List<Feed> feeds = feedDAO.findNextUpdatable(max, lastLoginThreshold);
-                                            .minus(config.feedRefresh().userInactivityPeriod());
+            if (!feeds.isEmpty()) {
-                    List<Feed> feeds = feedDAO.findNextUpdatable(max, lastLoginThreshold);
+                // update disabledUntil to prevent feeds from being returned again by
-                    if (!feeds.isEmpty()) {
+                // feedDAO.findNextUpdatable()
-                        // update disabledUntil to prevent feeds from being returned again by
+                Instant nextUpdateDate = Instant.now().plus(config.feedRefresh().interval());
-                        // feedDAO.findNextUpdatable()
+                feedDAO.setDisabledUntil(
-                        Instant nextUpdateDate =
+                        feeds.stream().map(AbstractModel::getId).toList(), nextUpdateDate);
-                                Instant.now().plus(config.feedRefresh().interval());
+            }
-                        feedDAO.setDisabledUntil(
+            return feeds;
-                                feeds.stream().map(AbstractModel::getId).toList(), nextUpdateDate);
+        });
-                    }
-                    return feeds;
-                });
     }
 
     private int getBatchSize() {
@@ -292,19 +276,18 @@ public class FeedRefreshEngine {
         ThreadPoolExecutor pool =
                 new ThreadPoolExecutor(
                         threads, threads, 0L, TimeUnit.MILLISECONDS, new SynchronousQueue<>());
-        pool.setRejectedExecutionHandler(
+        pool.setRejectedExecutionHandler((r, e) -> {
-                (r, e) -> {
+            if (e.isShutdown()) {
-                    if (e.isShutdown()) {
+                return;
-                        return;
+            }
-                    }
 
-                    try {
+            try {
-                        e.getQueue().put(r);
+                e.getQueue().put(r);
-                    } catch (InterruptedException ex) {
+            } catch (InterruptedException ex) {
-                        log.debug("interrupted while waiting for a slot in the queue.", ex);
+                log.debug("interrupted while waiting for a slot in the queue.", ex);
-                        Thread.currentThread().interrupt();
+                Thread.currentThread().interrupt();
-                    }
+            }
-                });
+        });
         return pool;
     }
 }

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

@@ -91,24 +91,22 @@ public class FeedRefreshUpdater {
             if (locked1 && locked2) {
                 processed = true;
                 insertedEntry =
-                        unitOfWork.call(
+                        unitOfWork.call(() -> {
-                                () -> {
+                            if (feedEntryService.find(feed, entry) != null) {
-                                    if (feedEntryService.find(feed, entry) != null) {
+                                // entry already exists, nothing to do
-                                        // entry already exists, nothing to do
+                                return null;
-                                        return null;
+                            }
-                                    }
 
-                                    FeedEntry feedEntry = feedEntryService.create(feed, entry);
+                            FeedEntry feedEntry = feedEntryService.create(feed, entry);
-                                    entryInserted.mark();
+                            entryInserted.mark();
-                                    for (FeedSubscription sub : subscriptions) {
+                            for (FeedSubscription sub : subscriptions) {
-                                        boolean unread =
+                                boolean unread = feedEntryService.applyFilter(sub, feedEntry);
-                                                feedEntryService.applyFilter(sub, feedEntry);
+                                if (unread) {
-                                        if (unread) {
+                                    subscriptionsForWhichEntryIsUnread.add(sub);
-                                            subscriptionsForWhichEntryIsUnread.add(sub);
+                                }
-                                        }
+                            }
-                                    }
+                            return feedEntry;
-                                    return feedEntry;
+                        });
-                                });
             } else {
                 log.error("lock timeout for {} - {}", feed.getUrl(), key1);
             }
@@ -147,14 +145,13 @@ public class FeedRefreshUpdater {
                 AddEntryResult addEntryResult = addEntry(feed, entry, subscriptions);
                 processed &= addEntryResult.processed;
                 inserted += addEntryResult.insertedEntry != null ? 1 : 0;
-                addEntryResult.subscriptionsForWhichEntryIsUnread.forEach(
+                addEntryResult.subscriptionsForWhichEntryIsUnread.forEach(sub -> {
-                        sub -> {
+                    if (addEntryResult.insertedEntry != null) {
-                            if (addEntryResult.insertedEntry != null) {
+                        insertedUnreadEntriesBySubscription
-                                insertedUnreadEntriesBySubscription
+                                .computeIfAbsent(sub, k -> new ArrayList<>())
-                                        .computeIfAbsent(sub, k -> new ArrayList<>())
+                                .add(addEntryResult.insertedEntry);
-                                        .add(addEntryResult.insertedEntry);
+                    }
-                            }
+                });
-                        });
             }
 
             if (inserted == 0) {

commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLExporter.java

@@ -65,20 +65,17 @@ public class OPMLExporter {
 
         for (FeedCategory child :
                 categories.stream()
-                        .filter(
+                        .filter(c ->
-                                c ->
+                                c.getParent() != null && c.getParent().getId().equals(cat.getId()))
-                                        c.getParent() != null
-                                                && c.getParent().getId().equals(cat.getId()))
                         .toList()) {
             outline.getChildren().add(buildCategoryOutline(child, categories, subscriptions));
         }
 
         for (FeedSubscription sub :
                 subscriptions.stream()
-                        .filter(
+                        .filter(s ->
-                                s ->
+                                s.getCategory() != null
-                                        s.getCategory() != null
+                                        && s.getCategory().getId().equals(cat.getId()))
-                                                && s.getCategory().getId().equals(cat.getId()))
                         .toList()) {
             outline.getChildren().add(buildSubscriptionOutline(sub));
         }

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

@@ -148,6 +148,7 @@ public class FeedEntryContentCleaningService {
 
         whitelist.addProtocols("a", "href", "ftp", "http", "https", "magnet", "mailto");
         whitelist.addProtocols("blockquote", "cite", "http", "https");
+        whitelist.addProtocols("iframe", "src", "http", "https");
         whitelist.addProtocols("img", "src", "http", "https");
         whitelist.addProtocols("q", "cite", "http", "https");
 

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

@@ -45,8 +45,7 @@ public class FeedEntryFilteringService {
                     .addVar("categories", SimpleType.STRING)
                     .addVar("categoriesLower", SimpleType.STRING)
                     .build();
-    private static final CelRuntime CEL_RUNTIME =
+    private static final CelRuntime CEL_RUNTIME = CelRuntimeFactory.plannerRuntimeBuilder().build();
-            CelRuntimeFactory.standardCelRuntimeBuilder().build();
 
     private final ExecutorService executor = Executors.newCachedThreadPool();
     private final CommaFeedConfiguration config;

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

@@ -148,26 +148,23 @@ public class FeedEntryService {
         List<FeedEntryStatus> statusesToMark =
                 statuses.stream()
                         .filter(FeedEntryStatus::isMarkable)
-                        .filter(
+                        .filter(s -> {
-                                s -> {
+                            Instant entryDate = s.getEntry().getPublished();
-                                    Instant entryDate = s.getEntry().getPublished();
+                            return olderThan == null
-                                    return olderThan == null
+                                    || entryDate == null
-                                            || entryDate == null
+                                    || entryDate.isBefore(olderThan);
-                                            || entryDate.isBefore(olderThan);
+                        })
-                                })
+                        .filter(s -> {
-                        .filter(
+                            Instant insertedDate = s.getEntry().getInserted();
-                                s -> {
+                            return insertedBefore == null
-                                    Instant insertedDate = s.getEntry().getInserted();
+                                    || insertedDate == null
-                                    return insertedBefore == null
+                                    || insertedDate.isBefore(insertedBefore);
-                                            || insertedDate == null
+                        })
-                                            || insertedDate.isBefore(insertedBefore);
-                                })
                         .toList();
 
-        statusesToMark.forEach(
+        statusesToMark.forEach(s -> {
-                s -> {
+            s.setRead(true);
-                    s.setRead(true);
+            feedEntryStatusDAO.merge(s);
-                    feedEntryStatusDAO.merge(s);
+        });
-                });
     }
 }

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

@@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Singleton
@@ -47,14 +46,13 @@ public class FeedSubscriptionService {
         // we need to use this hook because the feed needs to have been persisted before being
         // processed
         // by the feed engine
-        feedSubscriptionDAO.onPostCommitInsert(
+        feedSubscriptionDAO.onPostCommitInsert(sub -> {
-                sub -> {
+            Feed feed = sub.getFeed();
-                    Feed feed = sub.getFeed();
+            if (feed.getDisabledUntil() == null
-                    if (feed.getDisabledUntil() == null
+                    || feed.getDisabledUntil().isBefore(Instant.now())) {
-                            || feed.getDisabledUntil().isBefore(Instant.now())) {
+                feedRefreshEngine.refreshImmediately(feed);
-                        feedRefreshEngine.refreshImmediately(feed);
+            }
-                    }
+        });
-                });
     }
 
     public long subscribe(
@@ -116,10 +114,7 @@ public class FeedSubscriptionService {
     }
 
     public Map<Long, UnreadCount> getUnreadCount(User user) {
-        return feedSubscriptionDAO.findAll(user).stream()
+        return feedEntryStatusDAO.getUnreadCounts(feedSubscriptionDAO.findAll(user));
-                .collect(
-                        Collectors.toMap(
-                                FeedSubscription::getId, feedEntryStatusDAO::getUnreadCount));
     }
 
     @SuppressWarnings("serial")

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

@@ -16,26 +16,33 @@ import jakarta.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
-import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
-import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
+import org.apache.hc.client5.http.async.methods.SimpleRequestProducer;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.Message;
 import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
-import org.apache.hc.core5.util.Timeout;
+import org.apache.hc.core5.http.nio.entity.DiscardingEntityConsumer;
+import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
+import org.apache.hc.core5.net.WWWFormCodec;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 @Singleton
 @Slf4j
 public class PushNotificationService {
 
-    private final CloseableHttpClient httpClient;
+    private final CloseableHttpAsyncClient httpClient;
     private final Meter meter;
     private final CommaFeedConfiguration config;
 
@@ -97,13 +104,9 @@ public class PushNotificationService {
             return;
         }
 
-        HttpPost request = new HttpPost(serverUrl + "/" + topic);
+        SimpleRequestBuilder request = SimpleRequestBuilder.post(serverUrl + "/" + topic);
-        request.setConfig(
-                RequestConfig.custom()
-                        .setResponseTimeout(Timeout.of(config.httpClient().responseTimeout()))
-                        .build());
         request.addHeader("Title", feedTitle);
-        request.setEntity(new StringEntity(entryTitle, StandardCharsets.UTF_8));
+        request.setBody(entryTitle, ContentType.TEXT_PLAIN.withCharset(StandardCharsets.UTF_8));
 
         if (StringUtils.isNotBlank(entryUrl)) {
             request.addHeader("Click", entryUrl);
@@ -113,15 +116,7 @@ public class PushNotificationService {
             request.addHeader("Authorization", "Bearer " + settings.getUserSecret());
         }
 
-        httpClient.execute(
+        send("ntfy", request.build());
-                request,
-                response -> {
-                    if (response.getCode() >= 400) {
-                        throw new PushNotificationException(
-                                "ntfy notification failed with status " + response.getCode());
-                    }
-                    return null;
-                });
     }
 
     private void sendGotify(
@@ -152,23 +147,11 @@ public class PushNotificationService {
                                             .put("click", new JsonObject().put("url", entryUrl))));
         }
 
-        HttpPost request = new HttpPost(serverUrl + "/message");
+        SimpleRequestBuilder request = SimpleRequestBuilder.post(serverUrl + "/message");
-        request.setConfig(
-                RequestConfig.custom()
-                        .setResponseTimeout(Timeout.of(config.httpClient().responseTimeout()))
-                        .build());
         request.addHeader("X-Gotify-Key", token);
-        request.setEntity(new StringEntity(json.toString(), ContentType.APPLICATION_JSON));
+        request.setBody(json.toString(), ContentType.APPLICATION_JSON);
 
-        httpClient.execute(
+        send("gotify", request.build());
-                request,
-                response -> {
-                    if (response.getCode() >= 400) {
-                        throw new PushNotificationException(
-                                "gotify notification failed with status " + response.getCode());
-                    }
-                    return null;
-                });
     }
 
     private void sendPushover(
@@ -194,22 +177,40 @@ public class PushNotificationService {
             params.add(new BasicNameValuePair("url", entryUrl));
         }
 
-        HttpPost request = new HttpPost("https://api.pushover.net/1/messages.json");
+        SimpleRequestBuilder request =
-        request.setConfig(
+                SimpleRequestBuilder.post("https://api.pushover.net/1/messages.json");
-                RequestConfig.custom()
+        request.setBody(
-                        .setResponseTimeout(Timeout.of(config.httpClient().responseTimeout()))
+                WWWFormCodec.format(params, StandardCharsets.UTF_8),
-                        .build());
+                ContentType.APPLICATION_FORM_URLENCODED.withCharset(StandardCharsets.UTF_8));
-        request.setEntity(new UrlEncodedFormEntity(params, StandardCharsets.UTF_8));
 
-        httpClient.execute(
+        send("pushover", request.build());
-                request,
+    }
-                response -> {
+
-                    if (response.getCode() >= 400) {
+    private void send(String name, SimpleHttpRequest request) throws IOException {
-                        throw new PushNotificationException(
+        Future<Message<HttpResponse, Object>> future =
-                                "pushover notification failed with status " + response.getCode());
+                httpClient.execute(
-                    }
+                        SimpleRequestProducer.create(request),
-                    return null;
+                        new BasicResponseConsumer<>(new DiscardingEntityConsumer<>()),
-                });
+                        null);
+        try {
+            HttpResponse response =
+                    future.get(config.httpClient().responseTimeout().toSeconds(), TimeUnit.SECONDS)
+                            .getHead();
+            if (response.getCode() >= 400) {
+                throw new PushNotificationException(
+                        name + " notification failed with status " + response.getCode());
+            }
+        } catch (InterruptedException e) {
+            future.cancel(true);
+            Thread.currentThread().interrupt();
+            throw new IOException("interrupted while sending " + name + " notification", e);
+        } catch (TimeoutException e) {
+            future.cancel(true);
+            throw new IOException("timed out while sending " + name + " notification", e);
+        } catch (ExecutionException e) {
+            future.cancel(true);
+            throw new IOException(e.getCause());
+        }
     }
 
     public static class PushNotificationException extends RuntimeException {

commafeed-server/src/main/java/com/commafeed/backend/service/db/DatabaseCleaningService.java

@@ -79,13 +79,10 @@ public class DatabaseCleaningService {
                 } while (entriesDeleted > 0);
             }
             deleted =
-                    unitOfWork.call(
+                    unitOfWork.call(() ->
-                            () ->
+                            feedDAO.delete(
-                                    feedDAO.delete(
+                                    feedDAO.findByIds(
-                                            feedDAO.findByIds(
+                                            feeds.stream().map(AbstractModel::getId).toList())));
-                                                    feeds.stream()
-                                                            .map(AbstractModel::getId)
-                                                            .toList())));
             total += deleted;
             log.debug("removed {} feeds without subscriptions", total);
         } while (deleted != 0);
@@ -119,10 +116,9 @@ public class DatabaseCleaningService {
             }
 
             List<FeedCapacity> feeds =
-                    unitOfWork.call(
+                    unitOfWork.call(() ->
-                            () ->
+                            feedEntryDAO.findFeedsExceedingCapacity(
-                                    feedEntryDAO.findFeedsExceedingCapacity(
+                                    maxFeedCapacity, batchSize, keepStarredEntries));
-                                            maxFeedCapacity, batchSize, keepStarredEntries));
             if (feeds.isEmpty()) {
                 break;
             }
@@ -139,12 +135,11 @@ public class DatabaseCleaningService {
 
                     final long rem = remaining;
                     deleted =
-                            unitOfWork.call(
+                            unitOfWork.call(() ->
-                                    () ->
+                                    feedEntryDAO.deleteOldEntries(
-                                            feedEntryDAO.deleteOldEntries(
+                                            feed.id(),
-                                                    feed.id(),
+                                            Math.min(batchSize, rem),
-                                                    Math.min(batchSize, rem),
+                                            keepStarredEntries));
-                                                    keepStarredEntries));
                     entriesDeletedMeter.mark(deleted);
                     total += deleted;
                     remaining -= deleted;
@@ -166,10 +161,9 @@ public class DatabaseCleaningService {
             }
 
             deleted =
-                    unitOfWork.call(
+                    unitOfWork.call(() ->
-                            () ->
+                            feedEntryDAO.deleteEntriesOlderThan(
-                                    feedEntryDAO.deleteEntriesOlderThan(
+                                    olderThan, batchSize, keepStarredEntries));
-                                            olderThan, batchSize, keepStarredEntries));
             entriesDeletedMeter.mark(deleted);
             total += deleted;
             log.debug("removed {} old entries", total);

commafeed-server/src/main/java/com/commafeed/backend/task/DemoAccountCleanupTask.java

@@ -31,16 +31,15 @@ public class DemoAccountCleanupTask extends ScheduledTask {
         }
 
         log.info("recreating demo user account");
-        unitOfWork.run(
+        unitOfWork.run(() -> {
-                () -> {
+            User demoUser = userDAO.findByName(CommaFeedConstants.USERNAME_DEMO);
-                    User demoUser = userDAO.findByName(CommaFeedConstants.USERNAME_DEMO);
+            if (demoUser == null) {
-                    if (demoUser == null) {
+                return;
-                        return;
+            }
-                    }
 
-                    userService.unregister(demoUser);
+            userService.unregister(demoUser);
-                    userService.createDemoUser();
+            userService.createDemoUser();
-                });
+        });
     }
 
     @Override

commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java

@@ -435,6 +435,19 @@ public class CategoryREST {
                 && !Strings.CS.equals(req.getParentId(), String.valueOf(req.getId()))) {
             parent = feedCategoryDAO.findById(user, Long.valueOf(req.getParentId()));
         }
+        if (parent != null) {
+            Long parentId = parent.getId();
+            List<FeedCategory> descendants =
+                    feedCategoryDAO.findAllChildrenCategories(user, category);
+            boolean parentIsDescendant =
+                    descendants.stream().anyMatch(c -> c.getId().equals(parentId));
+            if (parentIsDescendant) {
+                return Response.status(Status.BAD_REQUEST)
+                        .entity(
+                                "<message>cannot set a category's own descendant as its parent</message>")
+                        .build();
+            }
+        }
         category.setParent(parent);
 
         if (req.getPosition() != null) {

commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java

@@ -140,14 +140,9 @@ public class FeverREST {
         Map<String, String> params = new HashMap<>();
         uri.getQueryParameters().forEach((k, v) -> params.put(k, v.getFirst()));
         form.getValues()
-                .forEach(
+                .forEach((k, v) ->
-                        (k, v) ->
+                        params.put(
-                                params.put(
+                                k, v.stream().map(FormValue::getValue).findFirst().orElse(null)));
-                                        k,
-                                        v.stream()
-                                                .map(FormValue::getValue)
-                                                .findFirst()
-                                                .orElse(null)));
         return handle(userId, params);
     }
 
@@ -246,46 +241,42 @@ public class FeverREST {
                                 s -> s.getCategory() == null ? 0 : s.getCategory().getId()))
                 .entrySet()
                 .stream()
-                .map(
+                .map(e -> {
-                        e -> {
+                    FeverFeedGroup fg = new FeverFeedGroup();
-                            FeverFeedGroup fg = new FeverFeedGroup();
+                    fg.setGroupId(e.getKey());
-                            fg.setGroupId(e.getKey());
+                    fg.setFeedIds(e.getValue().stream().map(FeedSubscription::getId).toList());
-                            fg.setFeedIds(
+                    return fg;
-                                    e.getValue().stream().map(FeedSubscription::getId).toList());
+                })
-                            return fg;
-                        })
                 .toList();
     }
 
     private List<FeverGroup> buildGroups(List<FeedCategory> categories) {
         return categories.stream()
-                .map(
+                .map(c -> {
-                        c -> {
+                    FeverGroup g = new FeverGroup();
-                            FeverGroup g = new FeverGroup();
+                    g.setId(c.getId());
-                            g.setId(c.getId());
+                    g.setTitle(c.getName());
-                            g.setTitle(c.getName());
+                    return g;
-                            return g;
+                })
-                        })
                 .toList();
     }
 
     private List<FeverFeed> buildFeeds(List<FeedSubscription> subscriptions) {
         return subscriptions.stream()
-                .map(
+                .map(s -> {
-                        s -> {
+                    FeverFeed f = new FeverFeed();
-                            FeverFeed f = new FeverFeed();
+                    f.setId(s.getId());
-                            f.setId(s.getId());
+                    f.setFaviconId(s.getId());
-                            f.setFaviconId(s.getId());
+                    f.setTitle(s.getTitle());
-                            f.setTitle(s.getTitle());
+                    f.setUrl(s.getFeed().getUrl());
-                            f.setUrl(s.getFeed().getUrl());
+                    f.setSiteUrl(s.getFeed().getLink());
-                            f.setSiteUrl(s.getFeed().getLink());
+                    f.setSpark(false);
-                            f.setSpark(false);
+                    f.setLastUpdatedOnTime(
-                            f.setLastUpdatedOnTime(
+                            s.getFeed().getLastUpdated() == null
-                                    s.getFeed().getLastUpdated() == null
+                                    ? 0
-                                            ? 0
+                                    : s.getFeed().getLastUpdated().getEpochSecond());
-                                            : s.getFeed().getLastUpdated().getEpochSecond());
+                    return f;
-                            return f;
+                })
-                        })
                 .toList();
     }
 
@@ -367,19 +358,18 @@ public class FeverREST {
 
     private List<FeverFavicon> buildFavicons(List<FeedSubscription> subscriptions) {
         return subscriptions.stream()
-                .map(
+                .map(s -> {
-                        s -> {
+                    Favicon favicon = feedFaviconService.fetchFavicon(s.getFeed());
-                            Favicon favicon = feedFaviconService.fetchFavicon(s.getFeed());
 
-                            FeverFavicon f = new FeverFavicon();
+                    FeverFavicon f = new FeverFavicon();
-                            f.setId(s.getFeed().getId());
+                    f.setId(s.getFeed().getId());
-                            f.setData(
+                    f.setData(
-                                    String.format(
+                            String.format(
-                                            "data:%s;base64,%s",
+                                    "data:%s;base64,%s",
-                                            favicon.mediaType(),
+                                    favicon.mediaType(),
-                                            Base64.getEncoder().encodeToString(favicon.icon())));
+                                    Base64.getEncoder().encodeToString(favicon.icon())));
-                            return f;
+                    return f;
-                        })
+                })
                 .toList();
     }
 

commafeed-server/src/main/java/com/commafeed/frontend/resource/googlereader/GoogleReaderREST.java

@@ -216,11 +216,10 @@ public class GoogleReaderREST {
         List<GoogleReaderModel.Tag> tags = new ArrayList<>();
         feedCategoryDAO
                 .findAll(user)
-                .forEach(
+                .forEach(c ->
-                        c ->
+                        tags.add(
-                                tags.add(
+                                new GoogleReaderModel.Tag(
-                                        new GoogleReaderModel.Tag(
+                                        GoogleReaderStreamId.label(c.getName()))));
-                                                GoogleReaderStreamId.label(c.getName()))));
         tags.add(new GoogleReaderModel.Tag(GoogleReaderStreamId.STARRED));
 
         GoogleReaderModel.TagList resp = new GoogleReaderModel.TagList();
@@ -259,21 +258,19 @@ public class GoogleReaderREST {
         Map<Long, FeedCategory> categoriesById =
                 feedCategoryDAO.findAll(user).stream()
                         .collect(Collectors.toMap(FeedCategory::getId, c -> c));
-        unreadByCategory.forEach(
+        unreadByCategory.forEach((categoryId, count) -> {
-                (categoryId, count) -> {
+            if (categoryId == 0) {
-                    if (categoryId == 0) {
+                return;
-                        return;
+            }
-                    }
+            FeedCategory category = categoriesById.get(categoryId);
-                    FeedCategory category = categoriesById.get(categoryId);
+            if (category == null) {
-                    if (category == null) {
+                return;
-                        return;
+            }
-                    }
+            GoogleReaderModel.UnreadCountEntry entry = new GoogleReaderModel.UnreadCountEntry();
-                    GoogleReaderModel.UnreadCountEntry entry =
+            entry.setId(GoogleReaderStreamId.label(category.getName()));
-                            new GoogleReaderModel.UnreadCountEntry();
+            entry.setCount(count);
-                    entry.setId(GoogleReaderStreamId.label(category.getName()));
+            entries.add(entry);
-                    entry.setCount(count);
+        });
-                    entries.add(entry);
-                });
 
         GoogleReaderModel.UnreadCountEntry readingList = new GoogleReaderModel.UnreadCountEntry();
         readingList.setId(GoogleReaderStreamId.READING_LIST);
@@ -334,10 +331,8 @@ public class GoogleReaderREST {
         GoogleReaderModel.ItemRefs resp = new GoogleReaderModel.ItemRefs();
         resp.setItemRefs(
                 paged.statuses().stream()
-                        .map(
+                        .map(s ->
-                                s ->
+                                new GoogleReaderModel.ItemRef(String.valueOf(s.getEntry().getId())))
-                                        new GoogleReaderModel.ItemRef(
-                                                String.valueOf(s.getEntry().getId())))
                         .toList());
         resp.setContinuation(paged.continuation());
         return resp;

commafeed-server/src/main/java/com/commafeed/security/identity/DatabaseApiKeyIdentityProvider.java

@@ -38,20 +38,18 @@ public class DatabaseApiKeyIdentityProvider
     @Override
     public Uni<SecurityIdentity> authenticate(
             TokenAuthenticationRequest request, AuthenticationRequestContext context) {
-        return context.runBlocking(
+        return context.runBlocking(() -> {
-                () -> {
+            Optional<User> user =
-                    Optional<User> user =
+                    unitOfWork.call(() -> userService.login(request.getToken().getToken()));
-                            unitOfWork.call(() -> userService.login(request.getToken().getToken()));
+            if (user.isEmpty()) {
-                    if (user.isEmpty()) {
+                throw new AuthenticationFailedException("could not find a user with this api key");
-                        throw new AuthenticationFailedException(
+            }
-                                "could not find a user with this api key");
-                    }
 
-                    Set<Role> roles = unitOfWork.call(() -> userService.getRoles(user.get()));
+            Set<Role> roles = unitOfWork.call(() -> userService.getRoles(user.get()));
-                    return QuarkusSecurityIdentity.builder()
+            return QuarkusSecurityIdentity.builder()
-                            .setPrincipal(new QuarkusPrincipal(String.valueOf(user.get().getId())))
+                    .setPrincipal(new QuarkusPrincipal(String.valueOf(user.get().getId())))
-                            .addRoles(roles.stream().map(Enum::name).collect(Collectors.toSet()))
+                    .addRoles(roles.stream().map(Enum::name).collect(Collectors.toSet()))
-                            .build();
+                    .build();
-                });
+        });
     }
 }

commafeed-server/src/main/java/com/commafeed/security/identity/DatabaseUsernamePasswordIdentityProvider.java

@@ -39,25 +39,22 @@ public class DatabaseUsernamePasswordIdentityProvider
     @Override
     public Uni<SecurityIdentity> authenticate(
             UsernamePasswordAuthenticationRequest request, AuthenticationRequestContext context) {
-        return context.runBlocking(
+        return context.runBlocking(() -> {
-                () -> {
+            Optional<User> user =
-                    Optional<User> user =
+                    unitOfWork.call(() ->
-                            unitOfWork.call(
+                            userService.login(
-                                    () ->
+                                    request.getUsername(),
-                                            userService.login(
+                                    new String(request.getPassword().getPassword())));
-                                                    request.getUsername(),
+            if (user.isEmpty()) {
-                                                    new String(
+                throw new CommaFeedApplicationException(
-                                                            request.getPassword().getPassword())));
+                        CommaFeedExceptionType.WRONG_USERNAME_OR_PASSWORD);
-                    if (user.isEmpty()) {
+            }
-                        throw new CommaFeedApplicationException(
-                                CommaFeedExceptionType.WRONG_USERNAME_OR_PASSWORD);
-                    }
 
-                    Set<Role> roles = unitOfWork.call(() -> userService.getRoles(user.get()));
+            Set<Role> roles = unitOfWork.call(() -> userService.getRoles(user.get()));
-                    return QuarkusSecurityIdentity.builder()
+            return QuarkusSecurityIdentity.builder()
-                            .setPrincipal(new QuarkusPrincipal(String.valueOf(user.get().getId())))
+                    .setPrincipal(new QuarkusPrincipal(String.valueOf(user.get().getId())))
-                            .addRoles(roles.stream().map(Enum::name).collect(Collectors.toSet()))
+                    .addRoles(roles.stream().map(Enum::name).collect(Collectors.toSet()))
-                            .build();
+                    .build();
-                });
+        });
     }
 }

commafeed-server/src/main/java/com/commafeed/security/identity/TrustedIdentityProvider.java

@@ -40,24 +40,23 @@ public class TrustedIdentityProvider implements IdentityProvider<TrustedAuthenti
     @Override
     public Uni<SecurityIdentity> authenticate(
             TrustedAuthenticationRequest request, AuthenticationRequestContext context) {
-        return context.runBlocking(
+        return context.runBlocking(() -> {
-                () -> {
+            Long userId = Long.valueOf(request.getPrincipal());
-                    Long userId = Long.valueOf(request.getPrincipal());
+            User user = unitOfWork.call(() -> userDAO.findById(userId));
-                    User user = unitOfWork.call(() -> userDAO.findById(userId));
+            if (user == null) {
-                    if (user == null) {
+                throw new AuthenticationFailedException("user not found");
-                        throw new AuthenticationFailedException("user not found");
+            }
-                    }
 
-                    // execute post login activities manually because we didn't call login() since
+            // execute post login activities manually because we didn't call login() since
-                    // we received
+            // we received
-                    // a trusted authentication request
+            // a trusted authentication request
-                    unitOfWork.run(() -> postLoginActivities.executeFor(user));
+            unitOfWork.run(() -> postLoginActivities.executeFor(user));
 
-                    Set<Role> roles = unitOfWork.call(() -> userService.getRoles(user));
+            Set<Role> roles = unitOfWork.call(() -> userService.getRoles(user));
-                    return QuarkusSecurityIdentity.builder()
+            return QuarkusSecurityIdentity.builder()
-                            .setPrincipal(new QuarkusPrincipal(String.valueOf(userId)))
+                    .setPrincipal(new QuarkusPrincipal(String.valueOf(userId)))
-                            .addRoles(roles.stream().map(Enum::name).collect(Collectors.toSet()))
+                    .addRoles(roles.stream().map(Enum::name).collect(Collectors.toSet()))
-                            .build();
+                    .build();
-                });
+        });
     }
 }

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

@@ -41,11 +41,10 @@ class NativeImageClassesTest {
                         WireFeedGenerator.class)) {
             Set<Class<?>> moduleClasses =
                     new HashSet<>(reflections.get(Scanners.SubTypes.of(clazz).asClass()));
-            moduleClasses.removeIf(
+            moduleClasses.removeIf(c ->
-                    c ->
+                    c.isInterface()
-                            c.isInterface()
+                            || Modifier.isAbstract(c.getModifiers())
-                                    || Modifier.isAbstract(c.getModifiers())
+                            || !Modifier.isPublic(c.getModifiers()));
-                                    || !Modifier.isPublic(c.getModifiers()));
             moduleClasses.removeAll(classesInAnnotation);
             missingClasses.addAll(moduleClasses);
         }

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

@@ -11,6 +11,8 @@ import com.google.common.net.HttpHeaders;
 
 import io.quarkus.runtime.configuration.MemorySize;
 
+import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.hc.client5.http.ConnectTimeoutException;
 import org.apache.hc.core5.http.HttpStatus;
@@ -29,12 +31,12 @@ import org.mockserver.model.Delay;
 import org.mockserver.model.HttpRequest;
 import org.mockserver.model.HttpResponse;
 import org.mockserver.model.MediaType;
+import org.mockserver.model.Protocol;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.NoRouteToHostException;
-import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.time.Duration;
 import java.time.Instant;
@@ -45,6 +47,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.GZIPOutputStream;
 
+@Slf4j
 class HttpGetterTest {
 
     private static final Instant NOW = Instant.now();
@@ -237,7 +240,7 @@ class HttpGetterTest {
                 .when(HttpRequest.request().withMethod("GET"))
                 .respond(HttpResponse.response().withDelay(Delay.milliseconds(1000)));
 
-        Assertions.assertThrows(SocketTimeoutException.class, () -> getter.get(this.feedUrl));
+        Assertions.assertThrows(IOException.class, () -> getter.get(this.feedUrl));
     }
 
     @Test
@@ -314,18 +317,17 @@ class HttpGetterTest {
 
         this.mockServerClient
                 .when(HttpRequest.request().withMethod("GET"))
-                .respond(
+                .respond(req -> {
-                        req -> {
+                    calls.incrementAndGet();
-                            calls.incrementAndGet();
 
-                            if (req.containsHeader(HttpHeaders.COOKIE)) {
+                    if (req.containsHeader(HttpHeaders.COOKIE)) {
-                                throw new Exception("cookie should not be sent by the client");
+                        throw new Exception("cookie should not be sent by the client");
-                            }
+                    }
 
-                            return HttpResponse.response()
+                    return HttpResponse.response()
-                                    .withBody("ok")
+                            .withBody("ok")
-                                    .withHeader(HttpHeaders.SET_COOKIE, "foo=bar");
+                            .withHeader(HttpHeaders.SET_COOKIE, "foo=bar");
-                        });
+                });
 
         Assertions.assertDoesNotThrow(() -> getter.get(this.feedUrl));
         Assertions.assertDoesNotThrow(() -> getter.get(this.feedUrl + "?foo=bar"));
@@ -338,11 +340,10 @@ class HttpGetterTest {
 
         this.mockServerClient
                 .when(HttpRequest.request().withMethod("GET"))
-                .respond(
+                .respond(req -> {
-                        req -> {
+                    calls.incrementAndGet();
-                            calls.incrementAndGet();
+                    return HttpResponse.response().withBody("ok");
-                            return HttpResponse.response().withBody("ok");
+                });
-                        });
 
         HttpResult result = getter.get(this.feedUrl);
         Assertions.assertEquals(result, getter.get(this.feedUrl));
@@ -397,17 +398,15 @@ class HttpGetterTest {
 
         this.mockServerClient
                 .when(HttpRequest.request().withMethod("GET"))
-                .respond(
+                .respond(req -> {
-                        req -> {
+                    calls.incrementAndGet();
-                            calls.incrementAndGet();
 
-                            if (req.containsHeader(HttpHeaders.UPGRADE)) {
+                    if (req.containsHeader(HttpHeaders.UPGRADE)) {
-                                throw new Exception(
+                        throw new Exception("upgrade header should not be sent by the client");
-                                        "upgrade header should not be sent by the client");
+                    }
-                            }
 
-                            return HttpResponse.response().withBody("ok");
+                    return HttpResponse.response().withBody("ok");
-                        });
+                });
 
         Assertions.assertDoesNotThrow(() -> getter.get(this.feedUrl));
         Assertions.assertEquals(1, calls.get());
@@ -416,7 +415,7 @@ class HttpGetterTest {
     @Nested
     class Compression {
 
-        private static final String ACCEPT_ENCODING = "gzip, deflate, br";
+        private static final String ACCEPT_ENCODING = "deflate, gzip";
 
         @Test
         void gzip() throws Exception {
@@ -435,27 +434,30 @@ class HttpGetterTest {
             HttpGetterTest.this
                     .mockServerClient
                     .when(HttpRequest.request().withMethod("GET"))
-                    .respond(
+                    .respond(req -> {
-                            req -> {
+                        try {
-                                String acceptEncodingHeader =
+                            String acceptEncodingHeader =
-                                        req.getFirstHeader(HttpHeaders.ACCEPT_ENCODING);
+                                    req.getFirstHeader(HttpHeaders.ACCEPT_ENCODING);
-                                if (!ACCEPT_ENCODING.equals(acceptEncodingHeader)) {
+                            if (!ACCEPT_ENCODING.equals(acceptEncodingHeader)) {
-                                    throw new Exception(
+                                throw new Exception(
-                                            "Wrong value in the Accept-Encoding header, should be '%s' but was '%s'"
+                                        "Wrong value in the Accept-Encoding header, should be '%s' but was '%s'"
-                                                    .formatted(
+                                                .formatted(ACCEPT_ENCODING, acceptEncodingHeader));
-                                                            ACCEPT_ENCODING, acceptEncodingHeader));
+                            }
-                                }
 
-                                ByteArrayOutputStream output = new ByteArrayOutputStream();
+                            ByteArrayOutputStream output = new ByteArrayOutputStream();
-                                try (OutputStream compressionOutputStream =
+                            try (OutputStream compressionOutputStream =
-                                        compressionFunction.apply(output)) {
+                                    compressionFunction.apply(output)) {
-                                    compressionOutputStream.write(body.getBytes());
+                                compressionOutputStream.write(body.getBytes());
-                                }
+                            }
 
-                                return HttpResponse.response()
+                            return HttpResponse.response()
-                                        .withBody(output.toByteArray())
+                                    .withBody(output.toByteArray())
-                                        .withHeader(HttpHeaders.CONTENT_ENCODING, encoding);
+                                    .withHeader(HttpHeaders.CONTENT_ENCODING, encoding);
-                            });
+                        } catch (Exception e) {
+                            log.error("Error in compression callback", e);
+                            throw e;
+                        }
+                    });
 
             HttpResult result = getter.get(HttpGetterTest.this.feedUrl);
             Assertions.assertEquals(body, new String(result.content()));
@@ -590,4 +592,30 @@ class HttpGetterTest {
                     UnknownHostException.class, () -> getter.get("http://[::a00:1]")); // 10.0.0.1
         }
     }
+
+    @Nested
+    class Protocols {
+        @Test
+        void usesHttp2OverTls() throws Exception {
+            mockServerClient
+                    .when(HttpRequest.request().withMethod("GET").withProtocol(Protocol.HTTP_2))
+                    .respond(HttpResponse.response().withBody("h2"));
+            mockServerClient
+                    .when(HttpRequest.request().withMethod("GET").withProtocol(Protocol.HTTP_1_1))
+                    .respond(HttpResponse.response().withBody("h1"));
+
+            HttpResult result = getter.get("https://localhost:" + mockServerClient.getPort());
+            Assertions.assertEquals("h2", new String(result.content()));
+        }
+
+        @Test
+        void fallsBackToHttp1OverCleartext() throws Exception {
+            mockServerClient
+                    .when(HttpRequest.request().withMethod("GET").withProtocol(Protocol.HTTP_1_1))
+                    .respond(HttpResponse.response().withBody("h1"));
+
+            HttpResult result = getter.get("http://localhost:" + mockServerClient.getPort());
+            Assertions.assertEquals("h1", new String(result.content()));
+        }
+    }
 }

commafeed-server/src/test/java/com/commafeed/backend/favicon/YoutubeFaviconFetcherTest.java

@@ -68,7 +68,8 @@ class YoutubeFaviconFetcherTest {
 
         byte[] apiResponse =
                 """
-				{"items":[{"snippet":{"thumbnails":{"default":{"url":"https://example.com/icon.png"}}}}]}"""
+                {"items":[{"snippet":{"thumbnails":{"default":{"url":"https://example.com/icon.png"}}}}]}\
+                """
                         .getBytes();
         HttpResult apiHttpResult =
                 new HttpResult(apiResponse, "application/json", null, null, null, Duration.ZERO);
@@ -102,7 +103,8 @@ class YoutubeFaviconFetcherTest {
 
         byte[] apiResponse =
                 """
-				{"items":[{"snippet":{"thumbnails":{"default":{"url":"https://example.com/icon.png"}}}}]}"""
+                {"items":[{"snippet":{"thumbnails":{"default":{"url":"https://example.com/icon.png"}}}}]}\
+                """
                         .getBytes();
         HttpResult apiHttpResult =
                 new HttpResult(apiResponse, "application/json", null, null, null, Duration.ZERO);
@@ -136,7 +138,8 @@ class YoutubeFaviconFetcherTest {
 
         byte[] playlistResponse =
                 """
-				{"items":[{"snippet":{"channelId":"testChannelId"}}]}"""
+                {"items":[{"snippet":{"channelId":"testChannelId"}}]}\
+                """
                         .getBytes();
         HttpResult playlistHttpResult =
                 new HttpResult(
@@ -151,7 +154,8 @@ class YoutubeFaviconFetcherTest {
 
         byte[] channelResponse =
                 """
-				{"items":[{"snippet":{"thumbnails":{"default":{"url":"https://example.com/icon.png"}}}}]}"""
+                {"items":[{"snippet":{"thumbnails":{"default":{"url":"https://example.com/icon.png"}}}}]}\
+                """
                         .getBytes();
         HttpResult channelHttpResult =
                 new HttpResult(

commafeed-server/src/test/java/com/commafeed/backend/feed/parser/XMLCleanerTest.java

@@ -226,14 +226,16 @@ class XMLCleanerTest {
         void testRemoveMultilineDoctype() {
             String source =
                     """
-					<!DOCTYPE
+                    <!DOCTYPE
-						html
+                    	html
-					>
+                    >
-					<html><head></head><body></body></html>""";
+                    <html><head></head><body></body></html>\
+                    """;
             Assertions.assertEquals(
                     """
 
-					<html><head></head><body></body></html>""",
+                    <html><head></head><body></body></html>\
+                    """,
                     xmlCleaner.removeDoctypeDeclarations(source));
         }
 

commafeed-server/src/test/java/com/commafeed/backend/service/FeedEntryContentCleaningServiceTest.java

@@ -12,23 +12,23 @@ class FeedEntryContentCleaningServiceTest {
     void testClean() {
         String content =
                 """
-				<p>
+                <p>
-				Some text
+                Some text
-				<img width="965" height="320" src="https://localhost/an-image.png" class="attachment-post-thumbnail size-post-thumbnail wp-post-image" alt="alt-desc" decoding="async" sizes="(max-width: 965px) 100vw, 965px" style="width: 100%; opacity: 0">
+                <img width="965" height="320" src="https://localhost/an-image.png" class="attachment-post-thumbnail size-post-thumbnail wp-post-image" alt="alt-desc" decoding="async" sizes="(max-width: 965px) 100vw, 965px" style="width: 100%; opacity: 0">
-				<iframe src="url" style="width: 100%; opacity: 0"></iframe>
+                <iframe src="https://localhost/an-iframe" style="width: 100%; opacity: 0"></iframe>
-				<forbidden-element>aaa</forbidden-element>
+                <forbidden-element>aaa</forbidden-element>
-				""";
+                """;
         String result = feedEntryContentCleaningService.clean(content, "baseUri", false);
 
         Assertions.assertLinesMatch(
                 """
-				<p>
+                <p>
-				Some text
+                Some text
-				<img width="965" height="320" src="https://localhost/an-image.png" alt="alt-desc" style="width:100%;">
+                <img width="965" height="320" src="https://localhost/an-image.png" alt="alt-desc" style="width:100%;">
-				<iframe src="url" style="width:100%;"></iframe>
+                <iframe src="https://localhost/an-iframe" style="width:100%;"></iframe>
-				aaa
+                aaa
-				</p>
+                </p>
-				"""
+                """
                         .lines(),
                 result.lines());
     }

commafeed-server/src/test/java/com/commafeed/backend/service/PushNotificationServiceTest.java

@@ -98,19 +98,19 @@ class PushNotificationServiceTest {
                                 .withBody(
                                         JsonBody.json(
                                                 """
-						{
+                                                {
-							"title": "Test Feed",
+                                                	"title": "Test Feed",
-							"message": "Test Entry",
+                                                	"message": "Test Entry",
-							"priority": 5,
+                                                	"priority": 5,
-							"extras": {
+                                                	"extras": {
-								"client::notification": {
+                                                		"client::notification": {
-									"click": {
+                                                			"click": {
-										"url": "http://example.com/entry"
+                                                				"url": "http://example.com/entry"
-									}
+                                                			}
-								}
+                                                		}
-							}
+                                                	}
-						}
+                                                }
-						""")))
+                                                """)))
                 .respond(HttpResponse.response().withStatusCode(200));
 
         Assertions.assertDoesNotThrow(

commafeed-server/src/test/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProviderTest.java

@@ -14,14 +14,15 @@ class InPageReferenceFeedURLProviderTest {
         String url = "http://example.com";
         String html =
                 """
-				<html>
+                <html>
-					<head>
+                	<head>
-						<link type="application/atom+xml" href="/feed.atom">
+                		<link type="application/atom+xml" href="/feed.atom">
-						<link type="application/rss+xml" href="/feed.rss">
+                		<link type="application/rss+xml" href="/feed.rss">
-					</head>
+                	</head>
-					<body>
+                	<body>
-					</body>
+                	</body>
-				</html>""";
+                </html>\
+                """;
 
         Assertions.assertIterableEquals(
                 List.of("http://example.com/feed.atom", "http://example.com/feed.rss"),
@@ -33,9 +34,10 @@ class InPageReferenceFeedURLProviderTest {
         String url = "http://example.com";
         String html =
                 """
-				<?xml version="1.0"?>
+                <?xml version="1.0"?>
-					<feed></feed>
+                	<feed></feed>
-				</xml>""";
+                </xml>\
+                """;
 
         Assertions.assertTrue(provider.get(url, html).isEmpty());
     }
@@ -45,13 +47,14 @@ class InPageReferenceFeedURLProviderTest {
         String url = "http://example.com";
         String html =
                 """
-				<html>
+                <html>
-					<head>
+                	<head>
-						<link type="text/css" href="/style.css">
+                		<link type="text/css" href="/style.css">
-					</head>
+                	</head>
-					<body>
+                	<body>
-					</body>
+                	</body>
-				</html>""";
+                </html>\
+                """;
 
         Assertions.assertTrue(provider.get(url, html).isEmpty());
     }

commafeed-server/src/test/java/com/commafeed/integration/rest/GoogleReaderIT.java

@@ -170,10 +170,9 @@ class GoogleReaderIT extends BaseIT {
                 client.get(BASE + "/reader/api/0/unread-count").as(UnreadCounts.class);
         Assertions.assertTrue(
                 counts.getUnreadCounts().stream()
-                        .anyMatch(
+                        .anyMatch(c ->
-                                c ->
+                                c.getId().equals("user/-/state/com.google/reading-list")
-                                        c.getId().equals("user/-/state/com.google/reading-list")
+                                        && c.getCount() == 2));
-                                                && c.getCount() == 2));
     }
 
     @Test

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>7.3.2</version>
+	<version>7.4.1</version>
 	<name>CommaFeed</name>
 	<packaging>pom</packaging>
 
@@ -19,7 +19,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.15.0</version>
+				<version>3.16.0</version>
 				<configuration>
 					<parameters>true</parameters>