Update debian:13.7 Docker digest to 9c6e381

Update dependency @vitejs/plugin-react to v6.2.1

.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
-        if: matrix.os == 'ubuntu-latest' # we only need to upload the cross-platform artifact once per database
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        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,10 +1,10 @@
 {
-    "$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,
         "lineEnding": "lf",
-        "lineWidth": 140
+        "lineWidth": 120
     },
     "javascript": {
         "formatter": {

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/react": "6.6.0",
-        "@mantine/core": "9.5.1",
-        "@mantine/dates": "9.5.1",
-        "@mantine/form": "9.5.1",
-        "@mantine/hooks": "9.5.1",
-        "@mantine/modals": "9.5.1",
-        "@mantine/notifications": "9.5.1",
-        "@mantine/spotlight": "9.5.1",
+        "@lingui/core": "6.11.0",
+        "@lingui/react": "6.11.0",
+        "@mantine/core": "9.7.4",
+        "@mantine/dates": "9.7.4",
+        "@mantine/form": "9.7.4",
+        "@mantine/hooks": "9.7.4",
+        "@mantine/modals": "9.7.4",
+        "@mantine/notifications": "9.7.4",
+        "@mantine/spotlight": "9.7.4",
         "@monaco-editor/react": "4.7.0",
-        "@react-querybuilder/mantine": "8.23.0",
-        "@reduxjs/toolkit": "2.12.0",
-        "@rolldown/plugin-babel": "0.2.3",
-        "axios": "1.19.0",
+        "@react-querybuilder/mantine": "8.26.0",
+        "@reduxjs/toolkit": "2.13.0",
+        "@rolldown/plugin-babel": "0.2.4",
+        "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-draggable": "4.7.1",
+        "react-dom": "19.3.1",
+        "react-draggable": "4.7.2",
         "react-icons": "5.7.0",
         "react-infinite-scroller": "1.2.6",
-        "react-querybuilder": "8.23.0",
-        "react-redux": "9.3.0",
-        "react-router-dom": "7.18.2",
+        "react-querybuilder": "8.26.0",
+        "react-redux": "9.3.1",
+        "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.5.9",
-        "@lingui/babel-plugin-lingui-macro": "6.6.0",
-        "@lingui/cli": "6.6.0",
-        "@lingui/vite-plugin": "6.6.0",
+        "@biomejs/biome": "2.6.4",
+        "@lingui/cli": "6.11.0",
+        "@lingui/vite-plugin": "6.11.0",
         "@testing-library/jest-dom": "7.0.1",
-        "@testing-library/react": "16.3.2",
-        "@testing-library/user-event": "14.6.5",
+        "@testing-library/react": "16.3.3",
+        "@testing-library/user-event": "14.6.8",
         "@types/mousetrap": "1.6.15",
-        "@types/react": "19.2.18",
-        "@types/react-dom": "19.2.4",
+        "@types/react": "19.3.0",
+        "@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",
-        "babel-plugin-react-compiler": "1.0.0",
-        "jsdom": "30.0.1",
+        "@vitejs/plugin-react": "6.2.1",
+        "babel-plugin-react-compiler": "^1.0.0",
+        "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",
-        "yaml": "2.9.0"
+        "vitest": "5.0.5",
+        "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.tsx

@@ -38,7 +38,8 @@ function Providers(
         children: React.ReactNode
     }>
 ) {
-    const primaryColor = useAppSelector(state => state.user.settings?.primaryColor) || Constants.theme.defaultPrimaryColor
+    const primaryColor =
+        useAppSelector(state => state.user.settings?.primaryColor) || Constants.theme.defaultPrimaryColor
     return (
         <I18nProvider i18n={i18n}>
             <MantineProvider
@@ -87,7 +88,10 @@ function AppRoutes() {
             <Route path="register" element={<RegistrationPage />} />
             <Route path="passwordRecovery" element={<PasswordRecoveryPage />} />
             <Route path="passwordReset" element={<PasswordResetPage />} />
-            <Route path="app" element={<Layout header={<Header />} sidebar={<Tree />} sidebarVisible={sidebarVisible} />}>
+            <Route
+                path="app"
+                element={<Layout header={<Header />} sidebar={<Tree />} sidebarVisible={sidebarVisible} />}
+            >
                 <Route path="category">
                     <Route path=":id" element={<FeedEntriesPage sourceType="category" />} />
                     <Route path=":id/details" element={<CategoryDetailsPage />} />

commafeed-client/src/app/client.ts

@@ -61,7 +61,8 @@ export const client = {
         getRoot: async () => await axiosInstance.get<Category>("category/get"),
         modify: async (req: CategoryModificationRequest) => await axiosInstance.post("category/modify", req),
         collapse: async (req: CollapseRequest) => await axiosInstance.post("category/collapse", req),
-        getEntries: async (req: GetEntriesPaginatedRequest) => await axiosInstance.get<Entries>("category/entries", { params: req }),
+        getEntries: async (req: GetEntriesPaginatedRequest) =>
+            await axiosInstance.get<Entries>("category/entries", { params: req }),
         markEntries: async (req: MarkRequest) => await axiosInstance.post("category/mark", req),
         add: async (req: AddCategoryRequest) => await axiosInstance.post("category/add", req),
         delete: async (req: IDRequest) => await axiosInstance.post("category/delete", req),
@@ -76,7 +77,8 @@ export const client = {
     feed: {
         get: async (id: string) => await axiosInstance.get<Subscription>(`feed/get/${id}`),
         modify: async (req: FeedModificationRequest) => await axiosInstance.post("feed/modify", req),
-        getEntries: async (req: GetEntriesPaginatedRequest) => await axiosInstance.get<Entries>("feed/entries", { params: req }),
+        getEntries: async (req: GetEntriesPaginatedRequest) =>
+            await axiosInstance.get<Entries>("feed/entries", { params: req }),
         markEntries: async (req: MarkRequest) => await axiosInstance.post("feed/mark", req),
         fetchFeed: async (req: FeedInfoRequest) => await axiosInstance.post<FeedInfo>("feed/fetch", req),
         refreshAll: async () => await axiosInstance.get("feed/refreshAll"),
@@ -107,7 +109,8 @@ export const client = {
         register: async (req: RegistrationRequest) => await axiosInstance.post("user/register", req),
         initialSetup: async (req: InitialSetupRequest) => await axiosInstance.post("user/initialSetup", req),
         passwordReset: async (req: PasswordResetRequest) => await axiosInstance.post("user/passwordReset", req),
-        passwordResetCallback: async (req: PasswordResetConfirmationRequest) => await axiosInstance.post("user/passwordResetCallback", req),
+        passwordResetCallback: async (req: PasswordResetConfirmationRequest) =>
+            await axiosInstance.post("user/passwordResetCallback", req),
         getSettings: async () => await axiosInstance.get<Settings>("user/settings"),
         saveSettings: async (settings: Settings) => await axiosInstance.post("user/settings", settings),
         sendTestPushNotification: async (settings: PushNotificationSettings) =>
@@ -156,9 +159,13 @@ function isCommaFeedApplicationError(err: AxiosError): err is AxiosError<CommaFe
 }
 
 function isMessageError(err: AxiosError): err is AxiosError<{ message: string }> {
-    return !!err.response && !!err.response.data && typeof err.response.data === "object" && "message" in err.response.data
+    return (
+        !!err.response && !!err.response.data && typeof err.response.data === "object" && "message" in err.response.data
+    )
 }
 
 function isMessageArrayError(err: AxiosError): err is AxiosError<{ errors: string[] }> {
-    return !!err.response && !!err.response.data && typeof err.response.data === "object" && "errors" in err.response.data
+    return (
+        !!err.response && !!err.response.data && typeof err.response.data === "object" && "errors" in err.response.data
+    )
 }

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

@@ -89,6 +89,188 @@ describe("entries", () => {
         expect(store.getState().entries.hasMore).toBe(false)
     })
 
+    it("stops loading after an initial-load failure and allows a retry", async () => {
+        const response = {
+            data: {
+                entries: [{ id: "3" } as Entry],
+                hasMore: true,
+                name: "my-feed",
+                feedLink: "https://mysite.com/feed",
+                timestamp: 123,
+            },
+        } as AxiosResponse<Entries>
+        vi.mocked(client.feed.getEntries)
+            .mockRejectedValueOnce(new Error("Network error"))
+            .mockResolvedValueOnce(response)
+
+        const store = configureStore({ reducer: reducers })
+        const arg = { source: { type: "feed" as const, id: "feed-id" }, clearSearch: true }
+        const request = store.dispatch(loadEntries(arg))
+
+        expect(store.getState().entries.loading).toBe(true)
+        expect(loadEntries.rejected.match(await request)).toBe(true)
+        expect(store.getState().entries.loading).toBe(false)
+        expect(store.getState().entries.entries).toStrictEqual([])
+        expect(store.getState().entries.hasMore).toBe(true)
+
+        expect(loadEntries.fulfilled.match(await store.dispatch(loadEntries(arg)))).toBe(true)
+        expect(store.getState().entries.entries).toStrictEqual(response.data.entries)
+        expect(store.getState().entries.loading).toBe(false)
+    })
+
+    it("preserves entries after a pagination failure and allows a retry", async () => {
+        const response = {
+            data: {
+                entries: [{ id: "3", read: false } as Entry],
+                hasMore: true,
+                name: "my-feed",
+                feedLink: "https://mysite.com/feed",
+                timestamp: 123,
+            },
+        } as AxiosResponse<Entries>
+        vi.mocked(client.feed.getEntries)
+            .mockResolvedValueOnce(response)
+            .mockRejectedValueOnce(new Error("Network error"))
+            .mockResolvedValueOnce({
+                data: { ...response.data, entries: [{ id: "4" } as Entry], hasMore: false },
+            } as AxiosResponse<Entries>)
+
+        const store = configureStore({ reducer: reducers })
+        await store.dispatch(loadEntries({ source: { type: "feed", id: "feed-id" }, clearSearch: true }))
+        const previousState = store.getState().entries
+        const request = store.dispatch(loadMoreEntries())
+
+        expect(store.getState().entries.loading).toBe(true)
+        expect(loadMoreEntries.rejected.match(await request)).toBe(true)
+        expect(store.getState().entries.loading).toBe(false)
+        expect(store.getState().entries.entries).toStrictEqual(previousState.entries)
+        expect(store.getState().entries.hasMore).toBe(true)
+        expect(store.getState().entries.timestamp).toBe(123)
+        expect(store.getState().entries.sourceLabel).toBe("my-feed")
+        expect(store.getState().entries.sourceWebsiteUrl).toBe("https://mysite.com/feed")
+
+        expect(loadMoreEntries.fulfilled.match(await store.dispatch(loadMoreEntries()))).toBe(true)
+        expect(store.getState().entries.entries).toStrictEqual([{ id: "3", read: false }, { id: "4" }])
+        expect(store.getState().entries.hasMore).toBe(false)
+        expect(store.getState().entries.loading).toBe(false)
+        expect(vi.mocked(client.feed.getEntries).mock.calls[1][0]).toEqual(
+            vi.mocked(client.feed.getEntries).mock.calls[2][0]
+        )
+    })
+
+    describe.each(["initial load", "pagination"] as const)("overlapping %s requests", olderRequestType => {
+        it.each(["initial load", "pagination"] as const)(
+            "ignores an older failure while a newer %s is pending",
+            async newerRequestType => {
+                let rejectOlder!: (reason: Error) => void
+                vi.mocked(client.category.getEntries).mockReturnValueOnce(
+                    new Promise<AxiosResponse<Entries>>((_, reject) => {
+                        rejectOlder = reject
+                    })
+                )
+                vi.mocked(client.category.getEntries).mockReturnValueOnce(new Promise<AxiosResponse<Entries>>(() => {}))
+
+                const store = configureStore({ reducer: reducers })
+                const arg = { source: { type: "category" as const, id: "all" }, clearSearch: true }
+                const older =
+                    olderRequestType === "initial load"
+                        ? store.dispatch(loadEntries(arg))
+                        : store.dispatch(loadMoreEntries())
+                const newer =
+                    newerRequestType === "initial load"
+                        ? store.dispatch(loadEntries(arg))
+                        : store.dispatch(loadMoreEntries())
+
+                rejectOlder(new Error("Older request failed"))
+                await older
+                expect(store.getState().entries.loading).toBe(true)
+
+                newer.abort()
+                await newer
+                expect(store.getState().entries.loading).toBe(false)
+            }
+        )
+
+        it("does not clear a newer request's loading state when an older request succeeds", async () => {
+            let resolveOlder!: (response: AxiosResponse<Entries>) => void
+            vi.mocked(client.category.getEntries).mockReturnValueOnce(
+                new Promise<AxiosResponse<Entries>>(resolve => {
+                    resolveOlder = resolve
+                })
+            )
+            vi.mocked(client.category.getEntries).mockReturnValueOnce(new Promise<AxiosResponse<Entries>>(() => {}))
+
+            const store = configureStore({ reducer: reducers })
+            const arg = { source: { type: "category" as const, id: "all" }, clearSearch: true }
+            const older =
+                olderRequestType === "initial load"
+                    ? store.dispatch(loadEntries(arg))
+                    : store.dispatch(loadMoreEntries())
+            const newer = store.dispatch(loadEntries(arg))
+
+            resolveOlder({
+                data: {
+                    entries: [] as Entry[],
+                    hasMore: true,
+                    name: "old-category",
+                    feedLink: "",
+                    timestamp: 123,
+                    errorCount: 0,
+                    ignoredReadStatus: false,
+                },
+            } as AxiosResponse<Entries>)
+            await older
+            expect(store.getState().entries.loading).toBe(true)
+
+            newer.abort()
+            await newer
+            expect(store.getState().entries.loading).toBe(false)
+        })
+
+        it("ignores an older failure after the newer request succeeds", async () => {
+            let rejectOlder!: (reason: Error) => void
+            vi.mocked(client.category.getEntries).mockReturnValueOnce(
+                new Promise<AxiosResponse<Entries>>((_, reject) => {
+                    rejectOlder = reject
+                })
+            )
+            vi.mocked(client.category.getEntries).mockResolvedValueOnce({
+                data: { entries: [{ id: "4" } as Entry], hasMore: false, name: "new-category", timestamp: 456 },
+            } as AxiosResponse<Entries>)
+
+            const store = configureStore({ reducer: reducers })
+            const arg = { source: { type: "category" as const, id: "all" }, clearSearch: true }
+            const older =
+                olderRequestType === "initial load"
+                    ? store.dispatch(loadEntries(arg))
+                    : store.dispatch(loadMoreEntries())
+            await store.dispatch(loadEntries(arg))
+            const completedState = store.getState().entries
+
+            rejectOlder(new Error("Older request failed"))
+            await older
+            expect(store.getState().entries).toStrictEqual(completedState)
+        })
+    })
+
+    it("does not append entries already present when loading more entries", async () => {
+        vi.mocked(client.category.getEntries)
+            .mockResolvedValueOnce({
+                data: { entries: [{ id: "3" } as Entry], hasMore: true },
+            } as AxiosResponse<Entries>)
+            .mockResolvedValueOnce({
+                data: { entries: [{ id: "3" } as Entry, { id: "4" } as Entry], hasMore: false },
+            } as AxiosResponse<Entries>)
+
+        const store = configureStore({ reducer: reducers })
+        await store.dispatch(loadEntries({ source: { type: "category", id: "all" }, clearSearch: true }))
+        await store.dispatch(loadMoreEntries())
+
+        expect(store.getState().entries.entries).toStrictEqual([{ id: "3" }, { id: "4" }])
+        expect(store.getState().entries.loading).toBe(false)
+        expect(store.getState().entries.hasMore).toBe(false)
+    })
+
     it("marks an entry as read", () => {
         const store = configureStore({
             reducer: reducers,
@@ -116,6 +298,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

@@ -1,6 +1,14 @@
-import { createSlice, type PayloadAction } from "@reduxjs/toolkit"
+import { createSlice, isAnyOf, type PayloadAction } from "@reduxjs/toolkit"
 import { Constants } from "@/app/constants"
-import { loadEntries, loadMoreEntries, markAllEntries, markEntry, markMultipleEntries, starEntry, tagEntry } from "@/app/entries/thunks"
+import {
+    loadEntries,
+    loadMoreEntries,
+    markAllEntries,
+    markEntry,
+    markMultipleEntries,
+    starEntry,
+    tagEntry,
+} from "@/app/entries/thunks"
 import type { Entry } from "@/app/types"
 
 export type EntrySourceType = "category" | "feed" | "tag"
@@ -10,7 +18,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 */
@@ -26,6 +38,8 @@ interface EntriesState {
     selectedEntryId?: string
     hasMore: boolean
     loading: boolean
+    /** identifies the request that owns the loading state */
+    currentRequestId?: string
     search?: string
     scrollingToEntry: boolean
     markAllAsReadConfirmationDialogOpen: boolean
@@ -71,20 +85,26 @@ 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) => {
-            for (const e of state.entries.filter(e => (action.meta.arg.req.olderThan ? e.date < action.meta.arg.req.olderThan : true))) {
+            for (const e of state.entries.filter(e =>
+                action.meta.arg.req.olderThan ? e.date < action.meta.arg.req.olderThan : true
+            )) {
                 e.read = true
             }
         })
         builder.addCase(starEntry.pending, (state, action) => {
-            for (const e of state.entries.filter(e => action.meta.arg.entry.id === e.id && action.meta.arg.entry.feedId === e.feedId)) {
+            for (const e of state.entries.filter(
+                e => action.meta.arg.entry.id === e.id && action.meta.arg.entry.feedId === e.feedId
+            )) {
                 e.starred = action.meta.arg.starred
             }
         })
@@ -97,9 +117,11 @@ export const entriesSlice = createSlice({
             state.hasMore = true
             state.selectedEntryId = undefined
             state.loading = true
+            state.currentRequestId = action.meta.requestId
         })
-        builder.addCase(loadMoreEntries.pending, state => {
+        builder.addCase(loadMoreEntries.pending, (state, action) => {
             state.loading = true
+            state.currentRequestId = action.meta.requestId
         })
         builder.addCase(loadEntries.fulfilled, (state, action) => {
             state.entries = action.payload.entries
@@ -107,20 +129,24 @@ export const entriesSlice = createSlice({
             state.sourceLabel = action.payload.name
             state.sourceWebsiteUrl = action.payload.feedLink
             state.hasMore = action.payload.hasMore
-            state.loading = false
         })
         builder.addCase(loadMoreEntries.fulfilled, (state, action) => {
             // remove already existing entries
             const entriesToAdd = action.payload.entries.filter(e => !state.entries.some(e2 => e.id === e2.id))
             state.entries = [...state.entries, ...entriesToAdd]
             state.hasMore = action.payload.hasMore
-            state.loading = false
         })
         builder.addCase(tagEntry.pending, (state, action) => {
             for (const e of state.entries.filter(e => +e.id === action.meta.arg.entryId)) {
                 e.tags = action.meta.arg.tags
             }
         })
+        builder.addMatcher(isAnyOf(loadEntries.settled, loadMoreEntries.settled), (state, action) => {
+            if (state.currentRequestId === action.meta.requestId) {
+                state.loading = false
+                state.currentRequestId = undefined
+            }
+        })
     },
 })
 

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

@@ -40,7 +40,9 @@ 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 +139,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 +154,7 @@ export const markAllAsReadWithConfirmationIfRequired = createAppAsyncThunk(
                         read: true,
                         olderThan: Date.now(),
                         insertedBefore: entriesTimestamp,
+                        keywords: search,
                     },
                 })
             )
@@ -218,7 +222,9 @@ export const selectEntry = createAppAsyncThunk(
 
             const entryIndex = state.entries.entries.indexOf(entry)
             const entriesToKeepOnTopWhenScrolling =
-                viewMode === "expanded" ? 0 : Math.min(state.user.settings?.entriesToKeepOnTopWhenScrolling ?? 0, entryIndex)
+                viewMode === "expanded"
+                    ? 0
+                    : Math.min(state.user.settings?.entriesToKeepOnTopWhenScrolling ?? 0, entryIndex)
             const entryToScrollTo = state.entries.entries[entryIndex - entriesToKeepOnTopWhenScrolling]
 
             const entryElement = document.getElementById(Constants.dom.entryId(entry))
@@ -226,7 +232,8 @@ export const selectEntry = createAppAsyncThunk(
             if (entryElement && entryElementToScrollTo) {
                 const scrollMode = state.user.settings?.scrollMode
                 const entryEntirelyVisible =
-                    Constants.layout.isTopVisible(entryElementToScrollTo) && Constants.layout.isBottomVisible(entryElement)
+                    Constants.layout.isTopVisible(entryElementToScrollTo) &&
+                    Constants.layout.isBottomVisible(entryElement)
                 if (scrollMode === "always" || (scrollMode === "if_needed" && !entryEntirelyVisible)) {
                     const scrollSpeed = state.user.settings?.scrollSpeed
                     const margin = viewMode === "detailed" ? 8 : 3
@@ -240,7 +247,12 @@ export const selectEntry = createAppAsyncThunk(
     }
 )
 
-const scrollToEntry = (entryElement: HTMLElement, margin: number, scrollSpeed: number | undefined, onScrollEnded: () => void) => {
+const scrollToEntry = (
+    entryElement: HTMLElement,
+    margin: number,
+    scrollSpeed: number | undefined,
+    onScrollEnded: () => void
+) => {
     const header = document.getElementsByTagName("header").item(0)?.getBoundingClientRect()
     const offset = (header?.bottom ?? 0) + margin
     scrollToWithCallback({

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

@@ -2,11 +2,17 @@ import { createAppAsyncThunk } from "@/app/async-thunk"
 import { Constants } from "@/app/constants"
 import { redirectTo } from "@/app/redirect/slice"
 
-export const redirectToLogin = createAppAsyncThunk("redirect/login", (_, thunkApi) => thunkApi.dispatch(redirectTo("/login")))
+export const redirectToLogin = createAppAsyncThunk("redirect/login", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/login"))
+)
 
-export const redirectToRegistration = createAppAsyncThunk("redirect/register", (_, thunkApi) => thunkApi.dispatch(redirectTo("/register")))
+export const redirectToRegistration = createAppAsyncThunk("redirect/register", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/register"))
+)
 
-export const redirectToInitialSetup = createAppAsyncThunk("redirect/initialSetup", (_, thunkApi) => thunkApi.dispatch(redirectTo("/setup")))
+export const redirectToInitialSetup = createAppAsyncThunk("redirect/initialSetup", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/setup"))
+)
 
 export const redirectToApiDocumentation = createAppAsyncThunk("redirect/api", () => {
     window.location.href = "api-documentation/"
@@ -38,15 +44,21 @@ export const redirectToFeedDetails = createAppAsyncThunk("redirect/feed/details"
     thunkApi.dispatch(redirectTo(`/app/feed/${id}/details`))
 )
 
-export const redirectToTag = createAppAsyncThunk("redirect/tag", (id: string, thunkApi) => thunkApi.dispatch(redirectTo(`/app/tag/${id}`)))
+export const redirectToTag = createAppAsyncThunk("redirect/tag", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/tag/${id}`))
+)
 
 export const redirectToTagDetails = createAppAsyncThunk("redirect/tag/details", (id: string, thunkApi) =>
     thunkApi.dispatch(redirectTo(`/app/tag/${id}/details`))
 )
 
-export const redirectToAdd = createAppAsyncThunk("redirect/add", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/add")))
+export const redirectToAdd = createAppAsyncThunk("redirect/add", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/app/add"))
+)
 
-export const redirectToSettings = createAppAsyncThunk("redirect/settings", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/settings")))
+export const redirectToSettings = createAppAsyncThunk("redirect/settings", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/app/settings"))
+)
 
 export const redirectToAdminUsers = createAppAsyncThunk("redirect/admin/users", (_, thunkApi) =>
     thunkApi.dispatch(redirectTo("/app/admin/users"))
@@ -56,6 +68,10 @@ export const redirectToMetrics = createAppAsyncThunk("redirect/admin/metrics", (
     thunkApi.dispatch(redirectTo("/app/admin/metrics"))
 )
 
-export const redirectToDonate = createAppAsyncThunk("redirect/donate", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/donate")))
+export const redirectToDonate = createAppAsyncThunk("redirect/donate", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/app/donate"))
+)
 
-export const redirectToAbout = createAppAsyncThunk("redirect/about", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/about")))
+export const redirectToAbout = createAppAsyncThunk("redirect/about", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/app/about"))
+)

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

@@ -1,4 +1,7 @@
 import { createAppAsyncThunk } from "@/app/async-thunk"
 import { client } from "@/app/client"
 
-export const reloadServerInfos = createAppAsyncThunk("server/infos", async () => await client.server.getServerInfos().then(r => r.data))
+export const reloadServerInfos = createAppAsyncThunk(
+    "server/infos",
+    async () => await client.server.getServerInfos().then(r => r.data)
+)

commafeed-client/src/app/store.ts

@@ -41,4 +41,5 @@ export type AppDispatch = typeof store.dispatch
 
 export const useAppDispatch: () => AppDispatch = useDispatch
 export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
-export const useShallowEqualAppSelector: TypedUseSelectorHook<RootState> = selector => useSelector(selector, shallowEqual)
+export const useShallowEqualAppSelector: TypedUseSelectorHook<RootState> = selector =>
+    useSelector(selector, shallowEqual)

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

@@ -6,7 +6,10 @@ import { incrementUnreadCount } from "@/app/tree/slice"
 import type { CollapseRequest, Subscription } from "@/app/types"
 import { flattenCategoryTree, visitCategoryTree } from "@/app/utils"
 
-export const reloadTree = createAppAsyncThunk("tree/reload", async () => await client.category.getRoot().then(r => r.data))
+export const reloadTree = createAppAsyncThunk(
+    "tree/reload",
+    async () => await client.category.getRoot().then(r => r.data)
+)
 
 export const collapseTreeCategory = createAppAsyncThunk(
     "tree/category/collapse",

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

@@ -2,14 +2,26 @@ import { createAppAsyncThunk } from "@/app/async-thunk"
 import { client } from "@/app/client"
 import type { Settings } from "@/app/types"
 
-export const reloadSettings = createAppAsyncThunk("settings/reload", async () => await client.user.getSettings().then(r => r.data))
+export const reloadSettings = createAppAsyncThunk(
+    "settings/reload",
+    async () => await client.user.getSettings().then(r => r.data)
+)
 
-export const reloadProfile = createAppAsyncThunk("profile/reload", async () => await client.user.getProfile().then(r => r.data))
+export const reloadProfile = createAppAsyncThunk(
+    "profile/reload",
+    async () => await client.user.getProfile().then(r => r.data)
+)
 
-export const reloadTags = createAppAsyncThunk("entries/tags", async () => await client.entry.getTags().then(r => r.data))
+export const reloadTags = createAppAsyncThunk(
+    "entries/tags",
+    async () => await client.entry.getTags().then(r => r.data)
+)
 
-export const changeSettings = createAppAsyncThunk("settings/change", async (newSettings: Partial<Settings>, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    await client.user.saveSettings({ ...settings, ...newSettings })
-})
+export const changeSettings = createAppAsyncThunk(
+    "settings/change",
+    async (newSettings: Partial<Settings>, thunkApi) => {
+        const { settings } = thunkApi.getState().user
+        if (!settings) return
+        await client.user.saveSettings({ ...settings, ...newSettings })
+    }
+)

commafeed-client/src/app/utils.ts

@@ -43,13 +43,27 @@ export function categoryHasNewEntries(category?: TreeCategory): boolean {
         .some(f => f.hasNewEntries)
 }
 
-export const calculatePlaceholderSize = ({ width, height, maxWidth }: { width?: number; height?: number; maxWidth: number }) => {
+export const calculatePlaceholderSize = ({
+    width,
+    height,
+    maxWidth,
+}: {
+    width?: number
+    height?: number
+    maxWidth: number
+}) => {
     const placeholderWidth = width && Math.min(width, maxWidth)
     const placeholderHeight = height && width && width > maxWidth ? height * (maxWidth / width) : height
     return { width: placeholderWidth, height: placeholderHeight }
 }
 
-export const scrollToWithCallback = ({ options, onScrollEnded }: { options: ScrollToOptions; onScrollEnded: () => void }) => {
+export const scrollToWithCallback = ({
+    options,
+    onScrollEnded,
+}: {
+    options: ScrollToOptions
+    onScrollEnded: () => void
+}) => {
     const offset = (options.top ?? 0).toFixed()
 
     const onScroll = throttle(100, () => {

commafeed-client/src/components/ActionButton.tsx

@@ -1,18 +1,27 @@
 import type { MessageDescriptor } from "@lingui/core"
 import { useLingui } from "@lingui/react"
-import { ActionIcon, type ActionIconVariant, Box, Button, type ButtonVariant, Tooltip, useMantineTheme } from "@mantine/core"
+import {
+    ActionIcon,
+    type ActionIconVariant,
+    Box,
+    Button,
+    type ButtonVariant,
+    Tooltip,
+    useMantineTheme,
+} from "@mantine/core"
 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
-    showLabelOnMobile?: boolean
+    mode?: Mode
 }
 
 /**
@@ -25,7 +34,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,7 +13,10 @@ 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 markAllAsReadNavigateToNextUnread = useAppSelector(state => state.user.settings?.markAllAsReadNavigateToNextUnread)
+    const search = useAppSelector(state => state.entries.search)
+    const markAllAsReadNavigateToNextUnread = useAppSelector(
+        state => state.user.settings?.markAllAsReadNavigateToNextUnread
+    )
     const dispatch = useAppDispatch()
 
     const onConfirm = async () => {
@@ -26,12 +29,14 @@ export function MarkAllAsReadConfirmationDialog() {
                     read: true,
                     olderThan: Date.now() - threshold * 24 * 60 * 60 * 1000,
                     insertedBefore: entriesTimestamp,
+                    keywords: search,
                 },
             })
         )
 
         const isAllCategorySelected = source.type === "category" && source.id === Constants.categories.all.id
-        if (markAllAsReadNavigateToNextUnread && !isAllCategorySelected) await dispatch(selectNextUnreadTreeItem({ direction: "forward" }))
+        if (markAllAsReadNavigateToNextUnread && !isAllCategorySelected)
+            await dispatch(selectNextUnreadTreeItem({ direction: "forward" }))
     }
 
     return (
@@ -49,7 +54,8 @@ export function MarkAllAsReadConfirmationDialog() {
                     )}
                     {threshold > 0 && (
                         <Trans>
-                            Are you sure you want to mark entries older than {threshold} days of <Code>{sourceLabel}</Code> as read?
+                            Are you sure you want to mark entries older than {threshold} days of{" "}
+                            <Code>{sourceLabel}</Code> as read?
                         </Trans>
                     )}
                 </Text>

commafeed-client/src/components/ReceivePushNotificationsChechbox.tsx

@@ -15,5 +15,12 @@ export const ReceivePushNotificationsChechbox = (props: CheckboxProps) => {
         description = <Trans>Push notifications are not configured in your user settings.</Trans>
     }
 
-    return <Checkbox label={<Trans>Receive push notifications</Trans>} disabled={disabled} description={description} {...props} />
+    return (
+        <Checkbox
+            label={<Trans>Receive push notifications</Trans>}
+            disabled={disabled}
+            description={description}
+            {...props}
+        />
+    )
 }

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

@@ -34,7 +34,11 @@ export function UserEdit(props: Readonly<UserEditProps>) {
             <form onSubmit={form.onSubmit(saveUser.execute)}>
                 <Stack>
                     <TextInput label={<Trans>Name</Trans>} {...form.getInputProps("name")} required />
-                    <PasswordInput label={<Trans>Password</Trans>} {...form.getInputProps("password")} required={!props.user} />
+                    <PasswordInput
+                        label={<Trans>Password</Trans>}
+                        {...form.getInputProps("password")}
+                        required={!props.user}
+                    />
                     <TextInput type="email" label={<Trans>E-mail</Trans>} {...form.getInputProps("email")} />
                     <Checkbox label={<Trans>Admin</Trans>} {...form.getInputProps("admin", { type: "checkbox" })} />
                     <Checkbox label={<Trans>Enabled</Trans>} {...form.getInputProps("enabled", { type: "checkbox" })} />

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

@@ -15,7 +15,9 @@ describe("Content component", () => {
     })
 
     it("renders iframe tag when included in content", () => {
-        const { container } = render(<Content content='<iframe src="https://example.com"></iframe>' />, { wrapper: MantineProvider })
+        const { container } = render(<Content content='<iframe src="https://example.com"></iframe>' />, {
+            wrapper: MantineProvider,
+        })
         expect(container.querySelector("iframe")).toHaveAttribute("src", "https://example.com")
     })
 

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

@@ -1,6 +1,14 @@
 import { Box, Mark } from "@mantine/core"
 import escapeStringRegexp from "escape-string-regexp"
-import { ALLOWED_TAG_LIST, type ChildrenNode, Interweave, Matcher, type MatchResponse, type Node, type TransformCallback } from "interweave"
+import {
+    ALLOWED_TAG_LIST,
+    type ChildrenNode,
+    Interweave,
+    Matcher,
+    type MatchResponse,
+    type Node,
+    type TransformCallback,
+} from "interweave"
 import React from "react"
 import styleToObject from "style-to-object"
 import { Constants } from "@/app/constants"

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(
@@ -299,7 +300,9 @@ export function FeedEntries() {
                     entry={entry}
                     expanded={!!entry.expanded || viewMode === "expanded"}
                     selected={entry.id === selectedEntryId}
-                    showSelectionIndicator={entry.id === selectedEntryId && (!entry.expanded || viewMode === "expanded")}
+                    showSelectionIndicator={
+                        entry.id === selectedEntryId && (!entry.expanded || viewMode === "expanded")
+                    }
                     maxWidth={sidebarVisible ? Constants.layout.entryMaxWidth : undefined}
                     onHeaderClick={event => headerClicked(entry, event)}
                     onHeaderRightClick={event => headerRightClicked(entry, event)}

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

@@ -34,67 +34,80 @@ const useStyles = tss
         maxWidth?: number
         fontSizePercentage: number
     }>()
-    .create(({ theme, colorScheme, read, expanded, viewMode, rtl, showSelectionIndicator, maxWidth, fontSizePercentage }) => {
-        let backgroundColor: string
-        if (colorScheme === "dark") {
-            backgroundColor = read ? "inherit" : theme.colors.dark[5]
-        } else {
-            backgroundColor = read && !expanded ? theme.colors.gray[0] : "inherit"
-        }
+    .create(
+        ({
+            theme,
+            colorScheme,
+            read,
+            expanded,
+            viewMode,
+            rtl,
+            showSelectionIndicator,
+            maxWidth,
+            fontSizePercentage,
+        }) => {
+            let backgroundColor: string
+            if (colorScheme === "dark") {
+                backgroundColor = read ? "inherit" : theme.colors.dark[5]
+            } else {
+                backgroundColor = read && !expanded ? theme.colors.gray[0] : "inherit"
+            }
 
-        let marginY = 10
-        if (viewMode === "title") {
-            marginY = 2
-        } else if (viewMode === "cozy") {
-            marginY = 6
-        }
+            let marginY = 10
+            if (viewMode === "title") {
+                marginY = 2
+            } else if (viewMode === "cozy") {
+                marginY = 6
+            }
 
-        let mobileMarginY = 6
-        if (viewMode === "title") {
-            mobileMarginY = 2
-        } else if (viewMode === "cozy") {
-            mobileMarginY = 4
-        }
+            let mobileMarginY = 6
+            if (viewMode === "title") {
+                mobileMarginY = 2
+            } else if (viewMode === "cozy") {
+                mobileMarginY = 4
+            }
 
-        let backgroundHoverColor = backgroundColor
-        if (!expanded && !read) {
-            backgroundHoverColor = colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[1]
-        }
+            let backgroundHoverColor = backgroundColor
+            if (!expanded && !read) {
+                backgroundHoverColor = colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[1]
+            }
 
-        let paperBorderLeftColor = ""
-        if (showSelectionIndicator) {
-            const borderLeftColor = colorScheme === "dark" ? theme.colors[theme.primaryColor][4] : theme.colors[theme.primaryColor][6]
-            paperBorderLeftColor = `${borderLeftColor} !important`
-        }
+            let paperBorderLeftColor = ""
+            if (showSelectionIndicator) {
+                const borderLeftColor =
+                    colorScheme === "dark" ? theme.colors[theme.primaryColor][4] : theme.colors[theme.primaryColor][6]
+                paperBorderLeftColor = `${borderLeftColor} !important`
+            }
 
-        return {
-            paper: {
-                backgroundColor,
-                borderLeftColor: paperBorderLeftColor,
-                marginTop: marginY,
-                marginBottom: marginY,
-                [`@media (max-width: ${Constants.layout.mobileBreakpoint}px)`]: {
-                    marginTop: mobileMarginY,
-                    marginBottom: mobileMarginY,
-                },
-                "@media (hover: hover)": {
-                    "&:hover": {
-                        backgroundColor: backgroundHoverColor,
+            return {
+                paper: {
+                    backgroundColor,
+                    borderLeftColor: paperBorderLeftColor,
+                    marginTop: marginY,
+                    marginBottom: marginY,
+                    [`@media (max-width: ${Constants.layout.mobileBreakpoint}px)`]: {
+                        marginTop: mobileMarginY,
+                        marginBottom: mobileMarginY,
+                    },
+                    "@media (hover: hover)": {
+                        "&:hover": {
+                            backgroundColor: backgroundHoverColor,
+                        },
                     },
                 },
-            },
-            headerLink: {
-                fontSize: `${fontSizePercentage}%`,
-                color: "inherit",
-                textDecoration: "none",
-            },
-            body: {
-                fontSize: `${fontSizePercentage}%`,
-                direction: rtl ? "rtl" : "ltr",
-                maxWidth: maxWidth ?? "100%",
-            },
+                headerLink: {
+                    fontSize: `${fontSizePercentage}%`,
+                    color: "inherit",
+                    textDecoration: "none",
+                },
+                body: {
+                    fontSize: `${fontSizePercentage}%`,
+                    direction: rtl ? "rtl" : "ltr",
+                    maxWidth: maxWidth ?? "100%",
+                },
+            }
         }
-    })
+    )
 
 export function FeedEntry(props: Readonly<FeedEntryProps>) {
     const viewMode = useAppSelector(state => state.user.localSettings.viewMode)
@@ -116,7 +129,9 @@ export function FeedEntry(props: Readonly<FeedEntryProps>) {
     const showExternalLinkIcon =
         externalLinkDisplayMode && ["always", mobile ? "on_mobile" : "on_desktop"].includes(externalLinkDisplayMode)
     const showStarIcon =
-        props.entry.markable && starIconDisplayMode && ["always", mobile ? "on_mobile" : "on_desktop"].includes(starIconDisplayMode)
+        props.entry.markable &&
+        starIconDisplayMode &&
+        ["always", mobile ? "on_mobile" : "on_desktop"].includes(starIconDisplayMode)
 
     const swipeHandlers = useSwipeable({
         onSwipedLeft: props.onSwipedLeft,

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

@@ -35,7 +35,12 @@ export function FeedEntryContextMenu(props: Readonly<FeedEntryContextMenuProps>)
     const { openLinkInBackgroundTab } = useBrowserExtension()
 
     return (
-        <Menu id={Constants.dom.entryContextMenuId(props.entry)} theme={colorScheme} animation={false} className={classes.menu}>
+        <Menu
+            id={Constants.dom.entryContextMenuId(props.entry)}
+            theme={colorScheme}
+            animation={false}
+            className={classes.menu}
+        >
             <Item
                 onClick={() => {
                     window.open(props.entry.url, "_blank", "noreferrer")
@@ -63,13 +68,19 @@ export function FeedEntryContextMenu(props: Readonly<FeedEntryContextMenuProps>)
 
             {props.entry.markable && (
                 <>
-                    <Item onClick={async () => await dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))}>
+                    <Item
+                        onClick={async () =>
+                            await dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))
+                        }
+                    >
                         <Group>
                             {props.entry.starred ? <TbStarOff size={iconSize} /> : <TbStar size={iconSize} />}
                             {props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
                         </Group>
                     </Item>
-                    <Item onClick={async () => await dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}>
+                    <Item
+                        onClick={async () => await dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}
+                    >
                         <Group>
                             {props.entry.read ? <TbMail size={iconSize} /> : <TbMailOpened size={iconSize} />}
                             {props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}

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

@@ -1,7 +1,16 @@
 import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
 import { Group, Indicator, Popover, TagsInput } from "@mantine/core"
-import { TbArrowBarToDown, TbExternalLink, TbMail, TbMailOpened, TbShare, TbStar, TbStarOff, TbTag } from "react-icons/tb"
+import {
+    TbArrowBarToDown,
+    TbExternalLink,
+    TbMail,
+    TbMailOpened,
+    TbShare,
+    TbStar,
+    TbStarOff,
+    TbTag,
+} from "react-icons/tb"
 import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "@/app/entries/thunks"
 import { useAppDispatch, useAppSelector } from "@/app/store"
 import type { Entry } from "@/app/types"
@@ -71,7 +80,12 @@ export function FeedEntryFooter(props: Readonly<FeedEntryFooterProps>) {
                 {tags && (
                     <Popover withArrow shadow="md" closeOnClickOutside={!mobile}>
                         <Popover.Target>
-                            <Indicator label={props.entry.tags.length} disabled={props.entry.tags.length === 0} inline size={16}>
+                            <Indicator
+                                label={props.entry.tags.length}
+                                disabled={props.entry.tags.length === 0}
+                                inline
+                                size={16}
+                            >
                                 <ActionButton icon={<TbTag size={18} />} label={msg`Tags`} />
                             </Indicator>
                         </Popover.Target>

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

@@ -104,7 +104,9 @@ export function ShareButtons(
     }>
 ) {
     const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
-    const enabledSharingSites = (Object.keys(Constants.sharing) as Array<keyof SharingSettings>).filter(site => sharingSettings?.[site])
+    const enabledSharingSites = (Object.keys(Constants.sharing) as Array<keyof SharingSettings>).filter(
+        site => sharingSettings?.[site]
+    )
     const url = encodeURIComponent(props.url)
     const desc = encodeURIComponent(props.description)
     const clipboardAvailable = typeof navigator.clipboard !== "undefined"
@@ -119,7 +121,9 @@ export function ShareButtons(
             {showNativeSection && (
                 <SimpleGrid cols={4}>
                     {clipboardAvailable && <CopyUrlButton url={props.url} />}
-                    {nativeSharingAvailable && <BrowserNativeShareButton url={props.url} description={props.description} />}
+                    {nativeSharingAvailable && (
+                        <BrowserNativeShareButton url={props.url} description={props.description} />
+                    )}
                 </SimpleGrid>
             )}
 

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

@@ -36,7 +36,12 @@ export function AddCategory() {
 
             <form onSubmit={form.onSubmit(addCategory.execute)}>
                 <Stack>
-                    <TextInput label={<Trans>Category</Trans>} placeholder={_(msg`Category`)} {...form.getInputProps("name")} required />
+                    <TextInput
+                        label={<Trans>Category</Trans>}
+                        placeholder={_(msg`Category`)}
+                        {...form.getInputProps("name")}
+                        required
+                    />
                     <CategorySelect label={<Trans>Parent</Trans>} {...form.getInputProps("parentId")} clearable />
                     <Group justify="center">
                         <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>

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

@@ -44,8 +44,8 @@ export function ImportOpml() {
                         placeholder={_(msg`OPML file`)}
                         description={
                             <Trans>
-                                An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your
-                                data from other feed reading services.
+                                An opml file is an XML file containing feed URLs and categories. You can get an OPML
+                                file by exporting your data from other feed reading services.
                             </Trans>
                         }
                         {...form.getInputProps("file")}

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

@@ -85,8 +85,8 @@ export function Subscribe() {
                             placeholder="https://www.mysite.com/rss"
                             description={
                                 <Trans>
-                                    The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed
-                                    will try to find the feed in the page.
+                                    The URL for the feed you want to subscribe to. You can also use the website's url
+                                    directly and CommaFeed will try to find the feed in the page.
                                 </Trans>
                             }
                             required
@@ -101,8 +101,17 @@ export function Subscribe() {
                     >
                         <Stack>
                             <TextInput label={<Trans>Feed URL</Trans>} {...step1Form.getInputProps("url")} disabled />
-                            <TextInput label={<Trans>Feed name</Trans>} {...step1Form.getInputProps("title")} required autoFocus />
-                            <CategorySelect label={<Trans>Category</Trans>} {...step1Form.getInputProps("categoryId")} clearable />
+                            <TextInput
+                                label={<Trans>Feed name</Trans>}
+                                {...step1Form.getInputProps("title")}
+                                required
+                                autoFocus
+                            />
+                            <CategorySelect
+                                label={<Trans>Category</Trans>}
+                                {...step1Form.getInputProps("categoryId")}
+                                clearable
+                            />
                         </Stack>
                     </Stepper.Step>
                 </Stepper>
@@ -117,7 +126,11 @@ export function Subscribe() {
                         </Button>
                     )}
                     {activeStep === 1 && (
-                        <Button type="submit" leftSection={<TbRss size={16} />} loading={fetchFeed.loading || subscribe.loading}>
+                        <Button
+                            type="submit"
+                            leftSection={<TbRss size={16} />}
+                            loading={fetchFeed.loading || subscribe.loading}
+                        >
                             <Trans>Subscribe</Trans>
                         </Button>
                     )}

commafeed-client/src/components/content/edit/FilteringExpressionEditor.tsx

@@ -26,7 +26,16 @@ const fields: Field[] = [
     { name: "categoriesLower", label: "Categories (lower case)" },
 ]
 
-const textOperators = new Set(["=", "!=", "contains", "beginsWith", "endsWith", "doesNotContain", "doesNotBeginWith", "doesNotEndWith"])
+const textOperators = new Set([
+    "=",
+    "!=",
+    "contains",
+    "beginsWith",
+    "endsWith",
+    "doesNotContain",
+    "doesNotBeginWith",
+    "doesNotEndWith",
+])
 
 function toCelString(query: RuleGroupType): string {
     if (query.rules.length === 0) {

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

@@ -24,7 +24,10 @@ export function Star(
     }
 
     return (
-        <Tooltip label={props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>} openDelay={Constants.tooltip.delay}>
+        <Tooltip
+            label={props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
+            openDelay={Constants.tooltip.delay}
+        >
             <ActionIcon variant="transparent" onClick={onClick}>
                 {props.entry.starred ? <TbStarFilled size={18} /> : <TbStar size={18} />}
             </ActionIcon>

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,
@@ -17,7 +17,13 @@ import {
     TbSortDescending,
     TbUser,
 } from "react-icons/tb"
-import { markAllAsReadWithConfirmationIfRequired, reloadEntries, search, selectNextEntry, selectPreviousEntry } from "@/app/entries/thunks"
+import {
+    markAllAsReadWithConfirmationIfRequired,
+    reloadEntries,
+    search,
+    selectNextEntry,
+    selectPreviousEntry,
+} from "@/app/entries/thunks"
 import { useAppDispatch, useAppSelector } from "@/app/store"
 import { changeSettings } from "@/app/user/thunks"
 import { ActionButton } from "@/components/ActionButton"
@@ -31,7 +37,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 +53,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>
     )
@@ -143,7 +149,13 @@ export function Header() {
                     onClick={toggleReadingMode}
                 />
                 <ActionButton
-                    icon={settings.readingOrder === "asc" ? <TbSortAscending size={iconSize} /> : <TbSortDescending size={iconSize} />}
+                    icon={
+                        settings.readingOrder === "asc" ? (
+                            <TbSortAscending size={iconSize} />
+                        ) : (
+                            <TbSortDescending size={iconSize} />
+                        )
+                    }
                     label={settings.readingOrder === "asc" ? msg`Asc` : msg`Desc`}
                     onClick={toggleReadingOrder}
                 />
@@ -160,7 +172,11 @@ export function Header() {
                                 placeholder={_(msg`Search`)}
                                 {...searchForm.getInputProps("search")}
                                 leftSection={<TbSearch size={iconSize} />}
-                                rightSection={<CloseButton onClick={async () => await (searchFromStore && dispatch(search("")))} />}
+                                rightSection={
+                                    <CloseButton
+                                        onClick={async () => await (searchFromStore && dispatch(search("")))}
+                                    />
+                                }
                                 autoFocus
                             />
                         </form>

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

@@ -31,7 +31,13 @@ import {
 } from "react-icons/tb"
 import { throttle } from "throttle-debounce"
 import { client } from "@/app/client"
-import { redirectToAbout, redirectToAdminUsers, redirectToDonate, redirectToMetrics, redirectToSettings } from "@/app/redirect/thunks"
+import {
+    redirectToAbout,
+    redirectToAdminUsers,
+    redirectToDonate,
+    redirectToMetrics,
+    redirectToSettings,
+} from "@/app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "@/app/store"
 import type { ViewMode } from "@/app/types"
 import { setFontSizePercentage, setViewMode } from "@/app/user/slice"
@@ -124,7 +130,13 @@ export function ProfileMenu(props: Readonly<ProfileMenuProps>) {
     }
 
     return (
-        <Menu position="bottom-end" closeOnItemClick={false} opened={opened} onChange={setOpened} preventPositionChangeWhenVisible={false}>
+        <Menu
+            position="bottom-end"
+            closeOnItemClick={false}
+            opened={opened}
+            onChange={setOpened}
+            preventPositionChangeWhenVisible={false}
+        >
             <Menu.Target>{props.control}</Menu.Target>
             <Menu.Dropdown>
                 {profile && <Menu.Label>{profile.name}</Menu.Label>}
@@ -164,7 +176,9 @@ export function ProfileMenu(props: Readonly<ProfileMenuProps>) {
                     }}
                 >
                     <Trans>Fetch all my feeds now</Trans>
-                    {!forceRefreshEnabled && <span> ({dayjs.duration(nextAvailableForceRefresh - now.getTime()).format("HH:mm:ss")})</span>}
+                    {!forceRefreshEnabled && (
+                        <span> ({dayjs.duration(nextAvailableForceRefresh - now.getTime()).format("HH:mm:ss")})</span>
+                    )}
                 </Menu.Item>
 
                 <Divider />

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

@@ -83,7 +83,11 @@ export function CustomCodeSettings() {
                         <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>
                             <Trans>Cancel</Trans>
                         </Button>
-                        <Button type="submit" leftSection={<TbDeviceFloppy size={16} />} loading={saveCustomCode.loading}>
+                        <Button
+                            type="submit"
+                            leftSection={<TbDeviceFloppy size={16} />}
+                            loading={saveCustomCode.loading}
+                        >
                             <Trans>Save</Trans>
                         </Button>
                     </Group>

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

@@ -111,7 +111,11 @@ export function DisplaySettings() {
             />
 
             <Switch
-                label={<Trans>Navigate to the next category/feed with unread entries when marking all entries as read</Trans>}
+                label={
+                    <Trans>
+                        Navigate to the next category/feed with unread entries when marking all entries as read
+                    </Trans>
+                }
                 checked={settings.markAllAsReadNavigateToNextUnread}
                 onChange={e => dispatch(changeSettings({ markAllAsReadNavigateToNextUnread: e.currentTarget.checked }))}
             />

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

@@ -1,6 +1,18 @@
 import { useLingui } from "@lingui/react"
 import { Trans } from "@lingui/react/macro"
-import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
+import {
+    Anchor,
+    Box,
+    Button,
+    Checkbox,
+    Divider,
+    Group,
+    Input,
+    PasswordInput,
+    Stack,
+    Text,
+    TextInput,
+} from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { openConfirmModal } from "@mantine/modals"
 import { useEffect } from "react"
@@ -91,8 +103,9 @@ export function ProfileSettings() {
                         label={<Trans>API key</Trans>}
                         description={
                             <Trans>
-                                This is your API key. It can be used for some read-only API operations and grants access to the Fever API
-                                and the Google Reader API. Use the form at the bottom of the page to generate a new API key
+                                This is your API key. It can be used for some read-only API operations and grants access
+                                to the Fever API and the Google Reader API. Use the form at the bottom of the page to
+                                generate a new API key
                             </Trans>
                         }
                         readOnly
@@ -103,7 +116,8 @@ export function ProfileSettings() {
                         label={<Trans>OPML export</Trans>}
                         description={
                             <Trans>
-                                Export your subscriptions and categories as an OPML file that can be imported in other feed reading services
+                                Export your subscriptions and categories as an OPML file that can be imported in other
+                                feed reading services
                             </Trans>
                         }
                     >
@@ -118,8 +132,8 @@ export function ProfileSettings() {
                         label={<Trans>Fever API</Trans>}
                         description={
                             <Trans>
-                                CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client.
-                                Login with your username and your <u>API key</u>.
+                                CommaFeed is compatible with the Fever API. Use the following URL in your
+                                Fever-compatible mobile client. Login with your username and your <u>API key</u>.
                             </Trans>
                         }
                     >
@@ -134,8 +148,8 @@ export function ProfileSettings() {
                         label={<Trans>Google Reader API</Trans>}
                         description={
                             <Trans>
-                                CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible
-                                mobile client. Login with your username and your <u>API key</u>.
+                                CommaFeed is compatible with the Google Reader API. Use the following URL in your Google
+                                Reader-compatible mobile client. Login with your username and your <u>API key</u>.
                             </Trans>
                         }
                     >
@@ -165,8 +179,14 @@ export function ProfileSettings() {
                         description={<Trans>Changing password will generate a new API key</Trans>}
                         {...form.getInputProps("newPassword")}
                     />
-                    <PasswordInput label={<Trans>Confirm password</Trans>} {...form.getInputProps("newPasswordConfirmation")} />
-                    <Checkbox label={<Trans>Generate new API key</Trans>} {...form.getInputProps("newApiKey", { type: "checkbox" })} />
+                    <PasswordInput
+                        label={<Trans>Confirm password</Trans>}
+                        {...form.getInputProps("newPasswordConfirmation")}
+                    />
+                    <Checkbox
+                        label={<Trans>Generate new API key</Trans>}
+                        {...form.getInputProps("newApiKey", { type: "checkbox" })}
+                    />
 
                     <Group>
                         <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>

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

@@ -50,8 +50,8 @@ export function PushNotificationSettings() {
                     label={<Trans>Push notification service</Trans>}
                     description={
                         <Trans>
-                            Receive push notifications when new feed entries are discovered. Enable "Receive push notifications" in the
-                            settings of each feed for which you want to receive notifications.
+                            Receive push notifications when new feed entries are discovered. Enable "Receive push
+                            notifications" in the settings of each feed for which you want to receive notifications.
                         </Trans>
                     }
                     data={[
@@ -77,7 +77,12 @@ export function PushNotificationSettings() {
                             required
                             {...form.getInputProps("serverUrl")}
                         />
-                        <TextInput label={<Trans>Topic</Trans>} placeholder="commafeed" required {...form.getInputProps("topic")} />
+                        <TextInput
+                            label={<Trans>Topic</Trans>}
+                            placeholder="commafeed"
+                            required
+                            {...form.getInputProps("topic")}
+                        />
                         <TextInput label={<Trans>Access token</Trans>} {...form.getInputProps("userSecret")} />
                     </>
                 )}

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

@@ -119,8 +119,11 @@ export function Tree() {
     const categoryNode = (category: Category, level = 0) => {
         if (!isCategoryDisplayed(category)) return null
 
-        const hasError = !category.expanded && flattenCategoryTree(category).some(c => c.feeds.some(f => f.errorCount > errorThreshold))
-        const hasWarning = !category.expanded && flattenCategoryTree(category).some(c => c.feeds.some(f => !!f.filterLegacy))
+        const hasError =
+            !category.expanded &&
+            flattenCategoryTree(category).some(c => c.feeds.some(f => f.errorCount > errorThreshold))
+        const hasWarning =
+            !category.expanded && flattenCategoryTree(category).some(c => c.feeds.some(f => !!f.filterLegacy))
         return (
             <TreeNode
                 id={category.id}

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

@@ -80,7 +80,11 @@ export function TreeNode(props: Readonly<TreeNodeProps>) {
             data-type={props.type}
             data-unread-count={props.unread}
         >
-            <Box mr={6} onClick={(e: React.MouseEvent) => props.onIconClick?.(e, props.id)} className="cf-treenode-icon">
+            <Box
+                mr={6}
+                onClick={(e: React.MouseEvent) => props.onIconClick?.(e, props.id)}
+                className="cf-treenode-icon"
+            >
                 <Center>{typeof props.icon === "string" ? <FeedFavicon url={props.icon} /> : props.icon}</Center>
             </Box>
             <Box className={classes.nodeText}>{props.name}</Box>

commafeed-client/src/pages/WelcomePage.tsx

@@ -1,10 +1,26 @@
 import { msg } from "@lingui/core/macro"
-import { Anchor, Box, Center, Container, Divider, Group, Image, Space, Title, useMantineColorScheme } from "@mantine/core"
+import {
+    Anchor,
+    Box,
+    Center,
+    Container,
+    Divider,
+    Group,
+    Image,
+    Space,
+    Title,
+    useMantineColorScheme,
+} from "@mantine/core"
 import { useAsyncCallback } from "react-async-hook"
 import { SiGithub, SiX } from "react-icons/si"
 import { TbClock, TbKey, TbMoon, TbSettings, TbSun, TbUserPlus } from "react-icons/tb"
 import { client } from "@/app/client"
-import { redirectToApiDocumentation, redirectToLogin, redirectToRegistration, redirectToRootCategory } from "@/app/redirect/thunks"
+import {
+    redirectToApiDocumentation,
+    redirectToLogin,
+    redirectToRegistration,
+    redirectToRootCategory,
+} from "@/app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "@/app/store"
 import welcomePageDark from "@/assets/welcome_page_dark.png"
 import welcomePageLight from "@/assets/welcome_page_light.png"
@@ -42,7 +58,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 +116,7 @@ function Buttons() {
                 icon={<TbKey size={iconSize} />}
                 variant="outline"
                 onClick={async () => await dispatch(redirectToLogin())}
-                showLabelOnMobile
+                mode="desktop"
             />
             {serverInfos?.allowRegistrations && (
                 <ActionButton
@@ -108,7 +124,7 @@ function Buttons() {
                     icon={<TbUserPlus size={iconSize} />}
                     variant="filled"
                     onClick={async () => await dispatch(redirectToRegistration())}
-                    showLabelOnMobile
+                    mode="desktop"
                 />
             )}
 
@@ -116,7 +132,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 +140,7 @@ function Buttons() {
                     label={msg`Extension options`}
                     icon={<TbSettings size={iconSize} />}
                     onClick={() => openSettingsPage()}
-                    hideLabelOnDesktop
+                    mode="mobile"
                 />
             )}
         </Group>

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

@@ -69,7 +69,11 @@ export function AdminUsersPage() {
             <Title order={3} mb="md">
                 <Group>
                     <Trans>Manage users</Trans>
-                    <ActionIcon color={theme.primaryColor} variant="subtle" onClick={() => openUserEditModal(<Trans>Add user</Trans>)}>
+                    <ActionIcon
+                        color={theme.primaryColor}
+                        variant="subtle"
+                        onClick={() => openUserEditModal(<Trans>Add user</Trans>)}
+                    >
                         <TbPlus size={20} />
                     </ActionIcon>
                 </Group>

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

@@ -19,8 +19,10 @@ const shownGauges: Record<string, string> = {
     "com.commafeed.backend.feed.FeedRefreshEngine.queue.size": "Feed Refresh Engine queue size",
     "com.commafeed.backend.feed.FeedRefreshEngine.worker.active": "Feed Refresh Engine active HTTP workers",
     "com.commafeed.backend.feed.FeedRefreshEngine.updater.active": "Feed Refresh Engine active database update workers",
-    "com.commafeed.backend.feed.FeedRefreshEngine.notifier.active": "Feed Refresh Engine active push notifications workers",
-    "com.commafeed.backend.feed.FeedRefreshEngine.notifier.queue": "Feed Refresh Engine queued push notifications workers",
+    "com.commafeed.backend.feed.FeedRefreshEngine.notifier.active":
+        "Feed Refresh Engine active push notifications workers",
+    "com.commafeed.backend.feed.FeedRefreshEngine.notifier.queue":
+        "Feed Refresh Engine queued push notifications workers",
     "com.commafeed.backend.HttpGetter.cache.size": "HttpGetter cached entries",
     "com.commafeed.backend.HttpGetter.cache.memoryUsage": "HttpGetter cache memory usage",
     "com.commafeed.frontend.ws.WebSocketSessions.users": "WebSocket users",

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

@@ -51,7 +51,12 @@ function NextUnreadBookmarklet() {
 
     return (
         <Box>
-            <CategorySelect value={categoryId} onChange={c => c && setCategoryId(c)} withAll description={<Trans>Category</Trans>} />
+            <CategorySelect
+                value={categoryId}
+                onChange={c => c && setCategoryId(c)}
+                withAll
+                description={<Trans>Category</Trans>}
+            />
             <NativeSelect
                 data={[
                     { value: "desc", label: _(msg`Newest first`) },
@@ -73,7 +78,8 @@ function NextUnreadBookmarklet() {
 export function AboutPage() {
     const version = useAppSelector(state => state.server.serverInfos?.version)
     const revision = useAppSelector(state => state.server.serverInfos?.gitCommit)
-    const { isBrowserExtensionInstalled, browserExtensionVersion, isBrowserExtensionInstallable } = useBrowserExtension()
+    const { isBrowserExtensionInstalled, browserExtensionVersion, isBrowserExtensionInstallable } =
+        useBrowserExtension()
     const dispatch = useAppDispatch()
 
     return (
@@ -100,7 +106,9 @@ export function AboutPage() {
                         </Trans>
                     </Box>
                     <Box>
-                        <Trans>If you encounter an issue, please report it on the issues page of the GitHub project.</Trans>
+                        <Trans>
+                            If you encounter an issue, please report it on the issues page of the GitHub project.
+                        </Trans>
                     </Box>
                 </Section>
                 <Section title={<Trans>Goodies</Trans>} icon={<TbPuzzle size={24} />}>

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

@@ -1,7 +1,21 @@
 import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
 import { Trans } from "@lingui/react/macro"
-import { Anchor, Box, Button, Code, Container, Divider, Group, Input, NumberInput, Stack, Text, TextInput, Title } from "@mantine/core"
+import {
+    Anchor,
+    Box,
+    Button,
+    Code,
+    Container,
+    Divider,
+    Group,
+    Input,
+    NumberInput,
+    Stack,
+    Text,
+    TextInput,
+    Title,
+} from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { openConfirmModal } from "@mantine/modals"
 import { useEffect } from "react"
@@ -37,6 +51,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,9 +142,14 @@ 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}
                             />
-                            <NumberInput label={<Trans>Position</Trans>} {...form.getInputProps("position")} required min={0} />
                         </>
                     )}
 
@@ -137,7 +159,11 @@ export function CategoryDetailsPage() {
                         </Button>
                         {editable && (
                             <>
-                                <Button type="submit" leftSection={<TbDeviceFloppy size={16} />} loading={modifyCategory.loading}>
+                                <Button
+                                    type="submit"
+                                    leftSection={<TbDeviceFloppy size={16} />}
+                                    loading={modifyCategory.loading}
+                                >
                                     <Trans>Save</Trans>
                                 </Button>
                                 <Divider orientation="vertical" />

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

@@ -19,8 +19,8 @@ export function DonatePage() {
                 <Trans>
                     <Box>Hey,</Box>
                     <Box mt="xs">
-                        I'm Jérémie from Belgium and I've been working on CommaFeed in my free time for over 10 years now. Thanks for taking
-                        an interest in helping me continue supporting CommaFeed.
+                        I'm Jérémie from Belgium and I've been working on CommaFeed in my free time for over 10 years
+                        now. Thanks for taking an interest in helping me continue supporting CommaFeed.
                     </Box>
                 </Trans>
 

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

@@ -133,7 +133,11 @@ export function FeedDetailsPage() {
                     <Input.Wrapper label={<Trans>Generated feed url</Trans>}>
                         <Box>
                             {apiKey && (
-                                <Anchor href={`rest/feed/entriesAsFeed?id=${feed.id}&apiKey=${apiKey}`} target="_blank" rel="noreferrer">
+                                <Anchor
+                                    href={`rest/feed/entriesAsFeed?id=${feed.id}&apiKey=${apiKey}`}
+                                    target="_blank"
+                                    rel="noreferrer"
+                                >
                                     <Trans>Link</Trans>
                                 </Anchor>
                             )}
@@ -146,10 +150,16 @@ export function FeedDetailsPage() {
                     <TextInput label={<Trans>Name</Trans>} {...form.getInputProps("name")} required />
                     <CategorySelect label={<Trans>Category</Trans>} {...form.getInputProps("categoryId")} clearable />
                     <NumberInput label={<Trans>Position</Trans>} {...form.getInputProps("position")} required min={0} />
-                    <ReceivePushNotificationsChechbox {...form.getInputProps("pushNotificationsEnabled", { type: "checkbox" })} />
+                    <ReceivePushNotificationsChechbox
+                        {...form.getInputProps("pushNotificationsEnabled", { type: "checkbox" })}
+                    />
                     <NumberInput
                         label={<Trans>Auto-mark as read</Trans>}
-                        description={<Trans>Mark entries in this feed as read after this number of days. Leave empty to disable.</Trans>}
+                        description={
+                            <Trans>
+                                Mark entries in this feed as read after this number of days. Leave empty to disable.
+                            </Trans>
+                        }
                         suffix={` ${_(msg`days`)}`}
                         {...form.getInputProps("autoMarkAsReadAfterDays")}
                         min={1}
@@ -159,21 +169,25 @@ export function FeedDetailsPage() {
                         label={<Trans>Filtering expression</Trans>}
                         description={
                             <Trans>
-                                Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read
-                                automatically.
+                                Build a filter expression to indicate what you want to read. Entries that don't match
+                                will be marked as read automatically.
                             </Trans>
                         }
                     >
                         {feed.filterLegacy && (
                             <MantineAlert color="yellow" icon={<TbAlertTriangle />}>
                                 <Trans>
-                                    This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using
-                                    the new expression editor. The legacy filter expression was: <Code>{feed.filterLegacy}</Code>
+                                    This feed has a legacy filter that cannot be edited and is not applied. Please
+                                    recreate the filter using the new expression editor. The legacy filter expression
+                                    was: <Code>{feed.filterLegacy}</Code>
                                 </Trans>
                             </MantineAlert>
                         )}
                         <Box mt="xs">
-                            <FilteringExpressionEditor initialValue={feed.filter} onChange={value => form.setFieldValue("filter", value)} />
+                            <FilteringExpressionEditor
+                                initialValue={feed.filter}
+                                onChange={value => form.setFieldValue("filter", value)}
+                            />
                         </Box>
                     </Input.Wrapper>
 

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"
@@ -20,7 +20,8 @@ function NoSubscriptionHelp() {
         <Box>
             <Center>
                 <Trans>
-                    You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?
+                    You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of
+                    the page?
                 </Trans>
             </Center>
         </Box>
@@ -51,7 +52,8 @@ export function FeedEntriesPage(props: Readonly<FeedEntriesPageProps>) {
     const viewport = useViewportSize()
     const theme = useMantineTheme()
     const noSubscriptions = useAppSelector(
-        state => state.tree.rootCategory && flattenCategoryTree(state.tree.rootCategory).every(c => c.feeds.length === 0)
+        state =>
+            state.tree.rootCategory && flattenCategoryTree(state.tree.rootCategory).every(c => c.feeds.length === 0)
     )
     const sourceLabel = useAppSelector(state => state.entries.sourceLabel)
     const sourceWebsiteUrl = useAppSelector(state => state.entries.sourceWebsiteUrl)
@@ -63,7 +65,8 @@ export function FeedEntriesPage(props: Readonly<FeedEntriesPageProps>) {
         if (!root) return { unreadCount: 0, hasNewEntries: false }
 
         if (props.sourceType === "category") {
-            const category = id === Constants.categories.all.id ? root : flattenCategoryTree(root).find(c => c.id === id)
+            const category =
+                id === Constants.categories.all.id ? root : flattenCategoryTree(root).find(c => c.id === id)
             return {
                 unreadCount: categoryUnreadCount(category),
                 hasNewEntries: categoryHasNewEntries(category),
@@ -138,7 +141,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/pages/auth/InitialSetupPage.tsx

@@ -50,8 +50,8 @@ export function InitialSetupPage() {
                 </Title>
                 <Box mb="md">
                     <Trans>
-                        Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get
-                        started.
+                        Welcome! This appears to be the first time you're running CommaFeed. Please create an
+                        administrator account to get started.
                     </Trans>
                 </Box>
                 {setup.error && (

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

@@ -1,7 +1,19 @@
 import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
 import { Trans } from "@lingui/react/macro"
-import { Anchor, Box, Button, Center, Container, Group, Paper, PasswordInput, Stack, TextInput, Title } from "@mantine/core"
+import {
+    Anchor,
+    Box,
+    Button,
+    Center,
+    Container,
+    Group,
+    Paper,
+    PasswordInput,
+    Stack,
+    TextInput,
+    Title,
+} from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { useAsyncCallback } from "react-async-hook"
 import { Link } from "react-router-dom"
@@ -49,7 +61,11 @@ export function LoginPage() {
                             placeholder={_(msg`User Name or E-mail`)}
                             {...form.getInputProps("name")}
                             description={
-                                serverInfos?.demoAccountEnabled ? <Trans>Try out CommaFeed with the demo account: demo/demo</Trans> : ""
+                                serverInfos?.demoAccountEnabled ? (
+                                    <Trans>Try out CommaFeed with the demo account: demo/demo</Trans>
+                                ) : (
+                                    ""
+                                )
                             }
                             size="md"
                             required

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

@@ -1,7 +1,19 @@
 import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
 import { Trans } from "@lingui/react/macro"
-import { Anchor, Box, Button, Center, Container, Group, Paper, PasswordInput, Stack, TextInput, Title } from "@mantine/core"
+import {
+    Anchor,
+    Box,
+    Button,
+    Center,
+    Container,
+    Group,
+    Paper,
+    PasswordInput,
+    Stack,
+    TextInput,
+    Title,
+} from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { useAsyncCallback } from "react-async-hook"
 import { Link } from "react-router-dom"
@@ -71,7 +83,13 @@ export function RegistrationPage() {
 
                         <form onSubmit={form.onSubmit(register.execute)}>
                             <Stack>
-                                <TextInput label="User Name" placeholder="User Name" {...form.getInputProps("name")} size="md" required />
+                                <TextInput
+                                    label="User Name"
+                                    placeholder="User Name"
+                                    {...form.getInputProps("name")}
+                                    size="md"
+                                    required
+                                />
                                 <TextInput
                                     type="email"
                                     label={<Trans>E-mail address</Trans>}

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({
-            presets: [reactCompilerPreset()],
-            plugins: ["@lingui/babel-plugin-lingui-macro"],
-        }),
-        lingui(),
+        lingui({ macroTransform: true }),
+        babel({ presets: [reactCompilerPreset()] }),
         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>
-        <querydsl.version>7.6</querydsl.version>
+        <quarkus.version>3.40.1.1</quarkus.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.11.0</version>
                 <?m2e ignore?>
                 <executions>
                     <execution>
@@ -290,6 +290,7 @@
                         <googleJavaFormat>
                             <version>${google-java-format.version}</version>
                             <style>AOSP</style>
+                            <maxLineLength>120</maxLineLength>
                             <reorderImports>true</reorderImports>
                         </googleJavaFormat>
                     </java>
@@ -302,14 +303,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 +323,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 +374,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 +405,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 +435,12 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.23.1</version>
+            <version>1.24.1</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 +455,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>
-        </dependency>
-        <dependency>
-            <groupId>org.brotli</groupId>
-            <artifactId>dec</artifactId>
-            <version>0.1.2</version>
+            <version>10.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.seancfoley</groupId>
@@ -476,13 +477,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>
-            <version>7.6.0</version>
+            <artifactId>mockserver-junit-jupiter-no-dependencies</artifactId>
+            <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.5.0-jre@sha256:b8fec7a8d2b3a8d50a4f070f169cf852f83208317036c38b86474d80eaf7becf
+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:9c6e381421d0f48d1b8133e573f33c185ee16cbf505eda9c4a8a4791b25ea8a6
+LABEL org.opencontainers.image.source="https://github.com/Athou/commafeed"
+
 ARG TARGETARCH
 
 EXPOSE 8082

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

@@ -34,16 +34,14 @@ public class CommaFeedApplication {
         System.setProperty(SystemProperties.JDK_XML_MAX_GENERAL_ENTITY_SIZE_LIMIT, "0");
         System.setProperty(SystemProperties.JDK_XML_TOTAL_ENTITY_SIZE_LIMIT, "0");
 
-        PasswordConstraintValidator.setMinimumPasswordLength(
-                config.users().minimumPasswordLength());
+        PasswordConstraintValidator.setMinimumPasswordLength(config.users().minimumPasswordLength());
 
         if (config.imageProxyEnabled()) {
             ImageProxyUrl.generateKey();
         }
 
         if (config.passwordRecoveryEnabled() && config.passwordRecoveryPublicBaseUrl().isEmpty()) {
-            throw new IllegalStateException(
-                    "password recovery is enabled but no public base url is set");
+            throw new IllegalStateException("password recovery is enabled but no public base url is set");
         }
 
         feedRefreshEngine.start();

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

@@ -19,24 +19,20 @@ import java.util.Optional;
 /**
  * CommaFeed configuration
  *
- * <p>Default values are for production, they can be overridden in application.properties for other
- * profiles
+ * <p>Default values are for production, they can be overridden in application.properties for other profiles
  */
 @ConfigMapping(prefix = "commafeed")
 @ConfigRoot(phase = ConfigPhase.RUN_TIME)
 public interface CommaFeedConfiguration {
-    /**
-     * Whether to expose a robots.txt file that disallows web crawlers and search engine indexers.
-     */
+    /** Whether to expose a robots.txt file that disallows web crawlers and search engine indexers. */
     @WithDefault("true")
     boolean hideFromWebCrawlers();
 
     /**
-     * If enabled, images in feed entries will be proxied through the server instead of accessed
-     * directly by the browser.
+     * If enabled, images in feed entries will be proxied through the server instead of accessed directly by the
+     * browser.
      *
-     * <p>This is useful if commafeed is accessed through a restricting proxy that blocks some feeds
-     * that are followed.
+     * <p>This is useful if commafeed is accessed through a restricting proxy that blocks some feeds that are followed.
      */
     @WithDefault("false")
     boolean imageProxyEnabled();
@@ -50,9 +46,8 @@ public interface CommaFeedConfiguration {
     boolean passwordRecoveryEnabled();
 
     /**
-     * The base URL of the application to use in the password recovery link in the email. We can't
-     * use the URL sent by the browser of the user because of malicious Host header injection
-     * attacks.
+     * The base URL of the application to use in the password recovery link in the email. We can't use the URL sent by
+     * the browser of the user because of malicious Host header injection attacks.
      */
     Optional<String> passwordRecoveryPublicBaseUrl();
 
@@ -87,16 +82,14 @@ public interface CommaFeedConfiguration {
     Websocket websocket();
 
     /**
-     * Duration to wait for the feed refresh engine and the task scheduler to stop when the
-     * application is shutting down.
+     * Duration to wait for the feed refresh engine and the task scheduler to stop when the application is shutting
+     * down.
      */
     @WithDefault("2s")
     Duration shutdownTimeout();
 
     interface HttpClient {
-        /**
-         * User-Agent string that will be used by the http client, leave empty for the default one.
-         */
+        /** User-Agent string that will be used by the http client, leave empty for the default one. */
         Optional<String> userAgent();
 
         /** Time to wait for a connection to be established. */
@@ -123,19 +116,15 @@ public interface CommaFeedConfiguration {
         @WithDefault("1m")
         Duration idleConnectionsEvictionInterval();
 
-        /**
-         * If a feed is larger than this, it will be discarded to prevent memory issues while
-         * parsing the feed.
-         */
+        /** If a feed is larger than this, it will be discarded to prevent memory issues while parsing the feed. */
         @WithDefault("5M")
         MemorySize maxResponseSize();
 
         /**
-         * Prevent access to local addresses to mitigate server-side request forgery (SSRF) attacks,
-         * which could potentially expose internal resources.
+         * Prevent access to local addresses to mitigate server-side request forgery (SSRF) attacks, which could
+         * potentially expose internal resources.
          *
-         * <p>You may want to enable this if you host a public instance of CommaFeed with
-         * registrations open.
+         * <p>You may want to enable this if you host a public instance of CommaFeed with registrations open.
          */
         @WithDefault("true")
         boolean blockLocalAddresses();
@@ -147,9 +136,8 @@ public interface CommaFeedConfiguration {
 
     interface HttpClientCache {
         /**
-         * Whether to enable the cache. This cache is used to avoid spamming feeds in short bursts
-         * (e.g. when subscribing to a feed for the first time or when clicking "fetch all my feeds
-         * now").
+         * Whether to enable the cache. This cache is used to avoid spamming feeds in short bursts (e.g. when
+         * subscribing to a feed for the first time or when clicking "fetch all my feeds now").
          */
         @WithDefault("true")
         boolean enabled();
@@ -169,8 +157,7 @@ public interface CommaFeedConfiguration {
         Duration interval();
 
         /**
-         * Maximum amount of time CommaFeed will wait before refreshing a feed. This is used as an
-         * upper bound when:
+         * Maximum amount of time CommaFeed will wait before refreshing a feed. This is used as an upper bound when:
          *
          * <ul>
          *   <li>an error occurs while refreshing a feed and we're backing off exponentially
@@ -182,10 +169,10 @@ public interface CommaFeedConfiguration {
         Duration maxInterval();
 
         /**
-         * If enabled, CommaFeed will calculate the next refresh time based on the feed's average
-         * time between entries and the time since the last entry was published. The interval will
-         * be sometimes between the default refresh interval (`commafeed.feed-refresh.interval`) and
-         * the maximum refresh interval (`commafeed.feed-refresh.max-interval`).
+         * If enabled, CommaFeed will calculate the next refresh time based on the feed's average time between entries
+         * and the time since the last entry was published. The interval will be sometimes between the default refresh
+         * interval (`commafeed.feed-refresh.interval`) and the maximum refresh interval
+         * (`commafeed.feed-refresh.max-interval`).
          *
          * <p>See {@link FeedRefreshIntervalCalculator} for details.
          */
@@ -207,8 +194,8 @@ public interface CommaFeedConfiguration {
         int databaseThreads();
 
         /**
-         * Duration after which a user is considered inactive. Feeds for inactive users are not
-         * refreshed until they log in again.
+         * Duration after which a user is considered inactive. Feeds for inactive users are not refreshed until they log
+         * in again.
          *
          * <p>0 to disable.
          */
@@ -216,15 +203,15 @@ public interface CommaFeedConfiguration {
         Duration userInactivityPeriod();
 
         /**
-         * Duration after which the evaluation of a filtering expresion to mark an entry as read is
-         * considered to have timed out.
+         * Duration after which the evaluation of a filtering expresion to mark an entry as read is considered to have
+         * timed out.
          */
         @WithDefault("500ms")
         Duration filteringExpressionEvaluationTimeout();
 
         /**
-         * Duration after which the "Fetch all my feeds now" action is available again after use to
-         * avoid spamming feeds.
+         * Duration after which the "Fetch all my feeds now" action is available again after use to avoid spamming
+         * feeds.
          */
         @WithDefault("0")
         Duration forceRefreshCooldownDuration();
@@ -240,10 +227,7 @@ public interface CommaFeedConfiguration {
         @WithDefault("5")
         int threads();
 
-        /**
-         * Maximum amount of notifications that can be queued before new notifications are
-         * discarded.
-         */
+        /** Maximum amount of notifications that can be queued before new notifications are discarded. */
         @Min(1)
         @WithDefault("100")
         int queueCapacity();
@@ -256,8 +240,8 @@ public interface CommaFeedConfiguration {
         int retriesBeforeBackoff();
 
         /**
-         * Duration to wait before retrying after an error. Will be multiplied by the number of
-         * errors since the last successful fetch.
+         * Duration to wait before retrying after an error. Will be multiplied by the number of errors since the last
+         * successful fetch.
          */
         @WithDefault("1h")
         Duration backoffInterval();
@@ -286,8 +270,7 @@ public interface CommaFeedConfiguration {
             Duration entriesMaxAge();
 
             /**
-             * Maximum age of feed entry statuses (read/unread) in the database. Older statuses will
-             * be deleted.
+             * Maximum age of feed entry statuses (read/unread) in the database. Older statuses will be deleted.
              *
              * <p>0 to disable.
              */
@@ -320,9 +303,7 @@ public interface CommaFeedConfiguration {
             boolean keepStarredEntries();
 
             default Instant statusesInstantThreshold() {
-                return statusesMaxAge().toMillis() > 0
-                        ? Instant.now().minus(statusesMaxAge())
-                        : null;
+                return statusesMaxAge().toMillis() > 0 ? Instant.now().minus(statusesMaxAge()) : null;
             }
         }
     }
@@ -346,23 +327,17 @@ public interface CommaFeedConfiguration {
     }
 
     interface Websocket {
-        /**
-         * Enable websocket connection so the server can notify web clients that there are new
-         * entries for feeds.
-         */
+        /** Enable websocket connection so the server can notify web clients that there are new entries for feeds. */
         @WithDefault("true")
         boolean enabled();
 
-        /**
-         * Interval at which the client will send a ping message on the websocket to keep the
-         * connection alive.
-         */
+        /** Interval at which the client will send a ping message on the websocket to keep the connection alive. */
         @WithDefault("15m")
         Duration pingInterval();
 
         /**
-         * If the websocket connection is disabled or the connection is lost, the client will reload
-         * the feed tree at this interval.
+         * If the websocket connection is disabled or the connection is lost, the client will reload the feed tree at
+         * this interval.
          */
         @WithDefault("30s")
         Duration treeReloadInterval();

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

@@ -10,7 +10,10 @@ import io.quarkus.security.UnauthorizedException;
 
 import jakarta.annotation.Priority;
 import jakarta.validation.ValidationException;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.UriInfo;
 import jakarta.ws.rs.ext.Provider;
 
 import lombok.RequiredArgsConstructor;
@@ -29,11 +32,9 @@ public class ExceptionMappers {
     private final CommaFeedConfiguration config;
 
     @ServerExceptionMapper(CommaFeedApplicationException.class)
-    public RestResponse<CommaFeedApplicationError> applicationError(
-            CommaFeedApplicationException e) {
+    public RestResponse<CommaFeedApplicationError> applicationError(CommaFeedApplicationException e) {
         ResponseBuilder<CommaFeedApplicationError> response =
-                ResponseBuilder.create(
-                        e.type().status(), new CommaFeedApplicationError(e.type(), e.getMessage()));
+                ResponseBuilder.create(e.type().status(), new CommaFeedApplicationError(e.type(), e.getMessage()));
         if (e.type().status() == Status.UNAUTHORIZED) {
             response.cookie(cookieService.buildLogoutCookie());
         }
@@ -43,14 +44,24 @@ public class ExceptionMappers {
     @ServerExceptionMapper(UnauthorizedException.class)
     public RestResponse<UnauthorizedResponse> unauthorized(UnauthorizedException e) {
         return RestResponse.status(
-                Status.UNAUTHORIZED,
-                new UnauthorizedResponse(e.getMessage(), config.users().allowRegistrations()));
+                Status.UNAUTHORIZED, new UnauthorizedResponse(e.getMessage(), config.users().allowRegistrations()));
     }
 
     @ServerExceptionMapper(AuthenticationFailedException.class)
     public RestResponse<AuthenticationFailed> authenticationFailed(
-            AuthenticationFailedException e) {
+            AuthenticationFailedException e, HttpHeaders headers, UriInfo uriInfo) {
         NewCookie logoutCookie = cookieService.buildLogoutCookie();
+
+        // a browser navigating with an invalidated session would otherwise display the error
+        // instead of the page, retry the request now that the cookie is removed
+        if (headers.getAcceptableMediaTypes().stream()
+                .anyMatch(m -> MediaType.TEXT_HTML_TYPE.isCompatible(m) && !m.isWildcardType())) {
+            return ResponseBuilder.<AuthenticationFailed>create(Status.TEMPORARY_REDIRECT)
+                    .location(uriInfo.getRequestUri())
+                    .cookie(logoutCookie)
+                    .build();
+        }
+
         return ResponseBuilder.create(Status.UNAUTHORIZED, new AuthenticationFailed(e.getMessage()))
                 .cookie(logoutCookie)
                 .build();

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.classic.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
-import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
+import org.apache.hc.client5.http.impl.async.HttpAsyncClients;
+import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
+import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
 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
@@ -56,81 +56,77 @@ public class HttpClientFactory {
 
     private static final DnsResolver DNS_RESOLVER = SystemDefaultDnsResolver.INSTANCE;
     private static final IPAddress CGNAT_RANGE = new IPAddressString("100.64.0.0/10").getAddress();
+    private static final IPAddress NAT64_LOCAL_USE_RANGE = new IPAddressString("64:ff9b:1::/48").getAddress();
 
     private final CommaFeedConfiguration config;
     private final CommaFeedVersion version;
 
-    public CloseableHttpClient newClient(int poolSize) {
-        PoolingHttpClientConnectionManager connectionManager =
-                newConnectionManager(config, poolSize);
+    public CloseableHttpAsyncClient newClient(int poolSize) {
+        PoolingAsyncClientConnectionManager connectionManager = newConnectionManager(config, poolSize);
         String userAgent =
                 config.httpClient()
                         .userAgent()
-                        .orElseGet(
-                                () ->
-                                        String.format(
-                                                "CommaFeed/%s (https://github.com/Athou/commafeed)",
-                                                version.getVersion()));
+                        .orElseGet(() ->
+                                String.format(
+                                        "CommaFeed/%s (https://github.com/Athou/commafeed)", version.getVersion()));
         return newClient(config, connectionManager, userAgent);
     }
 
-    private CloseableHttpClient newClient(
-            CommaFeedConfiguration config,
-            HttpClientConnectionManager connectionManager,
-            String userAgent) {
+    private CloseableHttpAsyncClient newClient(
+            CommaFeedConfiguration config, 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<>();
-        contentDecoderMap.put(ContentCoding.GZIP.token(), GZIPInputStream::new);
-        contentDecoderMap.put(ContentCoding.DEFLATE.token(), DeflateInputStream::new);
-        contentDecoderMap.put(ContentCoding.BROTLI.token(), BrotliInputStream::new);
+        SequencedMap<String, UnaryOperator<AsyncDataConsumer>> contentDecoderMap = new LinkedHashMap<>();
+        contentDecoderMap.put(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()
-                .disableConnectionState()
-                .useSystemProperties()
-                .disableAutomaticRetries()
-                .disableCookieManagement()
-                .setUserAgent(userAgent)
-                .setDefaultHeaders(headers)
-                .setConnectionManager(connectionManager)
-                .evictExpiredConnections()
-                .evictIdleConnections(
-                        TimeValue.of(config.httpClient().idleConnectionsEvictionInterval()))
-                .setContentDecoderRegistry(new LinkedHashMap<>(contentDecoderMap))
-                .setRedirectStrategy(redirectStrategy)
-                .build();
+        CloseableHttpAsyncClient client =
+                HttpAsyncClients.custom()
+                        .disableConnectionState()
+                        .useSystemProperties()
+                        .disableAutomaticRetries()
+                        .disableCookieManagement()
+                        .setUserAgent(userAgent)
+                        .setDefaultHeaders(headers)
+                        .setConnectionManager(connectionManager)
+                        .evictExpiredConnections()
+                        .evictIdleConnections(TimeValue.of(config.httpClient().idleConnectionsEvictionInterval()))
+                        .setContentDecoderMap(new LinkedHashMap<>(contentDecoderMap))
+                        .setRedirectStrategy(redirectStrategy)
+                        .build();
+        client.start();
+        return client;
     }
 
-    private PoolingHttpClientConnectionManager newConnectionManager(
-            CommaFeedConfiguration config, int poolSize) {
-        SSLFactory sslFactory =
-                SSLFactory.builder().withUnsafeTrustMaterial().withUnsafeHostnameVerifier().build();
+    private PoolingAsyncClientConnectionManager newConnectionManager(CommaFeedConfiguration config, int poolSize) {
+        SSLFactory sslFactory = SSLFactory.builder().withUnsafeTrustMaterial().withUnsafeHostnameVerifier().build();
         DnsResolver dnsResolver =
                 config.httpClient().blockLocalAddresses()
                         ? new BlockLocalAddressesDnsResolver(DNS_RESOLVER)
                         : DNS_RESOLVER;
 
-        return PoolingHttpClientConnectionManagerBuilder.create()
-                .setTlsSocketStrategy(Apache5SslUtils.toTlsSocketStrategy(sslFactory))
+        return PoolingAsyncClientConnectionManagerBuilder.create()
+                .setTlsStrategy(Apache5SslUtils.toTlsStrategy(sslFactory))
                 .setDefaultConnectionConfig(
                         ConnectionConfig.custom()
                                 .setConnectTimeout(Timeout.of(config.httpClient().connectTimeout()))
                                 .setSocketTimeout(Timeout.of(config.httpClient().socketTimeout()))
-                                .setTimeToLive(
-                                        Timeout.of(config.httpClient().connectionTimeToLive()))
+                                .setTimeToLive(Timeout.of(config.httpClient().connectionTimeToLive()))
                                 .build())
                 .setDefaultTlsConfig(
                         TlsConfig.custom()
-                                .setHandshakeTimeout(
-                                        Timeout.of(config.httpClient().sslHandshakeTimeout()))
+                                .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
+                                .setHandshakeTimeout(Timeout.of(config.httpClient().sslHandshakeTimeout()))
                                 .build())
                 .setMaxConnPerRoute(poolSize)
                 .setMaxConnTotal(poolSize)
@@ -143,7 +139,11 @@ public class HttpClientFactory {
     }
 
     private static boolean isLocalAddress(IPAddress ip) {
-        if (ip.isLocal() || ip.isLoopback() || ip.isMulticast() || CGNAT_RANGE.contains(ip)) {
+        if (ip.isLocal()
+                || ip.isLoopback()
+                || ip.isMulticast()
+                || CGNAT_RANGE.contains(ip)
+                || NAT64_LOCAL_USE_RANGE.contains(ip)) {
             return true;
         }
 
@@ -179,8 +179,7 @@ public class HttpClientFactory {
             InetAddress[] addresses = delegate.resolve(host);
             for (InetAddress addr : addresses) {
                 if (isLocalAddress(addr)) {
-                    throw new UnknownHostException(
-                            "Access to local address blocked: " + addr.getHostAddress());
+                    throw new UnknownHostException("Access to local address blocked: " + addr.getHostAddress());
                 }
             }
             return addresses;
@@ -216,8 +215,7 @@ public class HttpClientFactory {
 
             for (InetAddress addr : addresses) {
                 if (isLocalAddress(addr)) {
-                    throw new HttpException(
-                            "Access to local address blocked: " + addr.getHostAddress());
+                    throw new HttpException("Access to local address blocked: " + addr.getHostAddress());
                 }
             }
 

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.http.HttpEntity;
+import org.apache.hc.core5.concurrent.FutureCallback;
+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.util.Timeout;
+import org.apache.hc.core5.http.nio.AsyncEntityConsumer;
+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(
@@ -62,32 +75,22 @@ public class HttpGetter {
         this.client = httpClientFactory.newClient(config.feedRefresh().httpThreads());
         this.cache = newCache(config);
 
-        metrics.registerGauge(
-                MetricRegistry.name(getClass(), "cache", "size"),
-                () -> cache == null ? 0 : cache.size());
+        metrics.registerGauge(MetricRegistry.name(getClass(), "cache", "size"), () -> cache == null ? 0 : cache.size());
         metrics.registerGauge(
                 MetricRegistry.name(getClass(), "cache", "memoryUsage"),
                 () ->
                         cache == null
                                 ? 0
-                                : cache.asMap().values().stream()
-                                        .mapToInt(e -> ArrayUtils.getLength(e.content))
-                                        .sum());
+                                : cache.asMap().values().stream().mapToInt(e -> ArrayUtils.getLength(e.content)).sum());
     }
 
     public HttpResult get(String url)
-            throws IOException,
-                    NotModifiedException,
-                    TooManyRequestsException,
-                    SchemeNotAllowedException {
+            throws IOException, NotModifiedException, TooManyRequestsException, SchemeNotAllowedException {
         return get(HttpRequest.builder(url).build());
     }
 
     public HttpResult get(HttpRequest request)
-            throws IOException,
-                    NotModifiedException,
-                    TooManyRequestsException,
-                    SchemeNotAllowedException {
+            throws IOException, NotModifiedException, TooManyRequestsException, SchemeNotAllowedException {
         URI uri = URI.create(request.getUrl());
         ensureHttpScheme(uri.getScheme());
 
@@ -150,70 +153,95 @@ 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(
-                request.toClassicHttpRequest(),
-                context,
-                resp -> {
-                    byte[] content =
-                            resp.getEntity() == null
-                                    ? null
-                                    : toByteArray(
-                                            resp.getEntity(),
-                                            config.httpClient().maxResponseSize().asLongValue());
-                    int code = resp.getCode();
-                    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);
+        long maxResponseSize = config.httpClient().maxResponseSize().asLongValue();
+        AsyncRequestProducer req = SimpleRequestProducer.create(request.toSimpleHttpRequest());
+        AsyncResponseConsumer<Message<org.apache.hc.core5.http.HttpResponse, byte[]>> resp =
+                new BasicResponseConsumer<>(
+                        new LimitedContentLengthEntityConsumer(
+                                new LimitedBytesEntityConsumer(maxResponseSize), maxResponseSize));
+        FutureCallback<Message<org.apache.hc.core5.http.HttpResponse, byte[]>> callback =
+                new FutureCallback<>() {
+                    @Override
+                    public void completed(Message<org.apache.hc.core5.http.HttpResponse, byte[]> result) {}
 
-                    CacheControl cacheControl =
-                            Optional.ofNullable(resp.getFirstHeader(HttpHeaders.CACHE_CONTROL))
-                                    .map(NameValuePair::getValue)
-                                    .map(StringUtils::trimToNull)
-                                    .map(HttpGetter::toCacheControl)
-                                    .orElse(null);
+                    @Override
+                    public void failed(Exception ex) {}
 
-                    Instant retryAfter =
-                            Optional.ofNullable(resp.getFirstHeader(HttpHeaders.RETRY_AFTER))
-                                    .map(NameValuePair::getValue)
-                                    .map(StringUtils::trimToNull)
-                                    .map(this::toInstant)
-                                    .orElse(null);
+                    @Override
+                    public void cancelled() {}
+                };
+        Future<Message<org.apache.hc.core5.http.HttpResponse, byte[]>> future =
+                client.execute(req, resp, context, callback);
 
-                    String contentType =
-                            Optional.ofNullable(resp.getEntity())
-                                    .map(HttpEntity::getContentType)
-                                    .orElse(null);
-                    String urlAfterRedirect =
-                            Optional.ofNullable(context.getRedirectLocations())
-                                    .map(RedirectLocations::getAll)
-                                    .map(l -> Iterables.getLast(l, null))
-                                    .map(URI::toString)
-                                    .orElse(request.getUrl());
+        try {
+            Message<org.apache.hc.core5.http.HttpResponse, byte[]> message =
+                    future.get(config.httpClient().responseTimeout().toSeconds(), TimeUnit.SECONDS);
 
-                    return new HttpResponse(
-                            code,
-                            lastModifiedHeader,
-                            eTagHeader,
-                            cacheControl,
-                            retryAfter,
-                            content,
-                            contentType,
-                            urlAfterRedirect);
-                });
+            byte[] content = message.getBody();
+            int code = message.getHead().getCode();
+            String lastModifiedHeader =
+                    Optional.ofNullable(message.getHead().getFirstHeader(HttpHeaders.LAST_MODIFIED))
+                            .map(NameValuePair::getValue)
+                            .map(StringUtils::trimToNull)
+                            .orElse(null);
+            String eTagHeader =
+                    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 +265,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 +272,63 @@ public class HttpGetter {
         }
 
         return CacheBuilder.newBuilder()
-                .weigher(
-                        (HttpRequest key, HttpResponse value) ->
-                                value.content() != null ? value.content().length : 0)
+                .weigher((HttpRequest key, HttpResponse value) -> 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;
 
@@ -296,8 +351,7 @@ public class HttpGetter {
             this(message, null, null);
         }
 
-        public NotModifiedException(
-                String message, String newLastModifiedHeader, String newEtagHeader) {
+        public NotModifiedException(String message, String newLastModifiedHeader, String newEtagHeader) {
             super(message);
             this.newLastModifiedHeader = newLastModifiedHeader;
             this.newEtagHeader = newEtagHeader;
@@ -336,15 +390,15 @@ public class HttpGetter {
             return new HttpRequestBuilder().url(url);
         }
 
-        public ClassicHttpRequest toClassicHttpRequest() {
-            ClassicHttpRequest req = ClassicRequestBuilder.get(url).build();
+        public SimpleHttpRequest toSimpleHttpRequest() {
+            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/Urls.java

@@ -65,11 +65,7 @@ public class Urls {
         try {
             return URI.create(baseUrl).resolve(relativeUrl).toString();
         } catch (IllegalArgumentException e) {
-            log.debug(
-                    "Unable to create absolute url from relative url: {} base: {}",
-                    relativeUrl,
-                    baseUrl,
-                    e);
+            log.debug("Unable to create absolute url from relative url: {} base: {}", relativeUrl, baseUrl, e);
             return null;
         }
     }
@@ -86,8 +82,8 @@ public class Urls {
     }
 
     /**
-     * Normalize the url. The resulting url is not meant to be fetched but rather used as a mean to
-     * identify a feed and avoid duplicates
+     * Normalize the url. The resulting url is not meant to be fetched but rather used as a mean to identify a feed and
+     * avoid duplicates
      */
     public static String normalize(String url) {
         if (url == null) {

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) {
-        super(entityManager, FeedCategory.class);
+    public FeedCategoryDAO(EntityManager entityManager, CommaFeedConfiguration config) {
+        super(entityManager, FeedCategory.class, config);
     }
 
     public List<FeedCategory> findAll(User user) {
@@ -30,9 +31,7 @@ public class FeedCategoryDAO extends GenericDAO<FeedCategory> {
     }
 
     public FeedCategory findById(User user, Long id) {
-        return query().selectFrom(CATEGORY)
-                .where(CATEGORY.user.eq(user), CATEGORY.id.eq(id))
-                .fetchOne();
+        return query().selectFrom(CATEGORY).where(CATEGORY.user.eq(user), CATEGORY.id.eq(id)).fetchOne();
     }
 
     public FeedCategory findByName(User user, String name, FeedCategory parent) {

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) {
-        super(entityManager, Feed.class);
+    public FeedDAO(EntityManager entityManager, CommaFeedConfiguration config) {
+        super(entityManager, Feed.class, config);
     }
 
     public List<Feed> findByIds(List<Long> id) {
@@ -35,10 +36,7 @@ public class FeedDAO extends GenericDAO<Feed> {
                         // join on subscriptions to only refresh feeds that have subscribers
                         .join(SUBSCRIPTION)
                         .on(SUBSCRIPTION.feed.eq(FEED))
-                        .where(
-                                FEED.disabledUntil
-                                        .isNull()
-                                        .or(FEED.disabledUntil.lt(Instant.now())));
+                        .where(FEED.disabledUntil.isNull().or(FEED.disabledUntil.lt(Instant.now())));
 
         if (lastLoginThreshold != null) {
             query.join(SUBSCRIPTION.user).where(SUBSCRIPTION.user.lastLogin.gt(lastLoginThreshold));
@@ -52,11 +50,7 @@ public class FeedDAO extends GenericDAO<Feed> {
     }
 
     public Feed findByUrl(String normalizedUrl, String normalizedUrlHash) {
-        return query()
-                .selectFrom(FEED)
-                .where(FEED.normalizedUrlHash.eq(normalizedUrlHash))
-                .fetch()
-                .stream()
+        return query().selectFrom(FEED).where(FEED.normalizedUrlHash.eq(normalizedUrlHash)).fetch().stream()
                 .filter(f -> Strings.CS.equals(normalizedUrl, f.getNormalizedUrl()))
                 .findFirst()
                 .orElse(null);

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) {
-        super(entityManager, FeedEntryContent.class);
+    public FeedEntryContentDAO(EntityManager entityManager, CommaFeedConfiguration config) {
+        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) {
-        super(entityManager, FeedEntry.class);
+    public FeedEntryDAO(EntityManager entityManager, CommaFeedConfiguration config) {
+        super(entityManager, FeedEntry.class, config);
     }
 
     public FeedEntry findExisting(String guidHash, Feed feed) {
@@ -41,8 +42,7 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
         }
 
         Set<String> result = new HashSet<>();
-        for (List<String> batch :
-                Lists.partition(new ArrayList<>(guidHashes), IN_CLAUSE_BATCH_SIZE)) {
+        for (List<String> batch : Lists.partition(new ArrayList<>(guidHashes), IN_CLAUSE_BATCH_SIZE)) {
             result.addAll(
                     query().select(ENTRY.guidHash)
                             .from(ENTRY)
@@ -52,8 +52,7 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
         return result;
     }
 
-    public List<FeedCapacity> findFeedsExceedingCapacity(
-            long maxCapacity, long max, boolean keepStarredEntries) {
+    public List<FeedCapacity> findFeedsExceedingCapacity(long maxCapacity, long max, boolean keepStarredEntries) {
         NumberExpression<Long> count = ENTRY.id.count();
         JPAQuery<Tuple> query = query().select(ENTRY.feed.id, count).from(ENTRY);
 
@@ -67,8 +66,7 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
     }
 
     public int delete(Long feedId, long max) {
-        List<FeedEntry> list =
-                query().selectFrom(ENTRY).where(ENTRY.feed.id.eq(feedId)).limit(max).fetch();
+        List<FeedEntry> list = query().selectFrom(ENTRY).where(ENTRY.feed.id.eq(feedId)).limit(max).fetch();
         return delete(list);
     }
 
@@ -90,10 +88,7 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
     /** Delete the oldest entries of a feed */
     public int deleteOldEntries(Long feedId, long max, boolean keepStarredEntries) {
         JPAQuery<FeedEntry> query =
-                query().selectFrom(ENTRY)
-                        .where(ENTRY.feed.id.eq(feedId))
-                        .orderBy(ENTRY.published.asc())
-                        .limit(max);
+                query().selectFrom(ENTRY).where(ENTRY.feed.id.eq(feedId)).orderBy(ENTRY.published.asc()).limit(max);
 
         if (keepStarredEntries) {
             query.where(Predicates.isNotStarred(ENTRY));

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;
@@ -47,32 +48,24 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
     private final CommaFeedConfiguration config;
 
     public FeedEntryStatusDAO(
-            EntityManager entityManager,
-            FeedEntryTagDAO feedEntryTagDAO,
-            CommaFeedConfiguration config) {
-        super(entityManager, FeedEntryStatus.class);
+            EntityManager entityManager, FeedEntryTagDAO feedEntryTagDAO, CommaFeedConfiguration config) {
+        super(entityManager, FeedEntryStatus.class, config);
         this.feedEntryTagDAO = feedEntryTagDAO;
         this.config = config;
     }
 
     public FeedEntryStatus getStatus(User user, FeedSubscription sub, FeedEntry entry) {
         List<FeedEntryStatus> statuses =
-                query().selectFrom(STATUS)
-                        .where(STATUS.entry.eq(entry), STATUS.subscription.eq(sub))
-                        .fetch();
+                query().selectFrom(STATUS).where(STATUS.entry.eq(entry), STATUS.subscription.eq(sub)).fetch();
         FeedEntryStatus status = statuses.stream().findFirst().orElse(null);
         return handleStatus(user, status, sub, entry);
     }
 
     /** creates an artificial "unread" status if status is null */
-    private FeedEntryStatus handleStatus(
-            User user, FeedEntryStatus status, FeedSubscription sub, FeedEntry entry) {
+    private FeedEntryStatus handleStatus(User user, FeedEntryStatus status, FeedSubscription sub, FeedEntry entry) {
         if (status == null) {
-            Instant statusesInstantThreshold =
-                    config.database().cleanup().statusesInstantThreshold();
-            boolean read =
-                    statusesInstantThreshold != null
-                            && entry.getPublished().isBefore(statusesInstantThreshold);
+            Instant statusesInstantThreshold = config.database().cleanup().statusesInstantThreshold();
+            boolean read = statusesInstantThreshold != null && entry.getPublished().isBefore(statusesInstantThreshold);
             status = new FeedEntryStatus(user, sub, entry);
             status.setRead(read);
             status.setMarkable(!read);
@@ -84,8 +77,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 
     private void fetchTags(User user, List<FeedEntryStatus> statuses) {
         Map<Long, List<FeedEntryTag>> tagsByEntryIds =
-                feedEntryTagDAO.findByEntries(
-                        user, statuses.stream().map(FeedEntryStatus::getEntry).toList());
+                feedEntryTagDAO.findByEntries(user, statuses.stream().map(FeedEntryStatus::getEntry).toList());
         for (FeedEntryStatus status : statuses) {
             List<FeedEntryTag> tags = tagsByEntryIds.get(status.getEntry().getId());
             status.setTags(tags == null ? List.of() : tags);
@@ -129,8 +121,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 +197,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 +226,39 @@ 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))
-                        .where(ENTRY.feed.eq(sub.getFeed()))
-                        .where(buildUnreadPredicate());
+                        .on(STATUS.subscription.in(subs))
+                        .where(ENTRY.feed.id.in(subsByFeedId.keySet()))
+                        .where(buildUnreadPredicate())
+                        .groupBy(ENTRY.feed.id);
 
-        Tuple tuple = query.fetchOne();
-        Long count = tuple.get(ENTRY.count());
-        Instant published = tuple.get(ENTRY.published.max());
-        return new UnreadCount(sub.getId(), count == null ? 0 : count, published);
+        Map<Long, UnreadCount> result = new HashMap<>();
+        for (Tuple tuple : query.fetch()) {
+            Long feedId = tuple.get(ENTRY.feed.id);
+            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() {
@@ -284,8 +292,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
         where.and(SUBSCRIPTION.autoMarkAsReadAfterDays.gt(0));
 
         NumberExpression<Integer> daysDiff =
-                Expressions.numberTemplate(
-                        Integer.class, "TIMESTAMPDIFF(DAY, {0}, {1})", ENTRY.published, now);
+                Expressions.numberTemplate(Integer.class, "TIMESTAMPDIFF(DAY, {0}, {1})", ENTRY.published, now);
         where.and(daysDiff.goe(SUBSCRIPTION.autoMarkAsReadAfterDays));
 
         where.and(buildUnreadPredicate());
@@ -314,11 +321,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
                         .toList();
 
         if (!statusIdsToUpdate.isEmpty()) {
-            updated +=
-                    updateQuery(STATUS)
-                            .where(STATUS.id.in(statusIdsToUpdate))
-                            .set(STATUS.read, true)
-                            .execute();
+            updated += updateQuery(STATUS).where(STATUS.id.in(statusIdsToUpdate)).set(STATUS.read, true).execute();
         }
 
         // Insert new statuses for entries without existing status

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) {
-        super(entityManager, FeedEntryTag.class);
+    public FeedEntryTagDAO(EntityManager entityManager, CommaFeedConfiguration config) {
+        super(entityManager, FeedEntryTag.class, config);
     }
 
     public List<String> findByUser(User user) {
@@ -30,11 +31,7 @@ public class FeedEntryTagDAO extends GenericDAO<FeedEntryTag> {
     }
 
     public Map<Long, List<FeedEntryTag>> findByEntries(User user, List<FeedEntry> entries) {
-        return query()
-                .selectFrom(TAG)
-                .where(TAG.user.eq(user), TAG.entry.in(entries))
-                .fetch()
-                .stream()
+        return query().selectFrom(TAG).where(TAG.user.eq(user), TAG.entry.in(entries)).fetch().stream()
                 .collect(Collectors.groupingBy(t -> t.getEntry().getId()));
     }
 }

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) {
-        super(entityManager, FeedSubscription.class);
+    public FeedSubscriptionDAO(EntityManager entityManager, CommaFeedConfiguration config) {
+        super(entityManager, FeedSubscription.class, config);
         this.entityManager = entityManager;
     }
 
@@ -83,9 +84,7 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
 
     public FeedSubscription findByFeed(User user, Feed feed) {
         List<FeedSubscription> subs =
-                query().selectFrom(SUBSCRIPTION)
-                        .where(SUBSCRIPTION.user.eq(user), SUBSCRIPTION.feed.eq(feed))
-                        .fetch();
+                query().selectFrom(SUBSCRIPTION).where(SUBSCRIPTION.user.eq(user), SUBSCRIPTION.feed.eq(feed)).fetch();
         FeedSubscription sub = subs.stream().findFirst().orElse(null);
         return initRelations(sub);
     }
@@ -103,15 +102,11 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
     }
 
     public Long count(User user) {
-        return query().select(SUBSCRIPTION.count())
-                .from(SUBSCRIPTION)
-                .where(SUBSCRIPTION.user.eq(user))
-                .fetchOne();
+        return query().select(SUBSCRIPTION.count()).from(SUBSCRIPTION).where(SUBSCRIPTION.user.eq(user)).fetchOne();
     }
 
     public List<FeedSubscription> findByCategory(User user, FeedCategory category) {
-        JPQLQuery<FeedSubscription> query =
-                query().selectFrom(SUBSCRIPTION).where(SUBSCRIPTION.user.eq(user));
+        JPQLQuery<FeedSubscription> query = query().selectFrom(SUBSCRIPTION).where(SUBSCRIPTION.user.eq(user));
         if (category == null) {
             query.where(SUBSCRIPTION.category.isNull());
         } else {
@@ -121,13 +116,9 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
     }
 
     public List<FeedSubscription> findByCategories(User user, List<FeedCategory> categories) {
-        Set<Long> categoryIds =
-                categories.stream().map(AbstractModel::getId).collect(Collectors.toSet());
+        Set<Long> categoryIds = categories.stream().map(AbstractModel::getId).collect(Collectors.toSet());
         return findAll(user).stream()
-                .filter(
-                        s ->
-                                s.getCategory() != null
-                                        && categoryIds.contains(s.getCategory().getId()))
+                .filter(s -> 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) {
-        super(entityManager, User.class);
+    public UserDAO(EntityManager entityManager, CommaFeedConfiguration config) {
+        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) {
-        super(entityManager, UserRole.class);
+    public UserRoleDAO(EntityManager entityManager, CommaFeedConfiguration config) {
+        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) {
-        super(entityManager, UserSettings.class);
+    public UserSettingsDAO(EntityManager entityManager, CommaFeedConfiguration config) {
+        super(entityManager, UserSettings.class, config);
     }
 
     public UserSettings findByUser(User user) {

commafeed-server/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java

@@ -37,9 +37,7 @@ public class FacebookFaviconFetcher implements FaviconFetcher {
             return null;
         }
 
-        String iconUrl =
-                String.format(
-                        "https://graph.facebook.com/%s/picture?type=square&height=16", userName);
+        String iconUrl = String.format("https://graph.facebook.com/%s/picture?type=square&height=16", userName);
 
         try {
             log.debug("Getting Facebook user's icon, {}", url);

commafeed-server/src/main/java/com/commafeed/backend/favicon/Favicon.java

@@ -17,8 +17,7 @@ public record Favicon(byte[] icon, MediaType mediaType) {
         try {
             return MediaType.valueOf(contentType);
         } catch (Exception e) {
-            log.debug(
-                    "invalid content type '{}' received, returning default value", contentType, e);
+            log.debug("invalid content type '{}' received, returning default value", contentType, e);
             return DEFAULT_MEDIA_TYPE;
         }
     }

commafeed-server/src/main/java/com/commafeed/backend/favicon/RootFaviconFetcher.java

@@ -32,10 +32,7 @@ public class RootFaviconFetcher implements FaviconFetcher {
             URI uri = URI.create(url.trim());
             String faviconUrl =
                     "%s://%s%s/favicon.ico"
-                            .formatted(
-                                    uri.getScheme(),
-                                    uri.getHost(),
-                                    uri.getPort() > 0 ? ":" + uri.getPort() : "");
+                            .formatted(uri.getScheme(), uri.getHost(), uri.getPort() > 0 ? ":" + uri.getPort() : "");
 
             log.debug("getting root icon at {}", faviconUrl);
             HttpResult result = getter.get(faviconUrl);

commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java

@@ -37,8 +37,7 @@ public class YoutubeFaviconFetcher implements FaviconFetcher {
 
     private static final JsonPointer CHANNEL_THUMBNAIL_URL =
             JsonPointer.compile("/items/0/snippet/thumbnails/default/url");
-    private static final JsonPointer PLAYLIST_CHANNEL_ID =
-            JsonPointer.compile("/items/0/snippet/channelId");
+    private static final JsonPointer PLAYLIST_CHANNEL_ID = JsonPointer.compile("/items/0/snippet/channelId");
 
     private final HttpGetter getter;
     private final CommaFeedConfiguration config;
@@ -60,17 +59,11 @@ public class YoutubeFaviconFetcher implements FaviconFetcher {
         try {
             List<NameValuePair> params = new URIBuilder(url).getQueryParams();
             Optional<NameValuePair> userId =
-                    params.stream()
-                            .filter(nvp -> nvp.getName().equalsIgnoreCase("user"))
-                            .findFirst();
+                    params.stream().filter(nvp -> nvp.getName().equalsIgnoreCase("user")).findFirst();
             Optional<NameValuePair> channelId =
-                    params.stream()
-                            .filter(nvp -> nvp.getName().equalsIgnoreCase("channel_id"))
-                            .findFirst();
+                    params.stream().filter(nvp -> nvp.getName().equalsIgnoreCase("channel_id")).findFirst();
             Optional<NameValuePair> playlistId =
-                    params.stream()
-                            .filter(nvp -> nvp.getName().equalsIgnoreCase("playlist_id"))
-                            .findFirst();
+                    params.stream().filter(nvp -> nvp.getName().equalsIgnoreCase("playlist_id")).findFirst();
 
             byte[] response = null;
             if (userId.isPresent()) {
@@ -103,10 +96,7 @@ public class YoutubeFaviconFetcher implements FaviconFetcher {
     }
 
     private byte[] fetchForUser(String googleAuthKey, String userId)
-            throws IOException,
-                    NotModifiedException,
-                    TooManyRequestsException,
-                    SchemeNotAllowedException {
+            throws IOException, NotModifiedException, TooManyRequestsException, SchemeNotAllowedException {
         URI uri =
                 UriBuilder.fromUri("https://www.googleapis.com/youtube/v3/channels")
                         .queryParam("part", PART_SNIPPET)
@@ -117,10 +107,7 @@ public class YoutubeFaviconFetcher implements FaviconFetcher {
     }
 
     private byte[] fetchForChannel(String googleAuthKey, String channelId)
-            throws IOException,
-                    NotModifiedException,
-                    TooManyRequestsException,
-                    SchemeNotAllowedException {
+            throws IOException, NotModifiedException, TooManyRequestsException, SchemeNotAllowedException {
         URI uri =
                 UriBuilder.fromUri("https://www.googleapis.com/youtube/v3/channels")
                         .queryParam("part", PART_SNIPPET)
@@ -131,10 +118,7 @@ public class YoutubeFaviconFetcher implements FaviconFetcher {
     }
 
     private byte[] fetchForPlaylist(String googleAuthKey, String playlistId)
-            throws IOException,
-                    NotModifiedException,
-                    TooManyRequestsException,
-                    SchemeNotAllowedException {
+            throws IOException, NotModifiedException, TooManyRequestsException, SchemeNotAllowedException {
         URI uri =
                 UriBuilder.fromUri("https://www.googleapis.com/youtube/v3/playlists")
                         .queryParam("part", PART_SNIPPET)

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

@@ -36,8 +36,7 @@ public class FeedFetcher {
     private final HttpGetter getter;
     private final List<FeedURLProvider> urlProviders;
 
-    public FeedFetcher(
-            FeedParser parser, HttpGetter getter, @All List<FeedURLProvider> urlProviders) {
+    public FeedFetcher(FeedParser parser, HttpGetter getter, @All List<FeedURLProvider> urlProviders) {
         this.parser = parser;
         this.getter = getter;
         this.urlProviders = urlProviders;
@@ -58,9 +57,7 @@ public class FeedFetcher {
                     NoFeedFoundException {
         log.debug("Fetching feed {}", feedUrl);
 
-        HttpResult result =
-                getter.get(
-                        HttpRequest.builder(feedUrl).lastModified(lastModified).eTag(eTag).build());
+        HttpResult result = getter.get(HttpRequest.builder(feedUrl).lastModified(lastModified).eTag(eTag).build());
         byte[] content = result.content();
 
         FeedParserResult parserResult;
@@ -69,19 +66,12 @@ public class FeedFetcher {
         } catch (FeedParsingException e) {
             if (extractFeedUrlFromHtml) {
                 String extractedUrl =
-                        extractFeedUrl(
-                                urlProviders,
-                                feedUrl,
-                                new String(result.content(), StandardCharsets.UTF_8));
+                        extractFeedUrl(urlProviders, feedUrl, new String(result.content(), StandardCharsets.UTF_8));
                 if (StringUtils.isNotBlank(extractedUrl)) {
                     feedUrl = extractedUrl;
 
                     result =
-                            getter.get(
-                                    HttpRequest.builder(extractedUrl)
-                                            .lastModified(lastModified)
-                                            .eTag(eTag)
-                                            .build());
+                            getter.get(HttpRequest.builder(extractedUrl).lastModified(lastModified).eTag(eTag).build());
                     content = result.content();
                     parserResult = parser.parse(result.urlAfterRedirect(), content);
                 } else {
@@ -96,8 +86,7 @@ public class FeedFetcher {
             throw new IOException("Feed content is empty.");
         }
 
-        boolean lastModifiedHeaderValueChanged =
-                !Strings.CS.equals(lastModified, result.lastModifiedSince());
+        boolean lastModifiedHeaderValueChanged = !Strings.CS.equals(lastModified, result.lastModifiedSince());
         boolean etagHeaderValueChanged = !Strings.CS.equals(eTag, result.eTag());
 
         String hash = Digests.sha1Hex(content);
@@ -109,8 +98,7 @@ public class FeedFetcher {
                     etagHeaderValueChanged ? result.eTag() : null);
         }
 
-        if (lastPublishedDate != null
-                && lastPublishedDate.equals(parserResult.lastPublishedDate())) {
+        if (lastPublishedDate != null && lastPublishedDate.equals(parserResult.lastPublishedDate())) {
             log.debug("publishedDate not modified: {}", feedUrl);
             throw new NotModifiedException(
                     "publishedDate not modified",
@@ -127,8 +115,7 @@ public class FeedFetcher {
                 result.validFor());
     }
 
-    private static String extractFeedUrl(
-            List<FeedURLProvider> urlProviders, String url, String urlContent) {
+    private static String extractFeedUrl(List<FeedURLProvider> urlProviders, String url, String urlContent) {
         return urlProviders.stream()
                 .flatMap(provider -> provider.get(url, urlContent).stream())
                 .filter(StringUtils::isNotBlank)

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

@@ -67,8 +67,7 @@ public class FeedRefreshEngine {
 
         this.queue = new LinkedBlockingDeque<>();
 
-        metrics.register(
-                MetricRegistry.name(getClass(), "queue", "size"), (Gauge<Integer>) queue::size);
+        metrics.register(MetricRegistry.name(getClass(), "queue", "size"), (Gauge<Integer>) queue::size);
         metrics.register(
                 MetricRegistry.name(getClass(), "worker", "active"),
                 (Gauge<Integer>) () -> workerExecutor.getActiveCount());
@@ -88,12 +87,10 @@ public class FeedRefreshEngine {
         this.refillLoopExecutor = Executors.newSingleThreadExecutor();
         this.refillExecutor = newDiscardingSingleThreadExecutorService();
         this.workerExecutor = newBlockingExecutorService(config.feedRefresh().httpThreads());
-        this.databaseUpdaterExecutor =
-                newBlockingExecutorService(config.feedRefresh().databaseThreads());
+        this.databaseUpdaterExecutor = newBlockingExecutorService(config.feedRefresh().databaseThreads());
         this.notifierExecutor =
                 newDiscardingExecutorService(
-                        config.pushNotifications().threads(),
-                        config.pushNotifications().queueCapacity());
+                        config.pushNotifications().threads(), config.pushNotifications().queueCapacity());
     }
 
     public void start() {
@@ -104,56 +101,52 @@ public class FeedRefreshEngine {
 
     private void startFeedProcessingLoop() {
         // take a feed from the queue, process it, rince, repeat
-        feedProcessingLoopExecutor.submit(
-                () -> {
-                    while (!feedProcessingLoopExecutor.isShutdown()) {
-                        try {
-                            // take() is blocking until a feed is available from the queue
-                            Feed feed = queue.take();
+        feedProcessingLoopExecutor.submit(() -> {
+            while (!feedProcessingLoopExecutor.isShutdown()) {
+                try {
+                    // take() is blocking until a feed is available from the queue
+                    Feed feed = queue.take();
 
-                            // send the feed to be processed
-                            log.debug(
-                                    "got feed {} from the queue, send it for processing",
-                                    feed.getId());
-                            processFeedAsync(feed);
+                    // send the feed to be processed
+                    log.debug("got feed {} from the queue, send it for processing", feed.getId());
+                    processFeedAsync(feed);
 
-                            // we removed a feed from the queue, try to refill it as it may now be
-                            // empty
-                            if (queue.isEmpty()) {
-                                log.debug("took the last feed from the queue, try to refill");
-                                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);
-                        }
+                    // we removed a feed from the queue, try to refill it as it may now be
+                    // empty
+                    if (queue.isEmpty()) {
+                        log.debug("took the last feed from the queue, try to refill");
+                        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);
+                }
+            }
+        });
     }
 
     private void startRefillLoop() {
         // refill the queue at regular intervals if it's empty
-        refillLoopExecutor.submit(
-                () -> {
-                    while (!refillLoopExecutor.isShutdown()) {
-                        try {
-                            if (queue.isEmpty()) {
-                                log.debug("refilling queue");
-                                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);
-                        }
+        refillLoopExecutor.submit(() -> {
+            while (!refillLoopExecutor.isShutdown()) {
+                try {
+                    if (queue.isEmpty()) {
+                        log.debug("refilling queue");
+                        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);
+                }
+            }
+        });
     }
 
     public void refreshImmediately(Feed feed) {
@@ -173,9 +166,7 @@ public class FeedRefreshEngine {
                             refill.mark();
 
                             List<Feed> nextUpdatableFeeds = getNextUpdatableFeeds(getBatchSize());
-                            log.debug(
-                                    "found {} feeds that are up for refresh",
-                                    nextUpdatableFeeds.size());
+                            log.debug("found {} feeds that are up for refresh", nextUpdatableFeeds.size());
                             for (Feed feed : nextUpdatableFeeds) {
                                 // add the feed only if it was not already queued
                                 if (queue.stream().noneMatch(f -> f.getId().equals(feed.getId()))) {
@@ -184,65 +175,51 @@ public class FeedRefreshEngine {
                             }
                         },
                         refillExecutor)
-                .whenComplete(
-                        (data, ex) -> {
-                            if (ex != null) {
-                                log.error("error while refilling the queue", ex);
-                            }
-                        });
+                .whenComplete((data, ex) -> {
+                    if (ex != null) {
+                        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(
-                        r -> {
-                            List<CompletableFuture<Void>> futures =
-                                    r.insertedUnreadEntriesBySubscription().entrySet().stream()
-                                            .map(
-                                                    e -> {
-                                                        FeedSubscription sub = e.getKey();
-                                                        List<FeedEntry> entries = e.getValue();
+                .thenCompose(r -> {
+                    List<CompletableFuture<Void>> futures =
+                            r.insertedUnreadEntriesBySubscription().entrySet().stream()
+                                    .map(e -> {
+                                        FeedSubscription sub = e.getKey();
+                                        List<FeedEntry> entries = e.getValue();
 
-                                                        notifier.notifyOverWebsocket(sub, entries);
-                                                        return CompletableFuture.runAsync(
-                                                                () ->
-                                                                        notifier
-                                                                                .sendPushNotifications(
-                                                                                        sub,
-                                                                                        entries),
-                                                                notifierExecutor);
-                                                    })
-                                            .toList();
-                            return CompletableFuture.allOf(
-                                    futures.toArray(CompletableFuture[]::new));
-                        })
-                .exceptionally(
-                        ex -> {
-                            log.error("error while processing feed {}", feed.getUrl(), ex);
-                            return null;
-                        });
+                                        notifier.notifyOverWebsocket(sub, entries);
+                                        return CompletableFuture.runAsync(
+                                                () -> notifier.sendPushNotifications(sub, entries), notifierExecutor);
+                                    })
+                                    .toList();
+                    return CompletableFuture.allOf(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(
-                () -> {
-                    Instant lastLoginThreshold =
-                            config.feedRefresh().userInactivityPeriod().isZero()
-                                    ? null
-                                    : Instant.now()
-                                            .minus(config.feedRefresh().userInactivityPeriod());
-                    List<Feed> feeds = feedDAO.findNextUpdatable(max, lastLoginThreshold);
-                    if (!feeds.isEmpty()) {
-                        // update disabledUntil to prevent feeds from being returned again by
-                        // feedDAO.findNextUpdatable()
-                        Instant nextUpdateDate =
-                                Instant.now().plus(config.feedRefresh().interval());
-                        feedDAO.setDisabledUntil(
-                                feeds.stream().map(AbstractModel::getId).toList(), nextUpdateDate);
-                    }
-                    return feeds;
-                });
+        return unitOfWork.call(() -> {
+            Instant lastLoginThreshold =
+                    config.feedRefresh().userInactivityPeriod().isZero()
+                            ? null
+                            : Instant.now().minus(config.feedRefresh().userInactivityPeriod());
+            List<Feed> feeds = feedDAO.findNextUpdatable(max, lastLoginThreshold);
+            if (!feeds.isEmpty()) {
+                // update disabledUntil to prevent feeds from being returned again by
+                // feedDAO.findNextUpdatable()
+                Instant nextUpdateDate = Instant.now().plus(config.feedRefresh().interval());
+                feedDAO.setDisabledUntil(feeds.stream().map(AbstractModel::getId).toList(), nextUpdateDate);
+            }
+            return feeds;
+        });
     }
 
     private int getBatchSize() {
@@ -250,26 +227,19 @@ public class FeedRefreshEngine {
     }
 
     public void stop() {
-        MoreExecutors.shutdownAndAwaitTermination(
-                this.feedProcessingLoopExecutor, config.shutdownTimeout());
-        MoreExecutors.shutdownAndAwaitTermination(
-                this.refillLoopExecutor, config.shutdownTimeout());
+        MoreExecutors.shutdownAndAwaitTermination(this.feedProcessingLoopExecutor, config.shutdownTimeout());
+        MoreExecutors.shutdownAndAwaitTermination(this.refillLoopExecutor, config.shutdownTimeout());
         MoreExecutors.shutdownAndAwaitTermination(this.refillExecutor, config.shutdownTimeout());
         MoreExecutors.shutdownAndAwaitTermination(this.workerExecutor, config.shutdownTimeout());
-        MoreExecutors.shutdownAndAwaitTermination(
-                this.databaseUpdaterExecutor, config.shutdownTimeout());
+        MoreExecutors.shutdownAndAwaitTermination(this.databaseUpdaterExecutor, config.shutdownTimeout());
         MoreExecutors.shutdownAndAwaitTermination(this.notifierExecutor, config.shutdownTimeout());
 
         queue.clear();
     }
 
-    /**
-     * returns an ExecutorService with a single thread that discards tasks if a task is already
-     * running
-     */
+    /** returns an ExecutorService with a single thread that discards tasks if a task is already running */
     private ThreadPoolExecutor newDiscardingSingleThreadExecutorService() {
-        ThreadPoolExecutor pool =
-                new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new SynchronousQueue<>());
+        ThreadPoolExecutor pool = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new SynchronousQueue<>());
         pool.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardPolicy());
         return pool;
     }
@@ -278,11 +248,7 @@ public class FeedRefreshEngine {
     private ThreadPoolExecutor newDiscardingExecutorService(int threads, int queueCapacity) {
         ThreadPoolExecutor pool =
                 new ThreadPoolExecutor(
-                        threads,
-                        threads,
-                        0L,
-                        TimeUnit.MILLISECONDS,
-                        new LinkedBlockingQueue<>(queueCapacity));
+                        threads, threads, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(queueCapacity));
         pool.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardPolicy());
         return pool;
     }
@@ -290,21 +256,19 @@ public class FeedRefreshEngine {
     /** returns an ExecutorService that blocks submissions until a thread is available */
     private ThreadPoolExecutor newBlockingExecutorService(int threads) {
         ThreadPoolExecutor pool =
-                new ThreadPoolExecutor(
-                        threads, threads, 0L, TimeUnit.MILLISECONDS, new SynchronousQueue<>());
-        pool.setRejectedExecutionHandler(
-                (r, e) -> {
-                    if (e.isShutdown()) {
-                        return;
-                    }
+                new ThreadPoolExecutor(threads, threads, 0L, TimeUnit.MILLISECONDS, new SynchronousQueue<>());
+        pool.setRejectedExecutionHandler((r, e) -> {
+            if (e.isShutdown()) {
+                return;
+            }
 
-                    try {
-                        e.getQueue().put(r);
-                    } catch (InterruptedException ex) {
-                        log.debug("interrupted while waiting for a slot in the queue.", ex);
-                        Thread.currentThread().interrupt();
-                    }
-                });
+            try {
+                e.getQueue().put(r);
+            } catch (InterruptedException ex) {
+                log.debug("interrupted while waiting for a slot in the queue.", ex);
+                Thread.currentThread().interrupt();
+            }
+        });
         return pool;
     }
 }

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

@@ -22,8 +22,7 @@ public class FeedRefreshIntervalCalculator {
     private final FeedRefreshErrorHandling errorHandling;
     private final InstantSource instantSource;
 
-    public FeedRefreshIntervalCalculator(
-            CommaFeedConfiguration config, InstantSource instantSource) {
+    public FeedRefreshIntervalCalculator(CommaFeedConfiguration config, InstantSource instantSource) {
         this.interval = config.feedRefresh().interval();
         this.maxInterval = config.feedRefresh().maxInterval();
         this.empirical = config.feedRefresh().intervalEmpirical();
@@ -31,8 +30,7 @@ public class FeedRefreshIntervalCalculator {
         this.instantSource = instantSource;
     }
 
-    public Instant onFetchSuccess(
-            Instant publishedDate, Long averageEntryInterval, Duration validFor) {
+    public Instant onFetchSuccess(Instant publishedDate, Long averageEntryInterval, Duration validFor) {
         Instant instant =
                 empirical
                         ? computeEmpiricalRefreshInterval(publishedDate, averageEntryInterval)
@@ -54,14 +52,11 @@ public class FeedRefreshIntervalCalculator {
         }
 
         Duration retryInterval =
-                errorHandling
-                        .backoffInterval()
-                        .multipliedBy(errorCount - errorHandling.retriesBeforeBackoff() + 1L);
+                errorHandling.backoffInterval().multipliedBy(errorCount - errorHandling.retriesBeforeBackoff() + 1L);
         return constrainToBounds(instantSource.instant().plus(retryInterval));
     }
 
-    private Instant computeEmpiricalRefreshInterval(
-            Instant publishedDate, Long averageEntryInterval) {
+    private Instant computeEmpiricalRefreshInterval(Instant publishedDate, Long averageEntryInterval) {
         Instant now = instantSource.instant();
 
         if (publishedDate == null) {
@@ -80,9 +75,7 @@ public class FeedRefreshIntervalCalculator {
             int factor = 2;
             long millis =
                     Longs.constrainToRange(
-                            averageEntryInterval / factor,
-                            interval.toMillis(),
-                            maxInterval.dividedBy(4).toMillis());
+                            averageEntryInterval / factor, interval.toMillis(), maxInterval.dividedBy(4).toMillis());
             return now.plusMillis(millis);
         } else {
             // unknown case

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

@@ -64,8 +64,7 @@ public class FeedRefreshUpdater {
         entryInserted = metrics.meter(MetricRegistry.name(getClass(), "entryInserted"));
     }
 
-    private AddEntryResult addEntry(
-            final Feed feed, final Entry entry, final List<FeedSubscription> subscriptions) {
+    private AddEntryResult addEntry(final Feed feed, final Entry entry, final List<FeedSubscription> subscriptions) {
         boolean processed = false;
         FeedEntry insertedEntry = null;
         Set<FeedSubscription> subscriptionsForWhichEntryIsUnread = new HashSet<>();
@@ -91,33 +90,27 @@ public class FeedRefreshUpdater {
             if (locked1 && locked2) {
                 processed = true;
                 insertedEntry =
-                        unitOfWork.call(
-                                () -> {
-                                    if (feedEntryService.find(feed, entry) != null) {
-                                        // entry already exists, nothing to do
-                                        return null;
-                                    }
+                        unitOfWork.call(() -> {
+                            if (feedEntryService.find(feed, entry) != null) {
+                                // entry already exists, nothing to do
+                                return null;
+                            }
 
-                                    FeedEntry feedEntry = feedEntryService.create(feed, entry);
-                                    entryInserted.mark();
-                                    for (FeedSubscription sub : subscriptions) {
-                                        boolean unread =
-                                                feedEntryService.applyFilter(sub, feedEntry);
-                                        if (unread) {
-                                            subscriptionsForWhichEntryIsUnread.add(sub);
-                                        }
-                                    }
-                                    return feedEntry;
-                                });
+                            FeedEntry feedEntry = feedEntryService.create(feed, entry);
+                            entryInserted.mark();
+                            for (FeedSubscription sub : subscriptions) {
+                                boolean unread = feedEntryService.applyFilter(sub, feedEntry);
+                                if (unread) {
+                                    subscriptionsForWhichEntryIsUnread.add(sub);
+                                }
+                            }
+                            return feedEntry;
+                        });
             } else {
                 log.error("lock timeout for {} - {}", feed.getUrl(), key1);
             }
         } catch (InterruptedException e) {
-            log.error(
-                    "interrupted while waiting for lock for {} : {}",
-                    feed.getUrl(),
-                    e.getMessage(),
-                    e);
+            log.error("interrupted while waiting for lock for {} : {}", feed.getUrl(), e.getMessage(), e);
             Thread.currentThread().interrupt();
         } finally {
             if (locked1) {
@@ -133,13 +126,11 @@ public class FeedRefreshUpdater {
     public FeedRefreshUpdaterResult update(Feed feed, List<Entry> entries) {
         boolean processed = true;
         long inserted = 0;
-        Map<FeedSubscription, List<FeedEntry>> insertedUnreadEntriesBySubscription =
-                new HashMap<>();
+        Map<FeedSubscription, List<FeedEntry>> insertedUnreadEntriesBySubscription = new HashMap<>();
 
         if (!entries.isEmpty()) {
             List<FeedSubscription> subscriptions = null;
-            List<Entry> newEntries =
-                    unitOfWork.call(() -> feedEntryService.removeExistingEntries(feed, entries));
+            List<Entry> newEntries = unitOfWork.call(() -> feedEntryService.removeExistingEntries(feed, entries));
             for (Entry entry : newEntries) {
                 if (subscriptions == null) {
                     subscriptions = unitOfWork.call(() -> feedSubscriptionDAO.findByFeed(feed));
@@ -147,14 +138,13 @@ public class FeedRefreshUpdater {
                 AddEntryResult addEntryResult = addEntry(feed, entry, subscriptions);
                 processed &= addEntryResult.processed;
                 inserted += addEntryResult.insertedEntry != null ? 1 : 0;
-                addEntryResult.subscriptionsForWhichEntryIsUnread.forEach(
-                        sub -> {
-                            if (addEntryResult.insertedEntry != null) {
-                                insertedUnreadEntriesBySubscription
-                                        .computeIfAbsent(sub, k -> new ArrayList<>())
-                                        .add(addEntryResult.insertedEntry);
-                            }
-                        });
+                addEntryResult.subscriptionsForWhichEntryIsUnread.forEach(sub -> {
+                    if (addEntryResult.insertedEntry != null) {
+                        insertedUnreadEntriesBySubscription
+                                .computeIfAbsent(sub, k -> new ArrayList<>())
+                                .add(addEntryResult.insertedEntry);
+                    }
+                });
             }
 
             if (inserted == 0) {
@@ -179,9 +169,7 @@ public class FeedRefreshUpdater {
     }
 
     private record AddEntryResult(
-            boolean processed,
-            FeedEntry insertedEntry,
-            Set<FeedSubscription> subscriptionsForWhichEntryIsUnread) {}
+            boolean processed, FeedEntry insertedEntry, Set<FeedSubscription> subscriptionsForWhichEntryIsUnread) {}
 
     public record FeedRefreshUpdaterResult(
             Map<FeedSubscription, List<FeedEntry>> insertedUnreadEntriesBySubscription) {}

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

@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.Optional;
 
 /**
- * Calls {@link FeedFetcher} and updates the Feed object, but does not update the database, ({@link
- * FeedRefreshUpdater} does that)
+ * Calls {@link FeedFetcher} and updates the Feed object, but does not update the database, ({@link FeedRefreshUpdater}
+ * does that)
  */
 @Slf4j
 @Singleton
@@ -68,10 +68,7 @@ public class FeedRefreshWorker {
             Duration entriesMaxAge = config.database().cleanup().entriesMaxAge();
             if (!entriesMaxAge.isZero()) {
                 Instant threshold = Instant.now().minus(entriesMaxAge);
-                entries =
-                        entries.stream()
-                                .filter(entry -> entry.published().isAfter(threshold))
-                                .toList();
+                entries = entries.stream().filter(entry -> entry.published().isAfter(threshold)).toList();
             }
 
             String urlAfterRedirect = result.urlAfterRedirect();
@@ -121,9 +118,7 @@ public class FeedRefreshWorker {
 
             feed.setErrorCount(feed.getErrorCount() + 1);
             feed.setMessage("Server indicated that we are sending too many requests");
-            feed.setDisabledUntil(
-                    refreshIntervalCalculator.onTooManyRequests(
-                            e.getRetryAfter(), feed.getErrorCount()));
+            feed.setDisabledUntil(refreshIntervalCalculator.onTooManyRequests(e.getRetryAfter(), feed.getErrorCount()));
 
             return new FeedRefreshWorkerResult(feed, Collections.emptyList());
         } catch (Exception e) {

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

@@ -30,15 +30,12 @@ public class FeedUpdateNotifier {
 
     public void notifyOverWebsocket(FeedSubscription sub, List<FeedEntry> entries) {
         if (!entries.isEmpty()) {
-            webSocketSessions.sendMessage(
-                    sub.getUser(), WebSocketMessageBuilder.newFeedEntries(sub, entries.size()));
+            webSocketSessions.sendMessage(sub.getUser(), WebSocketMessageBuilder.newFeedEntries(sub, entries.size()));
         }
     }
 
     public void sendPushNotifications(FeedSubscription sub, List<FeedEntry> entries) {
-        if (!config.pushNotifications().enabled()
-                || !sub.isPushNotificationsEnabled()
-                || entries.isEmpty()) {
+        if (!config.pushNotifications().enabled() || !sub.isPushNotificationsEnabled() || entries.isEmpty()) {
             return;
         }
 

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

@@ -40,8 +40,7 @@ public class FeedUtils {
             return false;
         }
 
-        return TextDirectionDetector.detect(stripped)
-                == TextDirectionDetector.Direction.RIGHT_TO_LEFT;
+        return TextDirectionDetector.detect(stripped) == TextDirectionDetector.Direction.RIGHT_TO_LEFT;
     }
 
     public static String getFaviconUrl(FeedSubscription subscription) {

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

@@ -14,8 +14,8 @@ import java.nio.charset.Charset;
 public class EncodingDetector {
 
     /**
-     * Detect feed encoding by using the declared encoding in the xml processing instruction and by
-     * detecting the characters used in the feed
+     * Detect feed encoding by using the declared encoding in the xml processing instruction and by detecting the
+     * characters used in the feed
      */
     public Charset getEncoding(byte[] bytes) {
         String extracted = extractDeclaredEncoding(bytes);

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

@@ -42,14 +42,12 @@ import java.util.stream.Collectors;
 @Singleton
 public class FeedParser {
 
-    private static final Namespace ATOM_10_NS =
-            Namespace.getNamespace("http://www.w3.org/2005/Atom");
+    private static final Namespace ATOM_10_NS = Namespace.getNamespace("http://www.w3.org/2005/Atom");
 
     private static final Instant START = Instant.ofEpochMilli(86400000);
     private static final Instant END = Instant.ofEpochMilli(1000L * Integer.MAX_VALUE - 86400000);
 
-    private static final Comparator<Entry> ENTRY_COMPARATOR =
-            Comparator.comparing(Entry::published).reversed();
+    private static final Comparator<Entry> ENTRY_COMPARATOR = Comparator.comparing(Entry::published).reversed();
 
     private final EncodingDetector encodingDetector;
     private final XMLCleaner xmlCleaner;
@@ -78,20 +76,13 @@ public class FeedParser {
             List<Entry> entries = buildEntries(feed, feedUrl);
             Instant lastEntryDate = entries.stream().findFirst().map(Entry::published).orElse(null);
             Instant lastPublishedDate = toValidInstant(feed.getPublishedDate(), false);
-            if (lastPublishedDate == null
-                    || lastEntryDate != null && lastPublishedDate.isBefore(lastEntryDate)) {
+            if (lastPublishedDate == null || lastEntryDate != null && lastPublishedDate.isBefore(lastEntryDate)) {
                 lastPublishedDate = lastEntryDate;
             }
             Long averageEntryInterval = averageTimeBetweenEntries(entries);
 
             return new FeedParserResult(
-                    title,
-                    link,
-                    iconUrl,
-                    lastPublishedDate,
-                    averageEntryInterval,
-                    lastEntryDate,
-                    entries);
+                    title, link, iconUrl, lastPublishedDate, averageEntryInterval, lastEntryDate, entries);
         } catch (FeedParsingException e) {
             throw e;
         } catch (Exception e) {
@@ -151,9 +142,7 @@ public class FeedParser {
         String author = StringUtils.trimToNull(item.getAuthor());
         String categories =
                 StringUtils.trimToNull(
-                        item.getCategories().stream()
-                                .map(SyndCategory::getName)
-                                .collect(Collectors.joining(", ")));
+                        item.getCategories().stream().map(SyndCategory::getName).collect(Collectors.joining(", ")));
 
         Enclosure enclosure = buildEnclosure(item);
         Media media = buildMedia(item);
@@ -281,9 +270,7 @@ public class FeedParser {
         SummaryStatistics stats = new SummaryStatistics();
         for (int i = 0; i < entries.size() - 1; i++) {
             long diff =
-                    Math.abs(
-                            entries.get(i).published().toEpochMilli()
-                                    - entries.get(i + 1).published().toEpochMilli());
+                    Math.abs(entries.get(i).published().toEpochMilli() - entries.get(i + 1).published().toEpochMilli());
             stats.addValue(diff);
         }
         return (long) stats.getMean();

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

@@ -14,18 +14,9 @@ public record FeedParserResult(
     public record Entry(String guid, String url, Instant published, Content content) {}
 
     public record Content(
-            String title,
-            String content,
-            String author,
-            String categories,
-            Enclosure enclosure,
-            Media media) {}
+            String title, String content, String author, String categories, Enclosure enclosure, Media media) {}
 
     public record Enclosure(String url, String type) {}
 
-    public record Media(
-            String description,
-            String thumbnailUrl,
-            Integer thumbnailWidth,
-            Integer thumbnailHeight) {}
+    public record Media(String description, String thumbnailUrl, Integer thumbnailWidth, Integer thumbnailHeight) {}
 }

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

@@ -8,16 +8,15 @@ import org.apache.commons.lang3.StringUtils;
 import org.jdom2.Verifier;
 
 import java.util.Collection;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 @Singleton
 public class XMLCleaner {
 
-    private static final Pattern DOCTYPE_PATTERN =
-            Pattern.compile("<!DOCTYPE[^>]*>", Pattern.CASE_INSENSITIVE);
+    private static final Pattern DOCTYPE_START_PATTERN = Pattern.compile("<!DOCTYPE", Pattern.CASE_INSENSITIVE);
 
-    private final Trie trie =
-            Trie.builder().ignoreOverlaps().addKeywords(HtmlEntities.HTML_ENTITIES).build();
+    private final Trie trie = Trie.builder().ignoreOverlaps().addKeywords(HtmlEntities.HTML_ENTITIES).build();
 
     public String clean(String xml) {
         xml = removeCharactersBeforeFirstXmlTag(xml);
@@ -78,6 +77,22 @@ public class XMLCleaner {
             return null;
         }
 
-        return DOCTYPE_PATTERN.matcher(xml).replaceAll("");
+        // Equivalent to removing all matches of "<!DOCTYPE[^>]*>", without the quadratic cost of that regex when the
+        // input contains many "<!DOCTYPE" and no closing bracket after them.
+        Matcher matcher = DOCTYPE_START_PATTERN.matcher(xml);
+        StringBuilder sb = new StringBuilder(xml.length());
+
+        int pos = 0;
+        while (matcher.find(pos)) {
+            int end = xml.indexOf('>', matcher.end());
+            if (end < 0) {
+                break;
+            }
+
+            sb.append(xml, pos, matcher.start());
+            pos = end + 1;
+        }
+
+        return sb.append(xml, pos, xml.length()).toString();
     }
 }

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

@@ -42,6 +42,9 @@ public class User extends AbstractModel {
     @Column(nullable = false)
     private boolean disabled;
 
+    @Column(nullable = false)
+    private int sessionVersion;
+
     @Column private Instant lastLogin;
 
     @Column private Instant created;

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

@@ -155,8 +155,7 @@ public class UserSettings extends AbstractModel {
     private boolean instapaper;
     private boolean buffer;
 
-    @Embedded
-    private PushNotificationUserSettings pushNotifications = new PushNotificationUserSettings();
+    @Embedded private PushNotificationUserSettings pushNotifications = new PushNotificationUserSettings();
 
     @Embeddable
     @SuppressWarnings("serial")

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

@@ -49,8 +49,7 @@ public class OPMLExporter {
         }
 
         // export root subscriptions
-        for (FeedSubscription sub :
-                subscriptions.stream().filter(s -> s.getCategory() == null).toList()) {
+        for (FeedSubscription sub : subscriptions.stream().filter(s -> s.getCategory() == null).toList()) {
             opml.getOutlines().add(buildSubscriptionOutline(sub));
         }
 
@@ -65,20 +64,14 @@ public class OPMLExporter {
 
         for (FeedCategory child :
                 categories.stream()
-                        .filter(
-                                c ->
-                                        c.getParent() != null
-                                                && c.getParent().getId().equals(cat.getId()))
+                        .filter(c -> c.getParent() != null && c.getParent().getId().equals(cat.getId()))
                         .toList()) {
             outline.getChildren().add(buildCategoryOutline(child, categories, subscriptions));
         }
 
         for (FeedSubscription sub :
                 subscriptions.stream()
-                        .filter(
-                                s ->
-                                        s.getCategory() != null
-                                                && s.getCategory().getId().equals(cat.getId()))
+                        .filter(s -> s.getCategory() != null && s.getCategory().getId().equals(cat.getId()))
                         .toList()) {
             outline.getChildren().add(buildSubscriptionOutline(sub));
         }

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

@@ -47,7 +47,11 @@ public class OPMLImporter {
 
     private void handleOutline(User user, Outline outline, FeedCategory parent, int position) {
         List<Outline> children = outline.getChildren();
-        if (CollectionUtils.isNotEmpty(children)) {
+        // an outline without children is an empty category, unless it describes a feed or another type of content
+        boolean isCategory =
+                CollectionUtils.isNotEmpty(children)
+                        || StringUtils.isBlank(outline.getXmlUrl()) && StringUtils.isBlank(outline.getType());
+        if (isCategory) {
             String name = FeedUtils.truncate(outline.getText(), 128);
             if (name == null) {
                 name = FeedUtils.truncate(outline.getTitle(), 128);
@@ -79,8 +83,7 @@ public class OPMLImporter {
             }
             // make sure we continue with the import process even if a feed failed
             try {
-                feedSubscriptionService.subscribe(
-                        user, outline.getXmlUrl(), name, parent, position);
+                feedSubscriptionService.subscribe(user, outline.getXmlUrl(), name, parent, position);
             } catch (Exception e) {
                 log.error("error while importing {}: {}", outline.getXmlUrl(), e.getMessage());
             }

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

@@ -33,10 +33,8 @@ import java.util.List;
 public class FeedEntryContentCleaningService {
 
     private static final Safelist HTML_WHITELIST = buildWhiteList();
-    private static final List<String> ALLOWED_IFRAME_CSS_RULES =
-            Arrays.asList("height", "width", "border");
-    private static final List<String> ALLOWED_IMG_CSS_RULES =
-            Arrays.asList("display", "width", "height");
+    private static final List<String> ALLOWED_IFRAME_CSS_RULES = Arrays.asList("height", "width", "border");
+    private static final List<String> ALLOWED_IMG_CSS_RULES = Arrays.asList("display", "width", "height");
     private static final char[] FORBIDDEN_CSS_RULE_CHARACTERS = new char[] {'(', ')'};
 
     public String clean(String content, String baseUri, boolean keepTextOnly) {
@@ -59,8 +57,7 @@ public class FeedEntryContentCleaningService {
                 e.attr("style", escaped);
             }
 
-            clean.outputSettings(
-                    new OutputSettings().escapeMode(EscapeMode.base).prettyPrint(false));
+            clean.outputSettings(new OutputSettings().escapeMode(EscapeMode.base).prettyPrint(false));
             Element body = clean.body();
             if (keepTextOnly) {
                 content = body.text();
@@ -126,28 +123,18 @@ public class FeedEntryContentCleaningService {
         whitelist.addAttributes("blockquote", "cite");
         whitelist.addAttributes("col", "span", "width");
         whitelist.addAttributes("colgroup", "span", "width");
-        whitelist.addAttributes(
-                "iframe", "src", "height", "width", "allowfullscreen", "frameborder", "style");
+        whitelist.addAttributes("iframe", "src", "height", "width", "allowfullscreen", "frameborder", "style");
         whitelist.addAttributes("img", "align", "alt", "height", "src", "title", "width", "style");
         whitelist.addAttributes("ol", "start", "type");
         whitelist.addAttributes("q", "cite");
         whitelist.addAttributes("table", "border", "bordercolor", "summary", "width");
-        whitelist.addAttributes(
-                "td", "border", "bordercolor", "abbr", "axis", "colspan", "rowspan", "width");
-        whitelist.addAttributes(
-                "th",
-                "border",
-                "bordercolor",
-                "abbr",
-                "axis",
-                "colspan",
-                "rowspan",
-                "scope",
-                "width");
+        whitelist.addAttributes("td", "border", "bordercolor", "abbr", "axis", "colspan", "rowspan", "width");
+        whitelist.addAttributes("th", "border", "bordercolor", "abbr", "axis", "colspan", "rowspan", "scope", "width");
         whitelist.addAttributes("ul", "type");
 
         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");
 
@@ -160,8 +147,7 @@ public class FeedEntryContentCleaningService {
         String rule = "";
         try {
             List<String> rules = new ArrayList<>();
-            CSSStyleDeclaration decl =
-                    buildCssParser().parseStyleDeclaration(new InputSource(new StringReader(orig)));
+            CSSStyleDeclaration decl = buildCssParser().parseStyleDeclaration(new InputSource(new StringReader(orig)));
 
             for (int i = 0; i < decl.getLength(); i++) {
                 String property = decl.item(i);
@@ -186,8 +172,7 @@ public class FeedEntryContentCleaningService {
         String rule = "";
         try {
             List<String> rules = new ArrayList<>();
-            CSSStyleDeclaration decl =
-                    buildCssParser().parseStyleDeclaration(new InputSource(new StringReader(orig)));
+            CSSStyleDeclaration decl = buildCssParser().parseStyleDeclaration(new InputSource(new StringReader(orig)));
 
             for (int i = 0; i < decl.getLength(); i++) {
                 String property = decl.item(i);
@@ -215,8 +200,7 @@ public class FeedEntryContentCleaningService {
                 new ErrorHandler() {
                     @Override
                     public void warning(CSSParseException exception) throws CSSException {
-                        log.debug(
-                                "warning while parsing css: {}", exception.getMessage(), exception);
+                        log.debug("warning while parsing css: {}", exception.getMessage(), exception);
                     }
 
                     @Override
@@ -226,10 +210,7 @@ public class FeedEntryContentCleaningService {
 
                     @Override
                     public void fatalError(CSSParseException exception) throws CSSException {
-                        log.debug(
-                                "fatal error while parsing css: {}",
-                                exception.getMessage(),
-                                exception);
+                        log.debug("fatal error while parsing css: {}", exception.getMessage(), exception);
                     }
                 });
 

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

@@ -27,9 +27,7 @@ public class FeedEntryContentService {
     public FeedEntryContent findOrCreate(Content content, String baseUrl) {
         FeedEntryContent entryContent = buildContent(content, baseUrl);
         Optional<FeedEntryContent> existing =
-                feedEntryContentDAO
-                        .findExisting(entryContent.getContentHash(), entryContent.getTitleHash())
-                        .stream()
+                feedEntryContentDAO.findExisting(entryContent.getContentHash(), entryContent.getTitleHash()).stream()
                         .filter(entryContent::equivalentTo)
                         .findFirst();
         if (existing.isPresent()) {
@@ -44,11 +42,9 @@ public class FeedEntryContentService {
         FeedEntryContent entryContent = new FeedEntryContent();
         entryContent.setTitleHash(Digests.sha1Hex(StringUtils.trimToEmpty(content.title())));
         entryContent.setContentHash(Digests.sha1Hex(StringUtils.trimToEmpty(content.content())));
-        entryContent.setTitle(
-                FeedUtils.truncate(cleaningService.clean(content.title(), baseUrl, true), 2048));
+        entryContent.setTitle(FeedUtils.truncate(cleaningService.clean(content.title(), baseUrl, true), 2048));
         entryContent.setContent(cleaningService.clean(content.content(), baseUrl, false));
-        entryContent.setAuthor(
-                FeedUtils.truncate(cleaningService.clean(content.author(), baseUrl, true), 128));
+        entryContent.setAuthor(FeedUtils.truncate(cleaningService.clean(content.author(), baseUrl, true), 128));
         entryContent.setCategories(FeedUtils.truncate(content.categories(), 4096));
         entryContent.setDirection(
                 FeedUtils.isRTL(content.title(), content.content())
@@ -63,8 +59,7 @@ public class FeedEntryContentService {
 
         Media media = content.media();
         if (media != null) {
-            entryContent.setMediaDescription(
-                    cleaningService.clean(media.description(), baseUrl, false));
+            entryContent.setMediaDescription(cleaningService.clean(media.description(), baseUrl, false));
             entryContent.setMediaThumbnailUrl(FeedUtils.truncate(media.thumbnailUrl(), 2048));
             entryContent.setMediaThumbnailWidth(media.thumbnailWidth());
             entryContent.setMediaThumbnailHeight(media.thumbnailHeight());