release 4.3.3

Bump @emotion/react from 11.11.3 to 11.11.4 in /commafeed-client

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [4.3.3]
+
+- fix OPML import (#1279)
+
+## [4.3.2]
+
+- added support for unix sockets (#1278)
+
+## [4.3.1]
+
+- fix an issue that prevents new feeds from being added when mysql/mariadb is used as the database and the database
+  timezone is not UTC (#1239)
+- videos in enclosures can no longer have a width larger than the page (#1240)
+
 ## [4.3.0]
 
 - h2 (the embedded database) has been upgraded to 2.2.224

commafeed-client/.eslintrc.cjs

@@ -1,41 +1,47 @@
 module.exports = {
     env: {
         browser: true,
-        es2021: true
+        es2021: true,
     },
-    extends: ["standard-with-typescript", "plugin:react/recommended", "plugin:react-hooks/recommended", "plugin:prettier/recommended"],
+    extends: [
+        "eslint:recommended",
+        "standard",
+        "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"
-        }
+            version: "detect",
+        },
     },
     overrides: [
         {
             env: {
-                node: true
+                node: true,
             },
             files: [".eslintrc.{js,cjs}"],
             parserOptions: {
-                sourceType: "script"
-            }
-        }
+                sourceType: "script",
+            },
+        },
     ],
     parserOptions: {
+        project: true,
         ecmaVersion: "latest",
-        sourceType: "module"
+        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/strict-boolean-expressions": "off",
-        "@typescript-eslint/unbound-method": "off",
         "react/no-unescaped-entities": "off",
         "react/react-in-jsx-scope": "off",
-        "react-hooks/exhaustive-deps": "error"
-    }
+        "react-hooks/exhaustive-deps": "error",
+    },
 }

commafeed-client/package.json

@@ -14,19 +14,19 @@
     "i18n:extract": "lingui extract --clean"
   },
   "dependencies": {
-    "@emotion/react": "^11.11.3",
-    "@fontsource/open-sans": "^5.0.22",
-    "@lingui/core": "^4.7.0",
-    "@lingui/macro": "^4.7.0",
-    "@lingui/react": "^4.7.0",
-    "@mantine/core": "^7.5.1",
-    "@mantine/form": "^7.5.1",
-    "@mantine/hooks": "^7.5.1",
-    "@mantine/modals": "^7.5.1",
-    "@mantine/notifications": "^7.5.1",
-    "@mantine/spotlight": "^7.5.1",
+    "@emotion/react": "^11.11.4",
+    "@fontsource/open-sans": "^5.0.25",
+    "@lingui/core": "^4.7.1",
+    "@lingui/macro": "^4.7.1",
+    "@lingui/react": "^4.7.1",
+    "@mantine/core": "^7.6.1",
+    "@mantine/form": "^7.6.1",
+    "@mantine/hooks": "^7.6.1",
+    "@mantine/modals": "^7.6.1",
+    "@mantine/notifications": "^7.6.1",
+    "@mantine/spotlight": "^7.6.1",
     "@monaco-editor/react": "^4.6.0",
-    "@reduxjs/toolkit": "^2.1.0",
+    "@reduxjs/toolkit": "^2.2.1",
     "axios": "^1.6.7",
     "dayjs": "^1.11.10",
     "escape-string-regexp": "^5.0.0",
@@ -42,7 +42,7 @@
     "react-icons": "^5.0.1",
     "react-infinite-scroller": "^1.2.6",
     "react-redux": "^9.1.0",
-    "react-router-dom": "^6.22.0",
+    "react-router-dom": "^6.22.2",
     "react-swipeable": "^7.0.1",
     "redoc": "^2.1.3",
     "throttle-debounce": "^5.0.0",
@@ -52,31 +52,31 @@
     "websocket-heartbeat-js": "^1.1.3"
   },
   "devDependencies": {
-    "@lingui/cli": "^4.7.0",
-    "@lingui/vite-plugin": "^4.7.0",
+    "@lingui/cli": "^4.7.1",
+    "@lingui/vite-plugin": "^4.7.1",
     "@types/mousetrap": "^1.6.15",
-    "@types/react": "^18.2.55",
+    "@types/react": "^18.2.61",
     "@types/react-dom": "^18.2.19",
     "@types/react-infinite-scroller": "^1.2.5",
     "@types/swagger-ui-react": "^4.18.3",
     "@types/throttle-debounce": "^5.0.2",
     "@types/tinycon": "^0.6.5",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
     "@vitejs/plugin-react": "^4.2.1",
     "babel-plugin-macros": "^3.1.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard-with-typescript": "^43.0.1",
+    "eslint-config-standard": "^17.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react": "^7.34.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "prettier": "^3.2.5",
     "rollup-plugin-visualizer": "^5.12.0",
     "typescript": "^5.3.3",
-    "vite": "^5.1.1",
+    "vite": "^5.1.4",
     "vite-plugin-eslint": "^1.8.1",
     "vite-tsconfig-paths": "^4.3.1",
-    "vitest": "^1.2.2",
+    "vitest": "^1.3.1",
     "vitest-mock-extended": "^1.3.1"
   }
 }

