release 4.4.1

Update dependency vite to ^5.3.1

.github/dependabot.yml

@@ -1,24 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "maven"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 50
-  - package-ecosystem: "npm"
-    directory: "/commafeed-client"
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 50
-    groups:
-      mantine:
-        patterns:
-          - "@mantine/*"
-      lingui:
-        patterns:
-          - "@lingui/*"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 10

.github/workflows/build.yml

@@ -40,6 +40,14 @@ jobs:
           name: commafeed.jar
           path: commafeed-server/target/commafeed.jar
 
+      - name: Upload Playwright artifacts
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-artifacts
+          path: |
+            **/target/playwright-artifacts/
+
       # Docker
       - name: Login to Container Registry
         uses: docker/login-action@v3
@@ -54,7 +62,7 @@ jobs:
         with:
           context: .
           push: true
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: linux/amd64,linux/arm64/v8
           tags: |
             athou/commafeed:latest
             athou/commafeed:${{ github.ref_name }}
@@ -65,7 +73,7 @@ jobs:
         with:
           context: .
           push: true
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: linux/amd64,linux/arm64/v8
           tags: athou/commafeed:master
 
       # Create GitHub release after Docker image has been published

.mvn/wrapper/maven-wrapper.properties

@@ -6,7 +6,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#   https://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
+distributionType=only-script
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [4.4.1]
+
+- fix vertical scrolling issues with Safari (#1168)
+- the default value for new users for the "star entry" button and the "open in new tab" button in the entry headers is
+  now "on desktop" instead of "always"
+- the "keyboard shortcuts" help page now shows "Cmd" instead of "Ctrl" on macOS (#1389)
+- remove a superfluous feed fetch when subscribing to a feed (#1431)
+- the Docker image now uses Java 21
+
 ## [4.4.0]
 
 - add support for sharing using the browser native capabilities if available (#1255)

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre
+FROM eclipse-temurin:21.0.3_9-jre
 
 EXPOSE 8082
 

commafeed-client/.eslintignore

@@ -1,8 +0,0 @@
-dist
-node_modules
-
-vite.config.ts
-
-# compiled linguijs locales
-# they no longer exist but we keep this to avoid issues with people still having those files on disk
-src/locales/**/*.ts

commafeed-client/.eslintrc.cjs

@@ -1,52 +0,0 @@
-module.exports = {
-    env: {
-        browser: true,
-        es2021: true,
-    },
-    extends: [
-        "eslint:recommended",
-        "standard",
-        "love",
-        "plugin:@typescript-eslint/strict-type-checked",
-        "plugin:@typescript-eslint/stylistic-type-checked",
-        "plugin:react/recommended",
-        "plugin:react-hooks/recommended",
-        "plugin:prettier/recommended",
-    ],
-    settings: {
-        react: {
-            version: "detect",
-        },
-    },
-    overrides: [
-        {
-            env: {
-                node: true,
-            },
-            files: [".eslintrc.{js,cjs}"],
-            parserOptions: {
-                sourceType: "script",
-            },
-        },
-    ],
-    parserOptions: {
-        project: true,
-        ecmaVersion: "latest",
-        sourceType: "module",
-    },
-    plugins: ["react"],
-    rules: {
-        "@typescript-eslint/consistent-type-assertions": ["error", { assertionStyle: "as" }],
-        "@typescript-eslint/explicit-function-return-type": "off",
-        "@typescript-eslint/no-confusing-void-expression": ["error", { ignoreArrowShorthand: true }],
-        "@typescript-eslint/no-floating-promises": "off",
-        "@typescript-eslint/no-misused-promises": "off",
-        "@typescript-eslint/prefer-nullish-coalescing": ["error", { ignoreConditionalTests: true }],
-        "@typescript-eslint/restrict-template-expressions": ["error", { allowNumber: true }],
-        "@typescript-eslint/strict-boolean-expressions": "off",
-        "react/jsx-curly-brace-presence": ["error", "never"],
-        "react/no-unescaped-entities": "off",
-        "react/react-in-jsx-scope": "off",
-        "react-hooks/exhaustive-deps": "error",
-    },
-}

commafeed-client/.prettierrc

@@ -1,8 +0,0 @@
-{
-    "printWidth": 140,
-    "semi": false,
-    "tabWidth": 4,
-    "arrowParens": "avoid",
-    "endOfLine": "auto",
-    "trailingComma": "es5"
-}

commafeed-client/biome.json

@@ -0,0 +1,19 @@
+{
+    "$schema": "https://biomejs.dev/schemas/1.8.1/schema.json",
+    "formatter": {
+        "indentStyle": "space",
+        "indentWidth": 4,
+        "lineEnding": "lf",
+        "lineWidth": 140
+    },
+    "javascript": {
+        "formatter": {
+            "trailingCommas": "es5",
+            "semicolons": "asNeeded",
+            "arrowParentheses": "asNeeded"
+        }
+    },
+    "files": {
+        "ignore": ["dist", "node_modules", "target", "target-ide"]
+    }
+}

commafeed-client/package.json

@@ -1,83 +1,79 @@
 {
-  "name": "commafeed-client",
+    "name": "commafeed-client",
-  "private": true,
+    "private": true,
-  "version": "0.0.0",
+    "version": "0.0.0",
-  "type": "module",
+    "type": "module",
-  "scripts": {
+    "scripts": {
-    "dev": "vite --host",
+        "dev": "vite --host",
-    "dev:typescript": "tsc --watch",
+        "dev:typescript": "tsc --watch",
-    "build": "tsc && vite build",
+        "build": "tsc && vite build",
-    "preview": "vite preview",
+        "preview": "vite preview",
-    "test": "vitest",
+        "test": "vitest",
-    "test:ci": "vitest run",
+        "test:ci": "vitest run",
-    "eslint": "eslint --ext=.js,.jsx,.ts,.tsx src",
+        "lint": "biome check ./src",
-    "i18n:extract": "lingui extract --clean"
+        "lint:fix": "biome check --write ./src",
-  },
+        "i18n:extract": "lingui extract --clean"
-  "dependencies": {
+    },
-    "@emotion/react": "^11.11.4",
+    "dependencies": {
-    "@fontsource/open-sans": "^5.0.27",
+        "@emotion/react": "^11.11.4",
-    "@lingui/core": "^4.10.0",
+        "@fontsource/open-sans": "^5.0.28",
-    "@lingui/macro": "^4.10.0",
+        "@lingui/core": "^4.11.1",
-    "@lingui/react": "^4.10.0",
+        "@lingui/macro": "^4.11.1",
-    "@mantine/core": "^7.8.0",
+        "@lingui/react": "^4.11.1",
-    "@mantine/form": "^7.8.0",
+        "@mantine/core": "^7.10.2",
-    "@mantine/hooks": "^7.8.0",
+        "@mantine/form": "^7.10.2",
-    "@mantine/modals": "^7.8.0",
+        "@mantine/hooks": "^7.10.2",
-    "@mantine/notifications": "^7.8.0",
+        "@mantine/modals": "^7.10.2",
-    "@mantine/spotlight": "^7.8.0",
+        "@mantine/notifications": "^7.10.2",
-    "@monaco-editor/react": "^4.6.0",
+        "@mantine/spotlight": "^7.10.2",
-    "@reduxjs/toolkit": "^2.2.3",
+        "@monaco-editor/react": "^4.6.0",
-    "axios": "^1.6.8",
+        "@reduxjs/toolkit": "^2.2.5",
-    "dayjs": "^1.11.10",
+        "axios": "^1.7.2",
-    "escape-string-regexp": "^5.0.0",
+        "dayjs": "^1.11.11",
-    "interweave": "^13.1.0",
+        "escape-string-regexp": "^5.0.0",
-    "monaco-editor": "^0.47.0",
+        "interweave": "^13.1.0",
-    "mousetrap": "^1.6.5",
+        "monaco-editor": "^0.49.0",
-    "react": "^18.2.0",
+        "mousetrap": "^1.6.5",
-    "react-async-hook": "^4.0.0",
+        "react": "^18.3.1",
-    "react-contexify": "^6.0.0",
+        "react-async-hook": "^4.0.0",
-    "react-dom": "^18.2.0",
+        "react-contexify": "^6.0.0",
-    "react-draggable": "^4.4.6",
+        "react-device-detect": "^2.2.3",
-    "react-ga4": "^2.1.0",
+        "react-dom": "^18.3.1",
-    "react-icons": "^5.0.1",
+        "react-draggable": "^4.4.6",
-    "react-infinite-scroller": "^1.2.6",
+        "react-ga4": "^2.1.0",
-    "react-redux": "^9.1.0",
+        "react-helmet": "^6.1.0",
-    "react-router-dom": "^6.22.3",
+        "react-icons": "^5.2.1",
-    "react-swipeable": "^7.0.1",
+        "react-infinite-scroller": "^1.2.6",
-    "redoc": "^2.1.3",
+        "react-redux": "^9.1.2",
-    "throttle-debounce": "^5.0.0",
+        "react-router-dom": "^6.23.1",
-    "tinycon": "^0.6.8",
+        "react-swipeable": "^7.0.1",
-    "tss-react": "^4.9.6",
+        "redoc": "^2.1.5",
-    "use-local-storage": "^3.0.0",
+        "throttle-debounce": "^5.0.0",
-    "websocket-heartbeat-js": "^1.1.3"
+        "tinycon": "^0.6.8",
-  },
+        "tss-react": "^4.9.10",
-  "devDependencies": {
+        "use-local-storage": "^3.0.0",
-    "@lingui/cli": "^4.10.0",
+        "vite-plugin-biome": "^1.0.10",
-    "@lingui/vite-plugin": "^4.10.0",
+        "websocket-heartbeat-js": "^1.1.3"
-    "@types/mousetrap": "^1.6.15",
+    },
-    "@types/react": "^18.2.78",
+    "devDependencies": {
-    "@types/react-dom": "^18.2.25",
+        "@biomejs/biome": "^1.8.1",
-    "@types/react-infinite-scroller": "^1.2.5",
+        "@lingui/cli": "^4.11.1",
-    "@types/swagger-ui-react": "^4.18.3",
+        "@lingui/vite-plugin": "^4.11.1",
-    "@types/throttle-debounce": "^5.0.2",
+        "@types/mousetrap": "^1.6.15",
-    "@types/tinycon": "^0.6.5",
+        "@types/react": "^18.3.3",
-    "@typescript-eslint/eslint-plugin": "^7.6.0",
+        "@types/react-dom": "^18.3.0",
-    "@vitejs/plugin-react": "^4.2.1",
+        "@types/react-helmet": "^6.1.11",
-    "babel-plugin-macros": "^3.1.0",
+        "@types/react-infinite-scroller": "^1.2.5",
-    "eslint": "^8.57.0",
+        "@types/swagger-ui-react": "^4.18.3",
-    "eslint-config-love": "^47.0.0",
+        "@types/throttle-debounce": "^5.0.2",
-    "eslint-config-prettier": "^9.1.0",
+        "@types/tinycon": "^0.6.5",
-    "eslint-config-standard": "^17.1.0",
+        "@vitejs/plugin-react": "^4.3.1",
-    "eslint-plugin-prettier": "^5.1.3",
+        "babel-plugin-macros": "^3.1.0",
-    "eslint-plugin-react": "^7.34.1",
+        "rollup-plugin-visualizer": "^5.12.0",
-    "eslint-plugin-react-hooks": "^4.6.0",
+        "typescript": "^5.4.5",
-    "prettier": "^3.2.5",
+        "vite": "^5.3.1",
-    "rollup-plugin-visualizer": "^5.12.0",
+        "vite-tsconfig-paths": "^4.3.2",
-    "typescript": "^5.4.5",
+        "vitest": "^1.6.0",
-    "vite": "^5.2.8",
+        "vitest-mock-extended": "^1.3.1"
-    "vite-plugin-eslint": "^1.8.1",
+    }
-    "vite-tsconfig-paths": "^4.3.2",
-    "vitest": "^1.5.0",
-    "vitest-mock-extended": "^1.3.1"
-  }
 }

commafeed-client/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>4.4.0</version>
+		<version>4.4.1</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>

commafeed-client/src/App.tsx

@@ -1,7 +1,6 @@
 import { i18n } from "@lingui/core"
 import { I18nProvider } from "@lingui/react"
 import { MantineProvider } from "@mantine/core"
-import { useDidUpdate } from "@mantine/hooks"
 import { ModalsProvider } from "@mantine/modals"
 import { Notifications } from "@mantine/notifications"
 import { Constants } from "app/constants"
@@ -9,11 +8,13 @@ import { redirectTo } from "app/redirect/slice"
 import { reloadServerInfos } from "app/server/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { categoryUnreadCount } from "app/utils"
+import { DisablePullToRefresh } from "components/DisablePullToRefresh"
 import { ErrorBoundary } from "components/ErrorBoundary"
 import { Header } from "components/header/Header"
 import { Tree } from "components/sidebar/Tree"
 import { useBrowserExtension } from "hooks/useBrowserExtension"
 import { useI18n } from "i18n"
+import { WelcomePage } from "pages/WelcomePage"
 import { AdminUsersPage } from "pages/admin/AdminUsersPage"
 import { MetricsPage } from "pages/admin/MetricsPage"
 import { AboutPage } from "pages/app/AboutPage"
@@ -28,9 +29,10 @@ import { TagDetailsPage } from "pages/app/TagDetailsPage"
 import { LoginPage } from "pages/auth/LoginPage"
 import { PasswordRecoveryPage } from "pages/auth/PasswordRecoveryPage"
 import { RegistrationPage } from "pages/auth/RegistrationPage"
-import { WelcomePage } from "pages/WelcomePage"
+import React, { useEffect } from "react"
-import React, { useEffect, useRef } from "react"
+import { isSafari } from "react-device-detect"
 import ReactGA from "react-ga4"
+import { Helmet } from "react-helmet"
 import { HashRouter, Navigate, Route, Routes, useLocation, useNavigate } from "react-router-dom"
 import Tinycon from "tinycon"
 
@@ -166,38 +168,13 @@ function BrowserExtensionBadgeUnreadCountHandler() {
     return null
 }
 
-function CustomJs() {
+function CustomCode() {
-    const scriptLoaded = useRef(false)
+    return (
-
+        <Helmet>
-    // useDidUpdate is used instead of useEffect because we want to skip the first render
+            <link rel="stylesheet" type="text/css" href="custom_css.css" />
-    // the first render is the render of react-router, the routes are actually loaded in a second render
+            <script type="text/javascript" src="custom_js.js" />
-    // we want the script to be executed when the first route is done loading
+        </Helmet>
-    useDidUpdate(() => {
+    )
-        if (scriptLoaded.current) {
-            return
-        }
-
-        const script = document.createElement("script")
-        script.src = "custom_js.js"
-        script.async = true
-        document.body.appendChild(script)
-
-        scriptLoaded.current = true
-    })
-
-    return null
-}
-
-function CustomCss() {
-    useEffect(() => {
-        const link = document.createElement("link")
-        link.rel = "stylesheet"
-        link.type = "text/css"
-        link.href = "custom_css.css"
-        document.head.appendChild(link)
-    }, [])
-
-    return null
 }
 
 export function App() {
@@ -217,8 +194,12 @@ export function App() {
                     <GoogleAnalyticsHandler />
                     <RedirectHandler />
                     <AppRoutes />
-                    <CustomJs />
+                    <CustomCode />
-                    <CustomCss />
+                    {/* disable pull-to-refresh as it messes with vertical scrolling
+                        safari behaves weirdly when overscroll-behavior is set to none so we disable it only for other browsers
+                        https://github.com/Athou/commafeed/issues/1168
+                    */}
+                    {!isSafari && <DisablePullToRefresh />}
                 </HashRouter>
             </>
         </Providers>

commafeed-client/src/app/async-thunk.ts

@@ -1,5 +1,5 @@
 import { createAsyncThunk } from "@reduxjs/toolkit"
-import { type AppDispatch, type RootState } from "app/store"
+import type { AppDispatch, RootState } from "app/store"
 
 export const createAppAsyncThunk = createAsyncThunk.withTypes<{
     state: RootState

commafeed-client/src/app/client.ts

@@ -1,31 +1,31 @@
 import axios, { type AxiosError } from "axios"
-import {
+import type {
-    type AddCategoryRequest,
+    AddCategoryRequest,
-    type AdminSaveUserRequest,
+    AdminSaveUserRequest,
-    type AuthenticationError,
+    AuthenticationError,
-    type Category,
+    Category,
-    type CategoryModificationRequest,
+    CategoryModificationRequest,
-    type CollapseRequest,
+    CollapseRequest,
-    type Entries,
+    Entries,
-    type FeedInfo,
+    FeedInfo,
-    type FeedInfoRequest,
+    FeedInfoRequest,
-    type FeedModificationRequest,
+    FeedModificationRequest,
-    type GetEntriesPaginatedRequest,
+    GetEntriesPaginatedRequest,
-    type IDRequest,
+    IDRequest,
-    type LoginRequest,
+    LoginRequest,
-    type MarkRequest,
+    MarkRequest,
-    type Metrics,
+    Metrics,
-    type MultipleMarkRequest,
+    MultipleMarkRequest,
-    type PasswordResetRequest,
+    PasswordResetRequest,
-    type ProfileModificationRequest,
+    ProfileModificationRequest,
-    type RegistrationRequest,
+    RegistrationRequest,
-    type ServerInfo,
+    ServerInfo,
-    type Settings,
+    Settings,
-    type StarRequest,
+    StarRequest,
-    type SubscribeRequest,
+    SubscribeRequest,
-    type Subscription,
+    Subscription,
-    type TagRequest,
+    TagRequest,
-    type UserModel,
+    UserModel,
 } from "./types"
 
 const axiosInstance = axios.create({ baseURL: "./rest", withCredentials: true })

commafeed-client/src/app/constants.ts

@@ -1,8 +1,8 @@
 import { t } from "@lingui/macro"
-import { type IconType } from "react-icons"
+import type { IconType } from "react-icons"
 import { FaAt } from "react-icons/fa"
 import { SiBuffer, SiFacebook, SiGmail, SiInstapaper, SiPocket, SiTumblr, SiTwitter } from "react-icons/si"
-import { type Category, type Entry, type SharingSettings } from "./types"
+import type { Category, Entry, SharingSettings } from "./types"
 
 const categories: Record<string, Category> = {
     all: {

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

@@ -1,9 +1,9 @@
 import { configureStore } from "@reduxjs/toolkit"
-import { type client } from "app/client"
+import type { client } from "app/client"
 import { loadEntries, loadMoreEntries, markAllEntries, markEntry } from "app/entries/thunks"
-import { reducers, type RootState } from "app/store"
+import { type RootState, reducers } from "app/store"
-import { type Entries, type Entry } from "app/types"
+import type { Entries, Entry } from "app/types"
-import { type AxiosResponse } from "axios"
+import type { AxiosResponse } from "axios"
 import { beforeEach, describe, expect, it, vi } from "vitest"
 import { mockReset } from "vitest-mock-extended"
 

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

@@ -1,7 +1,7 @@
-import { createSlice, type PayloadAction } from "@reduxjs/toolkit"
+import { type PayloadAction, createSlice } from "@reduxjs/toolkit"
 import { Constants } from "app/constants"
 import { loadEntries, loadMoreEntries, markAllEntries, markEntry, markMultipleEntries, starEntry, tagEntry } from "app/entries/thunks"
-import { type Entry } from "app/types"
+import type { Entry } from "app/types"
 
 export type EntrySourceType = "category" | "feed" | "tag"
 
@@ -51,11 +51,9 @@ export const entriesSlice = createSlice({
             state.selectedEntryId = action.payload.id
         },
         setEntryExpanded: (state, action: PayloadAction<{ entry: Entry; expanded: boolean }>) => {
-            state.entries
+            for (const e of state.entries.filter(e => e.id === action.payload.entry.id)) {
-                .filter(e => e.id === action.payload.entry.id)
+                e.expanded = action.payload.expanded
-                .forEach(e => {
+            }
-                    e.expanded = action.payload.expanded
-                })
         },
         setScrollingToEntry: (state, action: PayloadAction<boolean>) => {
             state.scrollingToEntry = action.payload
@@ -66,32 +64,24 @@ export const entriesSlice = createSlice({
     },
     extraReducers: builder => {
         builder.addCase(markEntry.pending, (state, action) => {
-            state.entries
+            for (const e of state.entries.filter(e => e.id === action.meta.arg.entry.id)) {
-                .filter(e => e.id === action.meta.arg.entry.id)
+                e.read = action.meta.arg.read
-                .forEach(e => {
+            }
-                    e.read = action.meta.arg.read
-                })
         })
         builder.addCase(markMultipleEntries.pending, (state, action) => {
-            state.entries
+            for (const e of state.entries.filter(e => action.meta.arg.entries.some(e2 => e2.id === e.id))) {
-                .filter(e => action.meta.arg.entries.some(e2 => e2.id === e.id))
+                e.read = action.meta.arg.read
-                .forEach(e => {
+            }
-                    e.read = action.meta.arg.read
-                })
         })
         builder.addCase(markAllEntries.pending, (state, action) => {
-            state.entries
+            for (const e of state.entries.filter(e => (action.meta.arg.req.olderThan ? e.date < action.meta.arg.req.olderThan : true))) {
-                .filter(e => (action.meta.arg.req.olderThan ? e.date < action.meta.arg.req.olderThan : true))
+                e.read = true
-                .forEach(e => {
+            }
-                    e.read = true
-                })
         })
         builder.addCase(starEntry.pending, (state, action) => {
-            state.entries
+            for (const e of state.entries.filter(e => action.meta.arg.entry.id === e.id && action.meta.arg.entry.feedId === e.feedId)) {
-                .filter(e => action.meta.arg.entry.id === e.id && action.meta.arg.entry.feedId === e.feedId)
+                e.starred = action.meta.arg.starred
-                .forEach(e => {
+            }
-                    e.starred = action.meta.arg.starred
-                })
         })
         builder.addCase(loadEntries.pending, (state, action) => {
             state.source = action.meta.arg.source
@@ -122,11 +112,9 @@ export const entriesSlice = createSlice({
             state.loading = false
         })
         builder.addCase(tagEntry.pending, (state, action) => {
-            state.entries
+            for (const e of state.entries.filter(e => +e.id === action.meta.arg.entryId)) {
-                .filter(e => +e.id === action.meta.arg.entryId)
+                e.tags = action.meta.arg.tags
-                .forEach(e => {
+            }
-                    e.tags = action.meta.arg.tags
-                })
         })
     },
 })

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

@@ -1,7 +1,7 @@
 import { createAppAsyncThunk } from "app/async-thunk"
 import { client } from "app/client"
 import { Constants } from "app/constants"
-import { entriesSlice, type EntrySource, type EntrySourceType, setSearch } from "app/entries/slice"
+import { type EntrySource, type EntrySourceType, entriesSlice, setSearch } from "app/entries/slice"
 import type { RootState } from "app/store"
 import { reloadTree } from "app/tree/thunks"
 import type { Entry, MarkRequest, TagRequest } from "app/types"

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

@@ -1,4 +1,4 @@
-import { createSlice, type PayloadAction } from "@reduxjs/toolkit"
+import { type PayloadAction, createSlice } from "@reduxjs/toolkit"
 
 interface RedirectState {
     to?: string

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

@@ -1,6 +1,6 @@
-import { createSlice, type PayloadAction } from "@reduxjs/toolkit"
+import { type PayloadAction, createSlice } from "@reduxjs/toolkit"
 import { reloadServerInfos } from "app/server/thunks"
-import { type ServerInfo } from "app/types"
+import type { ServerInfo } from "app/types"
 
 interface ServerState {
     serverInfos?: ServerInfo

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

@@ -1,8 +1,8 @@
-import { createSlice, type PayloadAction } from "@reduxjs/toolkit"
+import { type PayloadAction, createSlice } from "@reduxjs/toolkit"
 import { markEntry } from "app/entries/thunks"
 import { redirectTo } from "app/redirect/slice"
 import { collapseTreeCategory, reloadTree } from "app/tree/thunks"
-import { type Category } from "app/types"
+import type { Category } from "app/types"
 import { visitCategoryTree } from "app/utils"
 
 interface TreeState {
@@ -34,13 +34,11 @@ export const treeSlice = createSlice({
             }>
         ) => {
             if (!state.rootCategory) return
-            visitCategoryTree(state.rootCategory, c =>
+            visitCategoryTree(state.rootCategory, c => {
-                c.feeds
+                for (const f of c.feeds.filter(f => f.id === action.payload.feedId)) {
-                    .filter(f => f.id === action.payload.feedId)
+                    f.unread += action.payload.amount
-                    .forEach(f => {
+                }
-                        f.unread += action.payload.amount
+            })
-                    })
-            )
         },
     },
     extraReducers: builder => {
@@ -55,13 +53,11 @@ export const treeSlice = createSlice({
         })
         builder.addCase(markEntry.pending, (state, action) => {
             if (!state.rootCategory) return
-            visitCategoryTree(state.rootCategory, c =>
+            visitCategoryTree(state.rootCategory, c => {
-                c.feeds
+                for (const f of c.feeds.filter(f => f.id === +action.meta.arg.entry.feedId)) {
-                    .filter(f => f.id === +action.meta.arg.entry.feedId)
+                    f.unread = action.meta.arg.read ? f.unread - 1 : f.unread + 1
-                    .forEach(f => {
+                }
-                        f.unread = action.meta.arg.read ? f.unread - 1 : f.unread + 1
+            })
-                    })
-            )
         })
         builder.addCase(redirectTo, state => {
             state.mobileMenuOpen = false

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

@@ -1,7 +1,7 @@
 import { t } from "@lingui/macro"
 import { showNotification } from "@mantine/notifications"
 import { createSlice, isAnyOf } from "@reduxjs/toolkit"
-import { type Settings, type UserModel } from "app/types"
+import type { Settings, UserModel } from "app/types"
 import {
     changeCustomContextMenu,
     changeExternalLinkIconDisplayMode,

commafeed-client/src/app/utils.ts

@@ -1,9 +1,11 @@
 import { throttle } from "throttle-debounce"
-import { type Category } from "./types"
+import type { Category } from "./types"
 
 export function visitCategoryTree(category: Category, visitor: (category: Category) => void): void {
     visitor(category)
-    category.children.forEach(child => visitCategoryTree(child, visitor))
+    for (const child of category.children) {
+        visitCategoryTree(child, visitor)
+    }
 }
 
 export function flattenCategoryTree(category: Category): Category[] {

commafeed-client/src/components/ActionButton.tsx

@@ -1,8 +1,8 @@
 import { ActionIcon, Button, type ButtonVariant, Tooltip, useMantineTheme } from "@mantine/core"
-import { type ActionIconVariant } from "@mantine/core/lib/components/ActionIcon/ActionIcon"
+import type { ActionIconVariant } from "@mantine/core/lib/components/ActionIcon/ActionIcon"
 import { Constants } from "app/constants"
 import { useActionButton } from "hooks/useActionButton"
-import { forwardRef, type MouseEventHandler, type ReactNode } from "react"
+import { type MouseEventHandler, type ReactNode, forwardRef } from "react"
 
 interface ActionButtonProps {
     className?: string

commafeed-client/src/components/Alert.tsx

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

commafeed-client/src/components/DisablePullToRefresh.tsx

@@ -0,0 +1,15 @@
+import { Helmet } from "react-helmet"
+
+export const DisablePullToRefresh = () => {
+    return (
+        <Helmet>
+            <style type="text/css">
+                {`
+                    html, body {
+                        overscroll-behavior: none;
+                    }
+                `}
+            </style>
+        </Helmet>
+    )
+}

commafeed-client/src/components/KeyboardShortcutsHelp.tsx

@@ -1,8 +1,10 @@
 import { Trans } from "@lingui/macro"
 import { Anchor, Box, Kbd, Stack, Table } from "@mantine/core"
+import { useOs } from "@mantine/hooks"
 import { Constants } from "app/constants"
 
 export function KeyboardShortcutsHelp() {
+    const isMacOS = useOs() === "macos"
     return (
         <Stack gap="xs">
             <Table striped highlightOnHover>
@@ -149,7 +151,7 @@ export function KeyboardShortcutsHelp() {
                         </Table.Td>
                         <Table.Td>
                             <Kbd>
-                                <Trans>Ctrl</Trans>
+                                <Trans>{isMacOS ? "Cmd" : "Ctrl"}</Trans>
                             </Kbd>
                             <span> + </span>
                             <Kbd>K</Kbd>

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

@@ -2,7 +2,7 @@ import { Trans } from "@lingui/macro"
 import { Box, Button, Checkbox, Group, PasswordInput, Stack, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
-import { type AdminSaveUserRequest, type UserModel } from "app/types"
+import type { AdminSaveUserRequest, UserModel } from "app/types"
 import { Alert } from "components/Alert"
 import { useAsyncCallback } from "react-async-hook"
 import { TbDeviceFloppy } from "react-icons/tb"

commafeed-client/src/components/code/CodeEditor.tsx

@@ -1,7 +1,7 @@
 import { Input, Textarea } from "@mantine/core"
 import RichCodeEditor from "components/code/RichCodeEditor"
 import { useMobile } from "hooks/useMobile"
-import { type ReactNode } from "react"
+import type { ReactNode } from "react"
 
 interface CodeEditorProps {
     description?: ReactNode

commafeed-client/src/components/code/RichCodeEditor.tsx

@@ -5,7 +5,7 @@ import { useAsync } from "react-async-hook"
 const init = async () => {
     window.MonacoEnvironment = {
         async getWorker(_, label) {
-            let worker
+            let worker: typeof import("*?worker")
             if (label === "css") {
                 worker = await import("monaco-editor/esm/vs/language/css/css.worker?worker")
             } else if (label === "javascript") {
@@ -13,7 +13,6 @@ const init = async () => {
             } else {
                 worker = await import("monaco-editor/esm/vs/editor/editor.worker?worker")
             }
-            // eslint-disable-next-line new-cap
             return new worker.default()
         },
     }

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

@@ -1,5 +1,5 @@
 import { TypographyStylesProvider } from "@mantine/core"
-import { type ReactNode } from "react"
+import type { ReactNode } from "react"
 
 /**
  * This component is used to provide basic styles to html typography elements.

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

@@ -1,10 +1,10 @@
 import { Box, Mark } from "@mantine/core"
 import { Constants } from "app/constants"
 import { calculatePlaceholderSize } from "app/utils"
-import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
 import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
 import escapeStringRegexp from "escape-string-regexp"
-import { type ChildrenNode, Interweave, Matcher, type MatchResponse, type Node, type TransformCallback } from "interweave"
+import { type ChildrenNode, Interweave, type MatchResponse, Matcher, type Node, type TransformCallback } from "interweave"
 import React from "react"
 import { tss } from "tss"
 
@@ -40,8 +40,8 @@ const transform: TransformCallback = node => {
         const title = node.getAttribute("title") ?? undefined
         const nodeWidth = node.getAttribute("width")
         const nodeHeight = node.getAttribute("height")
-        const width = nodeWidth ? parseInt(nodeWidth, 10) : undefined
+        const width = nodeWidth ? Number.parseInt(nodeWidth, 10) : undefined
-        const height = nodeHeight ? parseInt(nodeHeight, 10) : undefined
+        const height = nodeHeight ? Number.parseInt(nodeHeight, 10) : undefined
         const placeholderSize = calculatePlaceholderSize({
             width,
             height,

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

@@ -1,7 +1,10 @@
-import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
 import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
 
-export function Enclosure(props: { enclosureType: string; enclosureUrl: string }) {
+export function Enclosure(props: {
+    enclosureType: string
+    enclosureUrl: string
+}) {
     const hasVideo = props.enclosureType.startsWith("video")
     const hasAudio = props.enclosureType.startsWith("audio")
     const hasImage = props.enclosureType.startsWith("image")
@@ -9,11 +12,13 @@ export function Enclosure(props: { enclosureType: string; enclosureUrl: string }
     return (
         <BasicHtmlStyles>
             {hasVideo && (
+                // biome-ignore lint/a11y/useMediaCaption: we don't have any captions for videos
                 <video controls width="100%">
                     <source src={props.enclosureUrl} type={props.enclosureType} />
                 </video>
             )}
             {hasAudio && (
+                // biome-ignore lint/a11y/useMediaCaption: we don't have any captions for audio
                 <audio controls>
                     <source src={props.enclosureUrl} type={props.enclosureType} />
                 </audio>

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

@@ -2,7 +2,7 @@ import { Trans } from "@lingui/macro"
 import { Box } from "@mantine/core"
 import { openModal } from "@mantine/modals"
 import { Constants } from "app/constants"
-import { type ExpendableEntry } from "app/entries/slice"
+import type { ExpendableEntry } from "app/entries/slice"
 import {
     loadMoreEntries,
     markAllEntries,
@@ -126,7 +126,7 @@ export function FeedEntries() {
         })
         window.addEventListener("scroll", listener)
         return () => window.removeEventListener("scroll", listener)
-    }, [dispatch, contextMenu, entries, viewMode, scrollMarks, scrollingToEntry])
+    }, [dispatch, entries, viewMode, scrollMarks, scrollingToEntry])
 
     useMousetrap("r", async () => await dispatch(reloadEntries()))
     useMousetrap(

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

@@ -1,12 +1,12 @@
 import { Box, Divider, type MantineRadius, type MantineSpacing, Paper } from "@mantine/core"
 import { Constants } from "app/constants"
 import { useAppSelector } from "app/store"
-import { type Entry, type ViewMode } from "app/types"
+import type { Entry, ViewMode } from "app/types"
 import { FeedEntryCompactHeader } from "components/content/header/FeedEntryCompactHeader"
 import { FeedEntryHeader } from "components/content/header/FeedEntryHeader"
 import { useMobile } from "hooks/useMobile"
 import { useViewMode } from "hooks/useViewMode"
-import React from "react"
+import type React from "react"
 import { useSwipeable } from "react-swipeable"
 import { tss } from "tss"
 import { FeedEntryBody } from "./FeedEntryBody"
@@ -35,7 +35,7 @@ const useStyles = tss
         maxWidth?: number
     }>()
     .create(({ theme, colorScheme, read, expanded, viewMode, rtl, showSelectionIndicator, maxWidth }) => {
-        let backgroundColor
+        let backgroundColor: string
         if (colorScheme === "dark") {
             backgroundColor = read ? "inherit" : theme.colors.dark[5]
         } else {
@@ -61,7 +61,7 @@ const useStyles = tss
             backgroundHoverColor = colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[1]
         }
 
-        let paperBorderLeftColor
+        let paperBorderLeftColor = ""
         if (showSelectionIndicator) {
             const borderLeftColor = colorScheme === "dark" ? theme.colors[theme.primaryColor][4] : theme.colors[theme.primaryColor][6]
             paperBorderLeftColor = `${borderLeftColor} !important`

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

@@ -1,6 +1,6 @@
 import { Box } from "@mantine/core"
 import { useAppSelector } from "app/store"
-import { type Entry } from "app/types"
+import type { Entry } from "app/types"
 import { Content } from "./Content"
 import { Enclosure } from "./Enclosure"
 import { Media } from "./Media"

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

@@ -4,7 +4,7 @@ import { Constants } from "app/constants"
 import { markEntriesUpToEntry, markEntry, starEntry } from "app/entries/thunks"
 import { redirectToFeed } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
-import { type Entry } from "app/types"
+import type { Entry } from "app/types"
 import { truncate } from "app/utils"
 import { useBrowserExtension } from "hooks/useBrowserExtension"
 import { useColorScheme } from "hooks/useColorScheme"

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

@@ -1,8 +1,8 @@
-import { t, Trans } from "@lingui/macro"
+import { Trans, t } from "@lingui/macro"
 import { Group, Indicator, Popover, TagsInput } from "@mantine/core"
 import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "app/entries/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
-import { type Entry } from "app/types"
+import type { Entry } from "app/types"
 import { ActionButton } from "components/ActionButton"
 import { useActionButton } from "hooks/useActionButton"
 import { useMobile } from "hooks/useMobile"

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

@@ -1,8 +1,8 @@
 import { Box } from "@mantine/core"
 import { Constants } from "app/constants"
 import { calculatePlaceholderSize } from "app/utils"
-import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
 import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
 import { Content } from "./Content"
 
 export interface MediaProps {

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

@@ -2,10 +2,10 @@ import { Trans } from "@lingui/macro"
 import { ActionIcon, Box, CopyButton, Divider, SimpleGrid } from "@mantine/core"
 import { Constants } from "app/constants"
 import { useAppSelector } from "app/store"
-import { type SharingSettings } from "app/types"
+import type { SharingSettings } from "app/types"
 import { useBrowserExtension } from "hooks/useBrowserExtension"
 import { useMobile } from "hooks/useMobile"
-import { type IconType } from "react-icons"
+import type { IconType } from "react-icons"
 import { TbCheck, TbCopy, TbDeviceDesktopShare, TbDeviceMobileShare } from "react-icons/tb"
 import { tss } from "tss"
 

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

@@ -1,11 +1,11 @@
-import { t, Trans } from "@lingui/macro"
+import { Trans, t } from "@lingui/macro"
 import { Box, Button, Group, Stack, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
 import { redirectToSelectedSource } from "app/redirect/thunks"
 import { useAppDispatch } from "app/store"
 import { reloadTree } from "app/tree/thunks"
-import { type AddCategoryRequest } from "app/types"
+import type { AddCategoryRequest } from "app/types"
 import { Alert } from "components/Alert"
 import { useAsyncCallback } from "react-async-hook"
 import { TbFolderPlus } from "react-icons/tb"

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

@@ -1,9 +1,9 @@
 import { t } from "@lingui/macro"
 import { Select, type SelectProps } from "@mantine/core"
-import { type ComboboxItem } from "@mantine/core/lib/components/Combobox/Combobox.types"
+import type { ComboboxItem } from "@mantine/core/lib/components/Combobox/Combobox.types"
 import { Constants } from "app/constants"
 import { useAppSelector } from "app/store"
-import { type Category } from "app/types"
+import type { Category } from "app/types"
 import { flattenCategoryTree } from "app/utils"
 
 type CategorySelectProps = Partial<SelectProps> & {
@@ -18,7 +18,8 @@ export function CategorySelect(props: CategorySelectProps) {
         map.set(c.id, c)
         return map
     }, new Map<string, Category>())
-    const categoryLabel = (cat: Category) => {
+    const categoryLabel = (category: Category) => {
+        let cat = category
         let label = cat.name
 
         while (cat.parentId) {

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

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

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

@@ -6,7 +6,7 @@ import { Constants } from "app/constants"
 import { redirectToFeed, redirectToSelectedSource } from "app/redirect/thunks"
 import { useAppDispatch } from "app/store"
 import { reloadTree } from "app/tree/thunks"
-import { type FeedInfoRequest, type SubscribeRequest } from "app/types"
+import type { FeedInfoRequest, SubscribeRequest } from "app/types"
 import { Alert } from "components/Alert"
 import { useState } from "react"
 import { useAsyncCallback } from "react-async-hook"

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

@@ -1,9 +1,9 @@
 import { Box, Text } from "@mantine/core"
-import { type Entry } from "app/types"
+import type { Entry } from "app/types"
+import { RelativeDate } from "components/RelativeDate"
 import { FeedFavicon } from "components/content/FeedFavicon"
 import { OpenExternalLink } from "components/content/header/OpenExternalLink"
 import { Star } from "components/content/header/Star"
-import { RelativeDate } from "components/RelativeDate"
 import { OnDesktop } from "components/responsive/OnDesktop"
 import { tss } from "tss"
 import { FeedEntryTitle } from "./FeedEntryTitle"

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

@@ -1,9 +1,9 @@
 import { Box, Flex, Space, Text } from "@mantine/core"
-import { type Entry } from "app/types"
+import type { Entry } from "app/types"
+import { RelativeDate } from "components/RelativeDate"
 import { FeedFavicon } from "components/content/FeedFavicon"
 import { OpenExternalLink } from "components/content/header/OpenExternalLink"
 import { Star } from "components/content/header/Star"
-import { RelativeDate } from "components/RelativeDate"
 import { tss } from "tss"
 import { FeedEntryTitle } from "./FeedEntryTitle"
 

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

@@ -1,6 +1,6 @@
 import { Highlight } from "@mantine/core"
 import { useAppSelector } from "app/store"
-import { type Entry } from "app/types"
+import type { Entry } from "app/types"
 
 export interface FeedEntryTitleProps {
     entry: Entry

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

@@ -3,7 +3,7 @@ import { ActionIcon, Anchor, Tooltip } from "@mantine/core"
 import { Constants } from "app/constants"
 import { markEntry } from "app/entries/thunks"
 import { useAppDispatch } from "app/store"
-import { type Entry } from "app/types"
+import type { Entry } from "app/types"
 import { TbExternalLink } from "react-icons/tb"
 
 export function OpenExternalLink(props: { entry: Entry }) {

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

@@ -1,4 +1,4 @@
-import { t, Trans } from "@lingui/macro"
+import { Trans, t } from "@lingui/macro"
 import { Box, Center, CloseButton, Divider, Group, Indicator, Popover, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { reloadEntries, search, selectNextEntry, selectPreviousEntry } from "app/entries/thunks"

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

@@ -13,7 +13,7 @@ import { showNotification } from "@mantine/notifications"
 import { client } from "app/client"
 import { redirectToAbout, redirectToAdminUsers, redirectToDonate, redirectToMetrics, redirectToSettings } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
-import { type ViewMode } from "app/types"
+import type { ViewMode } from "app/types"
 import { useViewMode } from "hooks/useViewMode"
 import { type ReactNode, useState } from "react"
 import {

commafeed-client/src/components/metrics/Gauge.tsx

@@ -1,4 +1,4 @@
-import { type MetricGauge } from "app/types"
+import type { MetricGauge } from "app/types"
 
 interface MeterProps {
     gauge: MetricGauge

commafeed-client/src/components/metrics/Meter.tsx

@@ -1,5 +1,5 @@
 import { Box } from "@mantine/core"
-import { type MetricMeter } from "app/types"
+import type { MetricMeter } from "app/types"
 
 interface MeterProps {
     meter: MetricMeter

commafeed-client/src/components/metrics/Timer.tsx

@@ -1,5 +1,5 @@
 import { Box } from "@mantine/core"
-import { type MetricTimer } from "app/types"
+import type { MetricTimer } from "app/types"
 
 interface MetricTimerProps {
     timer: MetricTimer

commafeed-client/src/components/responsive/OnDesktop.tsx

@@ -1,6 +1,6 @@
 import { Box } from "@mantine/core"
 import { useMobile } from "hooks/useMobile"
-import React from "react"
+import type React from "react"
 
 export function OnDesktop(props: { children: React.ReactNode }) {
     const mobile = useMobile()

commafeed-client/src/components/responsive/OnMobile.tsx

@@ -1,6 +1,6 @@
 import { Box } from "@mantine/core"
 import { useMobile } from "hooks/useMobile"
-import React from "react"
+import type React from "react"
 
 export function OnMobile(props: { children: React.ReactNode }) {
     const mobile = useMobile()

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

@@ -1,9 +1,9 @@
-import { t, Trans } from "@lingui/macro"
+import { Trans, t } from "@lingui/macro"
 import { Divider, Group, Radio, Select, SimpleGrid, Stack, Switch } from "@mantine/core"
-import { type ComboboxData } from "@mantine/core/lib/components/Combobox/Combobox.types"
+import type { ComboboxData } from "@mantine/core/lib/components/Combobox/Combobox.types"
 import { Constants } from "app/constants"
 import { useAppDispatch, useAppSelector } from "app/store"
-import { type IconDisplayMode, type ScrollMode, type SharingSettings } from "app/types"
+import type { IconDisplayMode, ScrollMode, SharingSettings } from "app/types"
 import {
     changeCustomContextMenu,
     changeExternalLinkIconDisplayMode,
@@ -18,7 +18,7 @@ import {
     changeStarIconDisplayMode,
 } from "app/user/thunks"
 import { locales } from "i18n"
-import { type ReactNode } from "react"
+import type { ReactNode } from "react"
 
 export function DisplaySettings() {
     const language = useAppSelector(state => state.user.settings?.language)

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

@@ -1,11 +1,11 @@
-import { t, Trans } from "@lingui/macro"
+import { Trans, t } from "@lingui/macro"
 import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { openConfirmModal } from "@mantine/modals"
 import { client, errorToStrings } from "app/client"
 import { redirectToLogin, redirectToSelectedSource } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
-import { type ProfileModificationRequest } from "app/types"
+import type { ProfileModificationRequest } from "app/types"
 import { reloadProfile } from "app/user/thunks"
 import { Alert } from "components/Alert"
 import { useEffect } from "react"

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

@@ -11,7 +11,7 @@ import {
 } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { collapseTreeCategory } from "app/tree/thunks"
-import { type Category, type Subscription } from "app/types"
+import type { Category, Subscription } from "app/types"
 import { categoryUnreadCount, flattenCategoryTree } from "app/utils"
 import { Loader } from "components/Loader"
 import { OnDesktop } from "components/responsive/OnDesktop"

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

@@ -1,13 +1,13 @@
 import { Box, Center } from "@mantine/core"
 import { FeedFavicon } from "components/content/FeedFavicon"
-import React, { type ReactNode } from "react"
+import type React from "react"
 import { tss } from "tss"
 import { UnreadCount } from "./UnreadCount"
 
 interface TreeNodeProps {
     id: string
-    name: ReactNode
+    name: React.ReactNode
-    icon: ReactNode
+    icon: React.ReactNode
     unread: number
     selected: boolean
     expanded?: boolean
@@ -27,7 +27,7 @@ const useStyles = tss
         let backgroundColor = "inherit"
         if (selected) backgroundColor = colorScheme === "dark" ? theme.colors.dark[4] : theme.colors.gray[1]
 
-        let color
+        let color: string
         if (hasError) {
             color = theme.colors.red[6]
         } else if (colorScheme === "dark") {

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

@@ -1,9 +1,10 @@
-import { t, Trans } from "@lingui/macro"
+import { Trans, t } from "@lingui/macro"
 import { Box, Center, Kbd, TextInput } from "@mantine/core"
-import { Spotlight, spotlight, type SpotlightActionData } from "@mantine/spotlight"
+import { useOs } from "@mantine/hooks"
+import { Spotlight, type SpotlightActionData, spotlight } from "@mantine/spotlight"
 import { redirectToFeed } from "app/redirect/thunks"
 import { useAppDispatch } from "app/store"
-import { type Subscription } from "app/types"
+import type { Subscription } from "app/types"
 import { FeedFavicon } from "components/content/FeedFavicon"
 import { useMousetrap } from "hooks/useMousetrap"
 import { TbSearch } from "react-icons/tb"
@@ -14,7 +15,7 @@ export interface TreeSearchProps {
 
 export function TreeSearch(props: TreeSearchProps) {
     const dispatch = useAppDispatch()
-
+    const isMacOS = useOs() === "macos"
     const actions: SpotlightActionData[] = props.feeds
         .map(f => ({
             id: `${f.id}`,
@@ -27,7 +28,7 @@ export function TreeSearch(props: TreeSearchProps) {
     const searchIcon = <TbSearch size={18} />
     const rightSection = (
         <Center style={{ cursor: "pointer" }} onClick={() => spotlight.open()}>
-            <Kbd>Ctrl</Kbd>
+            <Kbd>{isMacOS ? "Cmd" : "Ctrl"}</Kbd>
             <Box mx={5}>+</Box>
             <Kbd>K</Kbd>
         </Center>
@@ -56,13 +57,13 @@ export function TreeSearch(props: TreeSearchProps) {
             <Spotlight
                 actions={actions}
                 limit={10}
-                shortcut="ctrl+k"
+                shortcut="mod+k"
                 searchProps={{
                     leftSection: searchIcon,
                     placeholder: t`Search`,
                 }}
                 nothingFound={<Trans>Nothing found</Trans>}
-            ></Spotlight>
+            />
         </>
     )
 }

commafeed-client/src/hooks/useBrowserExtension.ts

@@ -9,13 +9,13 @@ export const useBrowserExtension = () => {
     // monitor the attribute on the root element as it may change after the page was loaded
     useEffect(() => {
         const observer = new MutationObserver(mutations => {
-            mutations.forEach(mutation => {
+            for (const mutation of mutations) {
                 if (mutation.type === "attributes") {
                     const element = mutation.target as Element
                     const version = element.getAttribute("browser-extension-installed")
                     if (version) setBrowserExtensionVersion(version)
                 }
-            })
+            }
         })
 
         observer.observe(document.documentElement, {

commafeed-client/src/hooks/useViewMode.ts

@@ -1,4 +1,4 @@
-import { type ViewMode } from "app/types"
+import type { ViewMode } from "app/types"
 import useLocalStorage from "use-local-storage"
 
 export function useViewMode() {

commafeed-client/src/i18n.ts

@@ -1,4 +1,4 @@
-import { i18n, type Messages } from "@lingui/core"
+import { type Messages, i18n } from "@lingui/core"
 import { useAppSelector } from "app/store"
 import dayjs from "dayjs"
 import { useEffect } from "react"

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

@@ -315,7 +315,7 @@ msgstr "输入您当前的密码以更改配置文件设置"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entry headers"
-msgstr ""
+msgstr "条目头部"
 
 #: src/components/Alert.tsx
 msgid "Error"
@@ -578,7 +578,7 @@ msgstr "没有更多条目"
 
 #: src/components/content/ShareButtons.tsx
 msgid "No sharing options available."
-msgstr ""
+msgstr "没有可用的分享选项"
 
 #: src/components/sidebar/TreeSearch.tsx
 msgid "Nothing found"
@@ -590,11 +590,11 @@ msgstr "最早的优先"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On desktop"
-msgstr ""
+msgstr "桌面端"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On mobile"
-msgstr ""
+msgstr "移动端"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On mobile, show action buttons at the bottom of the screen"
@@ -660,7 +660,7 @@ msgstr "OPML 文件"
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file is required"
-msgstr ""
+msgstr "OPML 文件是必需的"
 
 #: src/pages/app/AboutPage.tsx
 msgid "Order"
@@ -718,7 +718,7 @@ msgstr "此 CommaFeed 实例上的注册已关闭"
 
 #: src/pages/app/AboutPage.tsx
 msgid "REST API"
-msgstr ""
+msgstr "REST API"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
@@ -804,7 +804,7 @@ msgstr "显示条目菜单（移动端）"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show external link icon"
-msgstr ""
+msgstr "显示外部链接图标"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show feeds and categories with no unread entries"
@@ -820,7 +820,7 @@ msgstr "显示原生菜单（桌面端）"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show star icon"
-msgstr ""
+msgstr "显示星标图标"
 
 #: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx

commafeed-client/src/main.css

@@ -1,4 +0,0 @@
-html, body {
-    /* disable pull-to-refresh on mobile as it messes with vertical scrolling */
-    overscroll-behavior: none;
-}

commafeed-client/src/main.tsx

@@ -3,7 +3,6 @@ import "@mantine/core/styles.css"
 import "@mantine/notifications/styles.css"
 import "@mantine/spotlight/styles.css"
 import "react-contexify/ReactContexify.css"
-import "main.css"
 import { App } from "App"
 import { store } from "app/store"
 import dayjs from "dayjs"

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

@@ -2,12 +2,12 @@ import { Trans } from "@lingui/macro"
 import { ActionIcon, Box, Code, Container, Group, Table, Text, Title, useMantineTheme } from "@mantine/core"
 import { closeAllModals, openConfirmModal, openModal } from "@mantine/modals"
 import { client, errorToStrings } from "app/client"
-import { type UserModel } from "app/types"
+import type { UserModel } from "app/types"
-import { UserEdit } from "components/admin/UserEdit"
 import { Alert } from "components/Alert"
 import { Loader } from "components/Loader"
 import { RelativeDate } from "components/RelativeDate"
-import { type ReactNode } from "react"
+import { UserEdit } from "components/admin/UserEdit"
+import type { ReactNode } from "react"
 import { useAsync, useAsyncCallback } from "react-async-hook"
 import { TbCheck, TbPencil, TbPlus, TbTrash, TbX } from "react-icons/tb"
 

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

@@ -1,12 +1,13 @@
-import { t, Trans } from "@lingui/macro"
+import { Trans, t } from "@lingui/macro"
 import { Anchor, Box, Container, List, NativeSelect, SimpleGrid, Title } from "@mantine/core"
 import { Constants } from "app/constants"
 import { redirectToApiDocumentation } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
-import { CategorySelect } from "components/content/add/CategorySelect"
 import { KeyboardShortcutsHelp } from "components/KeyboardShortcutsHelp"
+import { CategorySelect } from "components/content/add/CategorySelect"
 import { useBrowserExtension } from "hooks/useBrowserExtension"
-import React, { useState } from "react"
+import type React from "react"
+import { useState } from "react"
 import { TbHelp, TbKeyboard, TbPuzzle, TbRocket } from "react-icons/tb"
 import { tss } from "tss"
 

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

@@ -7,11 +7,11 @@ import { Constants } from "app/constants"
 import { redirectToRootCategory, redirectToSelectedSource } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { reloadTree } from "app/tree/thunks"
-import { type CategoryModificationRequest } from "app/types"
+import type { CategoryModificationRequest } from "app/types"
 import { flattenCategoryTree } from "app/utils"
 import { Alert } from "components/Alert"
-import { CategorySelect } from "components/content/add/CategorySelect"
 import { Loader } from "components/Loader"
+import { CategorySelect } from "components/content/add/CategorySelect"
 import { useEffect } from "react"
 import { useAsync, useAsyncCallback } from "react-async-hook"
 import { TbDeviceFloppy, TbTrash } from "react-icons/tb"

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

@@ -6,11 +6,11 @@ import { client, errorToStrings } from "app/client"
 import { redirectToRootCategory, redirectToSelectedSource } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { reloadTree } from "app/tree/thunks"
-import { type FeedModificationRequest } from "app/types"
+import type { FeedModificationRequest } from "app/types"
 import { Alert } from "components/Alert"
-import { CategorySelect } from "components/content/add/CategorySelect"
 import { Loader } from "components/Loader"
 import { RelativeDate } from "components/RelativeDate"
+import { CategorySelect } from "components/content/add/CategorySelect"
 import { useEffect } from "react"
 import { useAsync, useAsyncCallback } from "react-async-hook"
 import { TbDeviceFloppy, TbTrash } from "react-icons/tb"

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

@@ -2,7 +2,7 @@ import { Trans } from "@lingui/macro"
 import { ActionIcon, Box, Center, Divider, Group, Title, useMantineTheme } from "@mantine/core"
 import { useViewportSize } from "@mantine/hooks"
 import { Constants } from "app/constants"
-import { type EntrySourceType } from "app/entries/slice"
+import type { EntrySourceType } from "app/entries/slice"
 import { loadEntries } from "app/entries/thunks"
 import { redirectToCategoryDetails, redirectToFeedDetails, redirectToTagDetails } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
@@ -62,6 +62,7 @@ export function FeedEntriesPage(props: FeedEntriesPageProps) {
         }
     }
 
+    // biome-ignore lint/correctness/useExhaustiveDependencies: we subscribe to state.timestamp because we want to reload entries even if the props are the same
     useEffect(() => {
         dispatch(
             loadEntries({
@@ -72,7 +73,7 @@ export function FeedEntriesPage(props: FeedEntriesPageProps) {
                 clearSearch: true,
             })
         )
-    }, [dispatch, props.sourceType, id, location.state])
+    }, [dispatch, props.sourceType, id, location.state?.timestamp])
 
     const noSubscriptions = rootCategory && flattenCategoryTree(rootCategory).every(c => c.feeds.length === 0)
     if (noSubscriptions) return <NoSubscriptionHelp />

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

@@ -104,7 +104,7 @@ export default function Layout(props: LayoutProps) {
             label={mobileMenuOpen ? <Trans>Close menu</Trans> : <Trans>Open menu</Trans>}
             icon={mobileMenuOpen ? <TbX size={18} /> : <TbMenu2 size={18} />}
             onClick={() => dispatch(setMobileMenuOpen(!mobileMenuOpen))}
-        ></ActionButton>
+        />
     )
 
     const addButton = (
@@ -201,7 +201,7 @@ export default function Layout(props: LayoutProps) {
                                 width: "10px",
                                 cursor: "ew-resize",
                             }}
-                        ></Box>
+                        />
                     </Draggable>
                 </OnDesktop>
 

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

@@ -1,10 +1,10 @@
-import { t, Trans } from "@lingui/macro"
+import { Trans, t } from "@lingui/macro"
 import { Anchor, Box, Button, Center, Container, Group, Paper, PasswordInput, Stack, TextInput, Title } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
 import { redirectToRootCategory } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
-import { type LoginRequest } from "app/types"
+import type { LoginRequest } from "app/types"
 import { Alert } from "components/Alert"
 import { PageTitle } from "pages/PageTitle"
 import { useAsyncCallback } from "react-async-hook"
@@ -50,6 +50,7 @@ export function LoginPage() {
                             }
                             size="md"
                             required
+                            autoCapitalize="off"
                         />
                         <PasswordInput
                             label={<Trans>Password</Trans>}

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

@@ -1,8 +1,8 @@
-import { t, Trans } from "@lingui/macro"
+import { Trans, t } from "@lingui/macro"
 import { Anchor, Box, Button, Center, Container, Group, Paper, Stack, TextInput, Title } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
-import { type PasswordResetRequest } from "app/types"
+import type { PasswordResetRequest } from "app/types"
 import { Alert } from "components/Alert"
 import { PageTitle } from "pages/PageTitle"
 import { useState } from "react"

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

@@ -1,10 +1,10 @@
-import { t, Trans } from "@lingui/macro"
+import { Trans, t } from "@lingui/macro"
 import { Anchor, Box, Button, Center, Container, Group, Paper, PasswordInput, Stack, TextInput, Title } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
 import { redirectToRootCategory } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
-import { type RegistrationRequest } from "app/types"
+import type { RegistrationRequest } from "app/types"
 import { Alert } from "components/Alert"
 import { PageTitle } from "pages/PageTitle"
 import { useAsyncCallback } from "react-async-hook"

commafeed-client/vite.config.ts

@@ -2,7 +2,7 @@ import { lingui } from "@lingui/vite-plugin"
 import react from "@vitejs/plugin-react"
 import { visualizer } from "rollup-plugin-visualizer"
 import { defineConfig } from "vite"
-import eslint from "vite-plugin-eslint"
+import biomePlugin from "vite-plugin-biome"
 import tsconfigPaths from "vite-tsconfig-paths"
 
 // https://vitejs.dev/config/
@@ -16,9 +16,12 @@ export default defineConfig(env => ({
         }),
         lingui(),
         // https://github.com/vitest-dev/vitest/issues/4055#issuecomment-1732994672
-        env.mode !== "test" && eslint(),
         tsconfigPaths(),
         visualizer(),
+        biomePlugin({
+            mode: "check",
+            failOnError: true,
+        }),
     ],
     base: "./",
     server: {

commafeed-server/dev/checkstyle.xml

@@ -30,6 +30,8 @@
 			<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$" />
 		</module>
 		<module name="ParameterName" />
+		<module name="PatternVariableName" />
+		<module name="RecordComponentName" />
 		<module name="StaticVariableName" />
 		<module name="TypeName" />
 
@@ -90,6 +92,9 @@
 		<module name="SimplifyBooleanReturn" />
 		<module name="StringLiteralEquality" />
 		<module name="UnnecessaryParentheses" />
+		<module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
+		<module name="UnnecessarySemicolonInTryWithResources" />
+		<module name="UnusedLocalVariable" />
 
 		<!-- Checks for class design -->
 		<!-- See http://checkstyle.sf.net/config_design.html -->

commafeed-server/pom.xml

@@ -6,14 +6,14 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>4.4.0</version>
+		<version>4.4.1</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
 
 	<properties>
 		<guice.version>7.0.0</guice.version>
-		<querydsl.version>5.1.0</querydsl.version>
+		<querydsl.version>6.3</querydsl.version>
 		<rome.version>2.1.0</rome.version>
 	</properties>
 
@@ -36,12 +36,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.2.5</version>
+				<version>3.3.0</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.2.5</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<goals>
@@ -54,7 +54,7 @@
 			<plugin>
 				<groupId>io.github.git-commit-id</groupId>
 				<artifactId>git-commit-id-maven-plugin</artifactId>
-				<version>8.0.2</version>
+				<version>9.0.0</version>
 				<executions>
 					<execution>
 						<goals>
@@ -72,7 +72,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.5.2</version>
+				<version>3.6.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.kordamp.shade</groupId>
@@ -121,7 +121,7 @@
 			<plugin>
 				<groupId>io.swagger.core.v3</groupId>
 				<artifactId>swagger-maven-plugin-jakarta</artifactId>
-				<version>2.2.21</version>
+				<version>2.2.22</version>
 				<?m2e ignore?>
 				<configuration>
 					<outputPath>${project.build.directory}/classes/assets</outputPath>
@@ -145,7 +145,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.4.0</version>
+				<version>3.4.1</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -157,7 +157,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>3.4.0</version>
 				<executions>
 					<execution>
 						<id>validate</id>
@@ -211,7 +211,7 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>4.4.0</version>
+			<version>4.4.1</version>
 		</dependency>
 
 		<dependency>
@@ -280,37 +280,27 @@
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
 			<artifactId>swagger-annotations</artifactId>
-			<version>2.2.21</version>
+			<version>2.2.22</version>
 		</dependency>
 
 		<dependency>
-			<groupId>com.querydsl</groupId>
+			<groupId>io.github.openfeign.querydsl</groupId>
 			<artifactId>querydsl-apt</artifactId>
 			<version>${querydsl.version}</version>
 			<scope>provided</scope>
 			<classifier>jakarta</classifier>
 		</dependency>
 		<dependency>
-			<groupId>com.querydsl</groupId>
+			<groupId>io.github.openfeign.querydsl</groupId>
 			<artifactId>querydsl-jpa</artifactId>
 			<version>${querydsl.version}</version>
-			<classifier>jakarta</classifier>
 		</dependency>
 
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.16.1</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
 			<version>4.4</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-math3</artifactId>
@@ -336,7 +326,7 @@
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>5.1.2</version>
+			<version>5.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.mail</groupId>
@@ -373,7 +363,7 @@
 		<dependency>
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
-			<version>74.2</version>
+			<version>75.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.cssparser</groupId>
@@ -397,13 +387,13 @@
 		<dependency>
 			<groupId>io.github.hakky54</groupId>
 			<artifactId>sslcontext-kickstart-for-apache5</artifactId>
-			<version>8.3.4</version>
+			<version>8.3.6</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.google.apis</groupId>
 			<artifactId>google-api-services-youtube</artifactId>
-			<version>v3-rev20240310-2.0.0</version>
+			<version>v3-rev20240514-2.0.0</version>
 		</dependency>
 
 		<dependency>
@@ -419,12 +409,12 @@
 		<dependency>
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>
-			<version>8.3.0</version>
+			<version>8.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
-			<version>3.3.3</version>
+			<version>3.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
@@ -477,7 +467,7 @@
 		<dependency>
 			<groupId>com.microsoft.playwright</groupId>
 			<artifactId>playwright</artifactId>
-			<version>1.43.0</version>
+			<version>1.44.0</version>
 			<scope>test</scope>
 		</dependency>
 

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

@@ -0,0 +1,29 @@
+package com.commafeed.backend;
+
+import java.nio.charset.StandardCharsets;
+
+import com.google.common.hash.HashFunction;
+import com.google.common.hash.Hashing;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+@SuppressWarnings("deprecation")
+public class Digests {
+
+	public static String sha1Hex(byte[] input) {
+		return hashBytesToHex(Hashing.sha1(), input);
+	}
+
+	public static String sha1Hex(String input) {
+		return hashBytesToHex(Hashing.sha1(), input.getBytes(StandardCharsets.UTF_8));
+	}
+
+	public static String md5Hex(String input) {
+		return hashBytesToHex(Hashing.md5(), input.getBytes(StandardCharsets.UTF_8));
+	}
+
+	private static String hashBytesToHex(HashFunction function, byte[] input) {
+		return function.hashBytes(input).toString();
+	}
+}

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

@@ -35,6 +35,7 @@ import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import nl.altindag.ssl.SSLFactory;
 import nl.altindag.ssl.apache5.util.Apache5SslUtils;
 
@@ -43,6 +44,7 @@ import nl.altindag.ssl.apache5.util.Apache5SslUtils;
  *
  */
 @Singleton
+@Slf4j
 public class HttpGetter {
 
 	private final CloseableHttpClient client;
@@ -70,8 +72,9 @@ public class HttpGetter {
 	 *             if the url hasn't changed since we asked for it last time
 	 */
 	public HttpResult getBinary(String url, String lastModified, String eTag, int timeout) throws IOException, NotModifiedException {
-		long start = System.currentTimeMillis();
+		log.debug("fetching {}", url);
 
+		long start = System.currentTimeMillis();
 		ClassicHttpRequest request = ClassicRequestBuilder.get(url).build();
 		if (lastModified != null) {
 			request.addHeader(HttpHeaders.IF_MODIFIED_SINCE, lastModified);

commafeed-server/src/main/java/com/commafeed/backend/cache/CacheService.java

@@ -3,8 +3,7 @@ package com.commafeed.backend.cache;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.codec.digest.DigestUtils;
+import com.commafeed.backend.Digests;
-
 import com.commafeed.backend.feed.parser.FeedParserResult.Entry;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedSubscription;
@@ -20,7 +19,7 @@ public abstract class CacheService {
 	public abstract void setLastEntries(Feed feed, List<String> entries);
 
 	public String buildUniqueEntryKey(Entry entry) {
-		return DigestUtils.sha1Hex(entry.guid() + entry.url());
+		return Digests.sha1Hex(entry.guid() + entry.url());
 	}
 
 	// user categories

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

@@ -8,7 +8,7 @@ import com.commafeed.backend.model.FeedEntryContent;
 import com.commafeed.backend.model.QFeedEntry;
 import com.commafeed.backend.model.QFeedEntryContent;
 import com.querydsl.jpa.JPAExpressions;
-import com.querydsl.jpa.JPQLQuery;
+import com.querydsl.jpa.JPQLSubQuery;
 
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
@@ -29,7 +29,7 @@ public class FeedEntryContentDAO extends GenericDAO<FeedEntryContent> {
 	}
 
 	public long deleteWithoutEntries(int max) {
-		JPQLQuery<Integer> subQuery = JPAExpressions.selectOne().from(entry).where(entry.content.id.eq(content.id));
+		JPQLSubQuery<Integer> subQuery = JPAExpressions.selectOne().from(entry).where(entry.content.id.eq(content.id));
 		List<Long> ids = query().select(content.id).from(content).where(subQuery.notExists()).limit(max).fetch();
 
 		return deleteQuery(content).where(content.id.in(ids)).execute();

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

@@ -16,15 +16,12 @@ import io.dropwizard.hibernate.AbstractDAO;
 
 public abstract class GenericDAO<T extends AbstractModel> extends AbstractDAO<T> {
 
-	private final JPAQueryFactory factory;
-
 	protected GenericDAO(SessionFactory sessionFactory) {
 		super(sessionFactory);
-		this.factory = new JPAQueryFactory(this::currentSession);
 	}
 
 	protected JPAQueryFactory query() {
-		return factory;
+		return new JPAQueryFactory(currentSession());
 	}
 
 	protected JPAUpdateClause updateQuery(EntityPath<T> entityPath) {

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

@@ -5,8 +5,8 @@ import java.time.Instant;
 import java.util.Set;
 
 import org.apache.commons.codec.binary.StringUtils;
-import org.apache.commons.codec.digest.DigestUtils;
 
+import com.commafeed.backend.Digests;
 import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.HttpGetter.NotModifiedException;
@@ -68,7 +68,7 @@ public class FeedFetcher {
 		boolean lastModifiedHeaderValueChanged = !StringUtils.equals(lastModified, result.getLastModifiedSince());
 		boolean etagHeaderValueChanged = !StringUtils.equals(eTag, result.getETag());
 
-		String hash = DigestUtils.sha1Hex(content);
+		String hash = Digests.sha1Hex(content);
 		if (lastContentHash != null && lastContentHash.equals(hash)) {
 			log.debug("content hash not modified: {}", feedUrl);
 			throw new NotModifiedException("content hash not modified",

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

@@ -12,11 +12,11 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
+import com.commafeed.backend.Digests;
 import com.commafeed.backend.cache.CacheService;
 import com.commafeed.backend.dao.FeedSubscriptionDAO;
 import com.commafeed.backend.dao.UnitOfWork;
@@ -89,7 +89,7 @@ public class FeedRefreshUpdater {
 		// lock on content, make sure we are not updating the same entry
 		// twice at the same time
 		Content content = entry.content();
-		String key2 = DigestUtils.sha1Hex(StringUtils.trimToEmpty(content.content() + content.title()));
+		String key2 = Digests.sha1Hex(StringUtils.trimToEmpty(content.content() + content.title()));
 
 		Iterator<Lock> iterator = locks.bulkGet(Arrays.asList(key1, key2)).iterator();
 		Lock lock1 = iterator.next();

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

@@ -58,11 +58,11 @@ public class FeedEntryStatus extends AbstractModel {
 	}
 
 	public FeedEntryStatus(User user, FeedSubscription subscription, FeedEntry entry) {
-		setUser(user);
+		this.user = user;
-		setSubscription(subscription);
+		this.subscription = subscription;
-		setEntry(entry);
+		this.entry = entry;
-		setEntryInserted(entry.getInserted());
+		this.entryInserted = entry.getInserted();
-		setEntryUpdated(entry.getUpdated());
+		this.entryUpdated = entry.getUpdated();
 	}
 
 }

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

@@ -2,9 +2,9 @@ package com.commafeed.backend.service;
 
 import java.util.Optional;
 
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import com.commafeed.backend.Digests;
 import com.commafeed.backend.dao.FeedEntryContentDAO;
 import com.commafeed.backend.feed.FeedUtils;
 import com.commafeed.backend.feed.parser.FeedParserResult.Content;
@@ -42,8 +42,8 @@ public class FeedEntryContentService {
 
 	private FeedEntryContent buildContent(Content content, String baseUrl) {
 		FeedEntryContent entryContent = new FeedEntryContent();
-		entryContent.setTitleHash(DigestUtils.sha1Hex(StringUtils.trimToEmpty(content.title())));
+		entryContent.setTitleHash(Digests.sha1Hex(StringUtils.trimToEmpty(content.title())));
-		entryContent.setContentHash(DigestUtils.sha1Hex(StringUtils.trimToEmpty(content.content())));
+		entryContent.setContentHash(Digests.sha1Hex(StringUtils.trimToEmpty(content.content())));
 		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));

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

@@ -3,8 +3,7 @@ package com.commafeed.backend.service;
 import java.time.Instant;
 import java.util.List;
 
-import org.apache.commons.codec.digest.DigestUtils;
+import com.commafeed.backend.Digests;
-
 import com.commafeed.backend.cache.CacheService;
 import com.commafeed.backend.dao.FeedEntryDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
@@ -41,7 +40,7 @@ public class FeedEntryService {
 	 */
 	public FeedEntry findOrCreate(Feed feed, Entry entry) {
 		String guid = FeedUtils.truncate(entry.guid(), 2048);
-		String guidHash = DigestUtils.sha1Hex(entry.guid());
+		String guidHash = Digests.sha1Hex(entry.guid());
 		FeedEntry existing = feedEntryDAO.findExisting(guidHash, feed);
 		if (existing != null) {
 			return existing;

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

@@ -2,17 +2,17 @@ package com.commafeed.backend.service;
 
 import java.io.IOException;
 import java.time.Instant;
+import java.util.Objects;
 import java.util.Set;
 
-import org.apache.commons.codec.digest.DigestUtils;
+import com.commafeed.backend.Digests;
-import org.apache.commons.io.IOUtils;
-
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.favicon.AbstractFaviconFetcher;
 import com.commafeed.backend.favicon.Favicon;
 import com.commafeed.backend.feed.FeedUtils;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.Models;
+import com.google.common.io.Resources;
 
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
@@ -31,7 +31,8 @@ public class FeedService {
 		this.faviconFetchers = faviconFetchers;
 
 		try {
-			defaultFavicon = new Favicon(IOUtils.toByteArray(getClass().getResource("/images/default_favicon.gif")), "image/gif");
+			defaultFavicon = new Favicon(
+					Resources.toByteArray(Objects.requireNonNull(getClass().getResource("/images/default_favicon.gif"))), "image/gif");
 		} catch (IOException e) {
 			throw new RuntimeException("could not load default favicon", e);
 		}
@@ -39,7 +40,7 @@ public class FeedService {
 
 	public synchronized Feed findOrCreate(String url) {
 		String normalizedUrl = FeedUtils.normalizeURL(url);
-		String normalizedUrlHash = DigestUtils.sha1Hex(normalizedUrl);
+		String normalizedUrlHash = Digests.sha1Hex(normalizedUrl);
 		Feed feed = feedDAO.findByUrl(normalizedUrl, normalizedUrlHash);
 		if (feed == null) {
 			feed = new Feed();
@@ -55,7 +56,7 @@ public class FeedService {
 	public void save(Feed feed) {
 		String normalized = FeedUtils.normalizeURL(feed.getUrl());
 		feed.setNormalizedUrl(normalized);
-		feed.setNormalizedUrlHash(DigestUtils.sha1Hex(normalized));
+		feed.setNormalizedUrlHash(Digests.sha1Hex(normalized));
 		feed.setLastUpdated(Instant.now());
 		feed.setEtagHeader(FeedUtils.truncate(feed.getEtagHeader(), 255));
 		feedDAO.saveOrUpdate(feed);

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

@@ -8,11 +8,11 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.CommaFeedApplication;
 import com.commafeed.CommaFeedConfiguration;
+import com.commafeed.backend.Digests;
 import com.commafeed.backend.dao.FeedCategoryDAO;
 import com.commafeed.backend.dao.FeedSubscriptionDAO;
 import com.commafeed.backend.dao.UserDAO;
@@ -94,7 +94,7 @@ public class UserService {
 			return Optional.empty();
 		}
 
-		String computedFeverApiKey = DigestUtils.md5Hex(user.getName() + ":" + user.getApiKey());
+		String computedFeverApiKey = Digests.md5Hex(user.getName() + ":" + user.getApiKey());
 		if (!computedFeverApiKey.equals(feverApiKey)) {
 			return Optional.empty();
 		}
@@ -158,7 +158,7 @@ public class UserService {
 
 	public String generateApiKey(User user) {
 		byte[] key = encryptionService.getEncryptedPassword(UUID.randomUUID().toString(), user.getSalt());
-		return DigestUtils.sha1Hex(key);
+		return Digests.sha1Hex(key);
 	}
 
 	public Set<Role> getRoles(User user) {

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

@@ -11,7 +11,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.glassfish.jersey.media.multipart.FormDataParam;
@@ -399,20 +398,20 @@ public class FeedREST {
 		Preconditions.checkNotNull(req.getTitle());
 		Preconditions.checkNotNull(req.getUrl());
 
-		String url = prependHttp(req.getUrl());
 		try {
-			url = fetchFeedInternal(url).getUrl();
-
 			FeedCategory category = null;
 			if (req.getCategoryId() != null && !CategoryREST.ALL.equals(req.getCategoryId())) {
 				category = feedCategoryDAO.findById(Long.valueOf(req.getCategoryId()));
 			}
-			FeedInfo info = fetchFeedInternal(url);
+
+			FeedInfo info = fetchFeedInternal(prependHttp(req.getUrl()));
 			long subscriptionId = feedSubscriptionService.subscribe(user, info.getUrl(), req.getTitle(), category);
 			return Response.ok(subscriptionId).build();
 		} catch (Exception e) {
-			log.error("Failed to subscribe to URL {}: {}", url, e.getMessage(), e);
+			log.error("Failed to subscribe to URL {}: {}", req.getUrl(), e.getMessage(), e);
-			return Response.status(Status.SERVICE_UNAVAILABLE).entity("Failed to subscribe to URL " + url + ": " + e.getMessage()).build();
+			return Response.status(Status.SERVICE_UNAVAILABLE)
+					.entity("Failed to subscribe to URL " + req.getUrl() + ": " + e.getMessage())
+					.build();
 		}
 	}
 
@@ -423,14 +422,9 @@ public class FeedREST {
 	@Timed
 	public Response subscribeFromUrl(@Parameter(hidden = true) @SecurityCheck User user,
 			@Parameter(description = "feed url", required = true) @QueryParam("url") String url) {
-
 		try {
 			Preconditions.checkNotNull(url);
-
+			FeedInfo info = fetchFeedInternal(prependHttp(url));
-			url = prependHttp(url);
-			url = fetchFeedInternal(url).getUrl();
-
-			FeedInfo info = fetchFeedInternal(url);
 			feedSubscriptionService.subscribe(user, info.getUrl(), info.getTitle());
 		} catch (Exception e) {
 			log.info("Could not subscribe to url {} : {}", url, e.getMessage());
@@ -529,7 +523,7 @@ public class FeedREST {
 			return Response.status(Status.FORBIDDEN).entity("Import is disabled for the demo account").build();
 		}
 		try {
-			String opml = IOUtils.toString(input, StandardCharsets.UTF_8);
+			String opml = new String(input.readAllBytes(), StandardCharsets.UTF_8);
 			opmlImporter.importOpml(user, opml);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);

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

@@ -6,7 +6,6 @@ import java.util.Collections;
 import java.util.Optional;
 import java.util.UUID;
 
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.core5.net.URIBuilder;
@@ -14,6 +13,7 @@ import org.apache.hc.core5.net.URIBuilder;
 import com.codahale.metrics.annotation.Timed;
 import com.commafeed.CommaFeedApplication;
 import com.commafeed.CommaFeedConfiguration;
+import com.commafeed.backend.Digests;
 import com.commafeed.backend.dao.UserDAO;
 import com.commafeed.backend.dao.UserRoleDAO;
 import com.commafeed.backend.dao.UserSettingsDAO;
@@ -134,8 +134,8 @@ public class UserREST {
 			s.setLanguage("en");
 			s.setScrollSpeed(400);
 			s.setScrollMode(ScrollMode.if_needed.name());
-			s.setStarIconDisplayMode(IconDisplayMode.always.name());
+			s.setStarIconDisplayMode(IconDisplayMode.on_desktop.name());
-			s.setExternalLinkIconDisplayMode(IconDisplayMode.always.name());
+			s.setExternalLinkIconDisplayMode(IconDisplayMode.on_desktop.name());
 			s.setMarkAllAsReadConfirmation(true);
 			s.setCustomContextMenu(true);
 			s.setMobileFooter(false);
@@ -292,7 +292,7 @@ public class UserREST {
 		}
 
 		try {
-			user.setRecoverPasswordToken(DigestUtils.sha1Hex(UUID.randomUUID().toString()));
+			user.setRecoverPasswordToken(Digests.sha1Hex(UUID.randomUUID().toString()));
 			user.setRecoverPasswordTokenDate(Instant.now());
 			userDAO.saveOrUpdate(user);
 			mailService.sendMail(user, "Password recovery", buildEmailContent(user));

commafeed-server/src/main/java/com/commafeed/frontend/servlet/AbstractCustomCodeServlet.java

@@ -20,9 +20,9 @@ abstract class AbstractCustomCodeServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 1L;
 
-	private final UnitOfWork unitOfWork;
+	private final transient UnitOfWork unitOfWork;
-	private final UserDAO userDAO;
+	private final transient UserDAO userDAO;
-	private final UserSettingsDAO userSettingsDAO;
+	private final transient UserSettingsDAO userSettingsDAO;
 
 	@Override
 	protected final void doGet(final HttpServletRequest req, HttpServletResponse resp) throws IOException {

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

@@ -0,0 +1,18 @@
+package com.commafeed.backend;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class DigestsTest {
+
+	@Test
+	void sha1Hex() {
+		Assertions.assertEquals("aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d", Digests.sha1Hex("hello"));
+	}
+
+	@Test
+	void md5Hex() {
+		Assertions.assertEquals("5d41402abc4b2a76b9719d911017c592", Digests.md5Hex("hello"));
+	}
+
+}

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

@@ -3,7 +3,6 @@ package com.commafeed.backend.feed;
 import java.time.Instant;
 import java.util.Set;
 
-import org.apache.commons.codec.digest.DigestUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -17,6 +16,7 @@ import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.HttpGetter.NotModifiedException;
 import com.commafeed.backend.feed.parser.FeedParser;
 import com.commafeed.backend.urlprovider.FeedURLProvider;
+import com.google.gwt.thirdparty.guava.common.hash.Hashing;
 
 @ExtendWith(MockitoExtension.class)
 class FeedFetcherTest {
@@ -43,7 +43,7 @@ class FeedFetcherTest {
 		String lastModified = "last-modified-1";
 		String etag = "etag-1";
 		byte[] content = "content".getBytes();
-		String lastContentHash = DigestUtils.sha1Hex(content);
+		String lastContentHash = Hashing.sha1().hashBytes(content).toString();
 
 		Mockito.when(getter.getBinary(url, lastModified, etag, 20000))
 				.thenReturn(new HttpResult(content, "content-type", "last-modified-2", "etag-2", 20, null));

commafeed-server/src/test/java/com/commafeed/e2e/AuthentificationIT.java

@@ -5,7 +5,9 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import com.commafeed.CommaFeedDropwizardAppExtension;
 import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
 import com.microsoft.playwright.assertions.PlaywrightAssertions;
+import com.microsoft.playwright.options.AriaRole;
 
 import io.dropwizard.testing.junit5.DropwizardExtensionsSupport;
 
@@ -17,10 +19,10 @@ class AuthentificationIT extends PlaywrightTestBase {
 	@Test
 	void loginFail() {
 		page.navigate(getLoginPageUrl());
-		page.locator("[placeholder='User Name or E-mail']").fill("admin");
+		page.getByPlaceholder("User Name or E-mail").fill("admin");
-		page.locator("[placeholder='Password']").fill("wrong_password");
+		page.getByPlaceholder("Password").fill("wrong_password");
-		page.locator("button:has-text('Log in')").click();
+		page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Log in")).click();
-		PlaywrightAssertions.assertThat(page.locator("div[role='alert']")).containsText("wrong username or password");
+		PlaywrightAssertions.assertThat(page.getByRole(AriaRole.ALERT)).containsText("wrong username or password");
 	}
 
 	@Test
@@ -33,13 +35,13 @@ class AuthentificationIT extends PlaywrightTestBase {
 	@Test
 	void registerFailPasswordTooSimple() {
 		page.navigate(getLoginPageUrl());
-		page.locator("text=Sign up!").click();
+		page.getByText("Sign up!").click();
-		page.locator("[placeholder='User Name']").fill("user");
+		page.getByPlaceholder("User Name").fill("user");
-		page.locator("[placeholder='E-mail address']").fill("user@domain.com");
+		page.getByPlaceholder("E-mail address").fill("user@domain.com");
-		page.locator("[placeholder='Password']").fill("pass");
+		page.getByPlaceholder("Password").fill("pass");
-		page.locator("button:has-text('Sign up')").click();
+		page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign up")).click();
 
-		Locator alert = page.locator("div[role='alert']");
+		Locator alert = page.getByRole(AriaRole.ALERT);
 		PlaywrightAssertions.assertThat(alert).containsText("Password must be 8 or more characters in length.");
 		PlaywrightAssertions.assertThat(alert).containsText("Password must contain 1 or more uppercase characters.");
 		PlaywrightAssertions.assertThat(alert).containsText("Password must contain 1 or more digit characters.");
@@ -49,11 +51,11 @@ class AuthentificationIT extends PlaywrightTestBase {
 	@Test
 	void registerSuccess() {
 		page.navigate(getLoginPageUrl());
-		page.locator("text=Sign up!").click();
+		page.getByText("Sign up!").click();
-		page.locator("[placeholder='User Name']").fill("user");
+		page.getByPlaceholder("User Name").fill("user");
-		page.locator("[placeholder='E-mail address']").fill("user@domain.com");
+		page.getByPlaceholder("E-mail address").fill("user@domain.com");
-		page.locator("[placeholder='Password']").fill("MyPassword1!");
+		page.getByPlaceholder("Password").fill("MyPassword1!");
-		page.locator("button:has-text('Sign up')").click();
+		page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign up")).click();
 		PlaywrightAssertions.assertThat(page).hasURL("http://localhost:" + EXT.getLocalPort() + "/#/app/category/all");
 	}
 

commafeed-server/src/test/java/com/commafeed/e2e/PlaywrightTestBase.java

@@ -3,7 +3,7 @@ package com.commafeed.e2e;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.time.Instant;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Optional;
 
@@ -34,7 +34,7 @@ import com.microsoft.playwright.Tracing;
  * 
  */
 @ExtendWith(PlaywrightTestBase.SaveArtifactsOnTestFailed.class)
-public class PlaywrightTestBase {
+public abstract class PlaywrightTestBase {
 
 	private static Playwright playwright;
 	private static Browser browser;
@@ -115,7 +115,7 @@ public class PlaywrightTestBase {
 
 		private String getFileName(ExtensionContext context) {
 			return String.format("%s.%s-%s", context.getRequiredTestClass().getSimpleName(), context.getRequiredTestMethod().getName(),
-					DateTimeFormatter.ofPattern("yyyy-MM-dd--HH-mm-ss").format(Instant.now()));
+					DateTimeFormatter.ofPattern("yyyy-MM-dd--HH-mm-ss").format(ZonedDateTime.now()));
 		}
 
 		private void saveScreenshot(PlaywrightTestBase testInstance, String fileName) {

commafeed-server/src/test/java/com/commafeed/e2e/PlaywrightTestUtils.java

@@ -1,6 +1,8 @@
 package com.commafeed.e2e;
 
 import com.microsoft.playwright.Page;
+import com.microsoft.playwright.Page.GetByRoleOptions;
+import com.microsoft.playwright.options.AriaRole;
 
 import lombok.experimental.UtilityClass;
 
@@ -8,9 +10,9 @@ import lombok.experimental.UtilityClass;
 public class PlaywrightTestUtils {
 
 	public static void login(Page page) {
-		page.locator("[placeholder='User Name or E-mail']").fill("admin");
+		page.getByPlaceholder("User Name or E-mail").fill("admin");
-		page.locator("[placeholder='Password']").fill("admin");
+		page.getByPlaceholder("Password").fill("admin");
-		page.locator("button:has-text('Log in')").click();
+		page.getByRole(AriaRole.BUTTON, new GetByRoleOptions().setName("Log in")).click();
 	}
 
 }