commafeed-client/pom.xml

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

commafeed-client/src/app/client.ts

@@ -1,7 +1,8 @@
-import axios from "axios"
+import axios, { AxiosError } from "axios"
 import {
     type AddCategoryRequest,
     type AdminSaveUserRequest,
+    AuthenticationError,
     type Category,
     type CategoryModificationRequest,
     type CollapseRequest,
@@ -31,17 +32,18 @@ const axiosInstance = axios.create({ baseURL: "./rest", withCredentials: true })
 axiosInstance.interceptors.response.use(
     response => response,
     error => {
-        const { status, data } = error.response
-        if (
-            (status === 401 && data?.message === "Credentials are required to access this resource.") ||
-            (status === 403 && data?.message === "You don't have the required role to access this resource.")
-        ) {
+        if (isAuthenticationError(error)) {
+            const data = error.response?.data
             window.location.hash = data?.allowRegistrations ? "/welcome" : "/login"
         }
         throw error
     }
 )
 
+function isAuthenticationError(error: unknown): error is AxiosError<AuthenticationError> {
+    return axios.isAxiosError(error) && !!error.response && [401, 403].includes(error.response.status)
+}
+
 export const client = {
     category: {
         getRoot: async () => await axiosInstance.get<Category>("category/get"),
@@ -107,14 +109,19 @@ export const client = {
 export const errorToStrings = (err: unknown) => {
     let strings: string[] = []
 
-    if (axios.isAxiosError(err)) {
-        if (err.response) {
-            const { data } = err.response
-            if (typeof data === "string") strings.push(data)
-            if (typeof data === "object" && data.message) strings.push(data.message as string)
-            if (typeof data === "object" && data.errors) strings = [...strings, ...data.errors]
-        }
+    if (axios.isAxiosError(err) && err.response) {
+        if (typeof err.response.data === "string") strings.push(err.response.data)
+        if (isMessageError(err)) strings.push(err.response.data.message)
+        if (isMessageArrayError(err)) strings = [...strings, ...err.response.data.errors]
     }
 
     return strings
 }
+
+function isMessageError(err: AxiosError): err is AxiosError<{ message: string }> {
+    return !!err.response && !!err.response.data && typeof err.response.data === "object" && "message" in err.response.data
+}
+
+function isMessageArrayError(err: AxiosError): err is AxiosError<{ errors: string[] }> {
+    return !!err.response && !!err.response.data && typeof err.response.data === "object" && "errors" in err.response.data
+}

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

@@ -1,4 +1,3 @@
-/* eslint-disable import/first */
 import { configureStore } from "@reduxjs/toolkit"
 import { type client } from "app/client"
 import { loadEntries, loadMoreEntries, markAllEntries, markEntry } from "app/entries/thunks"
@@ -90,7 +89,7 @@ describe("entries", () => {
         expect(store.getState().entries.hasMore).toBe(false)
     })
 
-    it("marks an entry as read", async () => {
+    it("marks an entry as read", () => {
         const store = configureStore({
             reducer: reducers,
             preloadedState: {
@@ -117,7 +116,7 @@ describe("entries", () => {
         expect(mockClient.entry.mark).toHaveBeenCalledWith({ id: "3", read: true })
     })
 
-    it("marks all entries as read", async () => {
+    it("marks all entries as read", () => {
         const store = configureStore({
             reducer: reducers,
             preloadedState: {

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

@@ -46,11 +46,11 @@ const buildGetEntriesPaginatedRequest = (state: RootState, source: EntrySource,
     tag: source.type === "tag" ? source.id : undefined,
     keywords: state.entries.search,
 })
-export const reloadEntries = createAppAsyncThunk("entries/reload", async (arg, thunkApi) => {
+export const reloadEntries = createAppAsyncThunk("entries/reload", (arg, thunkApi) => {
     const state = thunkApi.getState()
     thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
 })
-export const search = createAppAsyncThunk("entries/search", async (arg: string, thunkApi) => {
+export const search = createAppAsyncThunk("entries/search", (arg: string, thunkApi) => {
     const state = thunkApi.getState()
     thunkApi.dispatch(setSearch(arg))
     thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
@@ -84,7 +84,7 @@ export const markMultipleEntries = createAppAsyncThunk(
         thunkApi.dispatch(reloadTree())
     }
 )
-export const markEntriesUpToEntry = createAppAsyncThunk("entries/entry/upToEntry", async (arg: Entry, thunkApi) => {
+export const markEntriesUpToEntry = createAppAsyncThunk("entries/entry/upToEntry", (arg: Entry, thunkApi) => {
     const state = thunkApi.getState()
     const { entries } = state.entries
 

commafeed-client/src/app/types.ts

@@ -1,8 +1,33 @@
+export type ReadingMode = "all" | "unread"
+
+export type ReadingOrder = "asc" | "desc"
+
+export type ViewMode = "title" | "cozy" | "detailed" | "expanded"
+
+export type ScrollMode = "always" | "never" | "if_needed"
+
 export interface AddCategoryRequest {
     name: string
     parentId?: string
 }
 
+export interface Subscription {
+    id: number
+    name: string
+    message?: string
+    errorCount: number
+    lastRefresh?: number
+    nextRefresh?: number
+    feedUrl: string
+    feedLink: string
+    iconUrl: string
+    unread: number
+    categoryId?: string
+    position: number
+    newestItemTime?: number
+    filter?: string
+}
+
 export interface Category {
     id: string
     parentId?: string
@@ -26,19 +51,6 @@ export interface CollapseRequest {
     collapse: boolean
 }
 
-export interface Entries {
-    name: string
-    message?: string
-    errorCount: number
-    feedLink: string
-    timestamp: number
-    hasMore: boolean
-    offset?: number
-    limit?: number
-    entries: Entry[]
-    ignoredReadStatus: boolean
-}
-
 export interface Entry {
     id: string
     guid: string
@@ -67,6 +79,19 @@ export interface Entry {
     tags: string[]
 }
 
+export interface Entries {
+    name: string
+    message?: string
+    errorCount: number
+    feedLink: string
+    timestamp: number
+    hasMore: boolean
+    offset?: number
+    limit?: number
+    entries: Entry[]
+    ignoredReadStatus: boolean
+}
+
 export interface FeedInfo {
     url: string
     title: string
@@ -196,6 +221,17 @@ export interface ServerInfo {
     treeReloadInterval: number
 }
 
+export interface SharingSettings {
+    email: boolean
+    gmail: boolean
+    facebook: boolean
+    twitter: boolean
+    tumblr: boolean
+    pocket: boolean
+    instapaper: boolean
+    buffer: boolean
+}
+
 export interface Settings {
     language: string
     readingMode: ReadingMode
@@ -212,17 +248,6 @@ export interface Settings {
     sharingSettings: SharingSettings
 }
 
-export interface SharingSettings {
-    email: boolean
-    gmail: boolean
-    facebook: boolean
-    twitter: boolean
-    tumblr: boolean
-    pocket: boolean
-    instapaper: boolean
-    buffer: boolean
-}
-
 export interface StarRequest {
     id: string
     feedId: number
@@ -235,34 +260,11 @@ export interface SubscribeRequest {
     categoryId?: string
 }
 
-export interface Subscription {
-    id: number
-    name: string
-    message?: string
-    errorCount: number
-    lastRefresh?: number
-    nextRefresh?: number
-    feedUrl: string
-    feedLink: string
-    iconUrl: string
-    unread: number
-    categoryId?: string
-    position: number
-    newestItemTime?: number
-    filter?: string
-}
-
 export interface TagRequest {
     entryId: number
     tags: string[]
 }
 
-export interface UnreadCount {
-    feedId?: number
-    unreadCount?: number
-    newestItemTime?: number
-}
-
 export interface UserModel {
     id: number
     name: string
@@ -284,10 +286,7 @@ export interface AdminSaveUserRequest {
     admin: boolean
 }
 
-export type ReadingMode = "all" | "unread"
-
-export type ReadingOrder = "asc" | "desc"
-
-export type ViewMode = "title" | "cozy" | "detailed" | "expanded"
-
-export type ScrollMode = "always" | "never" | "if_needed"
+export interface AuthenticationError {
+    message: string
+    allowRegistrations: boolean
+}

commafeed-client/src/components/ImageWithPlaceholderWhileLoading.tsx

@@ -1,5 +1,4 @@
-import { Box, Center, type MantineTheme, useMantineTheme } from "@mantine/core"
-import { useColorScheme } from "hooks/useColorScheme"
+import { Box, Center } from "@mantine/core"
 import { useState } from "react"
 import { TbPhoto } from "react-icons/tb"
 import { tss } from "tss"
@@ -18,8 +17,6 @@ interface ImageWithPlaceholderWhileLoadingProps {
 
 const useStyles = tss
     .withParams<{
-        theme: MantineTheme
-        colorScheme: "light" | "dark"
         placeholderWidth?: number
         placeholderHeight?: number
         placeholderBackgroundColor?: string
@@ -46,11 +43,7 @@ export function ImageWithPlaceholderWhileLoading({
     title,
     width,
 }: ImageWithPlaceholderWhileLoadingProps) {
-    const theme = useMantineTheme()
-    const colorScheme = useColorScheme()
     const { classes } = useStyles({
-        theme,
-        colorScheme,
         placeholderWidth,
         placeholderHeight,
         placeholderBackgroundColor,

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

@@ -76,7 +76,7 @@ class HighlightMatcher extends Matcher {
         return this.doMatch(string, new RegExp(pattern, "i"), () => ({}))
     }
 
-    replaceWith(children: ChildrenNode, props: unknown): Node {
+    replaceWith(children: ChildrenNode): Node {
         return <Mark>{children}</Mark>
     }
 

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

@@ -2,14 +2,14 @@ import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
 import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
 
 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")
+    const hasVideo = props.enclosureType.startsWith("video")
+    const hasAudio = props.enclosureType.startsWith("audio")
+    const hasImage = props.enclosureType.startsWith("image")
 
     return (
         <BasicHtmlStyles>
             {hasVideo && (
-                <video controls>
+                <video controls width="100%">
                     <source src={props.enclosureUrl} type={props.enclosureType} />
                 </video>
             )}

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

@@ -295,7 +295,6 @@ export function FeedEntries() {
         })
     )
 
-    if (!entries) return <Loader />
     return (
         <InfiniteScroll
             id="entries"

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

@@ -1,7 +1,6 @@
-import { Box, Divider, type MantineRadius, type MantineSpacing, type MantineTheme, Paper, useMantineTheme } from "@mantine/core"
+import { Box, Divider, type MantineRadius, type MantineSpacing, Paper } from "@mantine/core"
 import { Constants } from "app/constants"
 import { type Entry, type ViewMode } from "app/types"
-import { useColorScheme } from "hooks/useColorScheme"
 import { useViewMode } from "hooks/useViewMode"
 import React from "react"
 import { useSwipeable } from "react-swipeable"
@@ -26,8 +25,6 @@ interface FeedEntryProps {
 
 const useStyles = tss
     .withParams<{
-        theme: MantineTheme
-        colorScheme: "light" | "dark"
         read: boolean
         expanded: boolean
         viewMode: ViewMode
@@ -96,12 +93,8 @@ const useStyles = tss
     })
 
 export function FeedEntry(props: FeedEntryProps) {
-    const theme = useMantineTheme()
-    const colorScheme = useColorScheme()
     const { viewMode } = useViewMode()
     const { classes, cx } = useStyles({
-        theme,
-        colorScheme,
         read: props.entry.read,
         expanded: props.expanded,
         viewMode,

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

@@ -2,7 +2,6 @@ import { Box, Text } from "@mantine/core"
 import { type Entry } from "app/types"
 import { RelativeDate } from "components/RelativeDate"
 import { OnDesktop } from "components/responsive/OnDesktop"
-import { useColorScheme } from "hooks/useColorScheme"
 import { tss } from "tss"
 import { FeedEntryTitle } from "./FeedEntryTitle"
 import { FeedFavicon } from "./FeedFavicon"
@@ -13,7 +12,6 @@ export interface FeedEntryHeaderProps {
 
 const useStyles = tss
     .withParams<{
-        colorScheme: "light" | "dark"
         read: boolean
     }>()
     .create(({ colorScheme, read }) => ({
@@ -42,9 +40,7 @@ const useStyles = tss
     }))
 
 export function FeedEntryCompactHeader(props: FeedEntryHeaderProps) {
-    const colorScheme = useColorScheme()
     const { classes } = useStyles({
-        colorScheme,
         read: props.entry.read,
     })
     return (

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

@@ -1,5 +1,5 @@
 import { Trans } from "@lingui/macro"
-import { Group, type MantineTheme, useMantineTheme } from "@mantine/core"
+import { Group } from "@mantine/core"
 import { Constants } from "app/constants"
 import { markEntriesUpToEntry, markEntry, starEntry } from "app/entries/thunks"
 import { redirectToFeed } from "app/redirect/thunks"
@@ -17,28 +17,19 @@ interface FeedEntryContextMenuProps {
 }
 
 const iconSize = 16
-const useStyles = tss
-    .withParams<{
-        theme: MantineTheme
-        colorScheme: "light" | "dark"
-    }>()
-    .create(({ theme, colorScheme }) => ({
-        menu: {
-            // apply mantine theme from MenuItem.styles.ts
-            fontSize: theme.fontSizes.sm,
-            "--contexify-item-color": `${colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
-            "--contexify-activeItem-color": `${colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
-            "--contexify-activeItem-bgColor": `${colorScheme === "dark" ? theme.colors.dark[4] : theme.colors.gray[1]} !important`,
-        },
-    }))
+const useStyles = tss.create(({ theme, colorScheme }) => ({
+    menu: {
+        // apply mantine theme from MenuItem.styles.ts
+        fontSize: theme.fontSizes.sm,
+        "--contexify-item-color": `${colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
+        "--contexify-activeItem-color": `${colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
+        "--contexify-activeItem-bgColor": `${colorScheme === "dark" ? theme.colors.dark[4] : theme.colors.gray[1]} !important`,
+    },
+}))
 
 export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) {
-    const theme = useMantineTheme()
     const colorScheme = useColorScheme()
-    const { classes } = useStyles({
-        theme,
-        colorScheme,
-    })
+    const { classes } = useStyles()
     const sourceType = useAppSelector(state => state.entries.source.type)
     const dispatch = useAppDispatch()
     const { openLinkInBackgroundTab } = useBrowserExtension()

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

@@ -1,7 +1,6 @@
 import { Box, Space, Text } from "@mantine/core"
 import { type Entry } from "app/types"
 import { RelativeDate } from "components/RelativeDate"
-import { useColorScheme } from "hooks/useColorScheme"
 import { tss } from "tss"
 import { FeedEntryTitle } from "./FeedEntryTitle"
 import { FeedFavicon } from "./FeedFavicon"
@@ -13,7 +12,6 @@ export interface FeedEntryHeaderProps {
 
 const useStyles = tss
     .withParams<{
-        colorScheme: "light" | "dark"
         read: boolean
     }>()
     .create(({ colorScheme, read }) => ({
@@ -28,9 +26,7 @@ const useStyles = tss
     }))
 
 export function FeedEntryHeader(props: FeedEntryHeaderProps) {
-    const colorScheme = useColorScheme()
     const { classes } = useStyles({
-        colorScheme,
         read: props.entry.read,
     })
     return (

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

@@ -1,8 +1,7 @@
-import { ActionIcon, Box, type MantineTheme, SimpleGrid, useMantineTheme } from "@mantine/core"
+import { ActionIcon, Box, SimpleGrid } from "@mantine/core"
 import { Constants } from "app/constants"
 import { useAppSelector } from "app/store"
 import { type SharingSettings } from "app/types"
-import { useColorScheme } from "hooks/useColorScheme"
 import { type IconType } from "react-icons"
 import { tss } from "tss"
 
@@ -10,8 +9,6 @@ type Color = `#${string}`
 
 const useStyles = tss
     .withParams<{
-        theme: MantineTheme
-        colorScheme: "light" | "dark"
         color: Color
     }>()
     .create(({ theme, colorScheme, color }) => ({
@@ -23,11 +20,7 @@ const useStyles = tss
     }))
 
 function ShareButton({ url, icon, color }: { url: string; icon: IconType; color: Color }) {
-    const theme = useMantineTheme()
-    const colorScheme = useColorScheme()
     const { classes } = useStyles({
-        theme,
-        colorScheme,
         color,
     })
 
@@ -54,7 +47,7 @@ export function ShareButtons(props: { url: string; description: string }) {
 
     return (
         <SimpleGrid cols={4}>
-            {(Object.keys(Constants.sharing) as Array<keyof SharingSettings>)
+            {(Object.keys(Constants.sharing) as (keyof SharingSettings)[])
                 .filter(site => sharingSettings?.[site])
                 .map(site => (
                     <ShareButton

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

@@ -1,6 +1,6 @@
 import { t, Trans } from "@lingui/macro"
 import { Box, Button, FileInput, Group, Stack } from "@mantine/core"
-import { useForm } from "@mantine/form"
+import { isNotEmpty, useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
 import { redirectToSelectedSource } from "app/redirect/thunks"
 import { useAppDispatch } from "app/store"
@@ -14,7 +14,7 @@ export function ImportOpml() {
 
     const form = useForm<{ file: File }>({
         validate: {
-            file: v => (v ? null : t`file is required`),
+            file: isNotEmpty(t`OPML file is required`),
         },
     })
 
@@ -38,8 +38,7 @@ export function ImportOpml() {
                     <FileInput
                         label={<Trans>OPML file</Trans>}
                         leftSection={<TbFileImport />}
-                        // https://github.com/mantinedev/mantine/issues/5401
-                        {...{ placeholder: t`OPML file` }}
+                        placeholder={t`OPML file`}
                         description={
                             <Trans>
                                 An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your

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

@@ -100,7 +100,7 @@ export function DisplaySettings() {
             <Divider label={<Trans>Sharing sites</Trans>} labelPosition="center" />
 
             <SimpleGrid cols={2}>
-                {(Object.keys(Constants.sharing) as Array<keyof SharingSettings>).map(site => (
+                {(Object.keys(Constants.sharing) as (keyof SharingSettings)[]).map(site => (
                     <Switch
                         key={site}
                         label={Constants.sharing[site].label}

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

@@ -1,6 +1,5 @@
-import { Box, Center, type MantineTheme, useMantineTheme } from "@mantine/core"
+import { Box, Center } from "@mantine/core"
 import { FeedFavicon } from "components/content/FeedFavicon"
-import { useColorScheme } from "hooks/useColorScheme"
 import React, { type ReactNode } from "react"
 import { tss } from "tss"
 import { UnreadCount } from "./UnreadCount"
@@ -20,8 +19,6 @@ interface TreeNodeProps {
 
 const useStyles = tss
     .withParams<{
-        theme: MantineTheme
-        colorScheme: "dark" | "light"
         selected: boolean
         hasError: boolean
         hasUnread: boolean
@@ -60,11 +57,7 @@ const useStyles = tss
     })
 
 export function TreeNode(props: TreeNodeProps) {
-    const theme = useMantineTheme()
-    const colorScheme = useColorScheme()
     const { classes } = useStyles({
-        theme,
-        colorScheme,
         selected: props.selected,
         hasError: props.hasError,
         hasUnread: props.unread > 0,

commafeed-client/src/hooks/useWebSocket.ts

@@ -38,9 +38,8 @@ export const useWebSocket = () => {
             ws.onopen = () => dispatch(setWebSocketConnected(true))
             ws.onclose = () => dispatch(setWebSocketConnected(false))
             ws.onmessage = event => {
-                const { data } = event
-                if (typeof data === "string") {
-                    handleMessage(dispatch, data)
+                if (typeof event.data === "string") {
+                    handleMessage(dispatch, event.data)
                 }
             }
         }

commafeed-client/src/i18n.ts

@@ -44,8 +44,8 @@ export const locales: Locale[] = [
 
 function activateLocale(locale: string) {
     // lingui
-    import(`./locales/${locale}/messages.po`).then(data => {
-        i18n.load(locale, data.messages as Messages)
+    import(`./locales/${locale}/messages.po`).then((data: { messages: Messages }) => {
+        i18n.load(locale, data.messages)
         i18n.activate(locale)
     })
 

commafeed-client/src/pages/ErrorPage.tsx

@@ -1,44 +1,39 @@
 import { Trans } from "@lingui/macro"
-import { Box, Button, Container, Group, type MantineTheme, Text, Title, useMantineTheme } from "@mantine/core"
+import { Box, Button, Container, Group, Text, Title } from "@mantine/core"
 import { TbRefresh } from "react-icons/tb"
 import { tss } from "tss"
 import { PageTitle } from "./PageTitle"
 
-const useStyles = tss
-    .withParams<{
-        theme: MantineTheme
-    }>()
-    .create(({ theme }) => ({
-        root: {
-            paddingTop: 80,
-        },
+const useStyles = tss.create(({ theme }) => ({
+    root: {
+        paddingTop: 80,
+    },
 
-        label: {
-            textAlign: "center",
-            fontWeight: "bold",
-            fontSize: 120,
-            lineHeight: 1,
-            marginBottom: `calc(${theme.spacing.xl} * 1.5)`,
-            color: theme.colors[theme.primaryColor][3],
-        },
+    label: {
+        textAlign: "center",
+        fontWeight: "bold",
+        fontSize: 120,
+        lineHeight: 1,
+        marginBottom: `calc(${theme.spacing.xl} * 1.5)`,
+        color: theme.colors[theme.primaryColor][3],
+    },
 
-        title: {
-            textAlign: "center",
-            fontWeight: "bold",
-            fontSize: 32,
-        },
+    title: {
+        textAlign: "center",
+        fontWeight: "bold",
+        fontSize: 32,
+    },
 
-        description: {
-            maxWidth: 540,
-            margin: "auto",
-            marginTop: theme.spacing.xl,
-            marginBottom: `calc(${theme.spacing.xl} * 1.5)`,
-        },
-    }))
+    description: {
+        maxWidth: 540,
+        margin: "auto",
+        marginTop: theme.spacing.xl,
+        marginBottom: `calc(${theme.spacing.xl} * 1.5)`,
+    },
+}))
 
 export function ErrorPage(props: { error: Error }) {
-    const theme = useMantineTheme()
-    const { classes } = useStyles({ theme })
+    const { classes } = useStyles()
 
     return (
         <div className={classes.root}>

commafeed-client/src/pages/WelcomePage.tsx

@@ -3,8 +3,8 @@ import { Anchor, Box, Center, Container, Divider, Group, Image, Space, Title, us
 import { client } from "app/client"
 import { redirectToApiDocumentation, redirectToLogin, redirectToRegistration, redirectToRootCategory } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
-import welcome_page_dark from "assets/welcome_page_dark.png"
-import welcome_page_light from "assets/welcome_page_light.png"
+import welcomePageDark from "assets/welcome_page_dark.png"
+import welcomePageLight from "assets/welcome_page_light.png"
 import { ActionButton } from "components/ActionButton"
 import { useBrowserExtension } from "hooks/useBrowserExtension"
 import { useMobile } from "hooks/useMobile"
@@ -19,7 +19,7 @@ export function WelcomePage() {
     const serverInfos = useAppSelector(state => state.server.serverInfos)
     const { colorScheme } = useMantineColorScheme()
     const dispatch = useAppDispatch()
-    const image = colorScheme === "light" ? welcome_page_light : welcome_page_dark
+    const image = colorScheme === "light" ? welcomePageLight : welcomePageDark
 
     const login = useAsyncCallback(client.user.login, {
         onSuccess: () => {

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

@@ -108,7 +108,7 @@ export function AdminUsersPage() {
                     </Table.Tr>
                 </Table.Thead>
                 <Table.Tbody>
-                    {users?.map(u => (
+                    {users.map(u => (
                         <Table.Tr key={u.id}>
                             <Table.Td>{u.id}</Table.Td>
                             <Table.Td>{u.name}</Table.Td>

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

@@ -3,7 +3,9 @@ import { HistoryService, RedocStandalone } from "redoc"
 
 // disable redoc url sync because it causes issues with hashrouter
 Object.defineProperty(HistoryService.prototype, "replace", {
-    value: () => {},
+    value: () => {
+        // do nothing
+    },
 })
 
 function ApiDocumentationPage() {

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

@@ -49,11 +49,17 @@ export function FeedEntriesPage(props: FeedEntriesPageProps) {
     const dispatch = useAppDispatch()
 
     const titleClicked = () => {
-        if (props.sourceType === "category") {
-            dispatch(redirectToCategoryDetails(id))
-        } else if (props.sourceType === "feed") {
-            dispatch(redirectToFeedDetails(id))
-        } else if (props.sourceType === "tag") dispatch(redirectToTagDetails(id))
+        switch (props.sourceType) {
+            case "category":
+                dispatch(redirectToCategoryDetails(id))
+                break
+            case "feed":
+                dispatch(redirectToFeedDetails(id))
+                break
+            case "tag":
+                dispatch(redirectToTagDetails(id))
+                break
+        }
     }
 
     useEffect(() => {

commafeed-client/src/tss.ts

@@ -1,11 +1,14 @@
+import { useMantineTheme } from "@mantine/core"
+import { useColorScheme } from "hooks/useColorScheme"
 import { createTss } from "tss-react"
 
 const useContext = () => {
     // return anything here that will be accessible in tss.create()
-    // we don't need anything right now
-    return {}
+
+    const theme = useMantineTheme()
+    const colorScheme = useColorScheme()
+
+    return { theme, colorScheme }
 }
 
 export const { tss } = createTss({ useContext })
-
-export const useStyles = tss.create({})

commafeed-client/vite.config.ts

@@ -30,6 +30,7 @@ export default defineConfig(env => ({
             "/openapi.json": "http://localhost:8083",
             "/custom_css.css": "http://localhost:8083",
             "/custom_js.js": "http://localhost:8083",
+            "/logout": "http://localhost:8083",
         },
     },
     build: {

commafeed-server/config.dev.yml

@@ -95,11 +95,11 @@ app:
 # -------------------  
 # for MariaDB
 # driverClass is org.mariadb.jdbc.Driver
-# url is jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true
+# url is jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC
 #
 # for MySQL
 # driverClass is com.mysql.cj.jdbc.Driver
-# url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true
+# url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC
 #
 # for PostgreSQL
 # driverClass is org.postgresql.Driver

commafeed-server/config.yml.example

@@ -95,11 +95,11 @@ app:
 # -------------------
 # for MariaDB
 # driverClass is org.mariadb.jdbc.Driver
-# url is jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true
+# url is jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC
 #
 # for MySQL
 # driverClass is com.mysql.cj.jdbc.Driver
-# url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true
+# url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC
 #
 # for PostgreSQL
 # driverClass is org.postgresql.Driver

commafeed-server/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>4.3.0</version>
+		<version>4.3.3</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
@@ -72,7 +72,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.5.1</version>
+				<version>3.5.2</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.kordamp.shade</groupId>
@@ -211,7 +211,7 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>4.3.0</version>
+			<version>4.3.3</version>
 		</dependency>
 
 		<dependency>
@@ -239,6 +239,10 @@
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.dropwizard</groupId>
+			<artifactId>dropwizard-unix-socket</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-hibernate</artifactId>
@@ -332,7 +336,7 @@
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>5.1.0</version>
+			<version>5.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.mail</groupId>
@@ -393,13 +397,13 @@
 		<dependency>
 			<groupId>io.github.hakky54</groupId>
 			<artifactId>sslcontext-kickstart-for-apache5</artifactId>
-			<version>8.3.1</version>
+			<version>8.3.2</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.google.apis</groupId>
 			<artifactId>google-api-services-youtube</artifactId>
-			<version>v3-rev20240123-2.0.0</version>
+			<version>v3-rev20240225-2.0.0</version>
 		</dependency>
 
 		<dependency>
@@ -420,12 +424,12 @@
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
-			<version>3.3.2</version>
+			<version>3.3.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.7.1</version>
+			<version>42.7.2</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jtds</groupId>

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

@@ -25,6 +25,7 @@ import com.commafeed.backend.feed.parser.FeedParserResult.Entry;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.FeedSubscription;
+import com.commafeed.backend.model.Models;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.service.FeedEntryService;
 import com.commafeed.backend.service.FeedService;
@@ -177,7 +178,7 @@ public class FeedRefreshUpdater {
 
 		if (!processed) {
 			// requeue asap
-			feed.setDisabledUntil(Feed.MINIMUM_DISABLED_UNTIL);
+			feed.setDisabledUntil(Models.MINIMUM_INSTANT);
 		}
 
 		if (inserted > 0) {

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

@@ -15,9 +15,6 @@ import lombok.Setter;
 @Setter
 public class Feed extends AbstractModel {
 
-	// mariadb timestamp range starts at 1970-01-01 00:00:01
-	public static final Instant MINIMUM_DISABLED_UNTIL = Instant.EPOCH.plusSeconds(1);
-
 	/**
 	 * The url of the feed
 	 */

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

@@ -1,12 +1,24 @@
 package com.commafeed.backend.model;
 
+import java.time.Duration;
+import java.time.Instant;
+
 import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
 public class Models {
 
+	public static final Instant MINIMUM_INSTANT = Instant.EPOCH
+			// mariadb timestamp range starts at 1970-01-01 00:00:01
+			.plusSeconds(1)
+			// make sure the timestamp fits for all timezones
+			.plus(Duration.ofHours(24));
+
 	/**
 	 * initialize a proxy
 	 */
@@ -18,8 +30,8 @@ public class Models {
 	 * extract the id from the proxy without initializing it
 	 */
 	public static Long getId(AbstractModel model) {
-		if (model instanceof HibernateProxy) {
-			LazyInitializer lazyInitializer = ((HibernateProxy) model).getHibernateLazyInitializer();
+		if (model instanceof HibernateProxy proxy) {
+			LazyInitializer lazyInitializer = proxy.getHibernateLazyInitializer();
 			if (lazyInitializer.isUninitialized()) {
 				return (Long) lazyInitializer.getIdentifier();
 			}

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

@@ -12,6 +12,7 @@ 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 jakarta.inject.Inject;
 import jakarta.inject.Singleton;
@@ -45,7 +46,7 @@ public class FeedService {
 			feed.setUrl(url);
 			feed.setNormalizedUrl(normalizedUrl);
 			feed.setNormalizedUrlHash(normalizedUrlHash);
-			feed.setDisabledUntil(Feed.MINIMUM_DISABLED_UNTIL);
+			feed.setDisabledUntil(Models.MINIMUM_INSTANT);
 			feedDAO.saveOrUpdate(feed);
 		}
 		return feed;

commafeed-server/src/test/resources/config.test.yml

@@ -95,11 +95,11 @@ app:
 # -------------------
 # for MariaDB
 # driverClass is org.mariadb.jdbc.Driver
-# url is jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true
+# url is jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC
 #
 # for MySQL
 # driverClass is com.mysql.cj.jdbc.Driver
-# url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true
+# url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC
 #
 # for PostgreSQL
 # driverClass is org.postgresql.Driver

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>4.3.0</version>
+	<version>4.3.3</version>
 	<name>CommaFeed</name>
 	<packaging>pom</packaging>