release 5.9.0

chore(deps): pin jaywcjlove/markdown-to-html-cli action to d2c8ffd

.dockerignore

@@ -1,6 +1 @@
-# ignore everything
+commafeed-client
-*
-
-# allow only what we need
-!commafeed-server/target/commafeed.jar
-!commafeed-server/config.yml.example

.gitattributes

@@ -0,0 +1,3 @@
+*       text eol=lf
+*.cmd   text eol=crlf
+*.png   binary

.github/FUNDING.yml

@@ -1,2 +1,5 @@
-github: [athou]
+github: [ athou ]
-custom: ['https://www.paypal.com/donate/?business=9CNQHMJG2ZJVY&no_recurring=0&item_name=CommaFeed&currency_code=EUR']
+custom: [
+  'https://github.com/sponsors/Athou',
+  'https://www.paypal.com/donate/?business=9CNQHMJG2ZJVY&no_recurring=0&item_name=CommaFeed&currency_code=EUR'
+]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,7 +25,8 @@ If applicable, add screenshots to help explain your problem.
 
 **Environment (please complete the following information):**
 
-- CommaFeed version (or "commafeed.com"): 3.2.1
+- commafeed.com or self-hosted:
+- If self-hosted, CommaFeed version [e.g. 5.1.0 (a3dcb2c)]:
 - Browser [e.g. chrome, firefox]:
 - Device [e.g. desktop, mobile]:
 

.github/stale.yml

@@ -1,19 +1,19 @@
-# Number of days of inactivity before an issue becomes stale
+# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
+# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: 7
-# Issues with these labels will never be considered stale
+# Issues with these labels will never be considered stale
-exemptLabels:
+exemptLabels:
-  - pinned
+  - pinned
-  - security
+  - security
-  - enhancement
+  - enhancement
-  - bug
+  - bug
-# Label to use when marking an issue as stale
+# Label to use when marking an issue as stale
-staleLabel: wontfix
+staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
+# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
+markComment: >
-  This issue has been automatically marked as stale because it has not had
+  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
+  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
+  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
+# Comment to post when closing a stale issue. Set to `false` to disable
 closeComment: false

.github/workflows/build.yml

@@ -1,89 +0,0 @@
-name: Java CI
-
-on: [ push ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ "8", "11", "17" ]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      # Setup
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Set up Java
-        uses: actions/setup-java@v3
-        with:
-          java-version: ${{ matrix.java }}
-          distribution: "temurin"
-          cache: "maven"
-
-      # Build
-      - name: Build with Maven
-        run: mvn --batch-mode --update-snapshots verify
-
-      - name: Upload JAR
-        uses: actions/upload-artifact@v3
-        if: ${{ matrix.java == '8' }}
-        with:
-          name: commafeed.jar
-          path: commafeed-server/target/commafeed.jar
-
-      # Docker
-      - name: Login to Container Registry
-        uses: docker/login-action@v2
-        if: ${{ matrix.java == '8' }}
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Docker build and push tag
-        uses: docker/build-push-action@v4
-        if: ${{ matrix.java == '8' && github.ref_type == 'tag' }}
-        with:
-          context: .
-          push: true
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
-          tags: |
-            athou/commafeed:latest
-            athou/commafeed:${{ github.ref_name }}
-
-      - name: Docker build and push master
-        uses: docker/build-push-action@v4
-        if: ${{ matrix.java == '8' && github.ref_name == 'master' }}
-        with:
-          context: .
-          push: true
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
-          tags: athou/commafeed:master
-
-      # Create GitHub release after Docker image has been published
-      - name: Extract Changelog Entry
-        uses: mindsers/changelog-reader-action@v2
-        if: ${{ matrix.java == '8' && github.ref_type == 'tag' }}
-        id: changelog_reader
-        with:
-          version: ${{ github.ref_name }}
-
-      - name: Create GitHub release
-        uses: softprops/action-gh-release@v1
-        if: ${{ matrix.java == '8' && github.ref_type == 'tag' }}
-        with:
-          name: CommaFeed ${{ github.ref_name }}
-          body: ${{ steps.changelog_reader.outputs.changes }}
-          draft: false
-          prerelease: false
-          files: |
-            commafeed-server/target/commafeed.jar
-            commafeed-server/config.yml.example

.github/workflows/ci.yml

@@ -0,0 +1,278 @@
+name: ci
+permissions:
+  contents: read
+
+on:
+  push:
+  pull_request:
+
+env:
+  JAVA_VERSION: 21
+  DOCKER_BUILD_SUMMARY: false
+
+jobs:
+  build:
+    if: github.event_name != 'pull_request' || github.actor != 'renovate[bot]' # renovate already triggers the build on pushes
+
+    strategy:
+      matrix:
+        os: [ "ubuntu-latest", "ubuntu-22.04-arm", "windows-latest" ]
+        database: [ "h2", "postgresql", "mysql", "mariadb" ]
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      # Checkout
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          fetch-depth: 0
+
+      # Setup
+      - name: Set up GraalVM
+        uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: "graalvm"
+          cache: "maven"
+
+      - name: Install Playwright dependencies
+        run: sudo apt-get install -y libgbm1
+        if: matrix.os != 'windows-latest'
+
+      # Build & Test
+      - name: Build with Maven
+        run: mvn --batch-mode --no-transfer-progress install -Pnative -P${{ matrix.database }} -DskipTests=${{ matrix.os == 'windows-latest' && matrix.database != 'h2' }}
+
+      # Build pages
+      - name: Create pages directory structure
+        run: mkdir -p target/pages/documentation/custom-css
+
+      - name: Convert readme file to html
+        uses: jaywcjlove/markdown-to-html-cli@d2c8ffd676de1801e2586904bc540a938e4bc480 # v5.0.3
+        with:
+          source: README.md
+          output: target/pages/index.html
+
+      - name: Convert config documentation to html
+        uses: jaywcjlove/markdown-to-html-cli@d2c8ffd676de1801e2586904bc540a938e4bc480 # v5.0.3
+        with:
+          source: commafeed-server/target/quarkus-generated-doc/config/commafeed-server.md
+          output: target/pages/documentation/index.html
+
+      - name: Convert custom css documentation to html
+        uses: jaywcjlove/markdown-to-html-cli@d2c8ffd676de1801e2586904bc540a938e4bc480 # v5.0.3
+        with:
+          source: documentation/CUSTOMCSS.md
+          output: target/pages/documentation/custom-css/index.html
+
+      # Upload artifacts
+      - name: Upload cross-platform app
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        if: matrix.os == 'ubuntu-latest' # we only need to upload the cross-platform artifact once per database
+        with:
+          name: commafeed-${{ matrix.database }}-jvm
+          path: commafeed-server/target/commafeed-*.zip
+
+      - name: Upload native executable
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: commafeed-${{ matrix.database }}-${{ runner.os }}-${{ runner.arch }}
+          path: commafeed-server/target/commafeed-*-runner*
+
+      - name: Upload pages
+        uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
+        if: matrix.os == 'ubuntu-latest' && matrix.database == 'h2' # we only need to upload the pages once
+        with:
+          path: target/pages
+
+  docker:
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+
+    strategy:
+      matrix:
+        database: [ "h2", "postgresql", "mysql", "mariadb" ]
+
+    steps:
+      # Checkout
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          fetch-depth: 0
+
+      # Setup
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
+
+      - name: Install required packages
+        run: sudo apt-get install -y rename unzip
+
+      # Prepare artifacts
+      - name: Download artifacts
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        with:
+          pattern: commafeed-${{ matrix.database }}-*
+          path: ./artifacts
+          merge-multiple: true
+
+      - name: Set the exec flag on the native executables
+        run: chmod +x artifacts/*-runner
+
+      - name: Rename native executables to match buildx TARGETARCH
+        run: |
+          rename 's/x86_64/amd64/g' artifacts/*
+          rename 's/aarch_64/arm64/g' artifacts/*
+
+      - name: Unzip jvm package
+        run: |
+          unzip artifacts/*-jvm.zip -d artifacts/extracted-jvm-package
+          rename 's/commafeed-.*/quarkus-app/g' artifacts/extracted-jvm-package/*
+
+      # Docker
+      - name: Login to Container Registry
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
+        if: ${{ env.DOCKERHUB_USERNAME != '' }}
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      ## build but don't push for PRs and renovate
+      - name: Docker build - native
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.native
+          push: false
+          platforms: linux/amd64,linux/arm64/v8
+
+      - name: Docker build - jvm
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.jvm
+          push: false
+          platforms: linux/amd64,linux/arm64/v8
+
+      ## build and push tag
+      - name: Docker build and push tag - native
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
+        if: ${{ github.ref_type == 'tag' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.native
+          push: ${{ env.DOCKERHUB_USERNAME != '' }}
+          platforms: linux/amd64,linux/arm64/v8
+          tags: |
+            athou/commafeed:latest-${{ matrix.database }}
+            athou/commafeed:${{ github.ref_name }}-${{ matrix.database }}
+
+      - name: Docker build and push tag - jvm
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
+        if: ${{ github.ref_type == 'tag' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.jvm
+          push: ${{ env.DOCKERHUB_USERNAME != '' }}
+          platforms: linux/amd64,linux/arm64/v8
+          tags: |
+            athou/commafeed:latest-${{ matrix.database }}-jvm
+            athou/commafeed:${{ github.ref_name }}-${{ matrix.database }}-jvm
+
+      ## build and push master
+      - name: Docker build and push master - native
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
+        if: ${{ github.ref_name == 'master' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.native
+          push: ${{ env.DOCKERHUB_USERNAME != '' }}
+          platforms: linux/amd64,linux/arm64/v8
+          tags: athou/commafeed:master-${{ matrix.database }}
+
+      - name: Docker build and push master - jvm
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
+        if: ${{ github.ref_name == 'master' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.jvm
+          push: ${{ env.DOCKERHUB_USERNAME != '' }}
+          platforms: linux/amd64,linux/arm64/v8
+          tags: athou/commafeed:master-${{ matrix.database }}-jvm
+
+  release:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+      - docker
+    permissions:
+      contents: write
+    if: github.ref_type == 'tag'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          fetch-depth: 0
+
+      - name: Download artifacts
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        with:
+          pattern: commafeed-*
+          path: ./artifacts
+          merge-multiple: true
+
+      - name: Set the exec flag on the native executables
+        run: chmod +x artifacts/*-runner
+
+      - name: Extract Changelog Entry
+        uses: mindsers/changelog-reader-action@32aa5b4c155d76c94e4ec883a223c947b2f02656 # v2
+        id: changelog_reader
+        with:
+          version: ${{ github.ref_name }}
+
+      - name: Create GitHub release
+        uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1
+        with:
+          name: CommaFeed ${{ github.ref_name }}
+          body: ${{ steps.changelog_reader.outputs.changes }}
+          artifacts: ./artifacts/*
+
+
+  update-dockerhub-description:
+    runs-on: ubuntu-latest
+    needs: release
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          fetch-depth: 0
+
+      - name: Update Docker Hub Description
+        uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          repository: athou/commafeed
+          short-description: ${{ github.event.repository.description }}
+          readme-filepath: commafeed-server/src/main/docker/README.md
+
+
+  deploy-pages:
+    runs-on: ubuntu-latest
+    needs: release
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4
+        id: deployment

.gitignore

@@ -35,5 +35,8 @@ src/main/app/lib
 # Sublime
 *.sublime*
 
+# VSCode
+.vscode
+
 # Macs
 *.DS_Store

.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +1,18 @@
-# Licensed to the Apache Software Foundation (ASF) under one
+# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
+# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
+# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
+# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
+# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
+# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
+# 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,
+# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
+# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
+# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
+# specific language governing permissions and limitations
-# under the License.
+# 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.9/apache-maven-3.9.9-bin.zip

CHANGELOG.md

@@ -1,229 +1,490 @@
-# Changelog
+# Changelog
-
+
-## [3.10.0]
+## [5.9.0]
-
+
-- added a Fever-compatible API that is usable with mobile clients that support the Fever API (see instructions in Settings -> Profile)
+- A lot of CSS classes have been added to the elements of the application to ease custom CSS rules (#1757)
-- long entry titles are no longer shortened in the detailed view
+- Added a link in the README to the [documentation](https://athou.github.io/commafeed/documentation/custom-css/) of the new CSS classes
-- added the "s" keyboard shortcut to star/unstar entries
+- Static resources are now cached for much longer (#1782)
-- http sessions are now stored in the database (they were stored on disk before)
+
-- fixed an issue that made it impossible to override the database url in a config.yml mounted in the Docker image
+## [5.8.0]
-
+
-## [3.9.0]
+- A color picker is now available on the settings page to change the orange accent of the application (#1598)
-
+- A font size slider is now available to change the size of the text of feed entries (#1462)
-- improve performance by disabling the loader when nothing is loading (most noticeable on mobile)
+- The "mark all as read" confirmation setting now also applies to the "shift+a" keyboard shortcut (#1744)
-- added a setting to disable the 'mark all as read' confirmation
+- CommaFeed wil try to match the language of the browser before defaulting to english (#1767)
-- added a setting to disable the custom context menu
+- The default value for the number of entries to keep above the selected entry when scrolling is now 1 instead of 0 to match what other feed readers do
-- if the custom context is enabled, it can still be disabled by pressing the shift key
+
-- the announcement feature is now working again and supports html ('announcement' configuration element in config.yml)
+## [5.7.0]
-- add support for MariaDB 11+
+
-- fix entry header shortly rendered as mobile on desktop, causing a small visual glitch
+- Add Shift+J/Shift+K keyboard shortcuts to navigate to the next/previous feed or category with unread entries (#1558)
-- fix an issue that could cause a feed to not refresh correctly if the url was very long
+- Add the referrer "no-referrer" meta to index.html (#1724)
-- database cleanup batch size is now configurable
+- Load custom JS code when the app is done loading (#1724)
-- css parsing errors are no longer logged to the standard output
+- Correctly handle feeds that return an unmodified Last-Modified header but a different ETag header (#1746)
-- fix small errors in the api documentation
+- Restore gzip compression of responses that was accidentaly disabled since 5.0.0
-
+- Fix tooltips not showing up in mobile view
-## [3.8.1]
+- Fix the bookmarklet generator on the About page
-
+
-- in expanded mode, don't scroll when clicking on the body of the current entry
+## [5.6.1]
-- improve content cleanup task performance for instances with a very large number of feeds
+
-
+- Restore support for iframes in feed entries (#1688)
-## [3.8.0]
+- There is now a package available for Arch Linux thanks to @dcelasun (#1691)
-
+
-- add previous and next buttons in the toolbar
+## [5.6.0]
-- add a setting to always scroll selected entry to the top of the page, even if it fits entirely on screen
+
-- clicking on the body of an entry in expanded mode selects it and marks it as read
+- To better respect the bandwidth of feed owners, the default value of `commafeed.feed-refresh.interval-empirical` is now true. This means feeds no longer refresh exactly every 5 minutes (the default value of `commafeed.feed-refresh.interval`) but between 5 minutes and 4 hours (the default value of the new `commafeed.feed-refresh.max-interval` setting). The interval is calculated based on feed activity, so highly active feeds refresh more often (#1677)
-- add rich text editor with autocomplete for custom css and js code in settings (desktop only)
+- Many previously hardcoded values used in feed refresh interval calculation are now exposed as settings (#1677)
-- dramatically improve performance while scrolling
+- Access to local addresses is now blocked to mitigate server-side request forgery (SSRF) attacks, which could potentially expose internal resources. You might want to disable the new `commafeed.http-client.block-local-addresses` setting if you subscribe to feeds only available on your local network and you trust all your users
-- fix broken welcome page mobile layout
+- If a feed responds with a "429 - Too many requests" response, a backoff mechanism is triggered when the response does not contain a "Retry-After" header
-- format dates in user locale instead of GMT in relative date popups
+
-
+## [5.5.0]
-## [3.7.0]
+
-
+- CommaFeed now honors the Retry-After response header and will not try to refresh a feed sooner than the value of this header
-- the sidebar is now resizable
+- Audio enclosures (e.g. podcasts) now fill available entry width
-- added the "f" keyboard shortcut to hide the sidebar
+- Fix an issue with some labels not correctly internationalized
-- added tooltips to relative dates with the exact date
+
-- add a setting to hide commafeed from search engines (exposes a robots.txt file, enabled by default)
+## [5.4.0]
-- the browser extension unread count now updates when articles are marked as read/unread in the app
+
-- The "b" keyboard shortcut now works as expected on Chrome but requires the browser extension to be installed
+- An arm64 native executable is now available for download on the releases page
-- dark mode has been disabled on the api documentation page as it was unreadable
+- The native executable Docker image now supports arm64
-- improvement to the feed refresh queuing logic when "heavy load" mode is enabled
+- Fixed an issue with feeds that declared an invalid DOCTYPE (#1260)
-- fix a bug that could prevent feeds and categories from being edited
+
-
+## [5.3.6]
-## [3.6.0]
+
-
+- Ignore invalid Cache-Control header values (#1619)
-- add a button to open CommaFeed in a new tab and a button to open options when using the browser extension
+
-- clicking on the entry title in expanded mode now opens the link instead of doing nothing
+## [5.3.5]
-- add tooltips to buttons when the mobile layout is used on desktop
+
-- redirect the user to the welcome page if the user was deleted from the database
+- Fixed an issue with the aspect ratio of images of some feeds (#1595)
-- add link to api documentation on welcome page
+- CommaFeed now honors the Cache-Control response header and will not try to refresh a feed sooner than its max-age property (#1615)
-- the unread count is now correctly updated when using the "/next" bookmarklet while redis cache is enabled
+- Added support for compilation with JDK 23+. If you're building CommaFeed from sources with a JDK 17 or 21, you may need to update it to the most recent patch version to support `-proc:full` (#1618)
-
+
-## [3.5.0]
+## [5.3.4]
-
+
-- add compatibility with the new version of the CommaFeed browser extension
+- Added support for Internationalized Domain Names (#1588)
-- disable pull-to-refresh on mobile as it messes with vertical scrolling
+
-- add css classes to feed entries to help with custom css rules
+## [5.3.3]
-- api documentation page no longer requires users to be authenticated
+
-- add a setting to limit the number of feeds a user can subscribe to
+- Removed image bottom margins (#1587)
-- add a setting to disable strict password policy
+
-- add feed refresh engine metrics
+## [5.3.2]
-- fix redis timeouts
+
-
+- Fixed an issue that could cause some images from not being rendered correctly (#1587)
-## [3.4.0]
+
-
+## [5.3.1]
-- add support for arm64 docker images
+
-- add divider to visually separate read-only information from form on the profile settings page
+- Fixed an issue that could cause some HTTP feeds to return a 400 error (#1572)
-- reduce javascript bundle size by 30% by loading only the necessary translations
+
-- add a standalone donate page with all ways to support CommaFeed
+## [5.3.0]
-- fix an issue introduced in 3.1.0 that could make CommaFeed not refresh feeds as fast as before on instances with lots
+
-  of feeds
+- Added a setting to set a cooldown on the "fetch all my feeds" action, disabled by default (#1556)
-- fix alignment of icon with text for category tree nodes
+- Fixed an issue that could cause entries to not correctly load when using the "next" header button (#1557)
-- fix alignment of burger button with the rest of the header on mobile
+
-
+## [5.2.0]
-## [3.3.2]
+
-
+- Added an option to keep a number of entries above the selected entry when scrolling
-- restore entry selection indicator (left orange border) that was lost with the mantine 6.x upgrade (3.3.0)
+- Added a cache to the HTTP client to reduce the number of requests made to feeds when subscribing (#1431)
-- add dividers to visually separate read-only information from forms on feed and category details pages
+- Feeds are no longer refreshed between the moment its last user unsubscribes and the moment the feed is cleaned up (every hour)
-- reduced javascript bundle size by 10%
+- Fixed an issue that could cause entries to not correctly load when using keyboard navigation (#1557)
-
+
-## [3.3.1]
+## [5.1.1]
-
+
-- fix long feed names not being shortened to respect tree max width
+- Fixed database migration issue when upgrading from 5.0.0 to 5.1.0 on MariaDB (#1544)
-
+- When feeds without unread entries are hidden from the tree, the feed is displayed in the tree until another one is selected (#1543)
-## [3.3.0]
+
-
+## [5.1.0]
-- there are now database changes, rolling back to 2.x will no longer be possible
+
-- restore support for user custom CSS rules
+- Added a setting for showing/hiding unread count in the browser's tab title/favicon (#1518)
-- add support for user custom JS code that will be executed on page load
+- Fixed an issue that could prevent the app from starting on some systems (#1532)
-
+- Added a cache busting filter for the webapp index.html and openapi documentation to make sure they are always up to date
-## [3.2.0]
+- Reduced database cleanup log verbosity
-
+
-- restore the welcome page
+## [5.0.2]
-- only apply hover effect for unread entries (same as commafeed v2)
+
-- move notifications at the bottom of the screen
+- Fix favicon fetching for Youtube channels in native mode when Google auth key is set
-- always use https for sharing urls
+- Fix an error that appears in the logs when fetching some favicons
-- add support for redis ACLs
+
-- transition to google analytics v4
+## [5.0.1]
-
+
-## [3.1.0]
+- Configure native compilation to support older CPU architectures (#1524)
-
+
-- add an even more compact layout
+## [5.0.0]
-- restore hover effect from commafeed 2.x
+
-- view mode (compact, expanded, ...) is now stored on the device so you can have a different view mode on desktop and
+CommaFeed is now powered by Quarkus instead of Dropwizard. Read the rationale behind this change in
-  mobile
+the [announcement](https://github.com/Athou/commafeed/discussions/1517).
-- fix for the "Illegal attempt to associate a collection with two open sessions." error
+The gist of it is that CommaFeed can now be compiled to a native binary, resulting in blazing fast startup times (around
-- feed fetching workflow is now orchestrated with rxjava, removing a lot of code
+0.3s) and very low memory footprint (< 50M).
-
+
-## [3.0.1]
+- CommaFeed now has a different package for each supported database.
-
+    - If you are deploying CommaFeed with a precompiled package, please
-- allow env variable substitution in config.yml
+      read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#download-a-precompiled-package).
-- e.g. having a custom config.yml file with `app.session.path=${SOME_ENV_VAR}` will substitute `SOME_ENV_VAR` with its value
+    - If you are building CommaFeed from sources, please
-- allow env variable prefixed with `CF_` to override config.yml properties
+      read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#build-from-sources).
-- e.g. setting `CF_APP_ALLOWREGISTRATIONS=true` will set `app.allowRegistrations` to `true`
+    - If you are using the Docker image, please read the instructions on
-
+      the [Docker Hub page](https://hub.docker.com/r/athou/commafeed).
-## [3.0.0]
+- Due to the switch to Quarkus, the way CommaFeed is configured is very different (the `config.yml` file is gone).
-
+  Please
-- complete overhaul of the UI
+  read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#configuration).
-- backend and frontend are now in separate maven modules
+  Note that a lot of configuration elements have been removed or renamed and are now nested/grouped by feature.
-- no changes to the api or the database
+- Added a setting to prevent parsing large feeds to avoid out of memory errors. The default is 5MB.
-- Docker images are now automatically built and available at https://hub.docker.com/r/athou/commafeed
+- Use a different icon for filtering unread entries and marking an entry as read (#1506)
-
+- Added various HTML attributes to ease custom JS/CSS customization (#1507)
-## [2.6.0]
+- The Redis cache has been removed. There have been multiple enhancements to the feed refresh engine and it is no longer
-
+  needed, even for instances with a large number of feeds.
-- add support for media content as a backup for missing content (useful for youtube feeds)
+- The H2 migration tool that automatically upgrades H2 databases from format 2 to 3 has been removed. If you're using
-- correctly follow http error code 308 redirects
+  the H2 embedded database, please upgrade to at least version 4.3.0 before upgrading to CommaFeed 5.0.0.
-- fixed a bug that prevented users from deleting their account
+
-- fixed a bug that made commafeed store entry contents multiple times
+## [4.6.0]
-- fixed a bug that prevented the app to be used as an installed app on mobile devices if the context path of commafeed
+
-  was not "/"
+- switched from Temurin to OpenJ9 as the JVM used in the Docker image, resulting in memory usage reduction by up to 50%
-- fixed a bug that prevented entries from being "marked as read older than xxx" for a feed that was just added
+- fix an issue that could cause old entries to reappear if they were updated by their author (#1486)
-- removed support for google+ and readability as those services no longer exist
+- show all entries regardless of their read status when searching with keywords, even if the ui is configured to show
-- removed support for deploying on openshift
+  unread entries only
-- removed alphabetical sorting of entries because of really poor performance (title cannot be indexed)
+
-- improve performance for instances with the heavy load setting enabled by preventing CommaFeed from fetching feeds from
+## [4.5.0]
-  users that did not log in for a long time
+
-- various dependencies upgrades (notably dropwizard from 1.3 to 2.1)
+- significantly reduce the time needed to retrieve entries or mark them as read, especially when there are a lot of
-- add support for mariadb
+  entries (#1452)
-- add support for java17+ runtime
+- fix a race condition where a feed could be refreshed before it was created in the database
-- various security improvements
+- fix an issue that could cause the websocket notification to contain the wrong number of unread entries when using
-
+  mysql/mariadb
-## [2.5.0]
+- fix an error when trying to mark all starred entries as read
-
+- remove the `onlyIds` parameter from REST endpoints since retrieving all the entries is now just as fast
-- unread count is now displayed in a favicon badge when supported
+- remove support for microsoft sqlserver because it's not covered with integration tests (please open an issue if you'd
-- the user agent string for the bot fetching feeds is now configurable
+  like it back)
-- feed parsing performance improvements
+
-- support for java9+ runtime
+## [4.4.1]
-- can now properly start from an empty postgresql database
+
-
+- fix vertical scrolling issues with Safari (#1168)
-## [2.4.0]
+- 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"
-- users were not able to change password or delete account
+- the "keyboard shortcuts" help page now shows "Cmd" instead of "Ctrl" on macOS (#1389)
-- fix api key generation
+- remove a superfluous feed fetch when subscribing to a feed (#1431)
-- feed entries can now be sorted alphabetically
+- the Docker image now uses Java 21
-- fix facebook sharing
+
-- fix layout on iOS
+## [4.4.0]
-- postgresql driver update (fix for postgres 9.6)
+
-- various internationalization fixes
+- add support for sharing using the browser native capabilities if available (#1255)
-- security fixes
+- add a button in the entry headers to star an entry (#1025)
-
+- add a button in the entry headers to open links in a new tab (#1333)
-## [2.3.0]
+- add two options in the settings to toggle those buttons
-
+- accept .opml file extension when importing and export with the .opml extension
-- dropwizard upgrade 0.9.1
+- the "mark as read" option is no longer shown in the context menu for entries that are too old to be marked as read (
-- feed enclosures are hidden if they already displayed in the content
+  older than `keepStatusDays`) (#1303)
-- fix youtube favicons
+
-- various internationalization fixes
+## [4.3.3]
-
+
-## [2.2.0]
+- fix OPML import (#1279)
-
+
-- fix youtube and instagram favicon fetching
+## [4.3.2]
-- mark as read filter was lost when a feed was rearranged with drag&drop
+
-- feed entry categories are now displayed if available
+- added support for unix sockets (#1278)
-- various performance and dependencies upgrades
+
-- java8 is now required
+## [4.3.1]
-
+
-## [2.1.0]
+- 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)
-- dropwizard upgrade to 0.8.0
+- videos in enclosures can no longer have a width larger than the page (#1240)
-- you have to remove the "app.contextPath" setting from your yml file, you can optionally use
+
-  server.applicationContextPath instead
+## [4.3.0]
-- new setting app.maxFeedCapacity for deleting old entries
+
-- ability to set filtering expressions for subscriptions to automatically mark new entries as read based on title,
+- h2 (the embedded database) has been upgraded to 2.2.224
-  content, author or url.
+    - this version uses a different file format than 2.1.x, the first time you start CommaFeed with this version, the
-- ability to use !keyword or -keyword to exclude a keyword from a search query
+      database will be automatically converted to the new format
-- facebook feeds now show user favicon instead of facebook favicon
+- add a setting to completely disable scrolling to selected entry (#1157)
-- new dark theme 'nightsky'
+- add a css class reflecting the current view mode to ease custom css rules (#1232)
-
+- fix an issue that prevents new feeds from being added when mysql/mariadb is used as the database (#1239)
-## [2.0.3]
+
-
+## [4.2.1]
-- internet explorer ajax cache workaround
+
-- categories are now deletable again
+- fix an issue that caused the tree to show an incorrect unread count after a websocket notification because entries
-- openshift support is back
+  that were already marked as read by a filtering expression were not ignored (#1191)
-- youtube feeds now show user favicon instead of youtube favicon
+
-
+## [4.2.0]
-## [2.0.2]
+
-
+- add a setting to display the action buttons in the footer instead of in the header on mobile (#1121)
-- api using the api key is now working again
+- the websocket notification now contains everything needed to update the UI, the client no longer needs to make an API
-- context path is now configurable in config.yml (see app.contextPath in config.yml.example)
+  call to get the latest data when receiving the notification
-- fix login on firefox when fields are autofilled by the browser
+- add a workaround to the Fever API for the Unread iOS app (#1188)
-- fix scrolling of subscriptions list on mobile
+- fix an issue that caused dates to be saved incorrectly if the database server and the application server were in
-- user is now logged in after registration
+  different timezones (#1187)
-- fix link to documentation on home page and about page
+
-- fields autocomplete is disabled on the profile page
+## [4.1.0]
-- users are able to delete their account again
+
-- chinese and malaysian translation files are now correctly loaded
+- it is now possible to open the sidebar on mobile by swiping to the right (#1098)
-- software version in user-agent when fetching feeds is no longer hardcoded
+- swiping to mark entries as read/unread changed from swiping right to left because swiping right now opens the sidebar
-- admin settings page is now read only, settings are configured in config.yml
+- the full hierarchy of categories are now displayed in the category dropdown (#1045)
-- added link to metrics on the admin settings page
+- added a setting `maxEntriesAgeDays` to delete old entries based on their age during database cleanup.
-- Rome (rss library) upgrade to 1.5.0
+  The setting is disabled by default for existing installations, except for the docker image where it is enabled and set
-
+  to 365 days
-## [2.0.1]
+- if user registrations are disabled on your instance which is the default behavior, users are redirected on the login
-
+  page instead of the welcome page when not logged in (#1185)
-- the redis pool no longer throws an exception when it is unable to aquire a new connection
+- the sidebar resizer is no longer shown in the middle of the screen on mobile
-
+- when using the system color scheme and the system is using a dark theme, feed entries no longer flicker on load
-## [2.0.0]
+- the demo account (if enabled) cannot register custom javascript code anymore
-
+- removed the usage of `toSorted` in the client because older browsers do not support it (#1183)
-- The backend has been completely rewritten using Dropwizard instead of TomEE, resulting in a lot less memory
+- the openapi documentation is no longer cached by the browser so you always have access to the latest version
-  consumption and better overall performances.
+- added a memory management section to the readme, reading it is recommended if you are running CommaFeed on a server
-  See the README on how to build CommaFeed from now on.
+  with limited memory
-- CommaFeed should no longer fetch the same feed multiple times in a row
+- fixed an issue that caused users without an email address set to be unable to edit their profile (#1184)
-- Users can use their username or email to log in
+
+## [4.0.0]
+
+- migrated from dropwizard 2 to dropwizard 4, Java 17+ is now required
+- entries that were fetched and inserted in the database but not yet shown in the UI are no longer marked as read when
+  marking all entries as read
+- your custom sidebar width is now persisted in the local storage of your browser
+- there is now a third color scheme option in addition to light and dark: system (follows the system color scheme)
+- added support for youtube playlist favicons
+- custom JS code is now executed when the app is done loading instead of when the page is loaded
+- the favicon is now correctly returned for feeds that return an invalid content type
+- the feed refresh engine now uses httpclient5 with connection pooling and no longer creates a new client for each
+  request, reducing CPU usage
+- updated UI library Mantine to 7.0, improving performance
+- the h2 embedded database is now compacted on shutdown to reclaim unused space
+- the admin connector on port 8084 is now disabled in config.yml.example. Disabling it in your config.yml is
+  recommended (see https://github.com/Athou/commafeed/commit/929df60f09cce56020b0962ab111cd8349b271b0)
+- migrated documentation from swagger 2 to openapi 3
+- added a GET method to the fever api to indicate that the endpoint is working correctly when accessed from a browser
+- the websocket connection can now be disabled, the websocket ping interval and the tree reload interval can now be
+  configured (see config.yml.example)
+- the websocket connection now works correctly when the context root of the application is not "/"
+- unstable pubsubhubbub support was removed
+
+## [3.10.1]
+
+- swap next and previous buttons (#1159)
+- unread count for subscriptions will now be shortened starting at 10k instead of 1k
+- increased websocket ping interval to just under a minute to reduce data and battery usage on mobile
+- only refresh subscription tree on a timer if websocket connection is unavailable
+- the Docker image now uses less memory by returning unused memory to the OS
+- add support for Java 21
+
+## [3.10.0]
+
+- added a Fever-compatible API that is usable with mobile clients that support the Fever API (see instructions in
+  Settings -> Profile)
+- long entry titles are no longer shortened in the detailed view
+- added the "s" keyboard shortcut to star/unstar entries
+- http sessions are now stored in the database (they were stored on disk before)
+- fixed an issue that made it impossible to override the database url in a config.yml mounted in the Docker image
+
+## [3.9.0]
+
+- improve performance by disabling the loader when nothing is loading (most noticeable on mobile)
+- added a setting to disable the 'mark all as read' confirmation
+- added a setting to disable the custom context menu
+- if the custom context is enabled, it can still be disabled by pressing the shift key
+- the announcement feature is now working again and supports html ('announcement' configuration element in config.yml)
+- add support for MariaDB 11+
+- fix entry header shortly rendered as mobile on desktop, causing a small visual glitch
+- fix an issue that could cause a feed to not refresh correctly if the url was very long
+- database cleanup batch size is now configurable
+- css parsing errors are no longer logged to the standard output
+- fix small errors in the api documentation
+
+## [3.8.1]
+
+- in expanded mode, don't scroll when clicking on the body of the current entry
+- improve content cleanup task performance for instances with a very large number of feeds
+
+## [3.8.0]
+
+- add previous and next buttons in the toolbar
+- add a setting to always scroll selected entry to the top of the page, even if it fits entirely on screen
+- clicking on the body of an entry in expanded mode selects it and marks it as read
+- add rich text editor with autocomplete for custom css and js code in settings (desktop only)
+- dramatically improve performance while scrolling
+- fix broken welcome page mobile layout
+- format dates in user locale instead of GMT in relative date popups
+
+## [3.7.0]
+
+- the sidebar is now resizable
+- added the "f" keyboard shortcut to hide the sidebar
+- added tooltips to relative dates with the exact date
+- add a setting to hide commafeed from search engines (exposes a robots.txt file, enabled by default)
+- the browser extension unread count now updates when articles are marked as read/unread in the app
+- The "b" keyboard shortcut now works as expected on Chrome but requires the browser extension to be installed
+- dark mode has been disabled on the api documentation page as it was unreadable
+- improvement to the feed refresh queuing logic when "heavy load" mode is enabled
+- fix a bug that could prevent feeds and categories from being edited
+
+## [3.6.0]
+
+- add a button to open CommaFeed in a new tab and a button to open options when using the browser extension
+- clicking on the entry title in expanded mode now opens the link instead of doing nothing
+- add tooltips to buttons when the mobile layout is used on desktop
+- redirect the user to the welcome page if the user was deleted from the database
+- add link to api documentation on welcome page
+- the unread count is now correctly updated when using the "/next" bookmarklet while redis cache is enabled
+
+## [3.5.0]
+
+- add compatibility with the new version of the CommaFeed browser extension
+- disable pull-to-refresh on mobile as it messes with vertical scrolling
+- add css classes to feed entries to help with custom css rules
+- api documentation page no longer requires users to be authenticated
+- add a setting to limit the number of feeds a user can subscribe to
+- add a setting to disable strict password policy
+- add feed refresh engine metrics
+- fix redis timeouts
+
+## [3.4.0]
+
+- add support for arm64 docker images
+- add divider to visually separate read-only information from form on the profile settings page
+- reduce javascript bundle size by 30% by loading only the necessary translations
+- add a standalone donate page with all ways to support CommaFeed
+- fix an issue introduced in 3.1.0 that could make CommaFeed not refresh feeds as fast as before on instances with lots
+  of feeds
+- fix alignment of icon with text for category tree nodes
+- fix alignment of burger button with the rest of the header on mobile
+
+## [3.3.2]
+
+- restore entry selection indicator (left orange border) that was lost with the mantine 6.x upgrade (3.3.0)
+- add dividers to visually separate read-only information from forms on feed and category details pages
+- reduced javascript bundle size by 10%
+
+## [3.3.1]
+
+- fix long feed names not being shortened to respect tree max width
+
+## [3.3.0]
+
+- there are now database changes, rolling back to 2.x will no longer be possible
+- restore support for user custom CSS rules
+- add support for user custom JS code that will be executed on page load
+
+## [3.2.0]
+
+- restore the welcome page
+- only apply hover effect for unread entries (same as commafeed v2)
+- move notifications at the bottom of the screen
+- always use https for sharing urls
+- add support for redis ACLs
+- transition to google analytics v4
+
+## [3.1.0]
+
+- add an even more compact layout
+- restore hover effect from commafeed 2.x
+- view mode (compact, expanded, ...) is now stored on the device so you can have a different view mode on desktop and
+  mobile
+- fix for the "Illegal attempt to associate a collection with two open sessions." error
+- feed fetching workflow is now orchestrated with rxjava, removing a lot of code
+
+## [3.0.1]
+
+- allow env variable substitution in config.yml
+- e.g. having a custom config.yml file with `app.session.path=${SOME_ENV_VAR}` will substitute `SOME_ENV_VAR` with its
+  value
+- allow env variable prefixed with `CF_` to override config.yml properties
+- e.g. setting `CF_APP_ALLOWREGISTRATIONS=true` will set `app.allowRegistrations` to `true`
+
+## [3.0.0]
+
+- complete overhaul of the UI
+- backend and frontend are now in separate maven modules
+- no changes to the api or the database
+- Docker images are now automatically built and available at https://hub.docker.com/r/athou/commafeed
+
+## [2.6.0]
+
+- add support for media content as a backup for missing content (useful for youtube feeds)
+- correctly follow http error code 308 redirects
+- fixed a bug that prevented users from deleting their account
+- fixed a bug that made commafeed store entry contents multiple times
+- fixed a bug that prevented the app to be used as an installed app on mobile devices if the context path of commafeed
+  was not "/"
+- fixed a bug that prevented entries from being "marked as read older than xxx" for a feed that was just added
+- removed support for google+ and readability as those services no longer exist
+- removed support for deploying on openshift
+- removed alphabetical sorting of entries because of really poor performance (title cannot be indexed)
+- improve performance for instances with the heavy load setting enabled by preventing CommaFeed from fetching feeds from
+  users that did not log in for a long time
+- various dependencies upgrades (notably dropwizard from 1.3 to 2.1)
+- add support for mariadb
+- add support for java17+ runtime
+- various security improvements
+
+## [2.5.0]
+
+- unread count is now displayed in a favicon badge when supported
+- the user agent string for the bot fetching feeds is now configurable
+- feed parsing performance improvements
+- support for java9+ runtime
+- can now properly start from an empty postgresql database
+
+## [2.4.0]
+
+- users were not able to change password or delete account
+- fix api key generation
+- feed entries can now be sorted alphabetically
+- fix facebook sharing
+- fix layout on iOS
+- postgresql driver update (fix for postgres 9.6)
+- various internationalization fixes
+- security fixes
+
+## [2.3.0]
+
+- dropwizard upgrade 0.9.1
+- feed enclosures are hidden if they already displayed in the content
+- fix youtube favicons
+- various internationalization fixes
+
+## [2.2.0]
+
+- fix youtube and instagram favicon fetching
+- mark as read filter was lost when a feed was rearranged with drag&drop
+- feed entry categories are now displayed if available
+- various performance and dependencies upgrades
+- java8 is now required
+
+## [2.1.0]
+
+- dropwizard upgrade to 0.8.0
+- you have to remove the "app.contextPath" setting from your yml file, you can optionally use
+  server.applicationContextPath instead
+- new setting app.maxFeedCapacity for deleting old entries
+- ability to set filtering expressions for subscriptions to automatically mark new entries as read based on title,
+  content, author or url.
+- ability to use !keyword or -keyword to exclude a keyword from a search query
+- facebook feeds now show user favicon instead of facebook favicon
+- new dark theme 'nightsky'
+
+## [2.0.3]
+
+- internet explorer ajax cache workaround
+- categories are now deletable again
+- openshift support is back
+- youtube feeds now show user favicon instead of youtube favicon
+
+## [2.0.2]
+
+- api using the api key is now working again
+- context path is now configurable in config.yml (see app.contextPath in config.yml.example)
+- fix login on firefox when fields are autofilled by the browser
+- fix scrolling of subscriptions list on mobile
+- user is now logged in after registration
+- fix link to documentation on home page and about page
+- fields autocomplete is disabled on the profile page
+- users are able to delete their account again
+- chinese and malaysian translation files are now correctly loaded
+- software version in user-agent when fetching feeds is no longer hardcoded
+- admin settings page is now read only, settings are configured in config.yml
+- added link to metrics on the admin settings page
+- Rome (rss library) upgrade to 1.5.0
+
+## [2.0.1]
+
+- the redis pool no longer throws an exception when it is unable to aquire a new connection
+
+## [2.0.0]
+
+- The backend has been completely rewritten using Dropwizard instead of TomEE, resulting in a lot less memory
+  consumption and better overall performances.
+  See the README on how to build CommaFeed from now on.
+- CommaFeed should no longer fetch the same feed multiple times in a row
+- Users can use their username or email to log in

Dockerfile

@@ -1,11 +0,0 @@
-FROM eclipse-temurin:17-jre
-
-EXPOSE 8082
-
-RUN mkdir -p /commafeed/data
-VOLUME /commafeed/data
-
-COPY commafeed-server/config.yml.example config.yml
-COPY commafeed-server/target/commafeed.jar .
-
-CMD ["java", "-Djava.net.preferIPv4Stack=true", "-jar", "commafeed.jar", "server", "config.yml"]

LICENSE

@@ -1,31 +1,31 @@
-Apache License, Version 2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/
+Apache License, Version 2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-1. Definitions.
+1. Definitions.
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-2. Grant of Copyright License.
+2. Grant of Copyright License.
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-3. Grant of Patent License.
+3. Grant of Patent License.
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-4. Redistribution.
+4. Redistribution.
-You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-You must give any other recipients of the Work or Derivative Works a copy of this License; and You must cause any modified files to carry prominent notices stating that You changed the files; and You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+You must give any other recipients of the Work or Derivative Works a copy of this License; and You must cause any modified files to carry prominent notices stating that You changed the files; and You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-5. Submission of Contributions.
+5. Submission of Contributions.
-Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-6. Trademarks.
+6. Trademarks.
-This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-7. Disclaimer of Warranty.
+7. Disclaimer of Warranty.
-Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-8. Limitation of Liability.
+8. Limitation of Liability.
-In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-9. Accepting Warranty or Additional Liability.
+9. Accepting Warranty or Additional Liability.
-While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
 END OF TERMS AND CONDITIONS

README.md

@@ -1,48 +1,156 @@
 # CommaFeed
 
-Google Reader inspired self-hosted RSS reader, based on Dropwizard and React/TypeScript.
+Google Reader inspired self-hosted RSS reader, based on Quarkus and React/TypeScript.
 
 ![preview](https://user-images.githubusercontent.com/1256795/184886828-1973f148-58a9-4c6d-9587-ee5e5d3cc2cb.png)
 
 ## Features
 
 - 4 different layouts
-- Dark theme
+- Light/Dark theme
-- Fully responsive
+- Fully responsive, works great on both mobile and desktop
 - Keyboard shortcuts for almost everything
 - Support for right-to-left feeds
 - Translated in 25+ languages
 - Supports thousands of users and millions of feeds
 - OPML import/export
 - REST API
+- Fever-compatible API for native mobile apps
+- Can automatically mark articles as read based on user-defined rules
+- Highly customizable with [custom CSS](https://athou.github.io/commafeed/documentation/custom-css) and JavaScript
 - [Browser extension](https://github.com/Athou/commafeed-browser-extension)
+- Compiles to native code for blazing fast startup and low memory usage
+- Supports 4 databases
+    - H2 (embedded database)
+    - PostgreSQL
+    - MySQL
+    - MariaDB
 
-## Deployment on your own server
+## Deployment
 
 ### Docker
 
+Docker is the easiest way to get started with CommaFeed.
+
 Docker images are built automatically and are available at https://hub.docker.com/r/athou/commafeed
 
-### Download precompiled package
+### Cloud hosting
 
-    mkdir commafeed && cd commafeed
+[PikaPods](https://www.pikapods.com) offers 1-click cloud hosting solutions starting at $1/month with a free $5
-    wget https://github.com/Athou/commafeed/releases/latest/download/commafeed.jar
+welcome credit and officially supports CommaFeed.
-    wget https://github.com/Athou/commafeed/releases/latest/download/config.yml.example -O config.yml
+PikaPods shares 20% of the revenue back to CommaFeed.
-    java -Djava.net.preferIPv4Stack=true -jar commafeed.jar server config.yml
 
-The server will listen on http://localhost:8082. The default
+[![PikaPods](https://www.pikapods.com/static/run-button.svg)](https://www.pikapods.com/pods?run=commafeed)
-user is `admin` and the default password is `admin`.
+
+### Download a precompiled package
+
+Go to the [release page](https://github.com/Athou/commafeed/releases) and download the latest version for your operating
+system and database of choice.
+
+There are two types of packages:
+
+- The `linux-x86_64`, `linux-aarch_64` and `windows-x86_64` packages are compiled natively and contain an executable that can be run
+  directly.
+- The `jvm` package is a zip file containing all `.jar` files required to run the application. This package works on all
+  platforms but requires a JRE and is started with `java -jar quarkus-run.jar`.
+
+If available for your operating system, the native package is recommended because it has a faster startup time and lower
+memory usage.
 
 ### Build from sources
 
-    git clone https://github.com/Athou/commafeed.git
+    ./mvnw clean package [-P<database> [-Pnative]] [-DskipTests]
-    cd commafeed
-    ./mvnw clean package
-    cp commafeed-server/config.yml.example config.yml
-    java -Djava.net.preferIPv4Stack=true -jar commafeed-server/target/commafeed.jar server config.yml
 
-The server will listen on http://localhost:8082. The default
+- `<database>` can be one of `h2`, `postgresql`, `mysql` or `mariadb`. The default is `h2`.
-user is `admin` and the default password is `admin`.
+- `-Pnative` compiles the application to native code. This requires GraalVM to be installed (`GRAALVM_HOME` environment
+  variable pointing to a GraalVM installation).
+- `-DskipTests` to speed up the build process by skipping tests.
+
+When the build is complete:
+
+- a zip containing all jars required to run the application is located at
+  `commafeed-server/target/commafeed-<version>-<database>-jvm.zip`. Extract it and run the application with
+  `java -jar quarkus-run.jar`
+- if you used the native profile, the executable is located at
+  `commafeed-server/target/commafeed-<version>-<database>-<platform>-<arch>-runner[.exe]`
+
+### Distribution packages
+
+- Arch Linux users can use [the CommaFeed package on AUR](https://aur.archlinux.org/pkgbase/commafeed), which builds native binaries with GraalVM for all supported databases.
+
+## Configuration
+
+CommaFeed doesn't require any configuration to run with its embedded database (H2). The database file will be stored in
+the `data` directory of the current directory.
+
+To use a different database, you will need to configure the following properties:
+
+- `quarkus.datasource.jdbc.url`
+    - e.g. for H2: `jdbc:h2:./data/db;DEFRAG_ALWAYS=TRUE`
+    - e.g. for PostgreSQL: `jdbc:postgresql://localhost:5432/commafeed`
+    - e.g. for MySQL:
+      `jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC`
+    - e.g. for MariaDB:
+      `jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC`
+- `quarkus.datasource.username`
+- `quarkus.datasource.password`
+
+There are multiple ways to configure CommaFeed:
+
+- a `config/application.properties` [properties](https://en.wikipedia.org/wiki/.properties) file relative to the working
+  directory (keys in kebab-case)
+- Command line arguments each prefixed with `-D` (keys in kebab-case)
+- Environment variables (keys in UPPER_CASE)
+- a `.env` file in the working directory (keys in UPPER_CASE)
+
+The properties file is recommended because CommaFeed will be able to warn about invalid properties and typos.
+
+All [CommaFeed settings](https://athou.github.io/commafeed/documentation) are optional and have sensible default values.
+
+When logging in, credentials are stored in an encrypted cookie. The encryption key is randomly generated at startup,
+meaning that you will have to log back in after each restart of the application. To prevent this, you can set the
+`quarkus.http.auth.session.encryption-key` property to a fixed value (min. 16 characters).
+All other Quarkus settings can be found [here](https://quarkus.io/guides/all-config).
+
+When started, the server will listen on http://localhost:8082.
+The default user is `admin` and the default password is `admin`.
+
+### Updates
+
+When CommaFeed is up and running, you can subscribe to [this feed](https://github.com/Athou/commafeed/releases.atom) to be notified of new releases.
+
+### Memory management
+
+The Java Virtual Machine (JVM) is rather greedy by default and will not release unused memory to the
+operating system. This is because acquiring memory from the operating system is a relatively expensive operation.
+This can be problematic on systems with limited memory.
+
+#### Hard limit (`native` and `jvm` packages)
+
+The JVM can be configured to use a maximum amount of memory with the `-Xmx` parameter.
+For example, to limit the JVM to 256MB of memory, use `-Xmx256m`.
+
+#### Dynamic sizing (`jvm` package)
+
+In addition to the previous setting, the JVM can be configured to release unused memory to the operating system with the
+following parameters:
+
+    -Xms20m -XX:+UseG1GC -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -XX:G1PeriodicGCInterval=10000 -XX:-G1PeriodicGCInvokesConcurrent -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10
+
+See [here](https://docs.oracle.com/en/java/javase/17/gctuning/garbage-first-g1-garbage-collector1.html)
+and [here](https://docs.oracle.com/en/java/javase/17/gctuning/factors-affecting-garbage-collection-performance.html) for
+more
+information.
+
+#### OpenJ9 (`jvm` package)
+
+The [OpenJ9](https://eclipse.dev/openj9/) JVM is a more memory-efficient alternative to the HotSpot JVM, at the cost of
+slightly slower throughput.
+
+IBM provides precompiled binaries for OpenJ9
+named [Semeru](https://developer.ibm.com/languages/java/semeru-runtimes/downloads/).
+This is the JVM used in
+the [Docker image](https://github.com/Athou/commafeed/blob/master/commafeed-server/src/main/docker/Dockerfile.jvm).
 
 ## Translation
 
@@ -66,7 +174,7 @@ two-letters [ISO-639-1 language code](http://en.wikipedia.org/wiki/List_of_ISO_6
 
 - Open `commafeed-server` in your preferred Java IDE.
     - CommaFeed uses Lombok, you need the Lombok plugin for your IDE.
-- Start `CommaFeedApplication.java` in debug mode with `server config.dev.yml` as arguments
+- run `./mvnw quarkus:dev`
 
 ### Frontend
 
@@ -76,19 +184,3 @@ two-letters [ISO-639-1 language code](http://en.wikipedia.org/wiki/List_of_ISO_6
 
 The frontend server is now running at http://localhost:8082 and is proxying REST requests to the backend running on
 port 8083
-
-## Copyright and license
-
-Copyright 2013-2023 CommaFeed.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this work except in compliance with the License.
-You may obtain a copy of the License in the LICENSE file, or at:
-
-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 "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

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

@@ -1,85 +0,0 @@
-{
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended",
-        "plugin:react/recommended",
-        "react-app",
-        "airbnb",
-        "airbnb-typescript",
-        "prettier"
-    ],
-    "plugins": ["@typescript-eslint", "prettier", "hooks"],
-    "parserOptions": {
-        "project": "./tsconfig.json"
-    },
-    "rules": {
-        // make eslint check prettier rules
-        "prettier/prettier": "error",
-
-        // enforce consistent curly braces usage
-        "curly": ["error", "multi-line", "consistent"],
-
-        // set "props" to false because it cases false positives with immer
-        "no-param-reassign": ["error", { "props": false }],
-
-        "prefer-destructuring": [
-            "error",
-            {
-                "array": false,
-                "object": true
-            },
-            {
-                "enforceForRenamedProperties": false
-            }
-        ],
-
-        // causes issues in thunks when we want to dispatch an action that is defined in the reducer
-        "@typescript-eslint/no-use-before-define": "off",
-
-        // make sure the key prop is filled when required
-        "react/jsx-key": ["error", { "checkFragmentShorthand": true }],
-
-        // configure additional hooks
-        "react-hooks/exhaustive-deps": [
-            "warn",
-            {
-                "additionalHooks": "(^useAsync$|useDidUpdate)"
-            }
-        ],
-
-        // trigger even if props is used only in createStyles()
-        "react/no-unused-prop-types": "off",
-
-        // no longer required with modern react versions
-        "react/react-in-jsx-scope": "off",
-
-        // not required with typescript
-        "react/prop-types": "off",
-        "react/require-default-props": "off",
-
-        // matter of taste
-        "react/destructuring-assignment": "off",
-        "react/jsx-props-no-spreading": "off",
-        "react/no-unescaped-entities": "off",
-        "import/prefer-default-export": "off",
-
-        // enforce hook call order
-        "hooks/sort": [
-            2,
-            {
-                "groups": [
-                    "useLocation",
-                    "useParams",
-                    "useState",
-                    "useAppSelector",
-                    "useAppDispatch",
-                    "useAsync",
-                    "useForm",
-                    "useAsyncCallback",
-                    "useCallback",
-                    "useEffect"
-                ]
-            }
-        ]
-    }
-}

commafeed-client/.linguirc

@@ -1,52 +0,0 @@
-{
-    "locales": [
-        "ar",
-        "ca",
-        "cs",
-        "cy",
-        "da",
-        "de",
-        "en",
-        "es",
-        "fa",
-        "fi",
-        "fr",
-        "gl",
-        "hu",
-        "id",
-        "it",
-        "ja",
-        "ko",
-        "ms",
-        "nb",
-        "nl",
-        "nn",
-        "pl",
-        "pt",
-        "ru",
-        "sk",
-        "sv",
-        "tr",
-        "zh"
-    ],
-    "catalogs": [
-        {
-            "path": "src/locales/{locale}/messages",
-            "include": [
-                "src"
-            ],
-            "exclude": [
-                "src/locales/**"
-            ]
-        }
-    ],
-    "format": "po",
-    "formatOptions": {
-        "origins": true,
-        "lineNumbers": false
-    },
-    "sourceLocale": "en",
-    "fallbackLocales": {
-        "default": "en"
-    }
-}

commafeed-client/.prettierrc

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

commafeed-client/biome.json

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

commafeed-client/index.html

@@ -1,11 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta charset="UTF-8" />
+    <meta charset="UTF-8" />
-  <link rel="icon" type="image/x-icon" href="favicon.ico" />
+    <link rel="icon" type="image/x-icon" href="favicon.ico" />
-  <link rel="manifest" href="manifest.json" />
+    <link rel="manifest" href="manifest.json" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-  <title>CommaFeed</title>
+    <meta name="referrer" content="no-referrer" />
+
+    <title>CommaFeed</title>
 </head>
 <body>
 <div id="root"></div>

commafeed-client/lingui.config.ts

@@ -0,0 +1,52 @@
+import type { LinguiConfig } from "@lingui/conf"
+
+const config: LinguiConfig = {
+    locales: [
+        "ar",
+        "ca",
+        "cs",
+        "cy",
+        "da",
+        "de",
+        "en",
+        "es",
+        "fa",
+        "fi",
+        "fr",
+        "gl",
+        "hu",
+        "id",
+        "it",
+        "ja",
+        "ko",
+        "ms",
+        "nb",
+        "nl",
+        "nn",
+        "pl",
+        "pt",
+        "ru",
+        "sk",
+        "sv",
+        "tr",
+        "zh",
+    ],
+    catalogs: [
+        {
+            path: "src/locales/{locale}/messages",
+            include: ["src"],
+            exclude: ["src/locales/**"],
+        },
+    ],
+    format: "po",
+    formatOptions: {
+        origins: true,
+        lineNumbers: false,
+    },
+    sourceLocale: "en",
+    fallbackLocales: {
+        default: "en",
+    },
+}
+
+export default config

commafeed-client/package.json

@@ -1,85 +1,84 @@
 {
-  "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",
-    "dev:typescript": "tsc --watch",
+        "dev:host": "vite --host",
-    "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",
-    "i18n:extract": "lingui extract --clean"
+        "lint:fix": "biome check --write",
-  },
+        "i18n:extract": "lingui extract --clean"
-  "dependencies": {
+    },
-    "@emotion/react": "^11.11.0",
+    "dependencies": {
-    "@fontsource/open-sans": "^5.0.1",
+        "@emotion/react": "^11.14.0",
-    "@lingui/core": "^4.1.2",
+        "@fontsource/open-sans": "^5.2.5",
-    "@lingui/macro": "^4.1.2",
+        "@lingui/core": "^5.3.1",
-    "@lingui/react": "^4.1.2",
+        "@lingui/react": "^5.3.1",
-    "@mantine/core": "^6.0.11",
+        "@mantine/core": "^8.0.0",
-    "@mantine/form": "^6.0.11",
+        "@mantine/form": "^8.0.0",
-    "@mantine/hooks": "^6.0.11",
+        "@mantine/hooks": "^8.0.0",
-    "@mantine/modals": "^6.0.11",
+        "@mantine/modals": "^8.0.0",
-    "@mantine/notifications": "^6.0.11",
+        "@mantine/notifications": "^8.0.0",
-    "@mantine/spotlight": "^6.0.11",
+        "@mantine/spotlight": "^8.0.0",
-    "@mantine/styles": "^6.0.11",
+        "@monaco-editor/react": "^4.7.0",
-    "@monaco-editor/react": "^4.5.1",
+        "@reduxjs/toolkit": "^2.8.1",
-    "@reduxjs/toolkit": "^1.9.5",
+        "axios": "^1.9.0",
-    "axios": "^1.4.0",
+        "dayjs": "^1.11.13",
-    "dayjs": "^1.11.7",
+        "escape-string-regexp": "^5.0.0",
-    "escape-string-regexp": "^5.0.0",
+        "interweave": "^13.1.1",
-    "interweave": "^13.1.0",
+        "monaco-editor": "^0.52.2",
-    "monaco-editor": "^0.38.0",
+        "mousetrap": "^1.6.5",
-    "mousetrap": "^1.6.5",
+        "react": "^19.1.0",
-    "re-resizable": "^6.9.9",
+        "react-async-hook": "^4.0.0",
-    "react": "^18.2.0",
+        "react-contexify": "^6.0.0",
-    "react-async-hook": "^4.0.0",
+        "react-device-detect": "^2.2.3",
-    "react-contexify": "^6.0.0",
+        "react-dom": "^19.1.0",
-    "react-dom": "^18.2.0",
+        "react-draggable": "^4.4.6",
-    "react-ga4": "^2.1.0",
+        "react-ga4": "^2.1.0",
-    "react-icons": "^4.8.0",
+        "react-icons": "^5.5.0",
-    "react-infinite-scroller": "^1.2.6",
+        "react-infinite-scroller": "^1.2.6",
-    "react-redux": "^8.0.5",
+        "react-redux": "^9.2.0",
-    "react-router-dom": "^6.11.2",
+        "react-router-dom": "^7.6.0",
-    "react-swipeable": "^7.0.0",
+        "react-swipeable": "^7.0.2",
-    "swagger-ui-react": "^4.18.3",
+        "redoc": "^2.5.0",
-    "throttle-debounce": "^5.0.0",
+        "style-to-object": "^1.0.8",
-    "tinycon": "^0.6.8",
+        "throttle-debounce": "^5.0.2",
-    "use-local-storage": "^3.0.0",
+        "tinycon": "^0.6.8",
-    "websocket-heartbeat-js": "^1.1.2"
+        "tss-react": "^4.9.18",
-  },
+        "websocket-heartbeat-js": "^1.1.3"
-  "devDependencies": {
+    },
-    "@lingui/cli": "^4.1.2",
+    "devDependencies": {
-    "@lingui/vite-plugin": "^4.1.2",
+        "@biomejs/biome": "^1.9.4",
-    "@types/eslint": "^8.40.0",
+        "@lingui/babel-plugin-lingui-macro": "^5.3.1",
-    "@types/mousetrap": "^1.6.11",
+        "@lingui/cli": "^5.3.1",
-    "@types/react": "^18.2.6",
+        "@lingui/vite-plugin": "^5.3.1",
-    "@types/react-dom": "^18.2.4",
+        "@testing-library/jest-dom": "^6.6.3",
-    "@types/react-infinite-scroller": "^1.2.3",
+        "@testing-library/react": "^16.3.0",
-    "@types/swagger-ui-react": "^4.18.0",
+        "@testing-library/user-event": "^14.6.1",
-    "@types/throttle-debounce": "^5.0.0",
+        "@types/mousetrap": "^1.6.15",
-    "@types/tinycon": "^0.6.3",
+        "@types/react": "^19.1.4",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
+        "@types/react-dom": "^19.1.5",
-    "@typescript-eslint/parser": "^5.59.7",
+        "@types/react-infinite-scroller": "^1.2.5",
-    "@vitejs/plugin-react": "^4.0.0",
+        "@types/throttle-debounce": "^5.0.2",
-    "babel-plugin-macros": "^3.1.0",
+        "@types/tinycon": "^0.6.7",
-    "eslint": "^8.41.0",
+        "@vitejs/plugin-react": "^4.4.1",
-    "eslint-config-airbnb": "^19.0.4",
+        "babel-plugin-macros": "^3.1.0",
-    "eslint-config-airbnb-typescript": "^17.0.0",
+        "jsdom": "^26.1.0",
-    "eslint-config-prettier": "^8.8.0",
+        "rollup-plugin-visualizer": "^5.14.0",
-    "eslint-config-react-app": "^7.0.1",
+        "typescript": "^5.8.3",
-    "eslint-plugin-hooks": "^0.4.3",
+        "vite": "^6.3.5",
-    "eslint-plugin-prettier": "^4.2.1",
+        "vite-plugin-checker": "^0.9.3",
-    "prettier": "^2.8.8",
+        "vite-tsconfig-paths": "^5.1.4",
-    "rollup-plugin-visualizer": "^5.9.0",
+        "vitest": "^3.1.3"
-    "typescript": "^5.0.4",
+    },
-    "vite": "^4.3.9",
+    "overrides": {
-    "vite-plugin-eslint": "^1.8.1",
+        "react-infinite-scroller": {
-    "vite-tsconfig-paths": "^4.2.0",
+            "react": "^19.1.0"
-    "vitest": "^0.31.1",
+        }
-    "vitest-mock-extended": "^1.1.3"
+    }
-  }
 }

commafeed-client/pom.xml

@@ -1,98 +1,97 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+
-
+	<modelVersion>4.0.0</modelVersion>
-	<parent>
+
-		<groupId>com.commafeed</groupId>
+	<parent>
-		<artifactId>commafeed</artifactId>
+		<groupId>com.commafeed</groupId>
-		<version>3.10.0</version>
+		<artifactId>commafeed</artifactId>
-	</parent>
+		<version>5.9.0</version>
-	<artifactId>commafeed-client</artifactId>
+	</parent>
-	<name>CommaFeed Client</name>
+	<artifactId>commafeed-client</artifactId>
-
+	<name>CommaFeed Client</name>
-	<build>
+
-		<plugins>
+	<properties>
-			<plugin>
+		<!-- renovate: datasource=node-version depName=node -->
-				<groupId>com.github.eirslett</groupId>
+		<node.version>v22.15.0</node.version>
-				<artifactId>frontend-maven-plugin</artifactId>
+		<!-- renovate: datasource=npm depName=npm -->
-				<version>1.12.1</version>
+		<npm.version>11.3.0</npm.version>
-				<?m2e ignore?>
+	</properties>
-				<executions>
+
-					<execution>
+	<build>
-						<id>install node and npm</id>
+		<plugins>
-						<goals>
+			<plugin>
-							<goal>install-node-and-npm</goal>
+				<groupId>com.github.eirslett</groupId>
-						</goals>
+				<artifactId>frontend-maven-plugin</artifactId>
-						<phase>compile</phase>
+				<version>1.15.1</version>
-						<configuration>
+				<?m2e ignore?>
-							<nodeVersion>v16.16.0</nodeVersion>
+				<executions>
-							<npmVersion>8.15.0</npmVersion>
+					<execution>
-						</configuration>
+						<id>install node and npm</id>
-					</execution>
+						<goals>
-					<execution>
+							<goal>install-node-and-npm</goal>
-						<id>npm install</id>
+						</goals>
-						<goals>
+						<phase>compile</phase>
-							<goal>npm</goal>
+						<configuration>
-						</goals>
+							<nodeVersion>${node.version}</nodeVersion>
-						<phase>compile</phase>
+							<npmVersion>${npm.version}</npmVersion>
-						<configuration>
+						</configuration>
-							<arguments>ci</arguments>
+					</execution>
-						</configuration>
+					<execution>
-					</execution>
+						<id>npm install</id>
-					<execution>
+						<goals>
-						<id>npm run eslint</id>
+							<goal>npm</goal>
-						<goals>
+						</goals>
-							<goal>npm</goal>
+						<phase>compile</phase>
-						</goals>
+						<configuration>
-						<phase>compile</phase>
+							<arguments>ci</arguments>
-						<configuration>
+						</configuration>
-							<arguments>run eslint</arguments>
+					</execution>
-						</configuration>
+					<execution>
-					</execution>
+						<id>npm run test</id>
-					<execution>
+						<goals>
-						<id>npm run test</id>
+							<goal>npm</goal>
-						<goals>
+						</goals>
-							<goal>npm</goal>
+						<phase>compile</phase>
-						</goals>
+						<configuration>
-						<phase>compile</phase>
+							<arguments>run test:ci</arguments>
-						<configuration>
+							<skip>${skipTests}</skip>
-							<arguments>run test:ci</arguments>
+						</configuration>
-						</configuration>
+					</execution>
-					</execution>
+					<execution>
-					<execution>
+						<id>npm run build</id>
-						<id>npm run build</id>
+						<goals>
-						<goals>
+							<goal>npm</goal>
-							<goal>npm</goal>
+						</goals>
-						</goals>
+						<phase>compile</phase>
-						<phase>compile</phase>
+						<configuration>
-						<configuration>
+							<arguments>run build</arguments>
-							<arguments>run build</arguments>
+						</configuration>
-						</configuration>
+					</execution>
-					</execution>
+				</executions>
-				</executions>
+			</plugin>
-			</plugin>
+			<plugin>
-			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
-				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.3.1</version>
-				<version>3.3.0</version>
+				<executions>
-				<executions>
+					<execution>
-					<execution>
+						<id>copy web interface to resources</id>
-						<id>copy web interface to resources</id>
+						<phase>prepare-package</phase>
-						<phase>prepare-package</phase>
+						<goals>
-						<goals>
+							<goal>copy-resources</goal>
-							<goal>copy-resources</goal>
+						</goals>
-						</goals>
+						<configuration>
-						<configuration>
+							<outputDirectory>${project.build.directory}/classes/META-INF/resources</outputDirectory>
-							<outputDirectory>${project.build.directory}/classes/assets</outputDirectory>
+							<resources>
-							<resources>
+								<resource>
-								<resource>
+									<directory>dist</directory>
-									<directory>dist</directory>
+									<filtering>false</filtering>
-									<filtering>false</filtering>
+								</resource>
-								</resource>
+							</resources>
-							</resources>
+						</configuration>
-						</configuration>
+					</execution>
-					</execution>
+				</executions>
-				</executions>
+			</plugin>
-			</plugin>
+		</plugins>
-		</plugins>
+	</build>
-	</build>
 </project>

commafeed-client/src/App.tsx

@@ -1,19 +1,21 @@
 import { i18n } from "@lingui/core"
 import { I18nProvider } from "@lingui/react"
-import { ColorScheme, ColorSchemeProvider, MantineProvider } from "@mantine/core"
+import { MantineProvider } from "@mantine/core"
-import { useColorScheme } from "@mantine/hooks"
 import { ModalsProvider } from "@mantine/modals"
 import { Notifications } from "@mantine/notifications"
 import { Constants } from "app/constants"
-import { redirectTo } from "app/slices/redirect"
+import { redirectTo } from "app/redirect/slice"
-import { reloadServerInfos } from "app/slices/server"
+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 { useAppLoading } from "hooks/useAppLoading"
 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,45 +30,52 @@ 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, useState } from "react"
-import React, { useEffect } from "react"
+import { isSafari } from "react-device-detect"
 import ReactGA from "react-ga4"
 import { HashRouter, Navigate, Route, Routes, useLocation, useNavigate } from "react-router-dom"
 import Tinycon from "tinycon"
-import useLocalStorage from "use-local-storage"
 
 function Providers(props: { children: React.ReactNode }) {
-    const preferredColorScheme = useColorScheme()
+    const primaryColor = useAppSelector(state => state.user.settings?.primaryColor) || Constants.theme.defaultPrimaryColor
-    const [colorScheme, setColorScheme] = useLocalStorage<ColorScheme>("color-scheme", preferredColorScheme)
-    const toggleColorScheme = (value?: ColorScheme) => setColorScheme(value ?? (colorScheme === "dark" ? "light" : "dark"))
-
     return (
         <I18nProvider i18n={i18n}>
-            <ColorSchemeProvider colorScheme={colorScheme} toggleColorScheme={toggleColorScheme}>
+            <MantineProvider
-                <MantineProvider
+                defaultColorScheme="auto"
-                    withGlobalStyles
+                theme={{
-                    withNormalizeCSS
+                    primaryColor: primaryColor,
-                    theme={{
+                    fontFamily: "Open Sans",
-                        primaryColor: "orange",
+                    colors: {
-                        colorScheme,
+                        // keep using dark colors from mantine v6
-                        fontFamily: "Open Sans",
+                        // https://v6.mantine.dev/theming/colors/#default-colors
-                    }}
+                        dark: [
-                >
+                            "#C1C2C5",
-                    <ModalsProvider>
+                            "#A6A7AB",
-                        <Notifications position="bottom-right" zIndex={9999} />
+                            "#909296",
-                        <ErrorBoundary>{props.children}</ErrorBoundary>
+                            "#5c5f66",
-                    </ModalsProvider>
+                            "#373A40",
-                </MantineProvider>
+                            "#2C2E33",
-            </ColorSchemeProvider>
+                            "#25262b",
+                            "#1A1B1E",
+                            "#141517",
+                            "#101113",
+                        ],
+                    },
+                }}
+            >
+                <ModalsProvider>
+                    <Notifications position="bottom-right" zIndex={9999} />
+                    <ErrorBoundary>{props.children}</ErrorBoundary>
+                </ModalsProvider>
+            </MantineProvider>
         </I18nProvider>
     )
 }
 
-// swagger-ui is very large, load only on-demand
+// api documentation page is very large, load only on-demand
-const ApiDocumentationPage = React.lazy(() => import("pages/app/ApiDocumentationPage"))
+const ApiDocumentationPage = React.lazy(async () => await import("pages/app/ApiDocumentationPage"))
 
 function AppRoutes() {
-    const sidebarWidth = useAppSelector(state => state.tree.sidebarWidth)
     const sidebarVisible = useAppSelector(state => state.tree.sidebarVisible)
 
     return (
@@ -77,7 +86,7 @@ function AppRoutes() {
             <Route path="register" element={<RegistrationPage />} />
             <Route path="passwordRecovery" element={<PasswordRecoveryPage />} />
             <Route path="api" element={<ApiDocumentationPage />} />
-            <Route path="app" element={<Layout header={<Header />} sidebar={<Tree />} sidebarWidth={sidebarVisible ? sidebarWidth : 0} />}>
+            <Route path="app" element={<Layout header={<Header />} sidebar={<Tree />} sidebarVisible={sidebarVisible} />}>
                 <Route path="category">
                     <Route path=":id" element={<FeedEntriesPage sourceType="category" />} />
                     <Route path=":id/details" element={<CategoryDetailsPage />} />
@@ -134,16 +143,18 @@ function GoogleAnalyticsHandler() {
     return null
 }
 
-function FaviconHandler() {
+function UnreadCountTitleHandler({ unreadCount, enabled }: { unreadCount: number; enabled?: boolean }) {
-    const root = useAppSelector(state => state.tree.rootCategory)
+    return <title>{enabled && unreadCount > 0 ? `(${unreadCount}) CommaFeed` : "CommaFeed"}</title>
+}
+
+function UnreadCountFaviconHandler({ unreadCount, enabled }: { unreadCount: number; enabled?: boolean }) {
     useEffect(() => {
-        const unreadCount = categoryUnreadCount(root)
+        if (enabled && unreadCount > 0) {
-        if (unreadCount === 0) {
-            Tinycon.reset()
-        } else {
             Tinycon.setBubble(unreadCount)
+        } else {
+            Tinycon.reset()
         }
-    }, [root])
+    }, [unreadCount, enabled])
 
     return null
 }
@@ -160,10 +171,47 @@ function BrowserExtensionBadgeUnreadCountHandler() {
     return null
 }
 
+function CustomJsHandler() {
+    const [scriptLoaded, setScriptLoaded] = useState(false)
+    const { loading } = useAppLoading()
+
+    useEffect(() => {
+        if (scriptLoaded || loading) {
+            return
+        }
+
+        const script = document.createElement("script")
+        script.src = "custom_js.js"
+        script.async = true
+        document.body.appendChild(script)
+
+        setScriptLoaded(true)
+    }, [scriptLoaded, loading])
+
+    return null
+}
+
+function CustomCssHandler() {
+    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() {
     useI18n()
+    const root = useAppSelector(state => state.tree.rootCategory)
+    const unreadCountTitle = useAppSelector(state => state.user.settings?.unreadCountTitle)
+    const unreadCountFavicon = useAppSelector(state => state.user.settings?.unreadCountFavicon)
     const dispatch = useAppDispatch()
 
+    const unreadCount = categoryUnreadCount(root)
+
     useEffect(() => {
         dispatch(reloadServerInfos())
     }, [dispatch])
@@ -171,8 +219,18 @@ export function App() {
     return (
         <Providers>
             <>
-                <FaviconHandler />
+                <UnreadCountTitleHandler unreadCount={unreadCount} enabled={unreadCountTitle} />
+                <UnreadCountFaviconHandler unreadCount={unreadCount} enabled={unreadCountFavicon} />
                 <BrowserExtensionBadgeUnreadCountHandler />
+                <CustomJsHandler />
+                <CustomCssHandler />
+
+                {/* 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>
                     <GoogleAnalyticsHandler />
                     <RedirectHandler />

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

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

commafeed-client/src/app/client.ts

@@ -1,118 +1,137 @@
-import axios from "axios"
+import axios, { type AxiosError } from "axios"
-import {
+import type {
-    AddCategoryRequest,
+    AddCategoryRequest,
-    Category,
+    AdminSaveUserRequest,
-    CategoryModificationRequest,
+    AuthenticationError,
-    CollapseRequest,
+    Category,
-    Entries,
+    CategoryModificationRequest,
-    FeedInfo,
+    CollapseRequest,
-    FeedInfoRequest,
+    Entries,
-    FeedModificationRequest,
+    FeedInfo,
-    GetEntriesPaginatedRequest,
+    FeedInfoRequest,
-    IDRequest,
+    FeedModificationRequest,
-    LoginRequest,
+    GetEntriesPaginatedRequest,
-    MarkRequest,
+    IDRequest,
-    Metrics,
+    LoginRequest,
-    MultipleMarkRequest,
+    MarkRequest,
-    PasswordResetRequest,
+    Metrics,
-    ProfileModificationRequest,
+    MultipleMarkRequest,
-    RegistrationRequest,
+    PasswordResetRequest,
-    ServerInfo,
+    ProfileModificationRequest,
-    Settings,
+    RegistrationRequest,
-    StarRequest,
+    ServerInfo,
-    SubscribeRequest,
+    Settings,
-    Subscription,
+    StarRequest,
-    TagRequest,
+    SubscribeRequest,
-    UserModel,
+    Subscription,
-} from "./types"
+    TagRequest,
-
+    UserModel,
-const axiosInstance = axios.create({ baseURL: "./rest", withCredentials: true })
+} from "./types"
-axiosInstance.interceptors.response.use(
+
-    response => response,
+const axiosInstance = axios.create({ baseURL: "./rest", withCredentials: true })
-    error => {
+axiosInstance.interceptors.response.use(
-        if (
+    response => response,
-            (error.response.status === 401 && error.response.data === "Credentials are required to access this resource.") ||
+    error => {
-            (error.response.status === 403 && error.response.data === "You don't have the required role to access this resource.")
+        if (isAuthenticationError(error)) {
-        ) {
+            const data = error.response?.data
-            window.location.hash = "/welcome"
+            window.location.hash = data?.allowRegistrations ? "/welcome" : "/login"
-        }
+        }
-        throw error
+        throw error
-    }
+    }
-)
+)
-
+
-export const client = {
+function isAuthenticationError(error: unknown): error is AxiosError<AuthenticationError> {
-    category: {
+    return axios.isAxiosError(error) && !!error.response && [401, 403].includes(error.response.status)
-        getRoot: () => axiosInstance.get<Category>("category/get"),
+}
-        modify: (req: CategoryModificationRequest) => axiosInstance.post("category/modify", req),
+
-        collapse: (req: CollapseRequest) => axiosInstance.post("category/collapse", req),
+export const client = {
-        getEntries: (req: GetEntriesPaginatedRequest) => axiosInstance.get<Entries>("category/entries", { params: req }),
+    category: {
-        markEntries: (req: MarkRequest) => axiosInstance.post("category/mark", req),
+        getRoot: async () => await axiosInstance.get<Category>("category/get"),
-        add: (req: AddCategoryRequest) => axiosInstance.post("category/add", req),
+        modify: async (req: CategoryModificationRequest) => await axiosInstance.post("category/modify", req),
-        delete: (req: IDRequest) => axiosInstance.post("category/delete", req),
+        collapse: async (req: CollapseRequest) => await axiosInstance.post("category/collapse", req),
-    },
+        getEntries: async (req: GetEntriesPaginatedRequest) => await axiosInstance.get<Entries>("category/entries", { params: req }),
-    entry: {
+        markEntries: async (req: MarkRequest) => await axiosInstance.post("category/mark", req),
-        mark: (req: MarkRequest) => axiosInstance.post("entry/mark", req),
+        add: async (req: AddCategoryRequest) => await axiosInstance.post("category/add", req),
-        markMultiple: (req: MultipleMarkRequest) => axiosInstance.post("entry/markMultiple", req),
+        delete: async (req: IDRequest) => await axiosInstance.post("category/delete", req),
-        star: (req: StarRequest) => axiosInstance.post("entry/star", req),
+    },
-        getTags: () => axiosInstance.get<string[]>("entry/tags"),
+    entry: {
-        tag: (req: TagRequest) => axiosInstance.post("entry/tag", req),
+        mark: async (req: MarkRequest) => await axiosInstance.post("entry/mark", req),
-    },
+        markMultiple: async (req: MultipleMarkRequest) => await axiosInstance.post("entry/markMultiple", req),
-    feed: {
+        star: async (req: StarRequest) => await axiosInstance.post("entry/star", req),
-        get: (id: string) => axiosInstance.get<Subscription>(`feed/get/${id}`),
+        getTags: async () => await axiosInstance.get<string[]>("entry/tags"),
-        modify: (req: FeedModificationRequest) => axiosInstance.post("feed/modify", req),
+        tag: async (req: TagRequest) => await axiosInstance.post("entry/tag", req),
-        getEntries: (req: GetEntriesPaginatedRequest) => axiosInstance.get<Entries>("feed/entries", { params: req }),
+    },
-        markEntries: (req: MarkRequest) => axiosInstance.post("feed/mark", req),
+    feed: {
-        fetchFeed: (req: FeedInfoRequest) => axiosInstance.post<FeedInfo>("feed/fetch", req),
+        get: async (id: string) => await axiosInstance.get<Subscription>(`feed/get/${id}`),
-        refreshAll: () => axiosInstance.get("feed/refreshAll"),
+        modify: async (req: FeedModificationRequest) => await axiosInstance.post("feed/modify", req),
-        subscribe: (req: SubscribeRequest) => axiosInstance.post<number>("feed/subscribe", req),
+        getEntries: async (req: GetEntriesPaginatedRequest) => await axiosInstance.get<Entries>("feed/entries", { params: req }),
-        unsubscribe: (req: IDRequest) => axiosInstance.post("feed/unsubscribe", req),
+        markEntries: async (req: MarkRequest) => await axiosInstance.post("feed/mark", req),
-        importOpml: (req: File) => {
+        fetchFeed: async (req: FeedInfoRequest) => await axiosInstance.post<FeedInfo>("feed/fetch", req),
-            const formData = new FormData()
+        refreshAll: async () => await axiosInstance.get("feed/refreshAll"),
-            formData.append("file", req)
+        subscribe: async (req: SubscribeRequest) => await axiosInstance.post<number>("feed/subscribe", req),
-            return axiosInstance.post("feed/import", formData, {
+        unsubscribe: async (req: IDRequest) => await axiosInstance.post("feed/unsubscribe", req),
-                headers: {
+        importOpml: async (req: File) => {
-                    "Content-Type": "multipart/form-data",
+            const formData = new FormData()
-                },
+            formData.append("file", req)
-            })
+            return await axiosInstance.post("feed/import", formData, {
-        },
+                headers: {
-    },
+                    "Content-Type": "multipart/form-data",
-    user: {
+                },
-        login: (req: LoginRequest) => axiosInstance.post("user/login", req),
+            })
-        register: (req: RegistrationRequest) => axiosInstance.post("user/register", req),
+        },
-        passwordReset: (req: PasswordResetRequest) => axiosInstance.post("user/passwordReset", req),
+    },
-        getSettings: () => axiosInstance.get<Settings>("user/settings"),
+    user: {
-        saveSettings: (settings: Settings) => axiosInstance.post("user/settings", settings),
+        login: async (req: LoginRequest) => {
-        getProfile: () => axiosInstance.get<UserModel>("user/profile"),
+            const formData = new URLSearchParams()
-        saveProfile: (req: ProfileModificationRequest) => axiosInstance.post("user/profile", req),
+            formData.append("j_username", req.name)
-        deleteProfile: () => axiosInstance.post("user/profile/deleteAccount"),
+            formData.append("j_password", req.password)
-    },
+            return await axiosInstance.post("j_security_check", formData, {
-    server: {
+                baseURL: ".",
-        getServerInfos: () => axiosInstance.get<ServerInfo>("server/get"),
+                headers: {
-    },
+                    "Content-Type": "application/x-www-form-urlencoded",
-    admin: {
+                },
-        getAllUsers: () => axiosInstance.get<UserModel[]>("admin/user/getAll"),
+            })
-        saveUser: (req: UserModel) => axiosInstance.post("admin/user/save", req),
+        },
-        deleteUser: (req: IDRequest) => axiosInstance.post("admin/user/delete", req),
+        register: async (req: RegistrationRequest) => await axiosInstance.post("user/register", req),
-        getMetrics: () => axiosInstance.get<Metrics>("admin/metrics"),
+        passwordReset: async (req: PasswordResetRequest) => await axiosInstance.post("user/passwordReset", req),
-    },
+        getSettings: async () => await axiosInstance.get<Settings>("user/settings"),
-}
+        saveSettings: async (settings: Settings) => await axiosInstance.post("user/settings", settings),
-
+        getProfile: async () => await axiosInstance.get<UserModel>("user/profile"),
-/**
+        saveProfile: async (req: ProfileModificationRequest) => await axiosInstance.post("user/profile", req),
- * transform an error object to an array of strings that can be displayed to the user
+        deleteProfile: async () => await axiosInstance.post("user/profile/deleteAccount"),
- * @param err an error object (e.g. from axios)
+    },
- * @returns an array of messages to show the user
+    server: {
- */
+        getServerInfos: async () => await axiosInstance.get<ServerInfo>("server/get"),
-export const errorToStrings = (err: unknown) => {
+    },
-    let strings: string[] = []
+    admin: {
-
+        getAllUsers: async () => await axiosInstance.get<UserModel[]>("admin/user/getAll"),
-    if (axios.isAxiosError(err)) {
+        saveUser: async (req: AdminSaveUserRequest) => await axiosInstance.post("admin/user/save", req),
-        if (err.response) {
+        deleteUser: async (req: IDRequest) => await axiosInstance.post("admin/user/delete", req),
-            const { data } = err.response
+        getMetrics: async () => await axiosInstance.get<Metrics>("admin/metrics"),
-            if (typeof data === "string") strings.push(data)
+    },
-            if (typeof data === "object" && data.message) strings.push(data.message)
+}
-            if (typeof data === "object" && data.errors) strings = [...strings, ...data.errors]
+
-        }
+/**
-    }
+ * transform an error object to an array of strings that can be displayed to the user
-
+ * @param err an error object (e.g. from axios)
-    return strings
+ * @returns an array of messages to show the user
-}
+ */
+export const errorToStrings = (err: unknown) => {
+    let strings: string[] = []
+
+    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/constants.ts

@@ -1,101 +1,113 @@
-import { t } from "@lingui/macro"
+import type { IconType } from "react-icons"
-import { DEFAULT_THEME } from "@mantine/core"
+import { FaAt } from "react-icons/fa"
-import { IconType } from "react-icons"
+import { SiBuffer, SiFacebook, SiGmail, SiInstapaper, SiPocket, SiTumblr, SiX } from "react-icons/si"
-import { FaAt } from "react-icons/fa"
+import type { Category, Entry, SharingSettings } from "./types"
-import { SiBuffer, SiFacebook, SiGmail, SiInstapaper, SiPocket, SiTumblr, SiTwitter } from "react-icons/si"
+
-import { Category, Entry, SharingSettings } from "./types"
+const categories: Record<string, Omit<Category, "name">> = {
-
+    all: {
-const categories: { [key: string]: Category } = {
+        id: "all",
-    all: {
+        expanded: false,
-        id: "all",
+        children: [],
-        name: t`All`,
+        feeds: [],
-        expanded: false,
+        position: 0,
-        children: [],
+    },
-        feeds: [],
+    starred: {
-        position: 0,
+        id: "starred",
-    },
+        expanded: false,
-    starred: {
+        children: [],
-        id: "starred",
+        feeds: [],
-        name: t`Starred`,
+        position: 1,
-        expanded: false,
+    },
-        children: [],
+}
-        feeds: [],
+
-        position: 1,
+const sharing: {
-    },
+    [key in keyof SharingSettings]: {
-}
+        label: string
-
+        icon: IconType
-const sharing: {
+        color: `#${string}`
-    [key in keyof SharingSettings]: {
+        url: (url: string, description: string) => string
-        label: string
+    }
-        icon: IconType
+} = {
-        color: `#${string}`
+    email: {
-        url: (url: string, description: string) => string
+        label: "Email",
-    }
+        icon: FaAt,
-} = {
+        color: "#000000",
-    email: {
+        url: (url, desc) => `mailto:?subject=${desc}&body=${url}`,
-        label: "Email",
+    },
-        icon: FaAt,
+    gmail: {
-        color: "#000000",
+        label: "Gmail",
-        url: (url, desc) => `mailto:?subject=${desc}&body=${url}`,
+        icon: SiGmail,
-    },
+        color: "#EA4335",
-    gmail: {
+        url: (url, desc) => `https://mail.google.com/mail/?view=cm&fs=1&tf=1&source=mailto&su=${desc}&body=${url}`,
-        label: "Gmail",
+    },
-        icon: SiGmail,
+    facebook: {
-        color: "#EA4335",
+        label: "Facebook",
-        url: (url, desc) => `https://mail.google.com/mail/?view=cm&fs=1&tf=1&source=mailto&su=${desc}&body=${url}`,
+        icon: SiFacebook,
-    },
+        color: "#1B74E4",
-    facebook: {
+        url: url => `https://www.facebook.com/sharer/sharer.php?u=${url}`,
-        label: "Facebook",
+    },
-        icon: SiFacebook,
+    twitter: {
-        color: "#1B74E4",
+        label: "X",
-        url: url => `https://www.facebook.com/sharer/sharer.php?u=${url}`,
+        icon: SiX,
-    },
+        color: "#000000",
-    twitter: {
+        url: (url, desc) => `https://x.com/share?text=${desc}&url=${url}`,
-        label: "Twitter",
+    },
-        icon: SiTwitter,
+    tumblr: {
-        color: "#1D9BF0",
+        label: "Tumblr",
-        url: (url, desc) => `https://twitter.com/share?text=${desc}&url=${url}`,
+        icon: SiTumblr,
-    },
+        color: "#375672",
-    tumblr: {
+        url: (url, desc) => `https://www.tumblr.com/share/link?url=${url}&name=${desc}`,
-        label: "Tumblr",
+    },
-        icon: SiTumblr,
+    pocket: {
-        color: "#375672",
+        label: "Pocket",
-        url: (url, desc) => `https://www.tumblr.com/share/link?url=${url}&name=${desc}`,
+        icon: SiPocket,
-    },
+        color: "#EF4154",
-    pocket: {
+        url: (url, desc) => `https://getpocket.com/save?url=${url}&title=${desc}`,
-        label: "Pocket",
+    },
-        icon: SiPocket,
+    instapaper: {
-        color: "#EF4154",
+        label: "Instapaper",
-        url: (url, desc) => `https://getpocket.com/save?url=${url}&title=${desc}`,
+        icon: SiInstapaper,
-    },
+        color: "#010101",
-    instapaper: {
+        url: (url, desc) => `https://www.instapaper.com/hello2?url=${url}&title=${desc}`,
-        label: "Instapaper",
+    },
-        icon: SiInstapaper,
+    buffer: {
-        color: "#010101",
+        label: "Buffer",
-        url: (url, desc) => `https://www.instapaper.com/hello2?url=${url}&title=${desc}`,
+        icon: SiBuffer,
-    },
+        color: "#000000",
-    buffer: {
+        url: (url, desc) => `https://bufferapp.com/add?url=${url}&text=${desc}`,
-        label: "Buffer",
+    },
-        icon: SiBuffer,
+}
-        color: "#000000",
+
-        url: (url, desc) => `https://bufferapp.com/add?url=${url}&text=${desc}`,
+export const Constants = {
-    },
+    categories,
-}
+    sharing,
-
+    layout: {
-export const Constants = {
+        mobileBreakpoint: 992,
-    categories,
+        mobileBreakpointName: "md",
-    sharing,
+        headerHeight: 60,
-    layout: {
+        entryMaxWidth: 650,
-        mobileBreakpoint: DEFAULT_THEME.breakpoints.md,
+        isTopVisible: (div: HTMLElement) => {
-        headerHeight: 60,
+            const header = document.getElementById(Constants.dom.headerId)?.getBoundingClientRect()
-        entryMaxWidth: 650,
+            return div.getBoundingClientRect().top >= (header?.bottom ?? 0)
-        isTopVisible: (div: HTMLElement) => div.getBoundingClientRect().top >= Constants.layout.headerHeight,
+        },
-        isBottomVisible: (div: HTMLElement) => div.getBoundingClientRect().bottom <= window.innerHeight,
+        isBottomVisible: (div: HTMLElement) => {
-    },
+            const footer = document.getElementById(Constants.dom.footerId)?.getBoundingClientRect()
-    dom: {
+            return div.getBoundingClientRect().bottom <= (footer?.top ?? window.innerHeight)
-        entryId: (entry: Entry) => `entry-id-${entry.id}`,
+        },
-        entryContextMenuId: (entry: Entry) => entry.id,
+    },
-    },
+    dom: {
-    browserExtensionUrl: "https://github.com/Athou/commafeed-browser-extension",
+        headerId: "header",
-    bitcoinWalletAddress: "1dymfUxqCWpyD7a6rQSqNy4rLVDBsAr5e",
+        footerId: "footer",
-}
+        entryId: (entry: Entry) => `entry-id-${entry.id}`,
+        entryContextMenuId: (entry: Entry) => entry.id,
+    },
+    theme: {
+        defaultPrimaryColor: "orange",
+    },
+    tooltip: {
+        delay: 500,
+    },
+    browserExtensionUrl: "https://github.com/Athou/commafeed-browser-extension",
+    customCssDocumentationUrl: "https://athou.github.io/commafeed/documentation/custom-css",
+    bitcoinWalletAddress: "1dymfUxqCWpyD7a6rQSqNy4rLVDBsAr5e",
+}

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

@@ -1,146 +1,140 @@
-/* eslint-disable import/first */
+import { configureStore } from "@reduxjs/toolkit"
-import { configureStore } from "@reduxjs/toolkit"
+import { client } from "app/client"
-import { client } from "app/client"
+import { loadEntries, loadMoreEntries, markAllEntries, markEntry } from "app/entries/thunks"
-import { reducers } from "app/store"
+import { type RootState, reducers } from "app/store"
-import { Entries, Entry } from "app/types"
+import type { Entries, Entry } from "app/types"
-import { AxiosResponse } from "axios"
+import type { AxiosResponse } from "axios"
-import { beforeEach, describe, expect, it, vi } from "vitest"
+import { beforeEach, describe, expect, it, vi } from "vitest"
-import { mockReset } from "vitest-mock-extended"
+
-import { loadEntries, loadMoreEntries, markAllEntries, markEntry } from "./entries"
+vi.mock(import("app/client"))
-
+
-const mockClient = await vi.hoisted(async () => {
+describe("entries", () => {
-    const mockModule = await import("vitest-mock-extended")
+    beforeEach(() => {
-    return mockModule.mockDeep<typeof client>()
+        vi.resetAllMocks()
-})
+    })
-vi.mock("app/client", () => ({ client: mockClient }))
+
-
+    it("loads entries", async () => {
-describe("entries", () => {
+        vi.mocked(client.feed.getEntries).mockResolvedValue({
-    beforeEach(() => {
+            data: {
-        mockReset(mockClient)
+                entries: [{ id: "3" } as Entry],
-    })
+                hasMore: false,
-
+                name: "my-feed",
-    it("loads entries", async () => {
+                errorCount: 3,
-        mockClient.feed.getEntries.mockResolvedValue({
+                feedLink: "https://mysite.com/feed",
-            data: {
+                timestamp: 123,
-                entries: [{ id: "3" } as Entry],
+                ignoredReadStatus: false,
-                hasMore: false,
+            },
-                name: "my-feed",
+        } as AxiosResponse<Entries>)
-                errorCount: 3,
+
-                feedLink: "https://mysite.com/feed",
+        const store = configureStore({ reducer: reducers })
-                timestamp: 123,
+        const promise = store.dispatch(loadEntries({ source: { type: "feed", id: "feed-id" }, clearSearch: true }))
-                ignoredReadStatus: false,
+
-            },
+        expect(store.getState().entries.source.type).toBe("feed")
-        } as AxiosResponse<Entries>)
+        expect(store.getState().entries.source.id).toBe("feed-id")
-
+        expect(store.getState().entries.entries).toStrictEqual([])
-        const store = configureStore({ reducer: reducers })
+        expect(store.getState().entries.hasMore).toBe(true)
-        const promise = store.dispatch(loadEntries({ source: { type: "feed", id: "feed-id" }, clearSearch: true }))
+        expect(store.getState().entries.sourceLabel).toBe("")
-
+        expect(store.getState().entries.sourceWebsiteUrl).toBe("")
-        expect(store.getState().entries.source.type).toBe("feed")
+        expect(store.getState().entries.timestamp).toBeUndefined()
-        expect(store.getState().entries.source.id).toBe("feed-id")
+
-        expect(store.getState().entries.entries).toStrictEqual([])
+        await promise
-        expect(store.getState().entries.hasMore).toBe(true)
+        expect(store.getState().entries.source.type).toBe("feed")
-        expect(store.getState().entries.sourceLabel).toBe("")
+        expect(store.getState().entries.source.id).toBe("feed-id")
-        expect(store.getState().entries.sourceWebsiteUrl).toBe("")
+        expect(store.getState().entries.entries).toStrictEqual([{ id: "3" }])
-        expect(store.getState().entries.timestamp).toBeUndefined()
+        expect(store.getState().entries.hasMore).toBe(false)
-
+        expect(store.getState().entries.sourceLabel).toBe("my-feed")
-        await promise
+        expect(store.getState().entries.sourceWebsiteUrl).toBe("https://mysite.com/feed")
-        expect(store.getState().entries.source.type).toBe("feed")
+        expect(store.getState().entries.timestamp).toBe(123)
-        expect(store.getState().entries.source.id).toBe("feed-id")
+    })
-        expect(store.getState().entries.entries).toStrictEqual([{ id: "3" }])
+
-        expect(store.getState().entries.hasMore).toBe(false)
+    it("loads more entries", async () => {
-        expect(store.getState().entries.sourceLabel).toBe("my-feed")
+        vi.mocked(client.category.getEntries).mockResolvedValue({
-        expect(store.getState().entries.sourceWebsiteUrl).toBe("https://mysite.com/feed")
+            data: {
-        expect(store.getState().entries.timestamp).toBe(123)
+                entries: [{ id: "4" } as Entry],
-    })
+                hasMore: false,
-
+                name: "my-feed",
-    it("loads more entries", async () => {
+                errorCount: 3,
-        mockClient.category.getEntries.mockResolvedValue({
+                feedLink: "https://mysite.com/feed",
-            data: {
+                timestamp: 123,
-                entries: [{ id: "4" } as Entry],
+                ignoredReadStatus: false,
-                hasMore: false,
+            },
-                name: "my-feed",
+        } as AxiosResponse<Entries>)
-                errorCount: 3,
+
-                feedLink: "https://mysite.com/feed",
+        const store = configureStore({
-                timestamp: 123,
+            reducer: reducers,
-                ignoredReadStatus: false,
+            preloadedState: {
-            },
+                entries: {
-        } as AxiosResponse<Entries>)
+                    source: {
-
+                        type: "category",
-        const store = configureStore({
+                        id: "category-id",
-            reducer: reducers,
+                    },
-            preloadedState: {
+                    sourceLabel: "",
-                entries: {
+                    sourceWebsiteUrl: "",
-                    source: {
+                    entries: [{ id: "3" } as Entry],
-                        type: "category",
+                    hasMore: true,
-                        id: "category-id",
+                    loading: false,
-                    },
+                    scrollingToEntry: false,
-                    sourceLabel: "",
+                },
-                    sourceWebsiteUrl: "",
+            } as RootState,
-                    entries: [{ id: "3" } as Entry],
+        })
-                    hasMore: true,
+        const promise = store.dispatch(loadMoreEntries())
-                    loading: false,
+
-                    scrollingToEntry: false,
+        await promise
-                },
+        expect(store.getState().entries.entries).toStrictEqual([{ id: "3" }, { id: "4" }])
-            },
+        expect(store.getState().entries.hasMore).toBe(false)
-        })
+    })
-        const promise = store.dispatch(loadMoreEntries())
+
-
+    it("marks an entry as read", () => {
-        await promise
+        const store = configureStore({
-        expect(store.getState().entries.entries).toStrictEqual([{ id: "3" }, { id: "4" }])
+            reducer: reducers,
-        expect(store.getState().entries.hasMore).toBe(false)
+            preloadedState: {
-    })
+                entries: {
-
+                    source: {
-    it("marks an entry as read", async () => {
+                        type: "category",
-        const store = configureStore({
+                        id: "category-id",
-            reducer: reducers,
+                    },
-            preloadedState: {
+                    sourceLabel: "",
-                entries: {
+                    sourceWebsiteUrl: "",
-                    source: {
+                    entries: [{ id: "3", read: false } as Entry, { id: "4", read: false } as Entry],
-                        type: "category",
+                    hasMore: true,
-                        id: "category-id",
+                    loading: false,
-                    },
+                    scrollingToEntry: false,
-                    sourceLabel: "",
+                },
-                    sourceWebsiteUrl: "",
+            } as RootState,
-                    entries: [{ id: "3", read: false } as Entry, { id: "4", read: false } as Entry],
+        })
-                    hasMore: true,
+
-                    loading: false,
+        store.dispatch(markEntry({ entry: { id: "3" } as Entry, read: true }))
-                    scrollingToEntry: false,
+        expect(store.getState().entries.entries).toStrictEqual([
-                },
+            { id: "3", read: true },
-            },
+            { id: "4", read: false },
-        })
+        ])
-
+        expect(client.entry.mark).toHaveBeenCalledWith({ id: "3", read: true })
-        store.dispatch(markEntry({ entry: { id: "3" } as Entry, read: true }))
+    })
-        expect(store.getState().entries.entries).toStrictEqual([
+
-            { id: "3", read: true },
+    it("marks all entries as read", () => {
-            { id: "4", read: false },
+        const store = configureStore({
-        ])
+            reducer: reducers,
-        expect(mockClient.entry.mark).toHaveBeenCalledWith({ id: "3", read: true })
+            preloadedState: {
-    })
+                entries: {
-
+                    source: {
-    it("marks all entries as read", async () => {
+                        type: "category",
-        const store = configureStore({
+                        id: "category-id",
-            reducer: reducers,
+                    },
-            preloadedState: {
+                    sourceLabel: "",
-                entries: {
+                    sourceWebsiteUrl: "",
-                    source: {
+                    entries: [{ id: "3", read: false } as Entry, { id: "4", read: false } as Entry],
-                        type: "category",
+                    hasMore: true,
-                        id: "category-id",
+                    loading: false,
-                    },
+                    scrollingToEntry: false,
-                    sourceLabel: "",
+                },
-                    sourceWebsiteUrl: "",
+            } as RootState,
-                    entries: [{ id: "3", read: false } as Entry, { id: "4", read: false } as Entry],
+        })
-                    hasMore: true,
+
-                    loading: false,
+        store.dispatch(markAllEntries({ sourceType: "category", req: { id: "all", read: true } }))
-                    scrollingToEntry: false,
+        expect(store.getState().entries.entries).toStrictEqual([
-                },
+            { id: "3", read: true },
-            },
+            { id: "4", read: true },
-        })
+        ])
-
+        expect(client.category.markEntries).toHaveBeenCalledWith({ id: "all", read: true })
-        store.dispatch(markAllEntries({ sourceType: "category", req: { id: "all", read: true } }))
+    })
-        expect(store.getState().entries.entries).toStrictEqual([
+})
-            { id: "3", read: true },
-            { id: "4", read: true },
-        ])
-        expect(mockClient.category.markEntries).toHaveBeenCalledWith({ id: "all", read: true })
-    })
-})

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

@@ -0,0 +1,127 @@
+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"
+
+export type EntrySourceType = "category" | "feed" | "tag"
+
+export interface EntrySource {
+    type: EntrySourceType
+    id: string
+}
+
+export type ExpendableEntry = Entry & { expanded?: boolean }
+
+interface EntriesState {
+    /** selected source */
+    source: EntrySource
+    sourceLabel: string
+    sourceWebsiteUrl: string
+    entries: ExpendableEntry[]
+    /** stores when the first batch of entries were retrieved
+     *
+     * this is used when marking all entries of a feed/category to only mark entries up to that timestamp as newer entries were potentially never shown
+     */
+    timestamp?: number
+    selectedEntryId?: string
+    hasMore: boolean
+    loading: boolean
+    search?: string
+    scrollingToEntry: boolean
+    markAllAsReadConfirmationDialogOpen: boolean
+}
+
+const initialState: EntriesState = {
+    source: {
+        type: "category",
+        id: Constants.categories.all.id,
+    },
+    sourceLabel: "",
+    sourceWebsiteUrl: "",
+    entries: [],
+    hasMore: true,
+    loading: false,
+    scrollingToEntry: false,
+    markAllAsReadConfirmationDialogOpen: false,
+}
+
+export const entriesSlice = createSlice({
+    name: "entries",
+    initialState,
+    reducers: {
+        setSelectedEntry: (state, action: PayloadAction<Entry>) => {
+            state.selectedEntryId = action.payload.id
+        },
+        setEntryExpanded: (state, action: PayloadAction<{ entry: Entry; expanded: boolean }>) => {
+            for (const e of state.entries.filter(e => e.id === action.payload.entry.id)) {
+                e.expanded = action.payload.expanded
+            }
+        },
+        setScrollingToEntry: (state, action: PayloadAction<boolean>) => {
+            state.scrollingToEntry = action.payload
+        },
+        setSearch: (state, action: PayloadAction<string>) => {
+            state.search = action.payload
+        },
+        setMarkAllAsReadConfirmationDialogOpen: (state, action: PayloadAction<boolean>) => {
+            state.markAllAsReadConfirmationDialogOpen = action.payload
+        },
+    },
+    extraReducers: builder => {
+        builder.addCase(markEntry.pending, (state, action) => {
+            for (const e of state.entries.filter(e => e.id === action.meta.arg.entry.id)) {
+                e.read = action.meta.arg.read
+            }
+        })
+        builder.addCase(markMultipleEntries.pending, (state, action) => {
+            for (const e of state.entries.filter(e => action.meta.arg.entries.some(e2 => e2.id === e.id))) {
+                e.read = action.meta.arg.read
+            }
+        })
+        builder.addCase(markAllEntries.pending, (state, action) => {
+            for (const e of state.entries.filter(e => (action.meta.arg.req.olderThan ? e.date < action.meta.arg.req.olderThan : true))) {
+                e.read = true
+            }
+        })
+        builder.addCase(starEntry.pending, (state, action) => {
+            for (const e of state.entries.filter(e => action.meta.arg.entry.id === e.id && action.meta.arg.entry.feedId === e.feedId)) {
+                e.starred = action.meta.arg.starred
+            }
+        })
+        builder.addCase(loadEntries.pending, (state, action) => {
+            state.source = action.meta.arg.source
+            state.entries = []
+            state.timestamp = undefined
+            state.sourceLabel = ""
+            state.sourceWebsiteUrl = ""
+            state.hasMore = true
+            state.selectedEntryId = undefined
+            state.loading = true
+        })
+        builder.addCase(loadMoreEntries.pending, state => {
+            state.loading = true
+        })
+        builder.addCase(loadEntries.fulfilled, (state, action) => {
+            state.entries = action.payload.entries
+            state.timestamp = action.payload.timestamp
+            state.sourceLabel = action.payload.name
+            state.sourceWebsiteUrl = action.payload.feedLink
+            state.hasMore = action.payload.hasMore
+            state.loading = false
+        })
+        builder.addCase(loadMoreEntries.fulfilled, (state, action) => {
+            // remove already existing entries
+            const entriesToAdd = action.payload.entries.filter(e => !state.entries.some(e2 => e.id === e2.id))
+            state.entries = [...state.entries, ...entriesToAdd]
+            state.hasMore = action.payload.hasMore
+            state.loading = false
+        })
+        builder.addCase(tagEntry.pending, (state, action) => {
+            for (const e of state.entries.filter(e => +e.id === action.meta.arg.entryId)) {
+                e.tags = action.meta.arg.tags
+            }
+        })
+    },
+})
+
+export const { setSearch, setMarkAllAsReadConfirmationDialogOpen } = entriesSlice.actions

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

@@ -0,0 +1,307 @@
+import { createAppAsyncThunk } from "app/async-thunk"
+import { client } from "app/client"
+import { Constants } from "app/constants"
+import { type EntrySource, type EntrySourceType, entriesSlice, setMarkAllAsReadConfirmationDialogOpen, 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"
+import { reloadTags } from "app/user/thunks"
+import { scrollToWithCallback } from "app/utils"
+import { flushSync } from "react-dom"
+
+const getEndpoint = (sourceType: EntrySourceType) =>
+    sourceType === "category" || sourceType === "tag" ? client.category.getEntries : client.feed.getEntries
+
+export const loadEntries = createAppAsyncThunk(
+    "entries/load",
+    async (
+        arg: {
+            source: EntrySource
+            clearSearch: boolean
+        },
+        thunkApi
+    ) => {
+        if (arg.clearSearch) thunkApi.dispatch(setSearch(""))
+
+        const state = thunkApi.getState()
+        const endpoint = getEndpoint(arg.source.type)
+        const result = await endpoint(buildGetEntriesPaginatedRequest(state, arg.source, 0))
+        return result.data
+    }
+)
+
+export const loadMoreEntries = createAppAsyncThunk("entries/loadMore", async (_, thunkApi) => {
+    const state = thunkApi.getState()
+    const { source } = state.entries
+    const offset =
+        state.user.settings?.readingMode === "all" ? state.entries.entries.length : state.entries.entries.filter(e => !e.read).length
+    const endpoint = getEndpoint(state.entries.source.type)
+    const result = await endpoint(buildGetEntriesPaginatedRequest(state, source, offset))
+    return result.data
+})
+
+const buildGetEntriesPaginatedRequest = (state: RootState, source: EntrySource, offset: number) => ({
+    id: source.type === "tag" ? Constants.categories.all.id : source.id,
+    order: state.user.settings?.readingOrder,
+    readType: state.entries.search ? "all" : state.user.settings?.readingMode,
+    offset,
+    limit: 50,
+    tag: source.type === "tag" ? source.id : undefined,
+    keywords: state.entries.search,
+})
+
+export const reloadEntries = createAppAsyncThunk("entries/reload", (_, thunkApi) => {
+    const state = thunkApi.getState()
+    thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
+})
+
+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 }))
+})
+
+export const markEntry = createAppAsyncThunk(
+    "entries/entry/mark",
+    (arg: { entry: Entry; read: boolean }) => {
+        client.entry.mark({
+            id: arg.entry.id,
+            read: arg.read,
+        })
+    },
+    {
+        condition: arg => arg.entry.markable && arg.entry.read !== arg.read,
+    }
+)
+
+export const markMultipleEntries = createAppAsyncThunk(
+    "entries/entry/markMultiple",
+    async (
+        arg: {
+            entries: Entry[]
+            read: boolean
+        },
+        thunkApi
+    ) => {
+        const requests: MarkRequest[] = arg.entries.map(e => ({
+            id: e.id,
+            read: arg.read,
+        }))
+        await client.entry.markMultiple({ requests })
+        thunkApi.dispatch(reloadTree())
+    }
+)
+
+export const markEntriesUpToEntry = createAppAsyncThunk("entries/entry/upToEntry", (arg: Entry, thunkApi) => {
+    const state = thunkApi.getState()
+    const { entries } = state.entries
+
+    const index = entries.findIndex(e => e.id === arg.id)
+    if (index === -1) return
+
+    thunkApi.dispatch(
+        markMultipleEntries({
+            entries: entries.slice(0, index + 1),
+            read: true,
+        })
+    )
+})
+
+export const markAllEntries = createAppAsyncThunk(
+    "entries/entry/markAll",
+    async (
+        arg: {
+            sourceType: EntrySourceType
+            req: MarkRequest
+        },
+        thunkApi
+    ) => {
+        const endpoint = arg.sourceType === "category" ? client.category.markEntries : client.feed.markEntries
+        await endpoint(arg.req)
+        thunkApi.dispatch(reloadEntries())
+        thunkApi.dispatch(reloadTree())
+    }
+)
+
+export const markAllAsReadWithConfirmationIfRequired = createAppAsyncThunk(
+    "entries/entry/markAllAsReadWithConfirmationIfRequired",
+    async (_, thunkApi) => {
+        const state = thunkApi.getState()
+        const source = state.entries.source
+        const entriesTimestamp = state.entries.timestamp ?? Date.now()
+        const markAllAsReadConfirmation = state.user.settings?.markAllAsReadConfirmation
+
+        if (markAllAsReadConfirmation) {
+            thunkApi.dispatch(setMarkAllAsReadConfirmationDialogOpen(true))
+        } else {
+            thunkApi.dispatch(
+                markAllEntries({
+                    sourceType: source.type,
+                    req: {
+                        id: source.id,
+                        read: true,
+                        olderThan: Date.now(),
+                        insertedBefore: entriesTimestamp,
+                    },
+                })
+            )
+        }
+    }
+)
+
+export const starEntry = createAppAsyncThunk(
+    "entries/entry/star",
+    (arg: { entry: Entry; starred: boolean }) => {
+        client.entry.star({
+            id: arg.entry.id,
+            feedId: +arg.entry.feedId,
+            starred: arg.starred,
+        })
+    },
+    {
+        condition: arg => arg.entry.markable && arg.entry.starred !== arg.starred,
+    }
+)
+
+export const selectEntry = createAppAsyncThunk(
+    "entries/entry/select",
+    (
+        arg: {
+            entry: Entry
+            expand: boolean
+            markAsRead: boolean
+            scrollToEntry: boolean
+        },
+        thunkApi
+    ) => {
+        const state = thunkApi.getState()
+        const entry = state.entries.entries.find(e => e.id === arg.entry.id)
+        if (!entry) return
+
+        // flushSync is required because we need the newly selected entry to be expanded
+        // and the previously selected entry to be collapsed to be able to scroll to the right position
+        flushSync(() => {
+            // mark as read if requested
+            if (arg.markAsRead) {
+                thunkApi.dispatch(markEntry({ entry, read: true }))
+            }
+
+            // set entry as selected
+            thunkApi.dispatch(entriesSlice.actions.setSelectedEntry(entry))
+
+            // expand if requested
+            const previouslySelectedEntry = state.entries.entries.find(e => e.id === state.entries.selectedEntryId)
+            if (previouslySelectedEntry) {
+                thunkApi.dispatch(
+                    entriesSlice.actions.setEntryExpanded({
+                        entry: previouslySelectedEntry,
+                        expanded: false,
+                    })
+                )
+            }
+            thunkApi.dispatch(entriesSlice.actions.setEntryExpanded({ entry, expanded: arg.expand }))
+        })
+
+        if (arg.scrollToEntry) {
+            const viewMode = state.user.localSettings.viewMode
+
+            const entryIndex = state.entries.entries.indexOf(entry)
+            const entriesToKeepOnTopWhenScrolling =
+                viewMode === "expanded" ? 0 : Math.min(state.user.settings?.entriesToKeepOnTopWhenScrolling ?? 0, entryIndex)
+            const entryToScrollTo = state.entries.entries[entryIndex - entriesToKeepOnTopWhenScrolling]
+
+            const entryElement = document.getElementById(Constants.dom.entryId(entry))
+            const entryElementToScrollTo = document.getElementById(Constants.dom.entryId(entryToScrollTo))
+            if (entryElement && entryElementToScrollTo) {
+                const scrollMode = state.user.settings?.scrollMode
+                const entryEntirelyVisible =
+                    Constants.layout.isTopVisible(entryElementToScrollTo) && Constants.layout.isBottomVisible(entryElement)
+                if (scrollMode === "always" || (scrollMode === "if_needed" && !entryEntirelyVisible)) {
+                    const scrollSpeed = state.user.settings?.scrollSpeed
+                    const margin = viewMode === "detailed" ? 8 : 3
+                    thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(true))
+                    scrollToEntry(entryElementToScrollTo, margin, scrollSpeed, () =>
+                        thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(false))
+                    )
+                }
+            }
+        }
+    }
+)
+
+const scrollToEntry = (entryElement: HTMLElement, margin: number, scrollSpeed: number | undefined, onScrollEnded: () => void) => {
+    const header = document.getElementById(Constants.dom.headerId)?.getBoundingClientRect()
+    const offset = (header?.bottom ?? 0) + margin
+    scrollToWithCallback({
+        options: {
+            top: entryElement.offsetTop - offset,
+            behavior: scrollSpeed && scrollSpeed > 0 ? "smooth" : "auto",
+        },
+        onScrollEnded,
+    })
+}
+
+export const selectPreviousEntry = createAppAsyncThunk(
+    "entries/entry/selectPrevious",
+    (
+        arg: {
+            expand: boolean
+            markAsRead: boolean
+            scrollToEntry: boolean
+        },
+        thunkApi
+    ) => {
+        const state = thunkApi.getState()
+        const { entries } = state.entries
+        const previousIndex = entries.findIndex(e => e.id === state.entries.selectedEntryId) - 1
+        if (previousIndex >= 0) {
+            thunkApi.dispatch(
+                selectEntry({
+                    entry: entries[previousIndex],
+                    expand: arg.expand,
+                    markAsRead: arg.markAsRead,
+                    scrollToEntry: arg.scrollToEntry,
+                })
+            )
+        }
+    }
+)
+
+export const selectNextEntry = createAppAsyncThunk(
+    "entries/entry/selectNext",
+    async (
+        arg: {
+            expand: boolean
+            markAsRead: boolean
+            scrollToEntry: boolean
+        },
+        thunkApi
+    ) => {
+        const state = thunkApi.getState()
+        const { entries, hasMore, loading } = state.entries
+        const nextIndex = entries.findIndex(e => e.id === state.entries.selectedEntryId) + 1
+
+        // load more entries if needed
+        // this can happen if the last entry is too large to fit on the screen and the infinite loader doesn't trigger
+        if (nextIndex >= entries.length && hasMore && !loading) {
+            await thunkApi.dispatch(loadMoreEntries())
+        }
+
+        const entriesAfterLoading = thunkApi.getState().entries.entries
+        if (nextIndex < entriesAfterLoading.length) {
+            thunkApi.dispatch(
+                selectEntry({
+                    entry: entriesAfterLoading[nextIndex],
+                    expand: arg.expand,
+                    markAsRead: arg.markAsRead,
+                    scrollToEntry: arg.scrollToEntry,
+                })
+            )
+        }
+    }
+)
+
+export const tagEntry = createAppAsyncThunk("entries/entry/tag", async (arg: TagRequest, thunkApi) => {
+    await client.entry.tag(arg)
+    thunkApi.dispatch(reloadTags())
+})

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

@@ -1,10 +1,10 @@
-import { store } from "app/store"
+import { redirectToCategory } from "app/redirect/thunks"
-import { describe, expect, it } from "vitest"
+import { store } from "app/store"
-import { redirectToCategory } from "./redirect"
+import { describe, expect, it } from "vitest"
-
+
-describe("redirects", () => {
+describe("redirects", () => {
-    it("redirects to category", async () => {
+    it("redirects to category", async () => {
-        await store.dispatch(redirectToCategory("1"))
+        await store.dispatch(redirectToCategory("1"))
-        expect(store.getState().redirect.to).toBe("/app/category/1")
+        expect(store.getState().redirect.to).toBe("/app/category/1")
-    })
+    })
-})
+})

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

@@ -0,0 +1,19 @@
+import { type PayloadAction, createSlice } from "@reduxjs/toolkit"
+
+interface RedirectState {
+    to?: string
+}
+
+const initialState: RedirectState = {}
+
+export const redirectSlice = createSlice({
+    name: "redirect",
+    initialState,
+    reducers: {
+        redirectTo: (state, action: PayloadAction<string | undefined>) => {
+            state.to = action.payload
+        },
+    },
+})
+
+export const { redirectTo } = redirectSlice.actions

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

@@ -0,0 +1,57 @@
+import { createAppAsyncThunk } from "app/async-thunk"
+import { Constants } from "app/constants"
+import { redirectTo } from "app/redirect/slice"
+
+export const redirectToLogin = createAppAsyncThunk("redirect/login", (_, thunkApi) => thunkApi.dispatch(redirectTo("/login")))
+
+export const redirectToRegistration = createAppAsyncThunk("redirect/register", (_, thunkApi) => thunkApi.dispatch(redirectTo("/register")))
+
+export const redirectToApiDocumentation = createAppAsyncThunk("redirect/api", (_, thunkApi) => thunkApi.dispatch(redirectTo("/api")))
+
+export const redirectToSelectedSource = createAppAsyncThunk("redirect/selectedSource", (_, thunkApi) => {
+    const { source } = thunkApi.getState().entries
+    thunkApi.dispatch(redirectTo(`/app/${source.type}/${source.id}`))
+})
+
+export const redirectToCategory = createAppAsyncThunk("redirect/category", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/category/${id}`))
+)
+
+export const redirectToRootCategory = createAppAsyncThunk(
+    "redirect/category/root",
+    async (_, thunkApi) => await thunkApi.dispatch(redirectToCategory(Constants.categories.all.id))
+)
+
+export const redirectToCategoryDetails = createAppAsyncThunk("redirect/category/details", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/category/${id}/details`))
+)
+
+export const redirectToFeed = createAppAsyncThunk("redirect/feed", (id: string | number, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/feed/${id}`))
+)
+
+export const redirectToFeedDetails = createAppAsyncThunk("redirect/feed/details", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/feed/${id}/details`))
+)
+
+export const redirectToTag = createAppAsyncThunk("redirect/tag", (id: string, thunkApi) => thunkApi.dispatch(redirectTo(`/app/tag/${id}`)))
+
+export const redirectToTagDetails = createAppAsyncThunk("redirect/tag/details", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/tag/${id}/details`))
+)
+
+export const redirectToAdd = createAppAsyncThunk("redirect/add", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/add")))
+
+export const redirectToSettings = createAppAsyncThunk("redirect/settings", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/settings")))
+
+export const redirectToAdminUsers = createAppAsyncThunk("redirect/admin/users", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/app/admin/users"))
+)
+
+export const redirectToMetrics = createAppAsyncThunk("redirect/admin/metrics", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/app/admin/metrics"))
+)
+
+export const redirectToDonate = createAppAsyncThunk("redirect/donate", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/donate")))
+
+export const redirectToAbout = createAppAsyncThunk("redirect/about", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/about")))

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

@@ -0,0 +1,29 @@
+import { type PayloadAction, createSlice } from "@reduxjs/toolkit"
+import { reloadServerInfos } from "app/server/thunks"
+import type { ServerInfo } from "app/types"
+
+interface ServerState {
+    serverInfos?: ServerInfo
+    webSocketConnected: boolean
+}
+
+const initialState: ServerState = {
+    webSocketConnected: false,
+}
+
+export const serverSlice = createSlice({
+    name: "server",
+    initialState,
+    reducers: {
+        setWebSocketConnected: (state, action: PayloadAction<boolean>) => {
+            state.webSocketConnected = action.payload
+        },
+    },
+    extraReducers: builder => {
+        builder.addCase(reloadServerInfos.fulfilled, (state, action) => {
+            state.serverInfos = action.payload
+        })
+    },
+})
+
+export const { setWebSocketConnected } = serverSlice.actions

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

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

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

@@ -1,365 +0,0 @@
-import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"
-import { client } from "app/client"
-import { Constants } from "app/constants"
-import { RootState } from "app/store"
-import { Entries, Entry, MarkRequest, TagRequest } from "app/types"
-import { scrollToWithCallback } from "app/utils"
-import { flushSync } from "react-dom"
-// eslint-disable-next-line import/no-cycle
-import { reloadTree } from "./tree"
-// eslint-disable-next-line import/no-cycle
-import { reloadTags } from "./user"
-
-export type EntrySourceType = "category" | "feed" | "tag"
-export type EntrySource = { type: EntrySourceType; id: string }
-export type ExpendableEntry = Entry & { expanded?: boolean }
-
-interface EntriesState {
-    /** selected source */
-    source: EntrySource
-    sourceLabel: string
-    sourceWebsiteUrl: string
-    entries: ExpendableEntry[]
-    /** stores when the first batch of entries were retrieved
-     *
-     * this is used when marking all entries of a feed/category to only mark entries up to that timestamp as newer entries were potentially never shown
-     */
-    timestamp?: number
-    selectedEntryId?: string
-    hasMore: boolean
-    loading: boolean
-    search?: string
-    scrollingToEntry: boolean
-}
-
-const initialState: EntriesState = {
-    source: {
-        type: "category",
-        id: Constants.categories.all.id,
-    },
-    sourceLabel: "",
-    sourceWebsiteUrl: "",
-    entries: [],
-    hasMore: true,
-    loading: false,
-    scrollingToEntry: false,
-}
-
-const getEndpoint = (sourceType: EntrySourceType) =>
-    sourceType === "category" || sourceType === "tag" ? client.category.getEntries : client.feed.getEntries
-export const loadEntries = createAsyncThunk<
-    Entries,
-    { source: EntrySource; clearSearch: boolean },
-    {
-        state: RootState
-    }
->("entries/load", async (arg, thunkApi) => {
-    if (arg.clearSearch) thunkApi.dispatch(setSearch(""))
-
-    const state = thunkApi.getState()
-    const endpoint = getEndpoint(arg.source.type)
-    const result = await endpoint(buildGetEntriesPaginatedRequest(state, arg.source, 0))
-    return result.data
-})
-export const loadMoreEntries = createAsyncThunk<
-    Entries,
-    void,
-    {
-        state: RootState
-    }
->("entries/loadMore", async (_, thunkApi) => {
-    const state = thunkApi.getState()
-    const { source } = state.entries
-    const offset =
-        state.user.settings?.readingMode === "all" ? state.entries.entries.length : state.entries.entries.filter(e => !e.read).length
-    const endpoint = getEndpoint(state.entries.source.type)
-    const result = await endpoint(buildGetEntriesPaginatedRequest(state, source, offset))
-    return result.data
-})
-const buildGetEntriesPaginatedRequest = (state: RootState, source: EntrySource, offset: number) => ({
-    id: source.type === "tag" ? Constants.categories.all.id : source.id,
-    order: state.user.settings?.readingOrder,
-    readType: state.user.settings?.readingMode,
-    offset,
-    limit: 50,
-    tag: source.type === "tag" ? source.id : undefined,
-    keywords: state.entries.search,
-})
-export const reloadEntries = createAsyncThunk<
-    void,
-    void,
-    {
-        state: RootState
-    }
->("entries/reload", async (arg, thunkApi) => {
-    const state = thunkApi.getState()
-    thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
-})
-export const search = createAsyncThunk<void, string, { state: RootState }>("entries/search", async (arg, thunkApi) => {
-    const state = thunkApi.getState()
-    thunkApi.dispatch(setSearch(arg))
-    thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
-})
-export const markEntry = createAsyncThunk(
-    "entries/entry/mark",
-    (arg: { entry: Entry; read: boolean }) => {
-        client.entry.mark({
-            id: arg.entry.id,
-            read: arg.read,
-        })
-    },
-    {
-        condition: arg => arg.entry.read !== arg.read,
-    }
-)
-export const markMultipleEntries = createAsyncThunk(
-    "entries/entry/markMultiple",
-    async (arg: { entries: Entry[]; read: boolean }, thunkApi) => {
-        const requests: MarkRequest[] = arg.entries.map(e => ({
-            id: e.id,
-            read: arg.read,
-        }))
-        await client.entry.markMultiple({ requests })
-        thunkApi.dispatch(reloadTree())
-    }
-)
-export const markEntriesUpToEntry = createAsyncThunk<void, Entry, { state: RootState }>(
-    "entries/entry/upToEntry",
-    async (arg, thunkApi) => {
-        const state = thunkApi.getState()
-        const { entries } = state.entries
-
-        const index = entries.findIndex(e => e.id === arg.id)
-        if (index === -1) return
-
-        thunkApi.dispatch(
-            markMultipleEntries({
-                entries: entries.slice(0, index + 1),
-                read: true,
-            })
-        )
-    }
-)
-export const markAllEntries = createAsyncThunk<
-    void,
-    { sourceType: EntrySourceType; req: MarkRequest },
-    {
-        state: RootState
-    }
->("entries/entry/markAll", async (arg, thunkApi) => {
-    const endpoint = arg.sourceType === "category" ? client.category.markEntries : client.feed.markEntries
-    await endpoint(arg.req)
-    thunkApi.dispatch(reloadEntries())
-    thunkApi.dispatch(reloadTree())
-})
-export const starEntry = createAsyncThunk("entries/entry/star", (arg: { entry: Entry; starred: boolean }) => {
-    client.entry.star({
-        id: arg.entry.id,
-        feedId: +arg.entry.feedId,
-        starred: arg.starred,
-    })
-})
-export const selectEntry = createAsyncThunk<
-    void,
-    {
-        entry: Entry
-        expand: boolean
-        markAsRead: boolean
-        scrollToEntry: boolean
-    },
-    { state: RootState }
->("entries/entry/select", (arg, thunkApi) => {
-    const state = thunkApi.getState()
-    const entry = state.entries.entries.find(e => e.id === arg.entry.id)
-    if (!entry) return
-
-    // flushSync is required because we need the newly selected entry to be expanded
-    // and the previously selected entry to be collapsed to be able to scroll to the right position
-    flushSync(() => {
-        // mark as read if requested
-        if (arg.markAsRead) {
-            thunkApi.dispatch(markEntry({ entry, read: true }))
-        }
-
-        // set entry as selected
-        thunkApi.dispatch(entriesSlice.actions.setSelectedEntry(entry))
-
-        // expand if requested
-        const previouslySelectedEntry = state.entries.entries.find(e => e.id === state.entries.selectedEntryId)
-        if (previouslySelectedEntry) {
-            thunkApi.dispatch(entriesSlice.actions.setEntryExpanded({ entry: previouslySelectedEntry, expanded: false }))
-        }
-        thunkApi.dispatch(entriesSlice.actions.setEntryExpanded({ entry, expanded: arg.expand }))
-    })
-
-    if (arg.scrollToEntry) {
-        const entryElement = document.getElementById(Constants.dom.entryId(entry))
-        if (entryElement) {
-            const alwaysScrollToEntry = state.user.settings?.alwaysScrollToEntry
-            const entryEntirelyVisible = Constants.layout.isTopVisible(entryElement) && Constants.layout.isBottomVisible(entryElement)
-            if (alwaysScrollToEntry || !entryEntirelyVisible) {
-                const scrollSpeed = state.user.settings?.scrollSpeed
-                thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(true))
-                scrollToEntry(entryElement, scrollSpeed, () => thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(false)))
-            }
-        }
-    }
-})
-const scrollToEntry = (entryElement: HTMLElement, scrollSpeed: number | undefined, onScrollEnded: () => void) => {
-    scrollToWithCallback({
-        options: {
-            // add a small gap between the top of the content and the top of the page
-            top: entryElement.offsetTop - Constants.layout.headerHeight - 3,
-            behavior: scrollSpeed && scrollSpeed > 0 ? "smooth" : "auto",
-        },
-        onScrollEnded,
-    })
-}
-
-export const selectPreviousEntry = createAsyncThunk<
-    void,
-    {
-        expand: boolean
-        markAsRead: boolean
-        scrollToEntry: boolean
-    },
-    { state: RootState }
->("entries/entry/selectPrevious", (arg, thunkApi) => {
-    const state = thunkApi.getState()
-    const { entries } = state.entries
-    const previousIndex = entries.findIndex(e => e.id === state.entries.selectedEntryId) - 1
-    if (previousIndex >= 0) {
-        thunkApi.dispatch(
-            selectEntry({
-                entry: entries[previousIndex],
-                expand: arg.expand,
-                markAsRead: arg.markAsRead,
-                scrollToEntry: arg.scrollToEntry,
-            })
-        )
-    }
-})
-export const selectNextEntry = createAsyncThunk<
-    void,
-    {
-        expand: boolean
-        markAsRead: boolean
-        scrollToEntry: boolean
-    },
-    { state: RootState }
->("entries/entry/selectNext", (arg, thunkApi) => {
-    const state = thunkApi.getState()
-    const { entries } = state.entries
-    const nextIndex = entries.findIndex(e => e.id === state.entries.selectedEntryId) + 1
-    if (nextIndex < entries.length) {
-        thunkApi.dispatch(
-            selectEntry({
-                entry: entries[nextIndex],
-                expand: arg.expand,
-                markAsRead: arg.markAsRead,
-                scrollToEntry: arg.scrollToEntry,
-            })
-        )
-    }
-})
-export const tagEntry = createAsyncThunk<
-    void,
-    TagRequest,
-    {
-        state: RootState
-    }
->("entries/entry/tag", async (arg, thunkApi) => {
-    await client.entry.tag(arg)
-    thunkApi.dispatch(reloadTags())
-})
-
-export const entriesSlice = createSlice({
-    name: "entries",
-    initialState,
-    reducers: {
-        setSelectedEntry: (state, action: PayloadAction<Entry>) => {
-            state.selectedEntryId = action.payload.id
-        },
-        setEntryExpanded: (state, action: PayloadAction<{ entry: Entry; expanded: boolean }>) => {
-            state.entries
-                .filter(e => e.id === action.payload.entry.id)
-                .forEach(e => {
-                    e.expanded = action.payload.expanded
-                })
-        },
-        setScrollingToEntry: (state, action: PayloadAction<boolean>) => {
-            state.scrollingToEntry = action.payload
-        },
-        setSearch: (state, action: PayloadAction<string>) => {
-            state.search = action.payload
-        },
-    },
-    extraReducers: builder => {
-        builder.addCase(markEntry.pending, (state, action) => {
-            state.entries
-                .filter(e => e.id === action.meta.arg.entry.id)
-                .forEach(e => {
-                    e.read = action.meta.arg.read
-                })
-        })
-        builder.addCase(markMultipleEntries.pending, (state, action) => {
-            state.entries
-                .filter(e => action.meta.arg.entries.some(e2 => e2.id === e.id))
-                .forEach(e => {
-                    e.read = action.meta.arg.read
-                })
-        })
-        builder.addCase(markAllEntries.pending, (state, action) => {
-            state.entries
-                .filter(e => (action.meta.arg.req.olderThan ? e.date < action.meta.arg.req.olderThan : true))
-                .forEach(e => {
-                    e.read = true
-                })
-        })
-        builder.addCase(starEntry.pending, (state, action) => {
-            state.entries
-                .filter(e => action.meta.arg.entry.id === e.id && action.meta.arg.entry.feedId === e.feedId)
-                .forEach(e => {
-                    e.starred = action.meta.arg.starred
-                })
-        })
-        builder.addCase(loadEntries.pending, (state, action) => {
-            state.source = action.meta.arg.source
-            state.entries = []
-            state.timestamp = undefined
-            state.sourceLabel = ""
-            state.sourceWebsiteUrl = ""
-            state.hasMore = true
-            state.selectedEntryId = undefined
-            state.loading = true
-        })
-        builder.addCase(loadMoreEntries.pending, state => {
-            state.loading = true
-        })
-        builder.addCase(loadEntries.fulfilled, (state, action) => {
-            state.entries = action.payload.entries
-            state.timestamp = action.payload.timestamp
-            state.sourceLabel = action.payload.name
-            state.sourceWebsiteUrl = action.payload.feedLink
-            state.hasMore = action.payload.hasMore
-            state.loading = false
-        })
-        builder.addCase(loadMoreEntries.fulfilled, (state, action) => {
-            // remove already existing entries
-            const entriesToAdd = action.payload.entries.filter(e => !state.entries.some(e2 => e.id === e2.id))
-            state.entries = [...state.entries, ...entriesToAdd]
-            state.hasMore = action.payload.hasMore
-            state.loading = false
-        })
-        builder.addCase(tagEntry.pending, (state, action) => {
-            state.entries
-                .filter(e => +e.id === action.meta.arg.entryId)
-                .forEach(e => {
-                    e.tags = action.meta.arg.tags
-                })
-        })
-    },
-})
-
-export const { setSearch } = entriesSlice.actions
-export default entriesSlice.reducer

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

@@ -1,69 +0,0 @@
-import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"
-import { Constants } from "app/constants"
-import { RootState } from "app/store"
-
-interface RedirectState {
-    to?: string
-}
-
-const initialState: RedirectState = {}
-
-export const redirectToLogin = createAsyncThunk("redirect/login", (_, thunkApi) => thunkApi.dispatch(redirectTo("/login")))
-export const redirectToRegistration = createAsyncThunk("redirect/register", (_, thunkApi) => thunkApi.dispatch(redirectTo("/register")))
-export const redirectToPasswordRecovery = createAsyncThunk("redirect/passwordRecovery", (_, thunkApi) =>
-    thunkApi.dispatch(redirectTo("/passwordRecovery"))
-)
-export const redirectToApiDocumentation = createAsyncThunk("redirect/api", (_, thunkApi) => thunkApi.dispatch(redirectTo("/api")))
-
-export const redirectToSelectedSource = createAsyncThunk<
-    void,
-    void,
-    {
-        state: RootState
-    }
->("redirect/selectedSource", (_, thunkApi) => {
-    const { source } = thunkApi.getState().entries
-    thunkApi.dispatch(redirectTo(`/app/${source.type}/${source.id}`))
-})
-export const redirectToCategory = createAsyncThunk("redirect/category", (id: string, thunkApi) =>
-    thunkApi.dispatch(redirectTo(`/app/category/${id}`))
-)
-export const redirectToRootCategory = createAsyncThunk("redirect/category/root", (_, thunkApi) =>
-    thunkApi.dispatch(redirectToCategory(Constants.categories.all.id))
-)
-export const redirectToCategoryDetails = createAsyncThunk("redirect/category/details", (id: string, thunkApi) =>
-    thunkApi.dispatch(redirectTo(`/app/category/${id}/details`))
-)
-export const redirectToFeed = createAsyncThunk("redirect/feed", (id: string | number, thunkApi) =>
-    thunkApi.dispatch(redirectTo(`/app/feed/${id}`))
-)
-export const redirectToFeedDetails = createAsyncThunk("redirect/feed/details", (id: string, thunkApi) =>
-    thunkApi.dispatch(redirectTo(`/app/feed/${id}/details`))
-)
-export const redirectToTag = createAsyncThunk("redirect/tag", (id: string, thunkApi) => thunkApi.dispatch(redirectTo(`/app/tag/${id}`)))
-export const redirectToTagDetails = createAsyncThunk("redirect/tag/details", (id: string, thunkApi) =>
-    thunkApi.dispatch(redirectTo(`/app/tag/${id}/details`))
-)
-export const redirectToAdd = createAsyncThunk("redirect/add", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/add")))
-export const redirectToSettings = createAsyncThunk("redirect/settings", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/settings")))
-export const redirectToAdminUsers = createAsyncThunk("redirect/admin/users", (_, thunkApi) =>
-    thunkApi.dispatch(redirectTo("/app/admin/users"))
-)
-export const redirectToMetrics = createAsyncThunk("redirect/admin/metrics", (_, thunkApi) =>
-    thunkApi.dispatch(redirectTo("/app/admin/metrics"))
-)
-export const redirectToDonate = createAsyncThunk("redirect/donate", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/donate")))
-export const redirectToAbout = createAsyncThunk("redirect/about", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/about")))
-
-export const redirectSlice = createSlice({
-    name: "redirect",
-    initialState,
-    reducers: {
-        redirectTo: (state, action: PayloadAction<string | undefined>) => {
-            state.to = action.payload
-        },
-    },
-})
-
-export const { redirectTo } = redirectSlice.actions
-export default redirectSlice.reducer

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

@@ -1,23 +0,0 @@
-import { createAsyncThunk, createSlice } from "@reduxjs/toolkit"
-import { client } from "app/client"
-import { ServerInfo } from "app/types"
-
-interface ServerState {
-    serverInfos?: ServerInfo
-}
-
-const initialState: ServerState = {}
-
-export const reloadServerInfos = createAsyncThunk("server/infos", () => client.server.getServerInfos().then(r => r.data))
-export const serverSlice = createSlice({
-    name: "server",
-    initialState,
-    reducers: {},
-    extraReducers: builder => {
-        builder.addCase(reloadServerInfos.fulfilled, (state, action) => {
-            state.serverInfos = action.payload
-        })
-    },
-})
-
-export default serverSlice.reducer

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

@@ -1,209 +0,0 @@
-import { t } from "@lingui/macro"
-import { showNotification } from "@mantine/notifications"
-import { createAsyncThunk, createSlice, isAnyOf } from "@reduxjs/toolkit"
-import { client } from "app/client"
-import { RootState } from "app/store"
-import { ReadingMode, ReadingOrder, Settings, SharingSettings, UserModel } from "app/types"
-// eslint-disable-next-line import/no-cycle
-import { reloadEntries } from "./entries"
-
-interface UserState {
-    settings?: Settings
-    profile?: UserModel
-    tags?: string[]
-}
-
-const initialState: UserState = {}
-
-export const reloadSettings = createAsyncThunk("settings/reload", () => client.user.getSettings().then(r => r.data))
-export const reloadProfile = createAsyncThunk("profile/reload", () => client.user.getProfile().then(r => r.data))
-export const reloadTags = createAsyncThunk("entries/tags", () => client.entry.getTags().then(r => r.data))
-export const changeReadingMode = createAsyncThunk<void, ReadingMode, { state: RootState }>(
-    "settings/readingMode",
-    (readingMode, thunkApi) => {
-        const { settings } = thunkApi.getState().user
-        if (!settings) return
-        client.user.saveSettings({ ...settings, readingMode })
-        thunkApi.dispatch(reloadEntries())
-    }
-)
-export const changeReadingOrder = createAsyncThunk<void, ReadingOrder, { state: RootState }>(
-    "settings/readingOrder",
-    (readingOrder, thunkApi) => {
-        const { settings } = thunkApi.getState().user
-        if (!settings) return
-        client.user.saveSettings({ ...settings, readingOrder })
-        thunkApi.dispatch(reloadEntries())
-    }
-)
-export const changeLanguage = createAsyncThunk<
-    void,
-    string,
-    {
-        state: RootState
-    }
->("settings/language", (language, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, language })
-})
-export const changeScrollSpeed = createAsyncThunk<
-    void,
-    boolean,
-    {
-        state: RootState
-    }
->("settings/scrollSpeed", (speed, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, scrollSpeed: speed ? 400 : 0 })
-})
-export const changeShowRead = createAsyncThunk<
-    void,
-    boolean,
-    {
-        state: RootState
-    }
->("settings/showRead", (showRead, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, showRead })
-})
-export const changeScrollMarks = createAsyncThunk<
-    void,
-    boolean,
-    {
-        state: RootState
-    }
->("settings/scrollMarks", (scrollMarks, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, scrollMarks })
-})
-export const changeAlwaysScrollToEntry = createAsyncThunk<
-    void,
-    boolean,
-    {
-        state: RootState
-    }
->("settings/alwaysScrollToEntry", (alwaysScrollToEntry, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, alwaysScrollToEntry })
-})
-export const changeMarkAllAsReadConfirmation = createAsyncThunk<
-    void,
-    boolean,
-    {
-        state: RootState
-    }
->("settings/markAllAsReadConfirmation", (markAllAsReadConfirmation, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, markAllAsReadConfirmation })
-})
-export const changeCustomContextMenu = createAsyncThunk<
-    void,
-    boolean,
-    {
-        state: RootState
-    }
->("settings/customContextMenu", (customContextMenu, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, customContextMenu })
-})
-export const changeSharingSetting = createAsyncThunk<
-    void,
-    { site: keyof SharingSettings; value: boolean },
-    {
-        state: RootState
-    }
->("settings/sharingSetting", (sharingSetting, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({
-        ...settings,
-        sharingSettings: {
-            ...settings.sharingSettings,
-            [sharingSetting.site]: sharingSetting.value,
-        },
-    })
-})
-
-export const userSlice = createSlice({
-    name: "user",
-    initialState,
-    reducers: {},
-    extraReducers: builder => {
-        builder.addCase(reloadSettings.fulfilled, (state, action) => {
-            state.settings = action.payload
-        })
-        builder.addCase(reloadProfile.fulfilled, (state, action) => {
-            state.profile = action.payload
-        })
-        builder.addCase(reloadTags.fulfilled, (state, action) => {
-            state.tags = action.payload
-        })
-        builder.addCase(changeReadingMode.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.readingMode = action.meta.arg
-        })
-        builder.addCase(changeReadingOrder.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.readingOrder = action.meta.arg
-        })
-        builder.addCase(changeLanguage.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.language = action.meta.arg
-        })
-        builder.addCase(changeScrollSpeed.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.scrollSpeed = action.meta.arg ? 400 : 0
-        })
-        builder.addCase(changeShowRead.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.showRead = action.meta.arg
-        })
-        builder.addCase(changeScrollMarks.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.scrollMarks = action.meta.arg
-        })
-        builder.addCase(changeAlwaysScrollToEntry.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.alwaysScrollToEntry = action.meta.arg
-        })
-        builder.addCase(changeMarkAllAsReadConfirmation.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.markAllAsReadConfirmation = action.meta.arg
-        })
-        builder.addCase(changeCustomContextMenu.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.customContextMenu = action.meta.arg
-        })
-        builder.addCase(changeSharingSetting.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.sharingSettings[action.meta.arg.site] = action.meta.arg.value
-        })
-        builder.addMatcher(
-            isAnyOf(
-                changeLanguage.fulfilled,
-                changeScrollSpeed.fulfilled,
-                changeShowRead.fulfilled,
-                changeScrollMarks.fulfilled,
-                changeAlwaysScrollToEntry.fulfilled,
-                changeMarkAllAsReadConfirmation.fulfilled,
-                changeCustomContextMenu.fulfilled,
-                changeSharingSetting.fulfilled
-            ),
-            () => {
-                showNotification({
-                    message: t`Settings saved.`,
-                    color: "green",
-                })
-            }
-        )
-    },
-})
-
-export default userSlice.reducer

commafeed-client/src/app/store.ts

@@ -1,26 +1,43 @@
-import { configureStore } from "@reduxjs/toolkit"
+import { configureStore } from "@reduxjs/toolkit"
-import { setupListeners } from "@reduxjs/toolkit/query"
+import { entriesSlice } from "app/entries/slice"
-import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"
+import { redirectSlice } from "app/redirect/slice"
-import entriesReducer from "./slices/entries"
+import { serverSlice } from "app/server/slice"
-import redirectReducer from "./slices/redirect"
+import { treeSlice } from "app/tree/slice"
-import serverReducer from "./slices/server"
+import type { LocalSettings } from "app/types"
-import treeReducer from "./slices/tree"
+import { initialLocalSettings, userSlice } from "app/user/slice"
-import userReducer from "./slices/user"
+import { type TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"
-
+
-export const reducers = {
+export const reducers = {
-    entries: entriesReducer,
+    entries: entriesSlice.reducer,
-    redirect: redirectReducer,
+    redirect: redirectSlice.reducer,
-    tree: treeReducer,
+    tree: treeSlice.reducer,
-    server: serverReducer,
+    server: serverSlice.reducer,
-    user: userReducer,
+    user: userSlice.reducer,
-}
+}
-
+
-export const store = configureStore({ reducer: reducers })
+const loadLocalSettings = (): LocalSettings => {
-
+    const json = localStorage.getItem("commafeed-local-settings")
-setupListeners(store.dispatch)
+    return {
-
+        ...initialLocalSettings,
-export type RootState = ReturnType<typeof store.getState>
+        ...(json ? JSON.parse(json) : {}),
-export type AppDispatch = typeof store.dispatch
+    }
-
+}
-export const useAppDispatch: () => AppDispatch = useDispatch
+
-export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
+export const store = configureStore({
+    reducer: reducers,
+    preloadedState: {
+        user: {
+            localSettings: loadLocalSettings(),
+        },
+    },
+})
+store.subscribe(() => {
+    const localSettings = store.getState().user.localSettings
+    localStorage.setItem("commafeed-local-settings", JSON.stringify(localSettings))
+})
+
+export type RootState = ReturnType<typeof store.getState>
+export type AppDispatch = typeof store.dispatch
+
+export const useAppDispatch: () => AppDispatch = useDispatch
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector

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

@@ -1,68 +1,68 @@
-import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"
+import { type PayloadAction, createSlice } from "@reduxjs/toolkit"
-import { client } from "app/client"
+import { markEntry } from "app/entries/thunks"
-import { Category, CollapseRequest } from "app/types"
+import { redirectTo } from "app/redirect/slice"
-import { visitCategoryTree } from "app/utils"
+import { collapseTreeCategory, reloadTree } from "app/tree/thunks"
-// eslint-disable-next-line import/no-cycle
+import type { Category } from "app/types"
-import { markEntry } from "./entries"
+import { visitCategoryTree } from "app/utils"
-import { redirectTo } from "./redirect"
+
-
+interface TreeState {
-interface TreeState {
+    rootCategory?: Category
-    rootCategory?: Category
+    mobileMenuOpen: boolean
-    mobileMenuOpen: boolean
+    sidebarVisible: boolean
-    sidebarWidth: number
+}
-    sidebarVisible: boolean
+
-}
+const initialState: TreeState = {
-
+    mobileMenuOpen: false,
-const initialState: TreeState = {
+    sidebarVisible: true,
-    mobileMenuOpen: false,
+}
-    sidebarWidth: 350,
+
-    sidebarVisible: true,
+export const treeSlice = createSlice({
-}
+    name: "tree",
-
+    initialState,
-export const reloadTree = createAsyncThunk("tree/reload", () => client.category.getRoot().then(r => r.data))
+    reducers: {
-export const collapseTreeCategory = createAsyncThunk("tree/category/collapse", async (req: CollapseRequest) =>
+        setMobileMenuOpen: (state, action: PayloadAction<boolean>) => {
-    client.category.collapse(req)
+            state.mobileMenuOpen = action.payload
-)
+        },
-
+        toggleSidebar: state => {
-export const treeSlice = createSlice({
+            state.sidebarVisible = !state.sidebarVisible
-    name: "tree",
+        },
-    initialState,
+        incrementUnreadCount: (
-    reducers: {
+            state,
-        setMobileMenuOpen: (state, action: PayloadAction<boolean>) => {
+            action: PayloadAction<{
-            state.mobileMenuOpen = action.payload
+                feedId: number
-        },
+                amount: number
-        setSidebarWidth: (state, action: PayloadAction<number>) => {
+            }>
-            state.sidebarWidth = action.payload
+        ) => {
-        },
+            if (!state.rootCategory) return
-        toggleSidebar: state => {
+            visitCategoryTree(state.rootCategory, c => {
-            state.sidebarVisible = !state.sidebarVisible
+                for (const f of c.feeds.filter(f => f.id === action.payload.feedId)) {
-        },
+                    f.unread += action.payload.amount
-    },
+                }
-    extraReducers: builder => {
+            })
-        builder.addCase(reloadTree.fulfilled, (state, action) => {
+        },
-            state.rootCategory = action.payload
+    },
-        })
+    extraReducers: builder => {
-        builder.addCase(collapseTreeCategory.pending, (state, action) => {
+        builder.addCase(reloadTree.fulfilled, (state, action) => {
-            if (!state.rootCategory) return
+            state.rootCategory = action.payload
-            visitCategoryTree(state.rootCategory, c => {
+        })
-                if (+c.id === action.meta.arg.id) c.expanded = !action.meta.arg.collapse
+        builder.addCase(collapseTreeCategory.pending, (state, action) => {
-            })
+            if (!state.rootCategory) return
-        })
+            visitCategoryTree(state.rootCategory, c => {
-        builder.addCase(markEntry.pending, (state, action) => {
+                if (+c.id === action.meta.arg.id) c.expanded = !action.meta.arg.collapse
-            if (!state.rootCategory) return
+            })
-            visitCategoryTree(state.rootCategory, c =>
+        })
-                c.feeds
+        builder.addCase(markEntry.pending, (state, action) => {
-                    .filter(f => f.id === +action.meta.arg.entry.feedId)
+            if (!state.rootCategory) return
-                    .forEach(f => {
+            visitCategoryTree(state.rootCategory, c => {
-                        f.unread = action.meta.arg.read ? f.unread - 1 : f.unread + 1
+                for (const f of c.feeds.filter(f => f.id === +action.meta.arg.entry.feedId)) {
-                    })
+                    f.unread = action.meta.arg.read ? f.unread - 1 : f.unread + 1
-            )
+                }
-        })
+            })
-        builder.addCase(redirectTo, state => {
+        })
-            state.mobileMenuOpen = false
+        builder.addCase(redirectTo, state => {
-        })
+            state.mobileMenuOpen = false
-    },
+        })
-})
+    },
-
+})
-export const { setMobileMenuOpen, setSidebarWidth, toggleSidebar } = treeSlice.actions
+
-export default treeSlice.reducer
+export const { setMobileMenuOpen, toggleSidebar, incrementUnreadCount } = treeSlice.actions

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

@@ -0,0 +1,80 @@
+import { createAppAsyncThunk } from "app/async-thunk"
+import { client } from "app/client"
+import { redirectToCategory, redirectToFeed } from "app/redirect/thunks"
+import { incrementUnreadCount } from "app/tree/slice"
+import type { CollapseRequest, Subscription } from "app/types"
+import { flattenCategoryTree, visitCategoryTree } from "app/utils"
+
+export const reloadTree = createAppAsyncThunk("tree/reload", async () => await client.category.getRoot().then(r => r.data))
+
+export const collapseTreeCategory = createAppAsyncThunk(
+    "tree/category/collapse",
+    async (req: CollapseRequest) => await client.category.collapse(req).then(r => r.data)
+)
+
+export const selectNextUnreadTreeItem = createAppAsyncThunk(
+    "tree/selectNextUnreadItem",
+    (
+        arg: {
+            direction: "forward" | "backward"
+        },
+        thunkApi
+    ) => {
+        const state = thunkApi.getState()
+        const root = state.tree.rootCategory
+        if (!root) return
+
+        const { source } = state.entries
+        if (source.type === "category") {
+            const categories = flattenCategoryTree(root)
+            if (arg.direction === "backward") categories.reverse()
+
+            const index = categories.findIndex(c => c.id === source.id)
+            if (index === -1) return
+
+            for (let i = index + 1; i < categories.length; i++) {
+                const c = categories[i]
+                if (c.feeds.some(f => f.unread > 0)) {
+                    return thunkApi.dispatch(redirectToCategory(String(c.id)))
+                }
+            }
+        } else if (source.type === "feed") {
+            const feeds: Subscription[] = []
+            visitCategoryTree(root, c => feeds.push(...c.feeds), { childrenFirst: true })
+            if (arg.direction === "backward") feeds.reverse()
+
+            const index = feeds.findIndex(f => f.id === +source.id)
+            if (index === -1) return
+
+            for (let i = index + 1; i < feeds.length; i++) {
+                const f = feeds[i]
+                if (f.unread > 0) {
+                    return thunkApi.dispatch(redirectToFeed(String(f.id)))
+                }
+            }
+        }
+    }
+)
+
+export const newFeedEntriesDiscovered = createAppAsyncThunk(
+    "tree/new-feed-entries-discovered",
+    async ({ feedId, amount }: { feedId: number; amount: number }, thunkApi) => {
+        const root = thunkApi.getState().tree.rootCategory
+        if (!root) return
+
+        const feed = flattenCategoryTree(root)
+            .flatMap(c => c.feeds)
+            .some(f => f.id === feedId)
+        if (!feed) {
+            // feed not found in the tree, reload the tree completely
+            thunkApi.dispatch(reloadTree())
+        } else {
+            thunkApi.dispatch(
+                incrementUnreadCount({
+                    feedId,
+                    amount,
+                })
+            )
+        }
+    }
+)

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

@@ -0,0 +1,119 @@
+import { configureStore } from "@reduxjs/toolkit"
+import { type RootState, reducers } from "app/store"
+import { selectNextUnreadTreeItem } from "app/tree/thunks"
+import type { Category, Subscription } from "app/types"
+import { describe, expect, it } from "vitest"
+
+const createCategory = (id: string): Category => ({
+    id,
+    name: id,
+    children: [],
+    feeds: [],
+    expanded: true,
+    position: 0,
+})
+
+const createFeed = (id: number, unread: number): Subscription => ({
+    id,
+    name: String(id),
+    unread,
+    errorCount: 0,
+    position: 0,
+    feedUrl: "",
+    feedLink: "",
+    iconUrl: "",
+})
+
+const root = createCategory("root")
+
+const catA = createCategory("catA")
+catA.feeds.push(createFeed(1, 0), createFeed(2, 0), createFeed(3, 1))
+
+const catB = createCategory("catB")
+
+const catC = createCategory("catC")
+catC.feeds.push(createFeed(4, 1))
+
+root.children.push(catA, catB, catC)
+
+describe("selectNextUnreadTreeItem", () => {
+    it("selects the next unread category", async () => {
+        const store = configureStore({
+            reducer: reducers,
+            preloadedState: {
+                tree: {
+                    rootCategory: root,
+                },
+                entries: {
+                    source: {
+                        type: "category",
+                        id: "catA",
+                    },
+                },
+            } as RootState,
+        })
+
+        await store.dispatch(selectNextUnreadTreeItem({ direction: "forward" }))
+        expect(store.getState().redirect.to).toBe("/app/category/catC")
+    })
+
+    it("selects the previous unread category", async () => {
+        const store = configureStore({
+            reducer: reducers,
+            preloadedState: {
+                tree: {
+                    rootCategory: root,
+                },
+                entries: {
+                    source: {
+                        type: "category",
+                        id: "catC",
+                    },
+                },
+            } as RootState,
+        })
+
+        await store.dispatch(selectNextUnreadTreeItem({ direction: "backward" }))
+        expect(store.getState().redirect.to).toBe("/app/category/catA")
+    })
+
+    it("selects the next unread feed", async () => {
+        const store = configureStore({
+            reducer: reducers,
+            preloadedState: {
+                tree: {
+                    rootCategory: root,
+                },
+                entries: {
+                    source: {
+                        type: "feed",
+                        id: "1",
+                    },
+                },
+            } as RootState,
+        })
+
+        await store.dispatch(selectNextUnreadTreeItem({ direction: "forward" }))
+        expect(store.getState().redirect.to).toBe("/app/feed/3")
+    })
+
+    it("selects the previous unread feed", async () => {
+        const store = configureStore({
+            reducer: reducers,
+            preloadedState: {
+                tree: {
+                    rootCategory: root,
+                },
+                entries: {
+                    source: {
+                        type: "feed",
+                        id: "4",
+                    },
+                },
+            } as RootState,
+        })
+
+        await store.dispatch(selectNextUnreadTreeItem({ direction: "backward" }))
+        expect(store.getState().redirect.to).toBe("/app/feed/3")
+    })
+})

commafeed-client/src/app/types.ts

@@ -1,277 +1,308 @@
-export interface AddCategoryRequest {
+export type ReadingMode = "all" | "unread"
-    name: string
+
-    parentId?: string
+export type ReadingOrder = "asc" | "desc"
-}
+
-
+export type ViewMode = "title" | "cozy" | "detailed" | "expanded"
-export interface Category {
+
-    id: string
+export type ScrollMode = "always" | "never" | "if_needed"
-    parentId?: string
+
-    parentName?: string
+export type IconDisplayMode = "always" | "never" | "on_desktop" | "on_mobile"
-    name: string
+
-    children: Category[]
+export interface AddCategoryRequest {
-    feeds: Subscription[]
+    name: string
-    expanded: boolean
+    parentId?: string
-    position: number
+}
-}
+
-
+export interface Subscription {
-export interface CategoryModificationRequest {
+    id: number
-    id: number
+    name: string
-    name?: string
+    message?: string
-    parentId?: string
+    errorCount: number
-    position?: number
+    lastRefresh?: number
-}
+    nextRefresh?: number
-
+    feedUrl: string
-export interface CollapseRequest {
+    feedLink: string
-    id: number
+    iconUrl: string
-    collapse: boolean
+    unread: number
-}
+    categoryId?: string
-
+    position: number
-export interface Entries {
+    newestItemTime?: number
-    name: string
+    filter?: string
-    message?: string
+}
-    errorCount: number
+
-    feedLink: string
+export interface Category {
-    timestamp: number
+    id: string
-    hasMore: boolean
+    parentId?: string
-    offset?: number
+    parentName?: string
-    limit?: number
+    name: string
-    entries: Entry[]
+    children: Category[]
-    ignoredReadStatus: boolean
+    feeds: Subscription[]
-}
+    expanded: boolean
-
+    position: number
-export interface Entry {
+}
-    id: string
+
-    guid: string
+export interface CategoryModificationRequest {
-    title: string
+    id: number
-    content: string
+    name?: string
-    categories?: string
+    parentId?: string
-    rtl: boolean
+    position?: number
-    author?: string
+}
-    enclosureUrl?: string
+
-    enclosureType?: string
+export interface CollapseRequest {
-    mediaDescription?: string
+    id: number
-    mediaThumbnailUrl?: string
+    collapse: boolean
-    mediaThumbnailWidth?: number
+}
-    mediaThumbnailHeight?: number
+
-    date: number
+export interface Entry {
-    insertedDate: number
+    id: string
-    feedId: string
+    guid: string
-    feedName: string
+    title: string
-    feedUrl: string
+    content: string
-    feedLink: string
+    categories?: string
-    iconUrl: string
+    rtl: boolean
-    url: string
+    author?: string
-    read: boolean
+    enclosureUrl?: string
-    starred: boolean
+    enclosureType?: string
-    markable: boolean
+    mediaDescription?: string
-    tags: string[]
+    mediaThumbnailUrl?: string
-}
+    mediaThumbnailWidth?: number
-
+    mediaThumbnailHeight?: number
-export interface FeedInfo {
+    date: number
-    url: string
+    insertedDate: number
-    title: string
+    feedId: string
-}
+    feedName: string
-
+    feedUrl: string
-export interface FeedInfoRequest {
+    feedLink: string
-    url: string
+    iconUrl: string
-}
+    url: string
-
+    read: boolean
-export interface FeedModificationRequest {
+    starred: boolean
-    id: number
+    markable: boolean
-    name?: string
+    tags: string[]
-    categoryId?: string
+}
-    position?: number
+
-    filter?: string
+export interface Entries {
-}
+    name: string
-
+    message?: string
-export interface GetEntriesRequest {
+    errorCount: number
-    id: string
+    feedLink: string
-    readType?: ReadingMode
+    timestamp: number
-    newerThan?: number
+    hasMore: boolean
-    order?: ReadingOrder
+    offset?: number
-    keywords?: string
+    limit?: number
-    onlyIds?: boolean
+    entries: Entry[]
-    excludedSubscriptionIds?: string
+    ignoredReadStatus: boolean
-    tag?: string
+}
-}
+
-
+export interface FeedInfo {
-export interface GetEntriesPaginatedRequest extends GetEntriesRequest {
+    url: string
-    offset: number
+    title: string
-    limit: number
+}
-}
+
-
+export interface FeedInfoRequest {
-export interface IDRequest {
+    url: string
-    id: number
+}
-}
+
-
+export interface FeedModificationRequest {
-export interface LoginRequest {
+    id: number
-    name: string
+    name?: string
-    password: string
+    categoryId?: string
-}
+    position?: number
-
+    filter?: string
-export interface MarkRequest {
+}
-    id: string
+
-    read: boolean
+export interface GetEntriesRequest {
-    olderThan?: number
+    id: string
-    keywords?: string
+    readType?: ReadingMode
-    excludedSubscriptions?: number[]
+    newerThan?: number
-}
+    order?: ReadingOrder
-
+    keywords?: string
-export interface MetricCounter {
+    excludedSubscriptionIds?: string
-    count: number
+    tag?: string
-}
+}
-
+
-export interface MetricGauge {
+export interface GetEntriesPaginatedRequest extends GetEntriesRequest {
-    value: number
+    offset: number
-}
+    limit: number
-
+}
-export interface MetricMeter {
+
-    count: number
+export interface IDRequest {
-    m15_rate: number
+    id: number
-    m1_rate: number
+}
-    m5_rate: number
+
-    mean_rate: number
+export interface LoginRequest {
-    units: string
+    name: string
-}
+    password: string
-
+}
-export type MetricTimer = {
+
-    count: number
+export interface MarkRequest {
-    max: number
+    id: string
-    mean: number
+    read: boolean
-    min: number
+    olderThan?: number
-    p50: number
+    insertedBefore?: number
-    p75: number
+    keywords?: string
-    p95: number
+    excludedSubscriptions?: number[]
-    p98: number
+}
-    p99: number
+
-    p999: number
+export interface MetricCounter {
-    stddev: number
+    count: number
-    m15_rate: number
+}
-    m1_rate: number
+
-    m5_rate: number
+export interface MetricGauge {
-    mean_rate: number
+    value: number
-    duration_units: string
+}
-    rate_units: string
+
-}
+export interface MetricMeter {
-
+    count: number
-export interface Metrics {
+    m15_rate: number
-    counters: { [key: string]: MetricCounter }
+    m1_rate: number
-    gauges: { [key: string]: MetricGauge }
+    m5_rate: number
-    meters: { [key: string]: MetricMeter }
+    mean_rate: number
-    timers: { [key: string]: MetricTimer }
+    units: string
-}
+}
-
+
-export interface MultipleMarkRequest {
+export interface MetricTimer {
-    requests: MarkRequest[]
+    count: number
-}
+    max: number
-
+    mean: number
-export interface PasswordResetRequest {
+    min: number
-    email: string
+    p50: number
-}
+    p75: number
-
+    p95: number
-export interface ProfileModificationRequest {
+    p98: number
-    currentPassword: string
+    p99: number
-    email: string
+    p999: number
-    newPassword?: string
+    stddev: number
-    newApiKey?: boolean
+    m15_rate: number
-}
+    m1_rate: number
-
+    m5_rate: number
-export interface RegistrationRequest {
+    mean_rate: number
-    name: string
+    duration_units: string
-    password: string
+    rate_units: string
-    email: string
+}
-}
+
-
+export interface Metrics {
-export interface ServerInfo {
+    counters: Record<string, MetricCounter>
-    announcement?: string
+    gauges: Record<string, MetricGauge>
-    version: string
+    meters: Record<string, MetricMeter>
-    gitCommit: string
+    timers: Record<string, MetricTimer>
-    allowRegistrations: boolean
+}
-    googleAnalyticsCode?: string
+
-    smtpEnabled: boolean
+export interface MultipleMarkRequest {
-    demoAccountEnabled: boolean
+    requests: MarkRequest[]
-}
+}
-
+
-export interface Settings {
+export interface PasswordResetRequest {
-    language: string
+    email: string
-    readingMode: ReadingMode
+}
-    readingOrder: ReadingOrder
+
-    showRead: boolean
+export interface ProfileModificationRequest {
-    scrollMarks: boolean
+    currentPassword: string
-    customCss?: string
+    email: string
-    customJs?: string
+    newPassword?: string
-    scrollSpeed: number
+    newApiKey?: boolean
-    alwaysScrollToEntry: boolean
+}
-    markAllAsReadConfirmation: boolean
+
-    customContextMenu: boolean
+export interface RegistrationRequest {
-    sharingSettings: SharingSettings
+    name: string
-}
+    password: string
-
+    email: string
-export interface SharingSettings {
+}
-    email: boolean
+
-    gmail: boolean
+export interface ServerInfo {
-    facebook: boolean
+    announcement?: string
-    twitter: boolean
+    version: string
-    tumblr: boolean
+    gitCommit: string
-    pocket: boolean
+    allowRegistrations: boolean
-    instapaper: boolean
+    googleAnalyticsCode?: string
-    buffer: boolean
+    smtpEnabled: boolean
-}
+    demoAccountEnabled: boolean
-
+    websocketEnabled: boolean
-export interface StarRequest {
+    websocketPingInterval: number
-    id: string
+    treeReloadInterval: number
-    feedId: number
+    forceRefreshCooldownDuration: number
-    starred: boolean
+}
-}
+
-
+export interface SharingSettings {
-export interface SubscribeRequest {
+    email: boolean
-    url: string
+    gmail: boolean
-    title: string
+    facebook: boolean
-    categoryId?: string
+    twitter: boolean
-}
+    tumblr: boolean
-
+    pocket: boolean
-export interface Subscription {
+    instapaper: boolean
-    id: number
+    buffer: boolean
-    name: string
+}
-    message?: string
+
-    errorCount: number
+export interface Settings {
-    lastRefresh?: number
+    language: string
-    nextRefresh?: number
+    readingMode: ReadingMode
-    feedUrl: string
+    readingOrder: ReadingOrder
-    feedLink: string
+    showRead: boolean
-    iconUrl: string
+    scrollMarks: boolean
-    unread: number
+    customCss?: string
-    categoryId?: string
+    customJs?: string
-    position: number
+    scrollSpeed: number
-    newestItemTime?: number
+    scrollMode: ScrollMode
-    filter?: string
+    entriesToKeepOnTopWhenScrolling: number
-}
+    starIconDisplayMode: IconDisplayMode
-
+    externalLinkIconDisplayMode: IconDisplayMode
-export interface TagRequest {
+    markAllAsReadConfirmation: boolean
-    entryId: number
+    customContextMenu: boolean
-    tags: string[]
+    mobileFooter: boolean
-}
+    unreadCountTitle: boolean
-
+    unreadCountFavicon: boolean
-export interface UnreadCount {
+    primaryColor?: string
-    feedId?: number
+    sharingSettings: SharingSettings
-    unreadCount?: number
+}
-    newestItemTime?: number
+
-}
+export interface LocalSettings {
-
+    viewMode: ViewMode
-export interface UserModel {
+    sidebarWidth: number
-    id: number
+    announcementHash: string
-    name: string
+    fontSizePercentage: number
-    email?: string
+}
-    apiKey?: string
+
-    password?: string
+export interface StarRequest {
-    enabled: boolean
+    id: string
-    created: number
+    feedId: number
-    lastLogin?: number
+    starred: boolean
-    admin: boolean
+}
-}
+
-
+export interface SubscribeRequest {
-export type ReadingMode = "all" | "unread"
+    url: string
-
+    title: string
-export type ReadingOrder = "asc" | "desc"
+    categoryId?: string
-
+}
-export type ViewMode = "title" | "cozy" | "detailed" | "expanded"
+
+export interface TagRequest {
+    entryId: number
+    tags: string[]
+}
+
+export interface UserModel {
+    id: number
+    name: string
+    email?: string
+    apiKey?: string
+    password?: string
+    enabled: boolean
+    created: number
+    lastLogin?: number
+    admin: boolean
+    lastForceRefresh?: number
+}
+
+export interface AdminSaveUserRequest {
+    id?: number
+    name: string
+    email?: string
+    password?: string
+    enabled: boolean
+    admin: boolean
+}
+
+export interface AuthenticationError {
+    message: string
+    allowRegistrations: boolean
+}

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

@@ -0,0 +1,169 @@
+import { t } from "@lingui/core/macro"
+import { showNotification } from "@mantine/notifications"
+import { type PayloadAction, createSlice, isAnyOf } from "@reduxjs/toolkit"
+import type { LocalSettings, Settings, UserModel, ViewMode } from "app/types"
+import {
+    changeCustomContextMenu,
+    changeEntriesToKeepOnTopWhenScrolling,
+    changeExternalLinkIconDisplayMode,
+    changeLanguage,
+    changeMarkAllAsReadConfirmation,
+    changeMobileFooter,
+    changePrimaryColor,
+    changeReadingMode,
+    changeReadingOrder,
+    changeScrollMarks,
+    changeScrollMode,
+    changeScrollSpeed,
+    changeSharingSetting,
+    changeShowRead,
+    changeStarIconDisplayMode,
+    changeUnreadCountFavicon,
+    changeUnreadCountTitle,
+    reloadProfile,
+    reloadSettings,
+    reloadTags,
+} from "./thunks"
+
+interface UserState {
+    settings?: Settings
+    localSettings: LocalSettings
+    profile?: UserModel
+    tags?: string[]
+}
+
+export const initialLocalSettings: LocalSettings = {
+    viewMode: "detailed",
+    sidebarWidth: 360,
+    announcementHash: "no-hash",
+    fontSizePercentage: 100,
+}
+
+const initialState: UserState = {
+    localSettings: initialLocalSettings,
+}
+
+export const userSlice = createSlice({
+    name: "user",
+    initialState,
+    reducers: {
+        setViewMode: (state, action: PayloadAction<ViewMode>) => {
+            state.localSettings.viewMode = action.payload
+        },
+        setFontSizePercentage: (state, action: PayloadAction<number>) => {
+            state.localSettings.fontSizePercentage = action.payload
+        },
+        setSidebarWidth: (state, action: PayloadAction<number>) => {
+            state.localSettings.sidebarWidth = action.payload
+        },
+        setAnnouncementHash: (state, action: PayloadAction<string>) => {
+            state.localSettings.announcementHash = action.payload
+        },
+    },
+    extraReducers: builder => {
+        builder.addCase(reloadSettings.fulfilled, (state, action) => {
+            state.settings = action.payload
+        })
+        builder.addCase(reloadProfile.fulfilled, (state, action) => {
+            state.profile = action.payload
+        })
+        builder.addCase(reloadTags.fulfilled, (state, action) => {
+            state.tags = action.payload
+        })
+        builder.addCase(changeReadingMode.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.readingMode = action.meta.arg
+        })
+        builder.addCase(changeReadingOrder.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.readingOrder = action.meta.arg
+        })
+        builder.addCase(changeLanguage.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.language = action.meta.arg
+        })
+        builder.addCase(changeScrollSpeed.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.scrollSpeed = action.meta.arg ? 400 : 0
+        })
+        builder.addCase(changeShowRead.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.showRead = action.meta.arg
+        })
+        builder.addCase(changeScrollMarks.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.scrollMarks = action.meta.arg
+        })
+        builder.addCase(changeScrollMode.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.scrollMode = action.meta.arg
+        })
+        builder.addCase(changeEntriesToKeepOnTopWhenScrolling.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.entriesToKeepOnTopWhenScrolling = action.meta.arg
+        })
+        builder.addCase(changeStarIconDisplayMode.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.starIconDisplayMode = action.meta.arg
+        })
+        builder.addCase(changeExternalLinkIconDisplayMode.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.externalLinkIconDisplayMode = action.meta.arg
+        })
+        builder.addCase(changeMarkAllAsReadConfirmation.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.markAllAsReadConfirmation = action.meta.arg
+        })
+        builder.addCase(changeCustomContextMenu.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.customContextMenu = action.meta.arg
+        })
+        builder.addCase(changeMobileFooter.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.mobileFooter = action.meta.arg
+        })
+        builder.addCase(changeUnreadCountTitle.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.unreadCountTitle = action.meta.arg
+        })
+        builder.addCase(changeUnreadCountFavicon.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.unreadCountFavicon = action.meta.arg
+        })
+        builder.addCase(changePrimaryColor.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.primaryColor = action.meta.arg
+        })
+        builder.addCase(changeSharingSetting.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.sharingSettings[action.meta.arg.site] = action.meta.arg.value
+        })
+        builder.addMatcher(
+            isAnyOf(
+                changeLanguage.fulfilled,
+                changeScrollSpeed.fulfilled,
+                changeShowRead.fulfilled,
+                changeScrollMarks.fulfilled,
+                changeScrollMode.fulfilled,
+                changeEntriesToKeepOnTopWhenScrolling.fulfilled,
+                changeStarIconDisplayMode.fulfilled,
+                changeExternalLinkIconDisplayMode.fulfilled,
+                changeMarkAllAsReadConfirmation.fulfilled,
+                changeCustomContextMenu.fulfilled,
+                changeMobileFooter.fulfilled,
+                changeUnreadCountTitle.fulfilled,
+                changeUnreadCountFavicon.fulfilled,
+                changePrimaryColor.fulfilled,
+                changeSharingSetting.fulfilled
+            ),
+            () => {
+                showNotification({
+                    message: t`Settings saved.`,
+                    color: "green",
+                })
+            }
+        )
+    },
+})
+
+export const { setViewMode, setSidebarWidth, setAnnouncementHash, setFontSizePercentage } = userSlice.actions

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

@@ -0,0 +1,141 @@
+import { createAppAsyncThunk } from "app/async-thunk"
+import { client } from "app/client"
+import { reloadEntries } from "app/entries/thunks"
+import type { IconDisplayMode, ReadingMode, ReadingOrder, ScrollMode, SharingSettings } from "app/types"
+
+export const reloadSettings = createAppAsyncThunk("settings/reload", async () => await client.user.getSettings().then(r => r.data))
+
+export const reloadProfile = createAppAsyncThunk("profile/reload", async () => await client.user.getProfile().then(r => r.data))
+
+export const reloadTags = createAppAsyncThunk("entries/tags", async () => await client.entry.getTags().then(r => r.data))
+
+export const changeReadingMode = createAppAsyncThunk("settings/readingMode", (readingMode: ReadingMode, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, readingMode })
+    thunkApi.dispatch(reloadEntries())
+})
+
+export const changeReadingOrder = createAppAsyncThunk("settings/readingOrder", (readingOrder: ReadingOrder, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, readingOrder })
+    thunkApi.dispatch(reloadEntries())
+})
+
+export const changeLanguage = createAppAsyncThunk("settings/language", (language: string, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, language })
+})
+
+export const changeScrollSpeed = createAppAsyncThunk("settings/scrollSpeed", (speed: boolean, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, scrollSpeed: speed ? 400 : 0 })
+})
+
+export const changeShowRead = createAppAsyncThunk("settings/showRead", (showRead: boolean, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, showRead })
+})
+
+export const changeScrollMarks = createAppAsyncThunk("settings/scrollMarks", (scrollMarks: boolean, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, scrollMarks })
+})
+
+export const changeScrollMode = createAppAsyncThunk("settings/scrollMode", (scrollMode: ScrollMode, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, scrollMode })
+})
+
+export const changeEntriesToKeepOnTopWhenScrolling = createAppAsyncThunk(
+    "settings/entriesToKeepOnTopWhenScrolling",
+    (entriesToKeepOnTopWhenScrolling: number, thunkApi) => {
+        const { settings } = thunkApi.getState().user
+        if (!settings) return
+        client.user.saveSettings({ ...settings, entriesToKeepOnTopWhenScrolling })
+    }
+)
+
+export const changeStarIconDisplayMode = createAppAsyncThunk(
+    "settings/starIconDisplayMode",
+    (starIconDisplayMode: IconDisplayMode, thunkApi) => {
+        const { settings } = thunkApi.getState().user
+        if (!settings) return
+        client.user.saveSettings({ ...settings, starIconDisplayMode })
+    }
+)
+
+export const changeExternalLinkIconDisplayMode = createAppAsyncThunk(
+    "settings/externalLinkIconDisplayMode",
+    (externalLinkIconDisplayMode: IconDisplayMode, thunkApi) => {
+        const { settings } = thunkApi.getState().user
+        if (!settings) return
+        client.user.saveSettings({ ...settings, externalLinkIconDisplayMode })
+    }
+)
+
+export const changeMarkAllAsReadConfirmation = createAppAsyncThunk(
+    "settings/markAllAsReadConfirmation",
+    (markAllAsReadConfirmation: boolean, thunkApi) => {
+        const { settings } = thunkApi.getState().user
+        if (!settings) return
+        client.user.saveSettings({ ...settings, markAllAsReadConfirmation })
+    }
+)
+
+export const changeCustomContextMenu = createAppAsyncThunk("settings/customContextMenu", (customContextMenu: boolean, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, customContextMenu })
+})
+
+export const changeMobileFooter = createAppAsyncThunk("settings/mobileFooter", (mobileFooter: boolean, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, mobileFooter })
+})
+
+export const changeUnreadCountTitle = createAppAsyncThunk("settings/unreadCountTitle", (unreadCountTitle: boolean, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, unreadCountTitle })
+})
+
+export const changeUnreadCountFavicon = createAppAsyncThunk("settings/unreadCountFavicon", (unreadCountFavicon: boolean, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, unreadCountFavicon })
+})
+
+export const changePrimaryColor = createAppAsyncThunk("settings/primaryColor", (primaryColor: string, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, primaryColor })
+})
+
+export const changeSharingSetting = createAppAsyncThunk(
+    "settings/sharingSetting",
+    (
+        sharingSetting: {
+            site: keyof SharingSettings
+            value: boolean
+        },
+        thunkApi
+    ) => {
+        const { settings } = thunkApi.getState().user
+        if (!settings) return
+        client.user.saveSettings({
+            ...settings,
+            sharingSettings: {
+                ...settings.sharingSettings,
+                [sharingSetting.site]: sharingSetting.value,
+            },
+        })
+    }
+)

commafeed-client/src/app/utils.ts

@@ -1,47 +1,60 @@
-import { throttle } from "throttle-debounce"
+import { throttle } from "throttle-debounce"
-import { Category } from "./types"
+import type { Category } from "./types"
-
+
-export function visitCategoryTree(category: Category, visitor: (category: Category) => void): void {
+export function visitCategoryTree(
-    visitor(category)
+    category: Category,
-    category.children.forEach(child => visitCategoryTree(child, visitor))
+    visitor: (category: Category) => void,
-}
+    options?: {
-
+        childrenFirst?: boolean
-export function flattenCategoryTree(category: Category): Category[] {
+    }
-    const categories: Category[] = []
+): void {
-    visitCategoryTree(category, c => categories.push(c))
+    const childrenFirst = options?.childrenFirst
-    return categories
+
-}
+    if (!childrenFirst) visitor(category)
-
+
-export function categoryUnreadCount(category?: Category): number {
+    for (const child of category.children) {
-    if (!category) return 0
+        visitCategoryTree(child, visitor, options)
-
+    }
-    return flattenCategoryTree(category)
+
-        .flatMap(c => c.feeds)
+    if (childrenFirst) visitor(category)
-        .map(f => f.unread)
+}
-        .reduce((total, current) => total + current, 0)
+
-}
+export function flattenCategoryTree(category: Category): Category[] {
-
+    const categories: Category[] = []
-export const calculatePlaceholderSize = ({ width, height, maxWidth }: { width?: number; height?: number; maxWidth: number }) => {
+    visitCategoryTree(category, c => categories.push(c))
-    const placeholderWidth = width && Math.min(width, maxWidth)
+    return categories
-    const placeholderHeight = height && width && width > maxWidth ? height * (maxWidth / width) : height
+}
-    return { width: placeholderWidth, height: placeholderHeight }
+
-}
+export function categoryUnreadCount(category?: Category): number {
-
+    if (!category) return 0
-export const scrollToWithCallback = ({ options, onScrollEnded }: { options: ScrollToOptions; onScrollEnded: () => void }) => {
+
-    const offset = (options.top ?? 0).toFixed()
+    return flattenCategoryTree(category)
-
+        .flatMap(c => c.feeds)
-    const onScroll = throttle(100, () => {
+        .map(f => f.unread)
-        if (window.scrollY.toFixed() === offset) {
+        .reduce((total, current) => total + current, 0)
-            window.removeEventListener("scroll", onScroll)
+}
-            onScrollEnded()
+
-        }
+export const calculatePlaceholderSize = ({ width, height, maxWidth }: { width?: number; height?: number; maxWidth: number }) => {
-    })
+    const placeholderWidth = width && Math.min(width, maxWidth)
-    window.addEventListener("scroll", onScroll)
+    const placeholderHeight = height && width && width > maxWidth ? height * (maxWidth / width) : height
-
+    return { width: placeholderWidth, height: placeholderHeight }
-    // scrollTo does not trigger if there's nothing to do, trigger it manually
+}
-    onScroll()
+
-
+export const scrollToWithCallback = ({ options, onScrollEnded }: { options: ScrollToOptions; onScrollEnded: () => void }) => {
-    window.scrollTo(options)
+    const offset = (options.top ?? 0).toFixed()
-}
+
-
+    const onScroll = throttle(100, () => {
-export const truncate = (str: string, n: number) => (str.length > n ? `${str.slice(0, n - 1)}\u2026` : str)
+        if (window.scrollY.toFixed() === offset) {
+            window.removeEventListener("scroll", onScroll)
+            onScrollEnded()
+        }
+    })
+    window.addEventListener("scroll", onScroll)
+
+    // scrollTo does not trigger if there's nothing to do, trigger it manually
+    onScroll()
+
+    window.scrollTo(options)
+}
+
+export const truncate = (str: string, n: number) => (str.length > n ? `${str.slice(0, n - 1)}\u2026` : str)

commafeed-client/src/assets/logo.svg

@@ -1,20 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg height="512" width="512" viewBox="0 0 6.5625 6.5625" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd">
+<svg height="512" width="512" viewBox="0 0 6.5625 6.5625" xmlns="http://www.w3.org/2000/svg">
- <sodipodi:namedview guidetolerance="10">
+	<rect fill="#f88a14" rx="0.7" ry="0.7" height="6.5625" width="6.5625" />
-  <sodipodi:guide position="154.17325,117.15254" orientation="0,1"/>
+	<path d="m1.9761,1.5289c2.9002,0,2.9002,2.9101,2.9002,2.9101" fill="none" stroke="#FFF" stroke-linecap="round"
-  <sodipodi:guide position="154.17325,166.44575" orientation="0,1"/>
+		  stroke-width="0.78125" />
-  <sodipodi:guide position="154.17325,288.40369" orientation="0,1"/>
+	<path d="m1.9688,2.875c1.5705-0.00908,1.5705,1.5639,1.5705,1.5639" fill="none" stroke="#FFF" stroke-linecap="round"
-  <sodipodi:guide position="380.44742,392.71992" orientation="0,1"/>
+		  stroke-width="0.78125" />
-  <sodipodi:guide position="101.9661,166.44575" orientation="1,0"/>
+	<path d="m2.6503,4.4062c0,0.23366-0.10712,0.47418-0.24663,0.6537-0.1814,0.2333-0.5705,0.5618-0.6913,0.5653,0.0402-0.0662,0.263-0.5654,0.2563-0.5654-0.36423,0-0.6595-0.29265-0.6595-0.65365s0.29527-0.65365,0.6595-0.65365,0.68159,0.29265,0.68159,0.65365z"
-  <sodipodi:guide position="276.13119,288.40369" orientation="1,0"/>
+		  fill="#FFF" />
-  <sodipodi:guide position="380.44742,165.67871" orientation="1,0"/>
-  <sodipodi:guide position="154.17325,288.40369" orientation="1,0"/>
-  <sodipodi:guide position="154.17325,166.44575" orientation="-0.70710678,0.70710678"/>
-  <sodipodi:guide position="123.21968,135.49218" orientation="1,0"/>
-  <sodipodi:guide position="123.21968,135.49218" orientation="0,1"/>
- </sodipodi:namedview>
- <rect fill="#f88a14" rx="0.7" ry="0.7" height="6.5625" width="6.5625"/>
- <path d="m1.9761,1.5289c2.9002,0,2.9002,2.9101,2.9002,2.9101" fill="none" stroke="#FFF" stroke-linecap="round" stroke-width="0.78125"/>
- <path d="m1.9688,2.875c1.5705-0.00908,1.5705,1.5639,1.5705,1.5639" fill="none" stroke="#FFF" stroke-linecap="round" stroke-width="0.78125"/>
- <path d="m2.6503,4.4062c0,0.23366-0.10712,0.47418-0.24663,0.6537-0.1814,0.2333-0.5705,0.5618-0.6913,0.5653,0.0402-0.0662,0.263-0.5654,0.2563-0.5654-0.36423,0-0.6595-0.29265-0.6595-0.65365s0.29527-0.65365,0.6595-0.65365,0.68159,0.29265,0.68159,0.65365z" fill="#FFF"/>
 </svg>

commafeed-client/src/components/ActionButton.test.tsx

@@ -0,0 +1,47 @@
+import type { I18nContext } from "@lingui/react"
+import { MantineProvider } from "@mantine/core"
+import { fireEvent, render, screen, waitFor } from "@testing-library/react"
+import { useActionButton } from "hooks/useActionButton"
+import { describe, expect, it, vi } from "vitest"
+import { ActionButton } from "./ActionButton"
+
+vi.mock(import("@lingui/react"), () => ({
+    useLingui: vi.fn().mockReturnValue({
+        _: msg => msg,
+    } as I18nContext),
+}))
+vi.mock(import("hooks/useActionButton"))
+
+const label = "Test Label"
+const icon = "Test Icon"
+describe("ActionButton", () => {
+    it("renders Button with label on desktop", () => {
+        vi.mocked(useActionButton).mockReturnValue({ mobile: false, spacing: 0 })
+
+        render(<ActionButton label={label} icon={icon} />, { wrapper: MantineProvider })
+        expect(screen.getByText(label)).toBeInTheDocument()
+        expect(screen.getByText(icon)).toBeInTheDocument()
+    })
+
+    it("renders ActionIcon with tooltip on mobile", async () => {
+        vi.mocked(useActionButton).mockReturnValue({ mobile: true, spacing: 0 })
+
+        render(<ActionButton label={label} icon={icon} />, { wrapper: MantineProvider })
+        expect(screen.queryByText(label)).not.toBeInTheDocument()
+        expect(screen.getByText(icon)).toBeInTheDocument()
+
+        fireEvent.mouseEnter(screen.getByRole("button"))
+        const tooltip = await waitFor(() => screen.getByRole("tooltip"))
+        expect(tooltip).toContainHTML(label)
+    })
+
+    it("calls onClick handler when clicked", () => {
+        vi.mocked(useActionButton).mockReturnValue({ mobile: false, spacing: 0 })
+        const clickListener = vi.fn()
+
+        render(<ActionButton label={label} icon={icon} onClick={clickListener} />, { wrapper: MantineProvider })
+        fireEvent.click(screen.getByRole("button"))
+
+        expect(clickListener).toHaveBeenCalled()
+    })
+})

commafeed-client/src/components/ActionButton.tsx

@@ -1,37 +1,62 @@
-import { ActionIcon, Button, Tooltip, useMantineTheme } from "@mantine/core"
+import type { MessageDescriptor } from "@lingui/core"
-import { ActionIconProps } from "@mantine/core/lib/ActionIcon/ActionIcon"
+import { useLingui } from "@lingui/react"
-import { ButtonProps } from "@mantine/core/lib/Button/Button"
+import { ActionIcon, Box, Button, type ButtonVariant, Tooltip, useMantineTheme } from "@mantine/core"
-import { useActionButton } from "hooks/useActionButton"
+import type { ActionIconVariant } from "@mantine/core/lib/components/ActionIcon/ActionIcon"
-import { forwardRef, MouseEventHandler, ReactNode } from "react"
+import { Constants } from "app/constants"
-
+import { useActionButton } from "hooks/useActionButton"
-interface ActionButtonProps {
+import { type MouseEventHandler, type ReactNode, forwardRef } from "react"
-    className?: string
+
-    icon?: ReactNode
+interface ActionButtonProps {
-    label: ReactNode
+    icon: ReactNode
-    onClick?: MouseEventHandler
+    className?: string
-    variant?: ActionIconProps["variant"] & ButtonProps["variant"]
+    label?: string | MessageDescriptor
-    hideLabelOnDesktop?: boolean
+    onClick?: MouseEventHandler
-    showLabelOnMobile?: boolean
+    variant?: ActionIconVariant & ButtonVariant
-}
+    hideLabelOnDesktop?: boolean
-
+    showLabelOnMobile?: boolean
-/**
+}
- * Switches between Button with label (desktop) and ActionIcon (mobile)
+
- */
+/**
-export const ActionButton = forwardRef<HTMLButtonElement, ActionButtonProps>((props: ActionButtonProps, ref) => {
+ * Switches between Button with label (desktop) and ActionIcon (mobile)
-    const { mobile } = useActionButton()
+ */
-    const theme = useMantineTheme()
+export const ActionButton = forwardRef<HTMLDivElement, ActionButtonProps>((props: ActionButtonProps, ref) => {
-    const variant = props.variant ?? "subtle"
+    const { mobile } = useActionButton()
-    const iconOnly = (mobile && !props.showLabelOnMobile) || (!mobile && props.hideLabelOnDesktop)
+    const theme = useMantineTheme()
-    return iconOnly ? (
+    const { _ } = useLingui()
-        <Tooltip label={props.label} openDelay={500}>
+
-            <ActionIcon ref={ref} color={theme.primaryColor} variant={variant} className={props.className} onClick={props.onClick}>
+    const label = typeof props.label === "string" ? props.label : props.label && _(props.label)
-                {props.icon}
+    const variant = props.variant ?? "subtle"
-            </ActionIcon>
+    const iconOnly = (mobile && !props.showLabelOnMobile) || (!mobile && props.hideLabelOnDesktop)
-        </Tooltip>
+
-    ) : (
+    return (
-        <Button ref={ref} variant={variant} size="xs" className={props.className} leftIcon={props.icon} onClick={props.onClick}>
+        <Box ref={ref} className="cf-action-button">
-            {props.label}
+            {iconOnly && (
-        </Button>
+                <Tooltip label={label} openDelay={Constants.tooltip.delay}>
-    )
+                    <ActionIcon
-})
+                        color={theme.primaryColor}
-ActionButton.displayName = "HeaderButton"
+                        variant={variant}
+                        className={props.className}
+                        onClick={props.onClick}
+                        aria-label={label}
+                    >
+                        {props.icon}
+                    </ActionIcon>
+                </Tooltip>
+            )}
+            {!iconOnly && (
+                <Button
+                    variant={variant}
+                    size="xs"
+                    className={props.className}
+                    leftSection={props.icon}
+                    onClick={props.onClick}
+                    aria-label={label}
+                >
+                    {label}
+                </Button>
+            )}
+        </Box>
+    )
+})
+
+ActionButton.displayName = "HeaderButton"

commafeed-client/src/components/Alert.tsx

@@ -1,48 +1,47 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
-import { Box, Alert as MantineAlert } from "@mantine/core"
+import { Box, Alert as MantineAlert } from "@mantine/core"
-import { Fragment } from "react"
+import { Fragment } from "react"
-import { TbAlertCircle, TbAlertTriangle, TbCircleCheck } from "react-icons/tb"
+import { TbAlertCircle, TbAlertTriangle, TbCircleCheck } from "react-icons/tb"
-
+
-type Level = "error" | "warning" | "success"
+type Level = "error" | "warning" | "success"
-export interface ErrorsAlertProps {
+
-    level?: Level
+export interface ErrorsAlertProps {
-    messages: string[]
+    level?: Level
-}
+    messages: string[]
-
+}
-export function Alert(props: ErrorsAlertProps) {
+
-    let title: React.ReactNode
+export function Alert(props: ErrorsAlertProps) {
-    let color: string
+    let title: React.ReactNode
-    let icon: React.ReactNode
+    let color: string
-
+    let icon: React.ReactNode
-    const level = props.level ?? "error"
+
-    switch (level) {
+    const level = props.level ?? "error"
-        case "error":
+    switch (level) {
-            title = <Trans>Error</Trans>
+        case "error":
-            color = "red"
+            title = <Trans>Error</Trans>
-            icon = <TbAlertCircle />
+            color = "red"
-            break
+            icon = <TbAlertCircle />
-        case "warning":
+            break
-            title = <Trans>Warning</Trans>
+        case "warning":
-            color = "orange"
+            title = <Trans>Warning</Trans>
-            icon = <TbAlertTriangle />
+            color = "orange"
-            break
+            icon = <TbAlertTriangle />
-        case "success":
+            break
-            title = <Trans>Success</Trans>
+        case "success":
-            color = "green"
+            title = <Trans>Success</Trans>
-            icon = <TbCircleCheck />
+            color = "green"
-            break
+            icon = <TbCircleCheck />
-        default:
+            break
-            throw Error(`unsupported level: ${level}`)
+    }
-    }
+
-
+    return (
-    return (
+        <MantineAlert title={title} color={color} icon={icon}>
-        <MantineAlert title={title} color={color} icon={icon}>
+            {props.messages.map((m, i) => (
-            {props.messages.map((m, i) => (
+                <Fragment key={m}>
-                <Fragment key={m}>
+                    <Box>{m}</Box>
-                    <Box>{m}</Box>
+                    {i !== props.messages.length - 1 && <br />}
-                    {i !== props.messages.length - 1 && <br />}
+                </Fragment>
-                </Fragment>
+            ))}
-            ))}
+        </MantineAlert>
-        </MantineAlert>
+    )
-    )
+}
-}

commafeed-client/src/components/AnnouncementDialog.tsx

@@ -1,9 +1,9 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Box, Dialog, Text } from "@mantine/core"
-import { useAppSelector } from "app/store"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { setAnnouncementHash } from "app/user/slice"
 import { Content } from "components/content/Content"
 import { useAsync } from "react-async-hook"
-import useLocalStorage from "use-local-storage"
 
 const sha256Hex = async (input: string | undefined) => {
     const data = new TextEncoder().encode(input)
@@ -15,16 +15,17 @@ const sha256Hex = async (input: string | undefined) => {
 export function AnnouncementDialog() {
     const announcement = useAppSelector(state => state.server.serverInfos?.announcement)
     const announcementHash = useAsync(sha256Hex, [announcement]).result
-    const [localStorageHash, setLocalStorageHash] = useLocalStorage("announcement-hash", "no-hash")
+    const existingAnnouncementHash = useAppSelector(state => state.user.localSettings.announcementHash)
+    const dispatch = useAppDispatch()
 
-    const opened = !!announcementHash && announcementHash !== localStorageHash
+    const opened = !!announcementHash && announcementHash !== existingAnnouncementHash
-    const onClosed = () => setLocalStorageHash(announcementHash)
+    const onClosed = () => announcementHash && dispatch(setAnnouncementHash(announcementHash))
 
     if (!announcement) return null
     return (
         <Dialog opened={opened} withCloseButton onClose={onClosed} size="xl" radius="md">
             <Box>
-                <Text weight="bold">
+                <Text fw="bold">
                     <Trans>Announcement</Trans>
                 </Text>
             </Box>

commafeed-client/src/components/DisablePullToRefresh.css

@@ -0,0 +1,4 @@
+html,
+body {
+    overscroll-behavior: none;
+}

commafeed-client/src/components/DisablePullToRefresh.tsx

@@ -0,0 +1,4 @@
+export const DisablePullToRefresh = () => {
+    import("./DisablePullToRefresh.css")
+    return <></>
+}

commafeed-client/src/components/ErrorBoundary.tsx

@@ -1,26 +1,26 @@
-import { ErrorPage } from "pages/ErrorPage"
+import { ErrorPage } from "pages/ErrorPage"
-import React, { ReactNode } from "react"
+import React, { type ReactNode } from "react"
-
+
-interface ErrorBoundaryProps {
+interface ErrorBoundaryProps {
-    children?: ReactNode
+    children?: ReactNode
-}
+}
-
+
-interface ErrorBoundaryState {
+interface ErrorBoundaryState {
-    error?: Error
+    error?: Error
-}
+}
-
+
-export class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundaryState> {
+export class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundaryState> {
-    constructor(props: ErrorBoundaryProps) {
+    constructor(props: ErrorBoundaryProps) {
-        super(props)
+        super(props)
-        this.state = {}
+        this.state = {}
-    }
+    }
-
+
-    componentDidCatch(error: Error) {
+    componentDidCatch(error: Error) {
-        this.setState({ error })
+        this.setState({ error })
-    }
+    }
-
+
-    render() {
+    render() {
-        if (this.state.error) return <ErrorPage error={this.state.error} />
+        if (this.state.error) return <ErrorPage error={this.state.error} />
-        return this.props.children
+        return this.props.children
-    }
+    }
-}
+}

commafeed-client/src/components/ImageWithPlaceholderWhileLoading.tsx

@@ -1,54 +1,81 @@
-import { Box, Center, createStyles } from "@mantine/core"
+import { Box, Center } from "@mantine/core"
-import { useState } from "react"
+import { useState } from "react"
-import { TbPhoto } from "react-icons/tb"
+import { TbPhoto } from "react-icons/tb"
-
+import { tss } from "tss"
-interface ImageWithPlaceholderWhileLoadingProps {
+
-    src: string
+interface ImageWithPlaceholderWhileLoadingProps {
-    alt: string
+    src: string
-    title?: string
+    alt: string
-    width?: number
+    title?: string
-    height?: number | "auto"
+    width?: number
-    placeholderWidth?: number
+    height?: number | "auto"
-    placeholderHeight?: number
+    style?: React.CSSProperties
-    placeholderBackgroundColor?: string
+    placeholderWidth?: number
-    placeholderIconSize?: number
+    placeholderHeight?: number
-    placeholderIconColor?: string
+    placeholderBackgroundColor?: string
-}
+    placeholderIconSize?: number
-
+}
-const useStyles = createStyles((theme, props: ImageWithPlaceholderWhileLoadingProps) => ({
+
-    placeholder: {
+const useStyles = tss
-        width: props.placeholderWidth ?? 400,
+    .withParams<{
-        height: props.placeholderHeight ?? 600,
+        placeholderWidth?: number
-        maxWidth: "100%",
+        placeholderHeight?: number
-        color: props.placeholderIconColor ?? theme.fn.variant({ color: theme.primaryColor, variant: "subtle" }).color,
+        placeholderBackgroundColor?: string
-        backgroundColor: props.placeholderBackgroundColor ?? (theme.colorScheme === "dark" ? theme.colors.dark[5] : theme.colors.gray[1]),
+    }>()
-    },
+    .create(props => ({
-}))
+        placeholder: {
-
+            width: props.placeholderWidth ?? 400,
-export function ImageWithPlaceholderWhileLoading(props: ImageWithPlaceholderWhileLoadingProps) {
+            height: props.placeholderHeight ?? 600,
-    const { classes } = useStyles(props)
+            maxWidth: "100%",
-    const [loading, setLoading] = useState(true)
+            backgroundColor:
-
+                props.placeholderBackgroundColor ??
-    return (
+                (props.colorScheme === "dark" ? props.theme.colors.dark[5] : props.theme.colors.gray[1]),
-        <>
+        },
-            {loading && (
+    }))
-                <Box>
+
-                    <Center className={classes.placeholder}>
+export function ImageWithPlaceholderWhileLoading({
-                        <div>
+    alt,
-                            <TbPhoto size={props.placeholderIconSize ?? 48} />
+    height,
-                        </div>
+    placeholderBackgroundColor,
-                    </Center>
+    placeholderHeight,
-                </Box>
+    placeholderIconSize,
-            )}
+    placeholderWidth,
-            <img
+    src,
-                src={props.src}
+    title,
-                alt={props.alt}
+    width,
-                title={props.title}
+    style,
-                width={props.width}
+}: ImageWithPlaceholderWhileLoadingProps) {
-                height={props.height}
+    const { classes } = useStyles({
-                onLoad={() => setLoading(false)}
+        placeholderWidth,
-                style={{ display: loading ? "none" : "block" }}
+        placeholderHeight,
-            />
+        placeholderBackgroundColor,
-        </>
+    })
-    )
+    const [loading, setLoading] = useState(true)
-}
+
+    return (
+        <>
+            {loading && (
+                <Box>
+                    <Center className={classes.placeholder}>
+                        <div>
+                            <TbPhoto size={placeholderIconSize ?? 48} />
+                        </div>
+                    </Center>
+                </Box>
+            )}
+            <img
+                src={src}
+                alt={alt}
+                title={title}
+                width={width}
+                height={height}
+                onLoad={() => setLoading(false)}
+                style={{
+                    ...style,
+                    display: loading ? "none" : (style?.display ?? "initial"),
+                    height: style?.width ? "auto" : style?.height,
+                }}
+            />
+        </>
+    )
+}

commafeed-client/src/components/KeyboardShortcutsHelp.tsx

@@ -1,222 +1,242 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
-import { Anchor, Box, Kbd, Stack, Table } from "@mantine/core"
+import { Anchor, Box, Kbd, Stack, Table } from "@mantine/core"
-import { Constants } from "app/constants"
+import { useOs } from "@mantine/hooks"
-
+import { Constants } from "app/constants"
-export function KeyboardShortcutsHelp() {
+
-    return (
+export function KeyboardShortcutsHelp() {
-        <Stack spacing="xs">
+    const isMacOS = useOs() === "macos"
-            <Table striped highlightOnHover>
+    return (
-                <tbody>
+        <Stack gap="xs">
-                    <tr>
+            <Table striped highlightOnHover>
-                        <td>
+                <Table.Tbody>
-                            <Trans>Refresh</Trans>
+                    <Table.Tr>
-                        </td>
+                        <Table.Td>
-                        <td>
+                            <Trans>Refresh</Trans>
-                            <Kbd>R</Kbd>
+                        </Table.Td>
-                        </td>
+                        <Table.Td>
-                    </tr>
+                            <Kbd>R</Kbd>
-                    <tr>
+                        </Table.Td>
-                        <td>
+                    </Table.Tr>
-                            <Trans>Open next entry</Trans>
+                    <Table.Tr>
-                        </td>
+                        <Table.Td>
-                        <td>
+                            <Trans>Open next entry</Trans>
-                            <Kbd>J</Kbd>
+                        </Table.Td>
-                        </td>
+                        <Table.Td>
-                    </tr>
+                            <Kbd>J</Kbd>
-                    <tr>
+                        </Table.Td>
-                        <td>
+                    </Table.Tr>
-                            <Trans>Open previous entry</Trans>
+                    <Table.Tr>
-                        </td>
+                        <Table.Td>
-                        <td>
+                            <Trans>Open previous entry</Trans>
-                            <Kbd>K</Kbd>
+                        </Table.Td>
-                        </td>
+                        <Table.Td>
-                    </tr>
+                            <Kbd>K</Kbd>
-                    <tr>
+                        </Table.Td>
-                        <td>
+                    </Table.Tr>
-                            <Trans>Set focus on next entry without opening it</Trans>
+                    <Table.Tr>
-                        </td>
+                        <Table.Td>
-                        <td>
+                            <Trans>Select next unread feed/category</Trans>
-                            <Kbd>N</Kbd>
+                        </Table.Td>
-                        </td>
+                        <Table.Td>
-                    </tr>
+                            <Kbd>Shift</Kbd>
-                    <tr>
+                            <span> + </span>
-                        <td>
+                            <Kbd>J</Kbd>
-                            <Trans>Set focus on previous entry without opening it</Trans>
+                        </Table.Td>
-                        </td>
+                    </Table.Tr>
-                        <td>
+                    <Table.Tr>
-                            <Kbd>P</Kbd>
+                        <Table.Td>
-                        </td>
+                            <Trans>Select previous unread feed/category</Trans>
-                    </tr>
+                        </Table.Td>
-                    <tr>
+                        <Table.Td>
-                        <td>
+                            <Kbd>Shift</Kbd>
-                            <Trans>Move the page down</Trans>
+                            <span> + </span>
-                        </td>
+                            <Kbd>K</Kbd>
-                        <td>
+                        </Table.Td>
-                            <Kbd>
+                    </Table.Tr>
-                                <Trans>Space</Trans>
+                    <Table.Tr>
-                            </Kbd>
+                        <Table.Td>
-                        </td>
+                            <Trans>Set focus on next entry without opening it</Trans>
-                    </tr>
+                        </Table.Td>
-                    <tr>
+                        <Table.Td>
-                        <td>
+                            <Kbd>N</Kbd>
-                            <Trans>Move the page up</Trans>
+                        </Table.Td>
-                        </td>
+                    </Table.Tr>
-                        <td>
+                    <Table.Tr>
-                            <Kbd>
+                        <Table.Td>
-                                <Trans>Shift</Trans>
+                            <Trans>Set focus on previous entry without opening it</Trans>
-                            </Kbd>
+                        </Table.Td>
-                            <span> + </span>
+                        <Table.Td>
-                            <Kbd>
+                            <Kbd>P</Kbd>
-                                <Trans>Space</Trans>
+                        </Table.Td>
-                            </Kbd>
+                    </Table.Tr>
-                        </td>
+                    <Table.Tr>
-                    </tr>
+                        <Table.Td>
-                    <tr>
+                            <Trans>Move the page down</Trans>
-                        <td>
+                        </Table.Td>
-                            <Trans>Open/close current entry</Trans>
+                        <Table.Td>
-                        </td>
+                            <Kbd>
-                        <td>
+                                <Trans>Space</Trans>
-                            <Kbd>O</Kbd>
+                            </Kbd>
-                            <span>, </span>
+                        </Table.Td>
-                            <Kbd>
+                    </Table.Tr>
-                                <Trans>Enter</Trans>
+                    <Table.Tr>
-                            </Kbd>
+                        <Table.Td>
-                        </td>
+                            <Trans>Move the page up</Trans>
-                    </tr>
+                        </Table.Td>
-                    <tr>
+                        <Table.Td>
-                        <td>
+                            <Kbd>
-                            <Trans>Open current entry in a new tab</Trans>
+                                <Trans>Shift</Trans>
-                        </td>
+                            </Kbd>
-                        <td>
+                            <span> + </span>
-                            <Kbd>V</Kbd>
+                            <Kbd>
-                        </td>
+                                <Trans>Space</Trans>
-                    </tr>
+                            </Kbd>
-                    <tr>
+                        </Table.Td>
-                        <td>
+                    </Table.Tr>
-                            <Trans>Open current entry in a new tab in the background</Trans>
+                    <Table.Tr>
-                        </td>
+                        <Table.Td>
-                        <td>
+                            <Trans>Open/close current entry</Trans>
-                            <Kbd>B</Kbd>
+                        </Table.Td>
-                            <span>*, </span>
+                        <Table.Td>
-                            <Kbd>
+                            <Kbd>O</Kbd>
-                                <Trans>Middle click</Trans>
+                            <span>, </span>
-                            </Kbd>
+                            <Kbd>
-                        </td>
+                                <Trans>Enter</Trans>
-                    </tr>
+                            </Kbd>
-                    <tr>
+                        </Table.Td>
-                        <td>
+                    </Table.Tr>
-                            <Trans>Toggle read status of current entry</Trans>
+                    <Table.Tr>
-                        </td>
+                        <Table.Td>
-                        <td>
+                            <Trans>Open current entry in a new tab</Trans>
-                            <Kbd>M</Kbd>
+                        </Table.Td>
-                            <span>, </span>
+                        <Table.Td>
-                            <Trans>Swipe header to the right</Trans>
+                            <Kbd>V</Kbd>
-                        </td>
+                        </Table.Td>
-                    </tr>
+                    </Table.Tr>
-                    <tr>
+                    <Table.Tr>
-                        <td>
+                        <Table.Td>
-                            <Trans>Toggle starred status of current entry</Trans>
+                            <Trans>Open current entry in a new tab in the background</Trans>
-                        </td>
+                        </Table.Td>
-                        <td>
+                        <Table.Td>
-                            <Kbd>S</Kbd>
+                            <Kbd>B</Kbd>
-                        </td>
+                            <span>*, </span>
-                    </tr>
+                            <Kbd>
-                    <tr>
+                                <Trans>Middle click</Trans>
-                        <td>
+                            </Kbd>
-                            <Trans>Mark all entries as read</Trans>
+                        </Table.Td>
-                        </td>
+                    </Table.Tr>
-                        <td>
+                    <Table.Tr>
-                            <Kbd>
+                        <Table.Td>
-                                <Trans>Shift</Trans>
+                            <Trans>Toggle read status of current entry</Trans>
-                            </Kbd>
+                        </Table.Td>
-                            <span> + </span>
+                        <Table.Td>
-                            <Kbd>A</Kbd>
+                            <Kbd>M</Kbd>
-                        </td>
+                            <span>, </span>
-                    </tr>
+                            <Trans>Swipe header to the left</Trans>
-                    <tr>
+                        </Table.Td>
-                        <td>
+                    </Table.Tr>
-                            <Trans>Go to the All view</Trans>
+                    <Table.Tr>
-                        </td>
+                        <Table.Td>
-                        <td>
+                            <Trans>Toggle starred status of current entry</Trans>
-                            <Kbd>G</Kbd>
+                        </Table.Td>
-                            <span> </span>
+                        <Table.Td>
-                            <Kbd>A</Kbd>
+                            <Kbd>S</Kbd>
-                        </td>
+                        </Table.Td>
-                    </tr>
+                    </Table.Tr>
-                    <tr>
+                    <Table.Tr>
-                        <td>
+                        <Table.Td>
-                            <Trans>Navigate to a subscription by entering its name</Trans>
+                            <Trans>Mark all entries as read</Trans>
-                        </td>
+                        </Table.Td>
-                        <td>
+                        <Table.Td>
-                            <Kbd>
+                            <Kbd>
-                                <Trans>Ctrl</Trans>
+                                <Trans>Shift</Trans>
-                            </Kbd>
+                            </Kbd>
-                            <span> + </span>
+                            <span> + </span>
-                            <Kbd>K</Kbd>
+                            <Kbd>A</Kbd>
-                            <span>, </span>
+                        </Table.Td>
-                            <Kbd>G</Kbd>
+                    </Table.Tr>
-                            <span> </span>
+                    <Table.Tr>
-                            <Kbd>U</Kbd>
+                        <Table.Td>
-                        </td>
+                            <Trans>Go to the All view</Trans>
-                    </tr>
+                        </Table.Td>
-                    <tr>
+                        <Table.Td>
-                        <td>
+                            <Kbd>G</Kbd>
-                            <Trans>Show entry menu (desktop)</Trans>
+                            <span> </span>
-                        </td>
+                            <Kbd>A</Kbd>
-                        <td>
+                        </Table.Td>
-                            <Kbd>
+                    </Table.Tr>
-                                <Trans>Right click</Trans>
+                    <Table.Tr>
-                            </Kbd>
+                        <Table.Td>
-                        </td>
+                            <Trans>Navigate to a subscription by entering its name</Trans>
-                    </tr>
+                        </Table.Td>
-                    <tr>
+                        <Table.Td>
-                        <td>
+                            <Kbd>{isMacOS ? <Trans>Cmd</Trans> : <Trans>Ctrl</Trans>}</Kbd>
-                            <Trans>Show native menu (desktop)</Trans>
+                            <span> + </span>
-                        </td>
+                            <Kbd>K</Kbd>
-                        <td>
+                            <span>, </span>
-                            <Kbd>
+                            <Kbd>G</Kbd>
-                                <Trans>Shift</Trans>
+                            <span> </span>
-                            </Kbd>
+                            <Kbd>U</Kbd>
-                            <span> + </span>
+                        </Table.Td>
-                            <Kbd>
+                    </Table.Tr>
-                                <Trans>Right click</Trans>
+                    <Table.Tr>
-                            </Kbd>
+                        <Table.Td>
-                        </td>
+                            <Trans>Show entry menu (desktop)</Trans>
-                    </tr>
+                        </Table.Td>
-                    <tr>
+                        <Table.Td>
-                        <td>
+                            <Kbd>
-                            <Trans>Show entry menu (mobile)</Trans>
+                                <Trans>Right click</Trans>
-                        </td>
+                            </Kbd>
-                        <td>
+                        </Table.Td>
-                            <Kbd>
+                    </Table.Tr>
-                                <Trans>Long press</Trans>
+                    <Table.Tr>
-                            </Kbd>
+                        <Table.Td>
-                        </td>
+                            <Trans>Show native menu (desktop)</Trans>
-                    </tr>
+                        </Table.Td>
-                    <tr>
+                        <Table.Td>
-                        <td>
+                            <Kbd>
-                            <Trans>Toggle sidebar</Trans>
+                                <Trans>Shift</Trans>
-                        </td>
+                            </Kbd>
-                        <td>
+                            <span> + </span>
-                            <Kbd>F</Kbd>
+                            <Kbd>
-                        </td>
+                                <Trans>Right click</Trans>
-                    </tr>
+                            </Kbd>
-                    <tr>
+                        </Table.Td>
-                        <td>
+                    </Table.Tr>
-                            <Trans>Show keyboard shortcut help</Trans>
+                    <Table.Tr>
-                        </td>
+                        <Table.Td>
-                        <td>
+                            <Trans>Show entry menu (mobile)</Trans>
-                            <Kbd>?</Kbd>
+                        </Table.Td>
-                        </td>
+                        <Table.Td>
-                    </tr>
+                            <Kbd>
-                </tbody>
+                                <Trans>Long press</Trans>
-            </Table>
+                            </Kbd>
-            <Box>
+                        </Table.Td>
-                <span>* </span>
+                    </Table.Tr>
-                <Anchor href={Constants.browserExtensionUrl} target="_blank" rel="noreferrer">
+                    <Table.Tr>
-                    <Trans>Browser extension required for Chrome</Trans>
+                        <Table.Td>
-                </Anchor>
+                            <Trans>Toggle sidebar</Trans>
-            </Box>
+                        </Table.Td>
-        </Stack>
+                        <Table.Td>
-    )
+                            <Kbd>F</Kbd>
-}
+                        </Table.Td>
+                    </Table.Tr>
+                    <Table.Tr>
+                        <Table.Td>
+                            <Trans>Show keyboard shortcut help</Trans>
+                        </Table.Td>
+                        <Table.Td>
+                            <Kbd>?</Kbd>
+                        </Table.Td>
+                    </Table.Tr>
+                </Table.Tbody>
+            </Table>
+            <Box>
+                <span>* </span>
+                <Anchor href={Constants.browserExtensionUrl} target="_blank" rel="noreferrer">
+                    <Trans>Browser extension required for Chrome</Trans>
+                </Anchor>
+            </Box>
+        </Stack>
+    )
+}

commafeed-client/src/components/Loader.tsx

@@ -1,9 +1,9 @@
-import { Center, Loader as MantineLoader } from "@mantine/core"
+import { Center, Loader as MantineLoader } from "@mantine/core"
-
+
-export function Loader() {
+export function Loader() {
-    return (
+    return (
-        <Center>
+        <Center>
-            <MantineLoader size="xl" variant="bars" />
+            <MantineLoader size="lg" type="bars" />
-        </Center>
+        </Center>
-    )
+    )
-}
+}

commafeed-client/src/components/Logo.tsx

@@ -1,10 +1,10 @@
-import { Image } from "@mantine/core"
+import { Image } from "@mantine/core"
-import logo from "assets/logo.svg"
+import logo from "assets/logo.svg"
-
+
-export interface LogoProps {
+export interface LogoProps {
-    size: number
+    size: number
-}
+}
-
+
-export function Logo(props: LogoProps) {
+export function Logo(props: LogoProps) {
-    return <Image src={logo} width={props.size} />
+    return <Image src={logo} w={props.size} />
-}
+}

commafeed-client/src/components/MarkAllAsReadConfirmationDialog.tsx

@@ -0,0 +1,77 @@
+import { Trans } from "@lingui/react/macro"
+import { Button, Code, Group, Modal, Slider, Stack, Text } from "@mantine/core"
+import { setMarkAllAsReadConfirmationDialogOpen } from "app/entries/slice"
+import { markAllEntries } from "app/entries/thunks"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { useState } from "react"
+
+export function MarkAllAsReadConfirmationDialog() {
+    const [threshold, setThreshold] = useState(0)
+    const open = useAppSelector(state => state.entries.markAllAsReadConfirmationDialogOpen)
+    const source = useAppSelector(state => state.entries.source)
+    const sourceLabel = useAppSelector(state => state.entries.sourceLabel)
+    const entriesTimestamp = useAppSelector(state => state.entries.timestamp) ?? Date.now()
+    const dispatch = useAppDispatch()
+
+    const onConfirm = () => {
+        dispatch(
+            markAllEntries({
+                sourceType: source.type,
+                req: {
+                    id: source.id,
+                    read: true,
+                    olderThan: Date.now() - threshold * 24 * 60 * 60 * 1000,
+                    insertedBefore: entriesTimestamp,
+                },
+            })
+        )
+        dispatch(setMarkAllAsReadConfirmationDialogOpen(false))
+    }
+
+    return (
+        <Modal
+            opened={open}
+            onClose={() => dispatch(setMarkAllAsReadConfirmationDialogOpen(false))}
+            title={<Trans>Mark all entries as read</Trans>}
+        >
+            <Stack>
+                <Text size="sm">
+                    {threshold === 0 && (
+                        <Trans>
+                            Are you sure you want to mark all entries of <Code>{sourceLabel}</Code> as read?
+                        </Trans>
+                    )}
+                    {threshold > 0 && (
+                        <Trans>
+                            Are you sure you want to mark entries older than {threshold} days of <Code>{sourceLabel}</Code> as read?
+                        </Trans>
+                    )}
+                </Text>
+                <Slider
+                    py="xl"
+                    min={0}
+                    max={28}
+                    marks={[
+                        { value: 0, label: "0" },
+                        { value: 7, label: "7" },
+                        { value: 14, label: "14" },
+                        { value: 21, label: "21" },
+                        { value: 28, label: "28" },
+                    ]}
+                    value={threshold}
+                    onChange={setThreshold}
+                    data-autofocus
+                    onKeyDown={e => e.key === "Enter" && onConfirm()}
+                />
+                <Group justify="flex-end">
+                    <Button variant="default" onClick={() => dispatch(setMarkAllAsReadConfirmationDialogOpen(false))}>
+                        <Trans>Cancel</Trans>
+                    </Button>
+                    <Button color="red" onClick={onConfirm}>
+                        <Trans>Confirm</Trans>
+                    </Button>
+                </Group>
+            </Stack>
+        </Modal>
+    )
+}

commafeed-client/src/components/RelativeDate.tsx

@@ -1,20 +1,17 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
-import { Tooltip } from "@mantine/core"
+import { Tooltip } from "@mantine/core"
-import dayjs from "dayjs"
+import { Constants } from "app/constants"
-import { useEffect, useState } from "react"
+import dayjs from "dayjs"
-
+import { useNow } from "hooks/useNow"
-export function RelativeDate(props: { date: Date | number | undefined }) {
+
-    const [now, setNow] = useState(new Date())
+export function RelativeDate(props: { date: Date | number | undefined }) {
-    useEffect(() => {
+    const now = useNow(60 * 1000)
-        const interval = setInterval(() => setNow(new Date()), 60 * 1000)
+
-        return () => clearInterval(interval)
+    if (!props.date) return <Trans>N/A</Trans>
-    }, [])
+    const date = dayjs(props.date)
-
+    return (
-    if (!props.date) return <Trans>N/A</Trans>
+        <Tooltip label={date.toDate().toLocaleString()} openDelay={Constants.tooltip.delay}>
-    const date = dayjs(props.date)
+            <span>{date.from(dayjs(now))}</span>
-    return (
+        </Tooltip>
-        <Tooltip label={date.toDate().toLocaleString()} openDelay={500}>
+    )
-            <span>{date.from(dayjs(now))}</span>
+}
-        </Tooltip>
-    )
-}

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

@@ -1,50 +1,54 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
-import { Box, Button, Checkbox, Group, PasswordInput, Stack, TextInput } from "@mantine/core"
+import { Box, Button, Checkbox, Group, PasswordInput, Stack, TextInput } from "@mantine/core"
-import { useForm } from "@mantine/form"
+import { useForm } from "@mantine/form"
-import { client, errorToStrings } from "app/client"
+import { client, errorToStrings } from "app/client"
-import { UserModel } from "app/types"
+import type { AdminSaveUserRequest, UserModel } from "app/types"
-import { Alert } from "components/Alert"
+import { Alert } from "components/Alert"
-import { useAsyncCallback } from "react-async-hook"
+import { useAsyncCallback } from "react-async-hook"
-import { TbDeviceFloppy } from "react-icons/tb"
+import { TbDeviceFloppy } from "react-icons/tb"
-
+
-interface UserEditProps {
+interface UserEditProps {
-    user?: UserModel
+    user?: UserModel
-    onCancel: () => void
+    onCancel: () => void
-    onSave: () => void
+    onSave: () => void
-}
+}
-
+
-export function UserEdit(props: UserEditProps) {
+export function UserEdit(props: UserEditProps) {
-    const form = useForm<UserModel>({
+    const form = useForm<AdminSaveUserRequest>({
-        initialValues: props.user ?? ({ enabled: true } as UserModel),
+        initialValues: props.user ?? {
-    })
+            name: "",
-    const saveUser = useAsyncCallback(client.admin.saveUser, { onSuccess: props.onSave })
+            enabled: true,
-
+            admin: false,
-    return (
+        },
-        <>
+    })
-            {saveUser.error && (
+    const saveUser = useAsyncCallback(client.admin.saveUser, { onSuccess: props.onSave })
-                <Box mb="md">
+
-                    <Alert messages={errorToStrings(saveUser.error)} />
+    return (
-                </Box>
+        <>
-            )}
+            {saveUser.error && (
-
+                <Box mb="md">
-            <form onSubmit={form.onSubmit(saveUser.execute)}>
+                    <Alert messages={errorToStrings(saveUser.error)} />
-                <Stack>
+                </Box>
-                    <TextInput label={<Trans>Name</Trans>} {...form.getInputProps("name")} required />
+            )}
-                    <PasswordInput label={<Trans>Password</Trans>} {...form.getInputProps("password")} required={!props.user} />
+
-                    <TextInput type="email" label={<Trans>E-mail</Trans>} {...form.getInputProps("email")} />
+            <form onSubmit={form.onSubmit(saveUser.execute)}>
-                    <Checkbox label={<Trans>Admin</Trans>} {...form.getInputProps("admin", { type: "checkbox" })} />
+                <Stack>
-                    <Checkbox label={<Trans>Enabled</Trans>} {...form.getInputProps("enabled", { type: "checkbox" })} />
+                    <TextInput label={<Trans>Name</Trans>} {...form.getInputProps("name")} required />
-
+                    <PasswordInput label={<Trans>Password</Trans>} {...form.getInputProps("password")} required={!props.user} />
-                    <Group>
+                    <TextInput type="email" label={<Trans>E-mail</Trans>} {...form.getInputProps("email")} />
-                        <Button variant="default" onClick={props.onCancel}>
+                    <Checkbox label={<Trans>Admin</Trans>} {...form.getInputProps("admin", { type: "checkbox" })} />
-                            <Trans>Cancel</Trans>
+                    <Checkbox label={<Trans>Enabled</Trans>} {...form.getInputProps("enabled", { type: "checkbox" })} />
-                        </Button>
+
-                        <Button type="submit" leftIcon={<TbDeviceFloppy size={16} />} loading={saveUser.loading}>
+                    <Group justify="right">
-                            <Trans>Save</Trans>
+                        <Button variant="default" onClick={props.onCancel}>
-                        </Button>
+                            <Trans>Cancel</Trans>
-                    </Group>
+                        </Button>
-                </Stack>
+                        <Button type="submit" leftSection={<TbDeviceFloppy size={16} />} loading={saveUser.loading}>
-            </form>
+                            <Trans>Save</Trans>
-        </>
+                        </Button>
-    )
+                    </Group>
-}
+                </Stack>
+            </form>
+        </>
+    )
+}

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

@@ -1,36 +1,38 @@
-import { Input, Textarea } from "@mantine/core"
+import { Input, Textarea } from "@mantine/core"
-import RichCodeEditor from "components/code/RichCodeEditor"
+import RichCodeEditor from "components/code/RichCodeEditor"
-import { useMobile } from "hooks/useMobile"
+import { useMobile } from "hooks/useMobile"
-import { ReactNode } from "react"
+import type { ReactNode } from "react"
-
+
-interface CodeEditorProps {
+interface CodeEditorProps {
-    description?: ReactNode
+    label?: ReactNode
-    language: "css" | "javascript"
+    description?: ReactNode
-    value: string
+    language: "css" | "javascript"
-    onChange: (value: string | undefined) => void
+    value?: string
-}
+    onChange: (value: string | undefined) => void
-
+}
-export function CodeEditor(props: CodeEditorProps) {
+
-    const mobile = useMobile()
+export function CodeEditor(props: CodeEditorProps) {
-
+    const mobile = useMobile()
-    return mobile ? (
+
-        // monaco mobile support is poor, fallback to textarea
+    return mobile ? (
-        <Textarea
+        // monaco mobile support is poor, fallback to textarea
-            autosize
+        <Textarea
-            minRows={4}
+            autosize
-            maxRows={15}
+            minRows={4}
-            description={props.description}
+            maxRows={15}
-            styles={{
+            label={props.label}
-                input: {
+            description={props.description}
-                    fontFamily: "monospace",
+            styles={{
-                },
+                input: {
-            }}
+                    fontFamily: "monospace",
-            value={props.value}
+                },
-            onChange={e => props.onChange(e.currentTarget.value)}
+            }}
-        />
+            value={props.value}
-    ) : (
+            onChange={e => props.onChange(e.currentTarget.value)}
-        <Input.Wrapper description={props.description}>
+        />
-            <RichCodeEditor height="30vh" language={props.language} value={props.value} onChange={props.onChange} />
+    ) : (
-        </Input.Wrapper>
+        <Input.Wrapper label={props.label} description={props.description}>
-    )
+            <RichCodeEditor height="30vh" language={props.language} value={props.value} onChange={props.onChange} />
-}
+        </Input.Wrapper>
+    )
+}

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

@@ -1,52 +1,51 @@
-import { useMantineTheme } from "@mantine/core"
+import { Loader } from "components/Loader"
-import { Loader } from "components/Loader"
+import { useColorScheme } from "hooks/useColorScheme"
-import { useAsync } from "react-async-hook"
+import { useAsync } from "react-async-hook"
-
+
-const init = async () => {
+const init = async () => {
-    window.MonacoEnvironment = {
+    window.MonacoEnvironment = {
-        async getWorker(_, label) {
+        async getWorker(_, label) {
-            let worker
+            let worker: typeof import("*?worker")
-            if (label === "css") {
+            if (label === "css") {
-                worker = await import("monaco-editor/esm/vs/language/css/css.worker?worker")
+                worker = await import("monaco-editor/esm/vs/language/css/css.worker?worker")
-            } else if (label === "javascript") {
+            } else if (label === "javascript") {
-                worker = await import("monaco-editor/esm/vs/language/typescript/ts.worker?worker")
+                worker = await import("monaco-editor/esm/vs/language/typescript/ts.worker?worker")
-            } else {
+            } else {
-                worker = await import("monaco-editor/esm/vs/editor/editor.worker?worker")
+                worker = await import("monaco-editor/esm/vs/editor/editor.worker?worker")
-            }
+            }
-            // eslint-disable-next-line new-cap
+            return new worker.default()
-            return new worker.default()
+        },
-        },
+    }
-    }
+
-
+    const monacoReact = await import("@monaco-editor/react")
-    const monacoReact = await import("@monaco-editor/react")
+    const monaco = await import("monaco-editor")
-    const monaco = await import("monaco-editor")
+    monacoReact.loader.config({ monaco })
-    monacoReact.loader.config({ monaco })
+    return monacoReact.Editor
-    return monacoReact.Editor
+}
-}
+
-
+interface RichCodeEditorProps {
-interface RichCodeEditorProps {
+    height: number | string
-    height: number | string
+    language: "css" | "javascript"
-    language: "css" | "javascript"
+    value?: string
-    value: string
+    onChange: (value: string | undefined) => void
-    onChange: (value: string | undefined) => void
+}
-}
+
-
+function RichCodeEditor(props: RichCodeEditorProps) {
-function RichCodeEditor(props: RichCodeEditorProps) {
+    const colorScheme = useColorScheme()
-    const theme = useMantineTheme()
+    const editorTheme = colorScheme === "dark" ? "vs-dark" : "light"
-    const editorTheme = theme.colorScheme === "dark" ? "vs-dark" : "light"
+
-
+    const { result: Editor } = useAsync(init, [])
-    const { result: Editor } = useAsync(init, [])
+    if (!Editor) return <Loader />
-    if (!Editor) return <Loader />
+    return (
-    return (
+        <Editor
-        <Editor
+            height={props.height}
-            height={props.height}
+            defaultLanguage={props.language}
-            defaultLanguage={props.language}
+            theme={editorTheme}
-            theme={editorTheme}
+            options={{ minimap: { enabled: false } }}
-            options={{ minimap: { enabled: false } }}
+            value={props.value}
-            value={props.value}
+            onChange={props.onChange}
-            onChange={props.onChange}
+        />
-        />
+    )
-    )
+}
-}
+
-
+export default RichCodeEditor
-export default RichCodeEditor

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

@@ -0,0 +1,24 @@
+import { TypographyStylesProvider } from "@mantine/core"
+import type { ReactNode } from "react"
+import { tss } from "tss"
+
+/**
+ * This component is used to provide basic styles to html typography elements.
+ *
+ * see https://mantine.dev/core/typography-styles-provider/
+ */
+
+const useStyles = tss.create(() => ({
+    // override mantine default typography styles
+    content: {
+        paddingLeft: 0,
+        "& img": {
+            marginBottom: 0,
+        },
+    },
+}))
+
+export const BasicHtmlStyles = (props: { children: ReactNode }) => {
+    const { classes } = useStyles()
+    return <TypographyStylesProvider className={classes.content}>{props.children}</TypographyStylesProvider>
+}

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

@@ -0,0 +1,26 @@
+import { MantineProvider } from "@mantine/core"
+import { render } from "@testing-library/react"
+import { Content } from "components/content/Content"
+import { describe, expect, it } from "vitest"
+
+describe("Content component", () => {
+    it("renders basic content", () => {
+        const { container } = render(<Content content="<p>Hello World</p>" />, { wrapper: MantineProvider })
+        expect(container.querySelector("p")).toHaveTextContent("Hello World")
+    })
+
+    it("renders highlighted text when highlight prop is provided", () => {
+        const { container } = render(<Content content="Hello World" highlight="World" />, { wrapper: MantineProvider })
+        expect(container.querySelector("mark")).toHaveTextContent("World")
+    })
+
+    it("renders iframe tag when included in content", () => {
+        const { container } = render(<Content content='<iframe src="https://example.com"></iframe>' />, { wrapper: MantineProvider })
+        expect(container.querySelector("iframe")).toHaveAttribute("src", "https://example.com")
+    })
+
+    it("does not render unsupported tags", () => {
+        const { container } = render(<Content content='<script>alert("test")</script>' />, { wrapper: MantineProvider })
+        expect(container.querySelector("script")).toBeNull()
+    })
+})

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

@@ -1,101 +1,108 @@
-import { Box, createStyles, Mark, TypographyStylesProvider } from "@mantine/core"
+import { Box, Mark } from "@mantine/core"
-import { Constants } from "app/constants"
+import { Constants } from "app/constants"
-import { calculatePlaceholderSize } from "app/utils"
+import { calculatePlaceholderSize } from "app/utils"
-import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
-import escapeStringRegexp from "escape-string-regexp"
+import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
-import { ChildrenNode, Interweave, Matcher, MatchResponse, Node, TransformCallback } from "interweave"
+import escapeStringRegexp from "escape-string-regexp"
-import React from "react"
+import { ALLOWED_TAG_LIST, type ChildrenNode, Interweave, type MatchResponse, Matcher, type Node, type TransformCallback } from "interweave"
-
+import React from "react"
-export interface ContentProps {
+import styleToObject from "style-to-object"
-    content: string
+import { tss } from "tss"
-    highlight?: string
+
-}
+export interface ContentProps {
-
+    content: string
-const useStyles = createStyles(theme => ({
+    highlight?: string
-    content: {
+}
-        // break long links or long words
+
-        overflowWrap: "anywhere",
+const useStyles = tss.create(() => ({
-        "& a": {
+    content: {
-            color: theme.fn.variant({ color: theme.primaryColor, variant: "subtle" }).color,
+        // break long links or long words
-        },
+        overflowWrap: "anywhere",
-        "& iframe": {
+        "& a": {
-            maxWidth: "100%",
+            color: "inherit",
-        },
+            textDecoration: "underline",
-        "& pre, & code": {
+        },
-            whiteSpace: "pre-wrap",
+        "& iframe": {
-        },
+            maxWidth: "100%",
-    },
+        },
-}))
+        "& pre, & code": {
-
+            whiteSpace: "pre-wrap",
-const transform: TransformCallback = node => {
+        },
-    if (node.tagName === "IMG") {
+    },
-        // show placeholders for loading img tags, this allows the entry to have its final height immediately
+}))
-        const src = node.getAttribute("src") ?? undefined
+
-        if (!src) return undefined
+const transform: TransformCallback = node => {
-
+    if (node.tagName === "IMG") {
-        const alt = node.getAttribute("alt") ?? "image"
+        // show placeholders for loading img tags, this allows the entry to have its final height immediately
-        const title = node.getAttribute("title") ?? undefined
+        const src = node.getAttribute("src") ?? undefined
-        const nodeWidth = node.getAttribute("width")
+        if (!src) return undefined
-        const nodeHeight = node.getAttribute("height")
+
-        const width = nodeWidth ? parseInt(nodeWidth, 10) : undefined
+        const alt = node.getAttribute("alt") ?? "image"
-        const height = nodeHeight ? parseInt(nodeHeight, 10) : undefined
+        const title = node.getAttribute("title") ?? undefined
-        const placeholderSize = calculatePlaceholderSize({
+        const nodeWidth = node.getAttribute("width")
-            width,
+        const nodeHeight = node.getAttribute("height")
-            height,
+        const width = nodeWidth ? Number.parseInt(nodeWidth, 10) : undefined
-            maxWidth: Constants.layout.entryMaxWidth,
+        const height = nodeHeight ? Number.parseInt(nodeHeight, 10) : undefined
-        })
+        const style = styleToObject(node.getAttribute("style") ?? "") ?? undefined
-
+        const placeholderSize = calculatePlaceholderSize({
-        return (
+            width,
-            <ImageWithPlaceholderWhileLoading
+            height,
-                src={src}
+            maxWidth: Constants.layout.entryMaxWidth,
-                alt={alt}
+        })
-                title={title}
+
-                width={width}
+        return (
-                height="auto"
+            <ImageWithPlaceholderWhileLoading
-                placeholderWidth={placeholderSize.width}
+                src={src}
-                placeholderHeight={placeholderSize.height}
+                alt={alt}
-            />
+                title={title}
-        )
+                width={width}
-    }
+                height="auto"
-    return undefined
+                style={style}
-}
+                placeholderWidth={placeholderSize.width}
-
+                placeholderHeight={placeholderSize.height}
-class HighlightMatcher extends Matcher {
+            />
-    private search: string
+        )
-
+    }
-    constructor(search: string) {
+    return undefined
-        super("highlight")
+}
-        this.search = escapeStringRegexp(search)
+
-    }
+class HighlightMatcher extends Matcher {
-
+    private readonly regexp: RegExp
-    match(string: string): MatchResponse<unknown> | null {
+
-        const pattern = this.search.split(" ").join("|")
+    constructor(search: string) {
-        return this.doMatch(string, new RegExp(pattern, "i"), () => ({}))
+        super("highlight")
-    }
+        this.regexp = new RegExp(escapeStringRegexp(search).split(" ").join("|"), "i")
-
+    }
-    // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-unused-vars
+
-    replaceWith(children: ChildrenNode, props: unknown): Node {
+    match(string: string): MatchResponse<unknown> | null {
-        return <Mark>{children}</Mark>
+        return this.doMatch(string, this.regexp, () => ({}))
-    }
+    }
-
+
-    // eslint-disable-next-line class-methods-use-this
+    replaceWith(children: ChildrenNode): Node {
-    asTag(): string {
+        return <Mark key={0}>{children}</Mark>
-        return "span"
+    }
-    }
+
-}
+    asTag(): string {
-
+        return "span"
-// memoize component because Interweave is costly
+    }
-const Content = React.memo((props: ContentProps) => {
+}
-    const { classes } = useStyles()
+
-    const matchers = props.highlight ? [new HighlightMatcher(props.highlight)] : []
+// allow iframe tag
-
+const allowList = [...ALLOWED_TAG_LIST, "iframe"]
-    return (
+
-        <TypographyStylesProvider>
+// memoize component because Interweave is costly
-            <Box className={classes.content}>
+const Content = React.memo((props: ContentProps) => {
-                <Interweave content={props.content} transform={transform} matchers={matchers} />
+    const { classes } = useStyles()
-            </Box>
+    const matchers = props.highlight ? [new HighlightMatcher(props.highlight)] : []
-        </TypographyStylesProvider>
+
-    )
+    return (
-})
+        <BasicHtmlStyles>
-
+            <Box className={classes.content}>
-export { Content }
+                <Interweave content={props.content} transform={transform} matchers={matchers} allowList={allowList} />
+            </Box>
+        </BasicHtmlStyles>
+    )
+})
+Content.displayName = "Content"
+
+export { Content }

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

@@ -1,26 +1,29 @@
-import { TypographyStylesProvider } from "@mantine/core"
+import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
-import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
-
+
-export function Enclosure(props: { enclosureType: string; enclosureUrl: string }) {
+export function Enclosure(props: {
-    const hasVideo = props.enclosureType && props.enclosureType.indexOf("video") === 0
+    enclosureType: string
-    const hasAudio = props.enclosureType && props.enclosureType.indexOf("audio") === 0
+    enclosureUrl: string
-    const hasImage = props.enclosureType && props.enclosureType.indexOf("image") === 0
+}) {
-
+    const hasVideo = props.enclosureType.startsWith("video")
-    return (
+    const hasAudio = props.enclosureType.startsWith("audio")
-        <TypographyStylesProvider>
+    const hasImage = props.enclosureType.startsWith("image")
-            {hasVideo && (
+
-                // eslint-disable-next-line jsx-a11y/media-has-caption
+    return (
-                <video controls>
+        <BasicHtmlStyles>
-                    <source src={props.enclosureUrl} type={props.enclosureType} />
+            {hasVideo && (
-                </video>
+                // biome-ignore lint/a11y/useMediaCaption: we don't have any captions for videos
-            )}
+                <video controls width="100%">
-            {hasAudio && (
+                    <source src={props.enclosureUrl} type={props.enclosureType} />
-                // eslint-disable-next-line jsx-a11y/media-has-caption
+                </video>
-                <audio controls>
+            )}
-                    <source src={props.enclosureUrl} type={props.enclosureType} />
+            {hasAudio && (
-                </audio>
+                // biome-ignore lint/a11y/useMediaCaption: we don't have any captions for audio
-            )}
+                <audio controls style={{ width: "100%" }}>
-            {hasImage && <ImageWithPlaceholderWhileLoading src={props.enclosureUrl} alt="enclosure" />}
+                    <source src={props.enclosureUrl} type={props.enclosureType} />
-        </TypographyStylesProvider>
+                </audio>
-    )
+            )}
-}
+            {hasImage && <ImageWithPlaceholderWhileLoading src={props.enclosureUrl} alt="enclosure" />}
+        </BasicHtmlStyles>
+    )
+}

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

@@ -1,320 +1,313 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
-import { Box } from "@mantine/core"
+import { Box } from "@mantine/core"
-import { openModal } from "@mantine/modals"
+import { openModal } from "@mantine/modals"
-import { Constants } from "app/constants"
+import { Constants } from "app/constants"
-import {
+import type { ExpendableEntry } from "app/entries/slice"
-    ExpendableEntry,
+import {
-    loadMoreEntries,
+    loadMoreEntries,
-    markAllEntries,
+    markAllAsReadWithConfirmationIfRequired,
-    markEntry,
+    markEntry,
-    reloadEntries,
+    reloadEntries,
-    selectEntry,
+    selectEntry,
-    selectNextEntry,
+    selectNextEntry,
-    selectPreviousEntry,
+    selectPreviousEntry,
-    starEntry,
+    starEntry,
-} from "app/slices/entries"
+} from "app/entries/thunks"
-import { redirectToRootCategory } from "app/slices/redirect"
+import { redirectToRootCategory } from "app/redirect/thunks"
-import { toggleSidebar } from "app/slices/tree"
+import { useAppDispatch, useAppSelector } from "app/store"
-import { useAppDispatch, useAppSelector } from "app/store"
+import { toggleSidebar } from "app/tree/slice"
-import { KeyboardShortcutsHelp } from "components/KeyboardShortcutsHelp"
+import { selectNextUnreadTreeItem } from "app/tree/thunks"
-import { Loader } from "components/Loader"
+import { KeyboardShortcutsHelp } from "components/KeyboardShortcutsHelp"
-import { useBrowserExtension } from "hooks/useBrowserExtension"
+import { Loader } from "components/Loader"
-import { useMousetrap } from "hooks/useMousetrap"
+import { useBrowserExtension } from "hooks/useBrowserExtension"
-import { useViewMode } from "hooks/useViewMode"
+import { useMousetrap } from "hooks/useMousetrap"
-import { useEffect } from "react"
+import { useEffect } from "react"
-import { useContextMenu } from "react-contexify"
+import { useContextMenu } from "react-contexify"
-import InfiniteScroll from "react-infinite-scroller"
+import InfiniteScroll from "react-infinite-scroller"
-import { throttle } from "throttle-debounce"
+import { throttle } from "throttle-debounce"
-import { FeedEntry } from "./FeedEntry"
+import { FeedEntry } from "./FeedEntry"
-
+
-export function FeedEntries() {
+export function FeedEntries() {
-    const source = useAppSelector(state => state.entries.source)
+    const entries = useAppSelector(state => state.entries.entries)
-    const entries = useAppSelector(state => state.entries.entries)
+    const selectedEntryId = useAppSelector(state => state.entries.selectedEntryId)
-    const entriesTimestamp = useAppSelector(state => state.entries.timestamp)
+    const hasMore = useAppSelector(state => state.entries.hasMore)
-    const selectedEntryId = useAppSelector(state => state.entries.selectedEntryId)
+    const loading = useAppSelector(state => state.entries.loading)
-    const hasMore = useAppSelector(state => state.entries.hasMore)
+    const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
-    const loading = useAppSelector(state => state.entries.loading)
+    const scrollingToEntry = useAppSelector(state => state.entries.scrollingToEntry)
-    const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
+    const sidebarVisible = useAppSelector(state => state.tree.sidebarVisible)
-    const scrollingToEntry = useAppSelector(state => state.entries.scrollingToEntry)
+    const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu)
-    const sidebarVisible = useAppSelector(state => state.tree.sidebarVisible)
+    const viewMode = useAppSelector(state => state.user.localSettings.viewMode)
-    const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu)
+    const dispatch = useAppDispatch()
-    const { viewMode } = useViewMode()
+    const { openLinkInBackgroundTab } = useBrowserExtension()
-    const dispatch = useAppDispatch()
+
-    const { openLinkInBackgroundTab } = useBrowserExtension()
+    const selectedEntry = entries.find(e => e.id === selectedEntryId)
-
+
-    const selectedEntry = entries.find(e => e.id === selectedEntryId)
+    const headerClicked = (entry: ExpendableEntry, event: React.MouseEvent) => {
-
+        const middleClick = event.button === 1 || event.ctrlKey || event.metaKey
-    const headerClicked = (entry: ExpendableEntry, event: React.MouseEvent) => {
+        if (middleClick || viewMode === "expanded") {
-        const middleClick = event.button === 1 || event.ctrlKey || event.metaKey
+            dispatch(markEntry({ entry, read: true }))
-        if (middleClick || viewMode === "expanded") {
+        } else if (event.button === 0) {
-            dispatch(markEntry({ entry, read: true }))
+            // main click
-        } else if (event.button === 0) {
+            // don't trigger the link
-            // main click
+            event.preventDefault()
-            // don't trigger the link
+
-            event.preventDefault()
+            dispatch(
-
+                selectEntry({
-            dispatch(
+                    entry,
-                selectEntry({
+                    expand: !entry.expanded,
-                    entry,
+                    markAsRead: !entry.expanded,
-                    expand: !entry.expanded,
+                    scrollToEntry: true,
-                    markAsRead: !entry.expanded,
+                })
-                    scrollToEntry: true,
+            )
-                })
+        }
-            )
+    }
-        }
+
-    }
+    const contextMenu = useContextMenu()
-
+    const headerRightClicked = (entry: ExpendableEntry, event: React.MouseEvent) => {
-    const contextMenu = useContextMenu()
+        if (event.shiftKey || !customContextMenu) return
-    const headerRightClicked = (entry: ExpendableEntry, event: React.MouseEvent) => {
+
-        if (event.shiftKey || !customContextMenu) return
+        event.preventDefault()
-
+        contextMenu.show({
-        event.preventDefault()
+            id: Constants.dom.entryContextMenuId(entry),
-        contextMenu.show({
+            event,
-            id: Constants.dom.entryContextMenuId(entry),
+        })
-            event,
+    }
-        })
+
-    }
+    const bodyClicked = (entry: ExpendableEntry) => {
-
+        if (viewMode !== "expanded") return
-    const bodyClicked = (entry: ExpendableEntry) => {
+
-        if (viewMode !== "expanded") return
+        // entry is already selected
-
+        if (entry.id === selectedEntryId) return
-        // entry is already selected
+
-        if (entry.id === selectedEntryId) return
+        dispatch(
-
+            selectEntry({
-        dispatch(
+                entry,
-            selectEntry({
+                expand: true,
-                entry,
+                markAsRead: true,
-                expand: true,
+                scrollToEntry: true,
-                markAsRead: true,
+            })
-                scrollToEntry: true,
+        )
-            })
+    }
-        )
+
-    }
+    const swipedLeft = async (entry: ExpendableEntry) => await dispatch(markEntry({ entry, read: !entry.read }))
-
+
-    const swipedRight = (entry: ExpendableEntry) => dispatch(markEntry({ entry, read: !entry.read }))
+    // close context menu on scroll
-
+    useEffect(() => {
-    // close context menu on scroll
+        const listener = throttle(100, () => contextMenu.hideAll())
-    useEffect(() => {
+        window.addEventListener("scroll", listener)
-        const listener = throttle(100, () => contextMenu.hideAll())
+        return () => window.removeEventListener("scroll", listener)
-        window.addEventListener("scroll", listener)
+    }, [contextMenu])
-        return () => window.removeEventListener("scroll", listener)
+
-    }, [contextMenu])
+    useEffect(() => {
-
+        const listener = throttle(100, () => {
-    useEffect(() => {
+            if (viewMode !== "expanded") return
-        const listener = throttle(100, () => {
+            if (scrollingToEntry) return
-            if (viewMode !== "expanded") return
+
-            if (scrollingToEntry) return
+            const currentEntry = entries
-
+                // use slice to get a copy of the array because reverse mutates the array in-place
-            const currentEntry = entries
+                .slice()
-                // use slice to get a copy of the array because reverse mutates the array in-place
+                .reverse()
-                .slice()
+                .find(e => {
-                .reverse()
+                    const el = document.getElementById(Constants.dom.entryId(e))
-                .find(e => {
+                    return el && !Constants.layout.isTopVisible(el)
-                    const el = document.getElementById(Constants.dom.entryId(e))
+                })
-                    return el && !Constants.layout.isTopVisible(el)
+            if (currentEntry) {
-                })
+                dispatch(
-            if (currentEntry) {
+                    selectEntry({
-                dispatch(
+                        entry: currentEntry,
-                    selectEntry({
+                        expand: false,
-                        entry: currentEntry,
+                        markAsRead: !!scrollMarks,
-                        expand: false,
+                        scrollToEntry: false,
-                        markAsRead: !!scrollMarks,
+                    })
-                        scrollToEntry: false,
+                )
-                    })
+            }
-                )
+        })
-            }
+        window.addEventListener("scroll", listener)
-        })
+        return () => window.removeEventListener("scroll", listener)
-        window.addEventListener("scroll", listener)
+    }, [dispatch, entries, viewMode, scrollMarks, scrollingToEntry])
-        return () => window.removeEventListener("scroll", listener)
+
-    }, [dispatch, contextMenu, entries, viewMode, scrollMarks, scrollingToEntry])
+    useMousetrap("r", async () => await dispatch(reloadEntries()))
-
+    useMousetrap(
-    useMousetrap("r", () => dispatch(reloadEntries()))
+        "j",
-    useMousetrap("j", () =>
+        async () =>
-        dispatch(
+            await dispatch(
-            selectNextEntry({
+                selectNextEntry({
-                expand: true,
+                    expand: true,
-                markAsRead: true,
+                    markAsRead: true,
-                scrollToEntry: true,
+                    scrollToEntry: true,
-            })
+                })
-        )
+            )
-    )
+    )
-    useMousetrap("n", () =>
+    useMousetrap(
-        dispatch(
+        "n",
-            selectNextEntry({
+        async () =>
-                expand: false,
+            await dispatch(
-                markAsRead: false,
+                selectNextEntry({
-                scrollToEntry: true,
+                    expand: false,
-            })
+                    markAsRead: false,
-        )
+                    scrollToEntry: true,
-    )
+                })
-    useMousetrap("k", () =>
+            )
-        dispatch(
+    )
-            selectPreviousEntry({
+    useMousetrap(
-                expand: true,
+        "k",
-                markAsRead: true,
+        async () =>
-                scrollToEntry: true,
+            await dispatch(
-            })
+                selectPreviousEntry({
-        )
+                    expand: true,
-    )
+                    markAsRead: true,
-    useMousetrap("p", () =>
+                    scrollToEntry: true,
-        dispatch(
+                })
-            selectPreviousEntry({
+            )
-                expand: false,
+    )
-                markAsRead: false,
+    useMousetrap(
-                scrollToEntry: true,
+        "p",
-            })
+        async () =>
-        )
+            await dispatch(
-    )
+                selectPreviousEntry({
-    useMousetrap("space", () => {
+                    expand: false,
-        if (selectedEntry) {
+                    markAsRead: false,
-            if (selectedEntry.expanded) {
+                    scrollToEntry: true,
-                const entryElement = document.getElementById(Constants.dom.entryId(selectedEntry))
+                })
-                if (entryElement && Constants.layout.isBottomVisible(entryElement)) {
+            )
-                    dispatch(
+    )
-                        selectNextEntry({
+    useMousetrap("shift+j", async () => await dispatch(selectNextUnreadTreeItem({ direction: "forward" })))
-                            expand: true,
+    useMousetrap("shift+k", async () => await dispatch(selectNextUnreadTreeItem({ direction: "backward" })))
-                            markAsRead: true,
+    useMousetrap("space", () => {
-                            scrollToEntry: true,
+        if (selectedEntry) {
-                        })
+            if (selectedEntry.expanded) {
-                    )
+                const entryElement = document.getElementById(Constants.dom.entryId(selectedEntry))
-                } else {
+                if (entryElement && Constants.layout.isBottomVisible(entryElement)) {
-                    window.scrollTo({
+                    dispatch(
-                        top: window.scrollY + document.documentElement.clientHeight * 0.8,
+                        selectNextEntry({
-                        behavior: "smooth",
+                            expand: true,
-                    })
+                            markAsRead: true,
-                }
+                            scrollToEntry: true,
-            } else {
+                        })
-                dispatch(
+                    )
-                    selectEntry({
+                } else {
-                        entry: selectedEntry,
+                    window.scrollTo({
-                        expand: true,
+                        top: window.scrollY + document.documentElement.clientHeight * 0.8,
-                        markAsRead: true,
+                        behavior: "smooth",
-                        scrollToEntry: true,
+                    })
-                    })
+                }
-                )
+            } else {
-            }
+                dispatch(
-        } else {
+                    selectEntry({
-            dispatch(
+                        entry: selectedEntry,
-                selectNextEntry({
+                        expand: true,
-                    expand: true,
+                        markAsRead: true,
-                    markAsRead: true,
+                        scrollToEntry: true,
-                    scrollToEntry: true,
+                    })
-                })
+                )
-            )
+            }
-        }
+        } else {
-    })
+            dispatch(
-    useMousetrap("shift+space", () => {
+                selectNextEntry({
-        if (selectedEntry) {
+                    expand: true,
-            if (selectedEntry.expanded) {
+                    markAsRead: true,
-                const entryElement = document.getElementById(Constants.dom.entryId(selectedEntry))
+                    scrollToEntry: true,
-                if (entryElement && Constants.layout.isTopVisible(entryElement)) {
+                })
-                    dispatch(
+            )
-                        selectPreviousEntry({
+        }
-                            expand: true,
+    })
-                            markAsRead: true,
+    useMousetrap("shift+space", () => {
-                            scrollToEntry: true,
+        if (selectedEntry) {
-                        })
+            if (selectedEntry.expanded) {
-                    )
+                const entryElement = document.getElementById(Constants.dom.entryId(selectedEntry))
-                } else {
+                if (entryElement && Constants.layout.isTopVisible(entryElement)) {
-                    window.scrollTo({
+                    dispatch(
-                        top: window.scrollY - document.documentElement.clientHeight * 0.8,
+                        selectPreviousEntry({
-                        behavior: "smooth",
+                            expand: true,
-                    })
+                            markAsRead: true,
-                }
+                            scrollToEntry: true,
-            } else {
+                        })
-                dispatch(
+                    )
-                    selectPreviousEntry({
+                } else {
-                        expand: true,
+                    window.scrollTo({
-                        markAsRead: true,
+                        top: window.scrollY - document.documentElement.clientHeight * 0.8,
-                        scrollToEntry: true,
+                        behavior: "smooth",
-                    })
+                    })
-                )
+                }
-            }
+            } else {
-        }
+                dispatch(
-    })
+                    selectPreviousEntry({
-    useMousetrap(["o", "enter"], () => {
+                        expand: true,
-        // toggle expanded status
+                        markAsRead: true,
-        if (!selectedEntry) return
+                        scrollToEntry: true,
-        dispatch(
+                    })
-            selectEntry({
+                )
-                entry: selectedEntry,
+            }
-                expand: !selectedEntry.expanded,
+        }
-                markAsRead: !selectedEntry.expanded,
+    })
-                scrollToEntry: true,
+    useMousetrap(["o", "enter"], () => {
-            })
+        // toggle expanded status
-        )
+        if (!selectedEntry) return
-    })
+        dispatch(
-    useMousetrap("v", () => {
+            selectEntry({
-        // open tab in foreground
+                entry: selectedEntry,
-        if (!selectedEntry) return
+                expand: !selectedEntry.expanded,
-        window.open(selectedEntry.url, "_blank", "noreferrer")
+                markAsRead: !selectedEntry.expanded,
-    })
+                scrollToEntry: true,
-    useMousetrap("b", () => {
+            })
-        if (!selectedEntry) return
+        )
-        openLinkInBackgroundTab(selectedEntry.url)
+    })
-    })
+    useMousetrap("v", () => {
-    useMousetrap("m", () => {
+        // open tab in foreground
-        // toggle read status
+        if (!selectedEntry) return
-        if (!selectedEntry) return
+        window.open(selectedEntry.url, "_blank", "noreferrer")
-        dispatch(markEntry({ entry: selectedEntry, read: !selectedEntry.read }))
+    })
-    })
+    useMousetrap("b", () => {
-    useMousetrap("s", () => {
+        if (!selectedEntry) return
-        // toggle starred status
+        openLinkInBackgroundTab(selectedEntry.url)
-        if (!selectedEntry) return
+    })
-        dispatch(starEntry({ entry: selectedEntry, starred: !selectedEntry.starred }))
+    useMousetrap("m", () => {
-    })
+        // toggle read status
-    useMousetrap("shift+a", () => {
+        if (!selectedEntry) return
-        // mark all entries as read
+        dispatch(markEntry({ entry: selectedEntry, read: !selectedEntry.read }))
-        dispatch(
+    })
-            markAllEntries({
+    useMousetrap("s", () => {
-                sourceType: source.type,
+        // toggle starred status
-                req: {
+        if (!selectedEntry) return
-                    id: source.id,
+        dispatch(starEntry({ entry: selectedEntry, starred: !selectedEntry.starred }))
-                    read: true,
+    })
-                    olderThan: entriesTimestamp,
+    useMousetrap("shift+a", () => {
-                },
+        // mark all entries as read
-            })
+        dispatch(markAllAsReadWithConfirmationIfRequired())
-        )
+    })
-    })
+    useMousetrap("g a", async () => await dispatch(redirectToRootCategory()))
-    useMousetrap("g a", () => dispatch(redirectToRootCategory()))
+    useMousetrap("f", () => dispatch(toggleSidebar()))
-    useMousetrap("f", () => dispatch(toggleSidebar()))
+    useMousetrap("?", () =>
-    useMousetrap("?", () =>
+        openModal({
-        openModal({
+            title: <Trans>Keyboard shortcuts</Trans>,
-            title: <Trans>Keyboard shortcuts</Trans>,
+            size: "xl",
-            size: "xl",
+            children: <KeyboardShortcutsHelp />,
-            children: <KeyboardShortcutsHelp />,
+        })
-        })
+    )
-    )
+
-
+    return (
-    if (!entries) return <Loader />
+        <InfiniteScroll
-    return (
+            id="entries"
-        <InfiniteScroll
+            className={`cf-entries cf-view-mode-${viewMode}`}
-            id="entries"
+            initialLoad={false}
-            initialLoad={false}
+            loadMore={async () => await (!loading && dispatch(loadMoreEntries()))}
-            loadMore={() => !loading && dispatch(loadMoreEntries())}
+            hasMore={hasMore}
-            hasMore={hasMore}
+            loader={<Box key={0}>{loading && <Loader />}</Box>}
-            loader={<Box key={0}>{loading && <Loader />}</Box>}
+        >
-        >
+            {entries.map(entry => (
-            {entries.map(entry => (
+                <FeedEntry
-                <div
+                    key={entry.id}
-                    key={entry.id}
+                    entry={entry}
-                    ref={el => {
+                    expanded={!!entry.expanded || viewMode === "expanded"}
-                        if (el) el.id = Constants.dom.entryId(entry)
+                    selected={entry.id === selectedEntryId}
-                    }}
+                    showSelectionIndicator={entry.id === selectedEntryId && (!entry.expanded || viewMode === "expanded")}
-                >
+                    maxWidth={sidebarVisible ? Constants.layout.entryMaxWidth : undefined}
-                    <FeedEntry
+                    onHeaderClick={event => headerClicked(entry, event)}
-                        entry={entry}
+                    onHeaderRightClick={event => headerRightClicked(entry, event)}
-                        expanded={!!entry.expanded || viewMode === "expanded"}
+                    onBodyClick={() => bodyClicked(entry)}
-                        selected={entry.id === selectedEntryId}
+                    onSwipedLeft={async () => await swipedLeft(entry)}
-                        showSelectionIndicator={entry.id === selectedEntryId && (!entry.expanded || viewMode === "expanded")}
+                />
-                        maxWidth={sidebarVisible ? Constants.layout.entryMaxWidth : undefined}
+            ))}
-                        onHeaderClick={event => headerClicked(entry, event)}
+        </InfiniteScroll>
-                        onHeaderRightClick={event => headerRightClicked(entry, event)}
+    )
-                        onBodyClick={() => bodyClicked(entry)}
+}
-                        onSwipedRight={() => swipedRight(entry)}
-                    />
-                </div>
-            ))}
-        </InfiniteScroll>
-    )
-}

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

@@ -1,151 +1,198 @@
-import { Box, createStyles, Divider, Paper } from "@mantine/core"
+import { Box, Divider, type MantineRadius, type MantineSpacing, Paper } from "@mantine/core"
-import { MantineNumberSize } from "@mantine/styles"
+import { Constants } from "app/constants"
-import { Constants } from "app/constants"
+import { useAppSelector } from "app/store"
-import { Entry, ViewMode } from "app/types"
+import type { Entry, ViewMode } from "app/types"
-import { useViewMode } from "hooks/useViewMode"
+import { FeedEntryCompactHeader } from "components/content/header/FeedEntryCompactHeader"
-import React from "react"
+import { FeedEntryHeader } from "components/content/header/FeedEntryHeader"
-import { useSwipeable } from "react-swipeable"
+import { useMobile } from "hooks/useMobile"
-import { FeedEntryBody } from "./FeedEntryBody"
+import type React from "react"
-import { FeedEntryCompactHeader } from "./FeedEntryCompactHeader"
+import { useSwipeable } from "react-swipeable"
-import { FeedEntryContextMenu } from "./FeedEntryContextMenu"
+import { tss } from "tss"
-import { FeedEntryFooter } from "./FeedEntryFooter"
+import { FeedEntryBody } from "./FeedEntryBody"
-import { FeedEntryHeader } from "./FeedEntryHeader"
+import { FeedEntryContextMenu } from "./FeedEntryContextMenu"
-
+import { FeedEntryFooter } from "./FeedEntryFooter"
-interface FeedEntryProps {
+
-    entry: Entry
+interface FeedEntryProps {
-    expanded: boolean
+    entry: Entry
-    selected: boolean
+    expanded: boolean
-    showSelectionIndicator: boolean
+    selected: boolean
-    maxWidth?: number
+    showSelectionIndicator: boolean
-    onHeaderClick: (e: React.MouseEvent) => void
+    maxWidth?: number
-    onHeaderRightClick: (e: React.MouseEvent) => void
+    onHeaderClick: (e: React.MouseEvent) => void
-    onBodyClick: (e: React.MouseEvent) => void
+    onHeaderRightClick: (e: React.MouseEvent) => void
-    onSwipedRight: () => void
+    onBodyClick: (e: React.MouseEvent) => void
-}
+    onSwipedLeft: () => void
-
+}
-const useStyles = createStyles((theme, props: FeedEntryProps & { viewMode?: ViewMode }) => {
+
-    let backgroundColor
+const useStyles = tss
-    if (theme.colorScheme === "dark") {
+    .withParams<{
-        backgroundColor = props.entry.read ? "inherit" : theme.colors.dark[5]
+        read: boolean
-    } else {
+        expanded: boolean
-        backgroundColor = props.entry.read && !props.expanded ? theme.colors.gray[0] : "inherit"
+        viewMode: ViewMode
-    }
+        rtl: boolean
-
+        showSelectionIndicator: boolean
-    let marginY = 10
+        maxWidth?: number
-    if (props.viewMode === "title") {
+        fontSizePercentage: number
-        marginY = 2
+    }>()
-    } else if (props.viewMode === "cozy") {
+    .create(({ theme, colorScheme, read, expanded, viewMode, rtl, showSelectionIndicator, maxWidth, fontSizePercentage }) => {
-        marginY = 6
+        let backgroundColor: string
-    }
+        if (colorScheme === "dark") {
-
+            backgroundColor = read ? "inherit" : theme.colors.dark[5]
-    let mobileMarginY = 6
+        } else {
-    if (props.viewMode === "title") {
+            backgroundColor = read && !expanded ? theme.colors.gray[0] : "inherit"
-        mobileMarginY = 2
+        }
-    } else if (props.viewMode === "cozy") {
+
-        mobileMarginY = 4
+        let marginY = 10
-    }
+        if (viewMode === "title") {
-
+            marginY = 2
-    let backgroundHoverColor = backgroundColor
+        } else if (viewMode === "cozy") {
-    if (!props.expanded && !props.entry.read) {
+            marginY = 6
-        backgroundHoverColor = theme.colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[1]
+        }
-    }
+
-
+        let mobileMarginY = 6
-    let paperBorderLeftColor
+        if (viewMode === "title") {
-    if (props.showSelectionIndicator) {
+            mobileMarginY = 2
-        const borderLeftColor = theme.colorScheme === "dark" ? theme.colors.orange[4] : theme.colors.orange[6]
+        } else if (viewMode === "cozy") {
-        paperBorderLeftColor = `${borderLeftColor} !important`
+            mobileMarginY = 4
-    }
+        }
-
+
-    return {
+        let backgroundHoverColor = backgroundColor
-        paper: {
+        if (!expanded && !read) {
-            backgroundColor,
+            backgroundHoverColor = colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[1]
-            borderLeftColor: paperBorderLeftColor,
+        }
-            marginTop: marginY,
+
-            marginBottom: marginY,
+        let paperBorderLeftColor = ""
-            [theme.fn.smallerThan(Constants.layout.mobileBreakpoint)]: {
+        if (showSelectionIndicator) {
-                marginTop: mobileMarginY,
+            const borderLeftColor = colorScheme === "dark" ? theme.colors[theme.primaryColor][4] : theme.colors[theme.primaryColor][6]
-                marginBottom: mobileMarginY,
+            paperBorderLeftColor = `${borderLeftColor} !important`
-            },
+        }
-            "@media (hover: hover)": {
+
-                "&:hover": {
+        return {
-                    backgroundColor: backgroundHoverColor,
+            paper: {
-                },
+                backgroundColor,
-            },
+                borderLeftColor: paperBorderLeftColor,
-        },
+                marginTop: marginY,
-        headerLink: {
+                marginBottom: marginY,
-            color: "inherit",
+                [`@media (max-width: ${Constants.layout.mobileBreakpoint}px)`]: {
-            textDecoration: "none",
+                    marginTop: mobileMarginY,
-        },
+                    marginBottom: mobileMarginY,
-        body: {
+                },
-            direction: props.entry.rtl ? "rtl" : "ltr",
+                "@media (hover: hover)": {
-            maxWidth: props.maxWidth ?? "100%",
+                    "&:hover": {
-        },
+                        backgroundColor: backgroundHoverColor,
-    }
+                    },
-})
+                },
-
+            },
-export function FeedEntry(props: FeedEntryProps) {
+            headerLink: {
-    const { viewMode } = useViewMode()
+                fontSize: `${fontSizePercentage}%`,
-    const { classes, cx } = useStyles({ ...props, viewMode })
+                color: "inherit",
-
+                textDecoration: "none",
-    const swipeHandlers = useSwipeable({
+            },
-        onSwipedRight: props.onSwipedRight,
+            body: {
-    })
+                fontSize: `${fontSizePercentage}%`,
-
+                direction: rtl ? "rtl" : "ltr",
-    let paddingX: MantineNumberSize = "xs"
+                maxWidth: maxWidth ?? "100%",
-    if (viewMode === "title" || viewMode === "cozy") paddingX = 6
+            },
-
+        }
-    let paddingY: MantineNumberSize = "xs"
+    })
-    if (viewMode === "title") {
+
-        paddingY = 4
+export function FeedEntry(props: FeedEntryProps) {
-    } else if (viewMode === "cozy") {
+    const viewMode = useAppSelector(state => state.user.localSettings.viewMode)
-        paddingY = 8
+    const fontSizePercentage = useAppSelector(state => state.user.localSettings.fontSizePercentage)
-    }
+    const { classes, cx } = useStyles({
-
+        read: props.entry.read,
-    let borderRadius: MantineNumberSize = "sm"
+        expanded: props.expanded,
-    if (viewMode === "title") {
+        viewMode,
-        borderRadius = 0
+        rtl: props.entry.rtl,
-    } else if (viewMode === "cozy") {
+        showSelectionIndicator: props.showSelectionIndicator,
-        borderRadius = "xs"
+        maxWidth: props.maxWidth,
-    }
+        fontSizePercentage,
-
+    })
-    const compactHeader = !props.expanded && (viewMode === "title" || viewMode === "cozy")
+
-    return (
+    const externalLinkDisplayMode = useAppSelector(state => state.user.settings?.externalLinkIconDisplayMode)
-        <Paper
+    const starIconDisplayMode = useAppSelector(state => state.user.settings?.starIconDisplayMode)
-            withBorder
+    const mobile = useMobile()
-            radius={borderRadius}
+
-            className={cx(classes.paper, {
+    const showExternalLinkIcon =
-                read: props.entry.read,
+        externalLinkDisplayMode && ["always", mobile ? "on_mobile" : "on_desktop"].includes(externalLinkDisplayMode)
-                unread: !props.entry.read,
+    const showStarIcon =
-                expanded: props.expanded,
+        props.entry.markable && starIconDisplayMode && ["always", mobile ? "on_mobile" : "on_desktop"].includes(starIconDisplayMode)
-                selected: props.selected,
+
-                "show-selection-indicator": props.showSelectionIndicator,
+    const swipeHandlers = useSwipeable({
-            })}
+        onSwipedLeft: props.onSwipedLeft,
-        >
+    })
-            <a
+
-                className={classes.headerLink}
+    let paddingX: MantineSpacing = "xs"
-                href={props.entry.url}
+    if (viewMode === "title" || viewMode === "cozy") paddingX = 6
-                target="_blank"
+
-                rel="noreferrer"
+    let paddingY: MantineSpacing = "xs"
-                onClick={props.onHeaderClick}
+    if (viewMode === "title") {
-                onAuxClick={props.onHeaderClick}
+        paddingY = 4
-                onContextMenu={props.onHeaderRightClick}
+    } else if (viewMode === "cozy") {
-            >
+        paddingY = 8
-                <Box px={paddingX} py={paddingY} {...swipeHandlers}>
+    }
-                    {compactHeader && <FeedEntryCompactHeader entry={props.entry} />}
+
-                    {!compactHeader && <FeedEntryHeader entry={props.entry} expanded={props.expanded} />}
+    let borderRadius: MantineRadius = "sm"
-                </Box>
+    if (viewMode === "title") {
-            </a>
+        borderRadius = 0
-            {props.expanded && (
+    } else if (viewMode === "cozy") {
-                <Box px={paddingX} pb={paddingY} onClick={props.onBodyClick}>
+        borderRadius = "xs"
-                    <Box className={classes.body}>
+    }
-                        <FeedEntryBody entry={props.entry} />
+
-                    </Box>
+    const compactHeader = !props.expanded && (viewMode === "title" || viewMode === "cozy")
-                    <Divider variant="dashed" my={paddingY} />
+    return (
-                    <FeedEntryFooter entry={props.entry} />
+        <Paper
-                </Box>
+            component="article"
-            )}
+            id={Constants.dom.entryId(props.entry)}
-
+            data-id={props.entry.id}
-            <FeedEntryContextMenu entry={props.entry} />
+            withBorder
-        </Paper>
+            radius={borderRadius}
-    )
+            className={cx(classes.paper, {
-}
+                read: props.entry.read,
+                unread: !props.entry.read,
+                expanded: props.expanded,
+                selected: props.selected,
+                "show-selection-indicator": props.showSelectionIndicator,
+            })}
+        >
+            <a
+                className={classes.headerLink}
+                href={props.entry.url}
+                target="_blank"
+                rel="noreferrer"
+                onClick={props.onHeaderClick}
+                onAuxClick={props.onHeaderClick}
+                onContextMenu={props.onHeaderRightClick}
+            >
+                <Box px={paddingX} py={paddingY} {...swipeHandlers}>
+                    {compactHeader && (
+                        <FeedEntryCompactHeader
+                            entry={props.entry}
+                            showStarIcon={showStarIcon}
+                            showExternalLinkIcon={showExternalLinkIcon}
+                        />
+                    )}
+                    {!compactHeader && (
+                        <FeedEntryHeader
+                            entry={props.entry}
+                            expanded={props.expanded}
+                            showStarIcon={showStarIcon}
+                            showExternalLinkIcon={showExternalLinkIcon}
+                        />
+                    )}
+                </Box>
+            </a>
+            {props.expanded && (
+                <Box px={paddingX} pb={paddingY} onClick={props.onBodyClick}>
+                    <Box className={`${classes.body} cf-content`}>
+                        <FeedEntryBody entry={props.entry} />
+                    </Box>
+                    <Divider variant="dashed" my={paddingY} className="cf-footer-divider" />
+                    <FeedEntryFooter entry={props.entry} />
+                </Box>
+            )}
+
+            <FeedEntryContextMenu entry={props.entry} />
+        </Paper>
+    )
+}

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

@@ -1,37 +1,37 @@
-import { Box } from "@mantine/core"
+import { Box } from "@mantine/core"
-import { useAppSelector } from "app/store"
+import { useAppSelector } from "app/store"
-import { Entry } from "app/types"
+import type { Entry } from "app/types"
-import { Content } from "./Content"
+import { Content } from "./Content"
-import { Enclosure } from "./Enclosure"
+import { Enclosure } from "./Enclosure"
-import { Media } from "./Media"
+import { Media } from "./Media"
-
+
-export interface FeedEntryBodyProps {
+export interface FeedEntryBodyProps {
-    entry: Entry
+    entry: Entry
-}
+}
-
+
-export function FeedEntryBody(props: FeedEntryBodyProps) {
+export function FeedEntryBody(props: FeedEntryBodyProps) {
-    const search = useAppSelector(state => state.entries.search)
+    const search = useAppSelector(state => state.entries.search)
-    return (
+    return (
-        <Box>
+        <Box>
-            <Box>
+            <Box>
-                <Content content={props.entry.content} highlight={search} />
+                <Content content={props.entry.content} highlight={search} />
-            </Box>
+            </Box>
-            {props.entry.enclosureType && props.entry.enclosureUrl && (
+            {props.entry.enclosureType && props.entry.enclosureUrl && (
-                <Box pt="md">
+                <Box pt="md">
-                    <Enclosure enclosureType={props.entry.enclosureType} enclosureUrl={props.entry.enclosureUrl} />
+                    <Enclosure enclosureType={props.entry.enclosureType} enclosureUrl={props.entry.enclosureUrl} />
-                </Box>
+                </Box>
-            )}
+            )}
-            {/* show media only if we don't have content to avoid duplicate content */}
+            {/* show media only if we don't have content to avoid duplicate content */}
-            {!props.entry.content && props.entry.mediaThumbnailUrl && (
+            {!props.entry.content && props.entry.mediaThumbnailUrl && (
-                <Box pt="md">
+                <Box pt="md">
-                    <Media
+                    <Media
-                        thumbnailUrl={props.entry.mediaThumbnailUrl}
+                        thumbnailUrl={props.entry.mediaThumbnailUrl}
-                        thumbnailWidth={props.entry.mediaThumbnailWidth}
+                        thumbnailWidth={props.entry.mediaThumbnailWidth}
-                        thumbnailHeight={props.entry.mediaThumbnailHeight}
+                        thumbnailHeight={props.entry.mediaThumbnailHeight}
-                        description={props.entry.mediaDescription}
+                        description={props.entry.mediaDescription}
-                    />
+                    />
-                </Box>
+                </Box>
-            )}
+            )}
-        </Box>
+        </Box>
-    )
+    )
-}
+}

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

@@ -1,58 +0,0 @@
-import { Box, createStyles, Text } from "@mantine/core"
-import { Entry } from "app/types"
-import { RelativeDate } from "components/RelativeDate"
-import { OnDesktop } from "components/responsive/OnDesktop"
-import { FeedEntryTitle } from "./FeedEntryTitle"
-import { FeedFavicon } from "./FeedFavicon"
-
-export interface FeedEntryHeaderProps {
-    entry: Entry
-}
-
-const useStyles = createStyles((theme, props: FeedEntryHeaderProps) => ({
-    wrapper: {
-        display: "flex",
-        alignItems: "center",
-        columnGap: "10px",
-    },
-    title: {
-        flexGrow: 1,
-        fontWeight: theme.colorScheme === "light" && !props.entry.read ? "bold" : "inherit",
-        whiteSpace: "nowrap",
-        overflow: "hidden",
-        textOverflow: "ellipsis",
-    },
-    feedName: {
-        width: "145px",
-        minWidth: "145px",
-        whiteSpace: "nowrap",
-        overflow: "hidden",
-        textOverflow: "ellipsis",
-    },
-    date: {
-        whiteSpace: "nowrap",
-    },
-}))
-export function FeedEntryCompactHeader(props: FeedEntryHeaderProps) {
-    const { classes } = useStyles(props)
-    return (
-        <Box className={classes.wrapper}>
-            <Box>
-                <FeedFavicon url={props.entry.iconUrl} />
-            </Box>
-            <OnDesktop>
-                <Text color="dimmed" className={classes.feedName}>
-                    {props.entry.feedName}
-                </Text>
-            </OnDesktop>
-            <Box className={classes.title}>
-                <FeedEntryTitle entry={props.entry} />
-            </Box>
-            <OnDesktop>
-                <Text color="dimmed" className={classes.date}>
-                    <RelativeDate date={props.entry.date} />
-                </Text>
-            </OnDesktop>
-        </Box>
-    )
-}

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

@@ -1,100 +1,103 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
-import { createStyles, Group } from "@mantine/core"
+import { Group } from "@mantine/core"
-import { Constants } from "app/constants"
+import { Constants } from "app/constants"
-import { markEntriesUpToEntry, markEntry, starEntry } from "app/slices/entries"
+import { markEntriesUpToEntry, markEntry, starEntry } from "app/entries/thunks"
-import { redirectToFeed } from "app/slices/redirect"
+import { redirectToFeed } from "app/redirect/thunks"
-import { useAppDispatch, useAppSelector } from "app/store"
+import { useAppDispatch, useAppSelector } from "app/store"
-import { Entry } from "app/types"
+import type { Entry } from "app/types"
-import { truncate } from "app/utils"
+import { truncate } from "app/utils"
-import { useBrowserExtension } from "hooks/useBrowserExtension"
+import { useBrowserExtension } from "hooks/useBrowserExtension"
-import { Item, Menu, Separator } from "react-contexify"
+import { useColorScheme } from "hooks/useColorScheme"
-import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbRss, TbStar, TbStarOff } from "react-icons/tb"
+import { Item, Menu, Separator } from "react-contexify"
-
+import { TbArrowBarToDown, TbExternalLink, TbMail, TbMailOpened, TbRss, TbStar, TbStarOff } from "react-icons/tb"
-interface FeedEntryContextMenuProps {
+import { tss } from "tss"
-    entry: Entry
+
-}
+interface FeedEntryContextMenuProps {
-
+    entry: Entry
-const iconSize = 16
+}
-const useStyles = createStyles(theme => ({
+
-    menu: {
+const iconSize = 16
-        // apply mantine theme from MenuItem.styles.ts
+const useStyles = tss.create(({ theme, colorScheme }) => ({
-        fontSize: theme.fontSizes.sm,
+    menu: {
-        "--contexify-item-color": `${theme.colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
+        // apply mantine theme from MenuItem.styles.ts
-        "--contexify-activeItem-color": `${theme.colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
+        fontSize: theme.fontSizes.sm,
-        "--contexify-activeItem-bgColor": `${
+        "--contexify-item-color": `${colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
-            theme.colorScheme === "dark" ? theme.fn.rgba(theme.colors.dark[3], 0.35) : theme.colors.gray[1]
+        "--contexify-activeItem-color": `${colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
-        } !important`,
+        "--contexify-activeItem-bgColor": `${colorScheme === "dark" ? theme.colors.dark[4] : theme.colors.gray[1]} !important`,
-    },
+    },
-}))
+}))
-
+
-export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) {
+export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) {
-    const { classes, theme } = useStyles()
+    const colorScheme = useColorScheme()
-    const sourceType = useAppSelector(state => state.entries.source.type)
+    const { classes } = useStyles()
-    const dispatch = useAppDispatch()
+    const sourceType = useAppSelector(state => state.entries.source.type)
-    const { openLinkInBackgroundTab } = useBrowserExtension()
+    const dispatch = useAppDispatch()
-
+    const { openLinkInBackgroundTab } = useBrowserExtension()
-    return (
+
-        <Menu id={Constants.dom.entryContextMenuId(props.entry)} theme={theme.colorScheme} animation={false} className={classes.menu}>
+    return (
-            <Item
+        <Menu id={Constants.dom.entryContextMenuId(props.entry)} theme={colorScheme} animation={false} className={classes.menu}>
-                onClick={() => {
+            <Item
-                    window.open(props.entry.url, "_blank", "noreferrer")
+                onClick={() => {
-                    dispatch(markEntry({ entry: props.entry, read: true }))
+                    window.open(props.entry.url, "_blank", "noreferrer")
-                }}
+                    dispatch(markEntry({ entry: props.entry, read: true }))
-            >
+                }}
-                <Group>
+            >
-                    <TbExternalLink size={iconSize} />
+                <Group>
-                    <Trans>Open link in new tab</Trans>
+                    <TbExternalLink size={iconSize} />
-                </Group>
+                    <Trans>Open link in new tab</Trans>
-            </Item>
+                </Group>
-            <Item
+            </Item>
-                onClick={() => {
+            <Item
-                    openLinkInBackgroundTab(props.entry.url)
+                onClick={() => {
-                    dispatch(markEntry({ entry: props.entry, read: true }))
+                    openLinkInBackgroundTab(props.entry.url)
-                }}
+                    dispatch(markEntry({ entry: props.entry, read: true }))
-            >
+                }}
-                <Group>
+            >
-                    <TbExternalLink size={iconSize} />
+                <Group>
-                    <Trans>Open link in new background tab</Trans>
+                    <TbExternalLink size={iconSize} />
-                </Group>
+                    <Trans>Open link in new background tab</Trans>
-            </Item>
+                </Group>
-
+            </Item>
-            <Separator />
+
-
+            <Separator />
-            <Item onClick={() => dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))}>
+
-                <Group>
+            <Item onClick={async () => await dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))}>
-                    {props.entry.starred ? <TbStarOff size={iconSize} /> : <TbStar size={iconSize} />}
+                <Group>
-                    {props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
+                    {props.entry.starred ? <TbStarOff size={iconSize} /> : <TbStar size={iconSize} />}
-                </Group>
+                    {props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
-            </Item>
+                </Group>
-            <Item onClick={() => dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}>
+            </Item>
-                <Group>
+            {props.entry.markable && (
-                    {props.entry.read ? <TbEyeOff size={iconSize} /> : <TbEyeCheck size={iconSize} />}
+                <Item onClick={async () => await dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}>
-                    {props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}
+                    <Group>
-                </Group>
+                        {props.entry.read ? <TbMail size={iconSize} /> : <TbMailOpened size={iconSize} />}
-            </Item>
+                        {props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}
-            <Item onClick={() => dispatch(markEntriesUpToEntry(props.entry))}>
+                    </Group>
-                <Group>
+                </Item>
-                    <TbArrowBarToDown size={iconSize} />
+            )}
-                    <Trans>Mark as read up to here</Trans>
+            <Item onClick={async () => await dispatch(markEntriesUpToEntry(props.entry))}>
-                </Group>
+                <Group>
-            </Item>
+                    <TbArrowBarToDown size={iconSize} />
-
+                    <Trans>Mark as read up to here</Trans>
-            {sourceType === "category" && (
+                </Group>
-                <>
+            </Item>
-                    <Separator />
+
-
+            {sourceType === "category" && (
-                    <Item
+                <>
-                        onClick={() => {
+                    <Separator />
-                            dispatch(redirectToFeed(props.entry.feedId))
+
-                        }}
+                    <Item
-                    >
+                        onClick={() => {
-                        <Group>
+                            dispatch(redirectToFeed(props.entry.feedId))
-                            <TbRss size={iconSize} />
+                        }}
-                            <Trans>Go to {truncate(props.entry.feedName, 30)}</Trans>
+                    >
-                        </Group>
+                        <Group>
-                    </Item>
+                            <TbRss size={iconSize} />
-                </>
+                            <Trans>Go to {truncate(props.entry.feedName, 30)}</Trans>
-            )}
+                        </Group>
-        </Menu>
+                    </Item>
-    )
+                </>
-}
+            )}
+        </Menu>
+    )
+}

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

@@ -1,95 +1,104 @@
-import { t, Trans } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
-import { Group, Indicator, MultiSelect, Popover } from "@mantine/core"
+import { useLingui } from "@lingui/react"
-import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "app/slices/entries"
+import { Group, Indicator, Popover, TagsInput } from "@mantine/core"
-import { useAppDispatch, useAppSelector } from "app/store"
+import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "app/entries/thunks"
-import { Entry } from "app/types"
+import { useAppDispatch, useAppSelector } from "app/store"
-import { ActionButton } from "components/ActionButton"
+import type { Entry } from "app/types"
-import { useActionButton } from "hooks/useActionButton"
+import { ActionButton } from "components/ActionButton"
-import { useMobile } from "hooks/useMobile"
+import { useActionButton } from "hooks/useActionButton"
-import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbShare, TbStar, TbStarOff, TbTag } from "react-icons/tb"
+import { useMobile } from "hooks/useMobile"
-import { ShareButtons } from "./ShareButtons"
+import { TbArrowBarToDown, TbExternalLink, TbMail, TbMailOpened, TbShare, TbStar, TbStarOff, TbTag } from "react-icons/tb"
-
+import { ShareButtons } from "./ShareButtons"
-interface FeedEntryFooterProps {
+
-    entry: Entry
+interface FeedEntryFooterProps {
-}
+    entry: Entry
-
+}
-export function FeedEntryFooter(props: FeedEntryFooterProps) {
+
-    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
+export function FeedEntryFooter(props: FeedEntryFooterProps) {
-    const tags = useAppSelector(state => state.user.tags)
+    const tags = useAppSelector(state => state.user.tags)
-    const mobile = useMobile()
+    const mobile = useMobile()
-    const { spacing } = useActionButton()
+    const { spacing } = useActionButton()
-    const dispatch = useAppDispatch()
+    const dispatch = useAppDispatch()
-
+    const { _ } = useLingui()
-    const showSharingButtons = sharingSettings && Object.values(sharingSettings).some(v => v)
+
-
+    const readStatusButtonClicked = async () =>
-    const readStatusButtonClicked = () => dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))
+        await dispatch(
-    const onTagsChange = (values: string[]) =>
+            markEntry({
-        dispatch(
+                entry: props.entry,
-            tagEntry({
+                read: !props.entry.read,
-                entryId: +props.entry.id,
+            })
-                tags: values,
+        )
-            })
+    const onTagsChange = async (values: string[]) =>
-        )
+        await dispatch(
-
+            tagEntry({
-    return (
+                entryId: +props.entry.id,
-        <Group position="apart">
+                tags: values,
-            <Group spacing={spacing}>
+            })
-                {props.entry.markable && (
+        )
-                    <ActionButton
+
-                        icon={props.entry.read ? <TbEyeOff size={18} /> : <TbEyeCheck size={18} />}
+    return (
-                        label={props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}
+        <Group justify="space-between" className="cf-footer">
-                        onClick={readStatusButtonClicked}
+            <Group gap={spacing}>
-                    />
+                {props.entry.markable && (
-                )}
+                    <ActionButton
-                <ActionButton
+                        icon={props.entry.read ? <TbMail size={18} /> : <TbMailOpened size={18} />}
-                    icon={props.entry.starred ? <TbStarOff size={18} /> : <TbStar size={18} />}
+                        label={props.entry.read ? msg`Keep unread` : msg`Mark as read`}
-                    label={props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
+                        onClick={readStatusButtonClicked}
-                    onClick={() => dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))}
+                    />
-                />
+                )}
-
+                <ActionButton
-                {showSharingButtons && (
+                    icon={props.entry.starred ? <TbStarOff size={18} /> : <TbStar size={18} />}
-                    <Popover withArrow withinPortal shadow="md" closeOnClickOutside={!mobile}>
+                    label={props.entry.starred ? msg`Unstar` : msg`Star`}
-                        <Popover.Target>
+                    onClick={async () =>
-                            <ActionButton icon={<TbShare size={18} />} label={<Trans>Share</Trans>} />
+                        await dispatch(
-                        </Popover.Target>
+                            starEntry({
-                        <Popover.Dropdown>
+                                entry: props.entry,
-                            <ShareButtons url={props.entry.url} description={props.entry.title} />
+                                starred: !props.entry.starred,
-                        </Popover.Dropdown>
+                            })
-                    </Popover>
+                        )
-                )}
+                    }
-
+                />
-                {tags && (
+
-                    <Popover withArrow withinPortal shadow="md" closeOnClickOutside={!mobile}>
+                <Popover withArrow withinPortal shadow="md" closeOnClickOutside={!mobile}>
-                        <Popover.Target>
+                    <Popover.Target>
-                            <Indicator label={props.entry.tags.length} disabled={props.entry.tags.length === 0} inline size={16}>
+                        <ActionButton icon={<TbShare size={18} />} label={msg`Share`} />
-                                <ActionButton icon={<TbTag size={18} />} label={<Trans>Tags</Trans>} />
+                    </Popover.Target>
-                            </Indicator>
+                    <Popover.Dropdown>
-                        </Popover.Target>
+                        <ShareButtons url={props.entry.url} description={props.entry.title} />
-                        <Popover.Dropdown>
+                    </Popover.Dropdown>
-                            <MultiSelect
+                </Popover>
-                                data={tags}
+
-                                placeholder="Tags"
+                {tags && (
-                                searchable
+                    <Popover withArrow shadow="md" closeOnClickOutside={!mobile}>
-                                creatable
+                        <Popover.Target>
-                                autoFocus
+                            <Indicator label={props.entry.tags.length} disabled={props.entry.tags.length === 0} inline size={16}>
-                                getCreateLabel={query => t`Create tag: ${query}`}
+                                <ActionButton icon={<TbTag size={18} />} label={msg`Tags`} />
-                                value={props.entry.tags}
+                            </Indicator>
-                                onChange={onTagsChange}
+                        </Popover.Target>
-                            />
+                        <Popover.Dropdown>
-                        </Popover.Dropdown>
+                            <TagsInput
-                    </Popover>
+                                placeholder={_(msg`Tags`)}
-                )}
+                                data={tags}
-
+                                value={props.entry.tags}
-                <a href={props.entry.url} target="_blank" rel="noreferrer">
+                                onChange={onTagsChange}
-                    <ActionButton icon={<TbExternalLink size={18} />} label={<Trans>Open link</Trans>} />
+                                comboboxProps={{
-                </a>
+                                    withinPortal: false,
-            </Group>
+                                }}
-
+                            />
-            <ActionButton
+                        </Popover.Dropdown>
-                icon={<TbArrowBarToDown size={18} />}
+                    </Popover>
-                label={<Trans>Mark as read up to here</Trans>}
+                )}
-                onClick={() => dispatch(markEntriesUpToEntry(props.entry))}
+
-            />
+                <a href={props.entry.url} target="_blank" rel="noreferrer">
-        </Group>
+                    <ActionButton icon={<TbExternalLink size={18} />} label={msg`Open link`} />
-    )
+                </a>
-}
+            </Group>
+
+            <ActionButton
+                icon={<TbArrowBarToDown size={18} />}
+                label={msg`Mark as read up to here`}
+                onClick={async () => await dispatch(markEntriesUpToEntry(props.entry))}
+            />
+        </Group>
+    )
+}

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

@@ -1,49 +0,0 @@
-import { Box, createStyles, Space, Text } from "@mantine/core"
-import { Entry } from "app/types"
-import { RelativeDate } from "components/RelativeDate"
-import { FeedEntryTitle } from "./FeedEntryTitle"
-import { FeedFavicon } from "./FeedFavicon"
-
-export interface FeedEntryHeaderProps {
-    entry: Entry
-    expanded: boolean
-}
-
-const useStyles = createStyles((theme, props: FeedEntryHeaderProps) => ({
-    headerText: {
-        fontWeight: theme.colorScheme === "light" && !props.entry.read ? "bold" : "inherit",
-    },
-    headerSubtext: {
-        display: "flex",
-        alignItems: "center",
-        fontSize: "90%",
-    },
-}))
-export function FeedEntryHeader(props: FeedEntryHeaderProps) {
-    const { classes } = useStyles(props)
-    return (
-        <Box>
-            <Box className={classes.headerText}>
-                <FeedEntryTitle entry={props.entry} />
-            </Box>
-            <Box className={classes.headerSubtext}>
-                <FeedFavicon url={props.entry.iconUrl} />
-                <Space w={6} />
-                <Text color="dimmed">
-                    {props.entry.feedName}
-                    <span> · </span>
-                    <RelativeDate date={props.entry.date} />
-                </Text>
-            </Box>
-            {props.expanded && (
-                <Box className={classes.headerSubtext}>
-                    <Text color="dimmed">
-                        {props.entry.author && <span>by {props.entry.author}</span>}
-                        {props.entry.author && props.entry.categories && <span>&nbsp;·&nbsp;</span>}
-                        {props.entry.categories && <span>{props.entry.categories}</span>}
-                    </Text>
-                </Box>
-            )}
-        </Box>
-    )
-}

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

@@ -1,22 +1,21 @@
-import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
-
+
-export interface FeedFaviconProps {
+export interface FeedFaviconProps {
-    url: string
+    url: string
-    size?: number
+    size?: number
-}
+}
-
+
-export function FeedFavicon({ url, size = 18 }: FeedFaviconProps) {
+export function FeedFavicon({ url, size = 18 }: FeedFaviconProps) {
-    return (
+    return (
-        <ImageWithPlaceholderWhileLoading
+        <ImageWithPlaceholderWhileLoading
-            src={url}
+            src={url}
-            alt="feed favicon"
+            alt="feed favicon"
-            width={size}
+            width={size}
-            height={size}
+            height={size}
-            placeholderWidth={size}
+            placeholderWidth={size}
-            placeholderHeight={size}
+            placeholderHeight={size}
-            placeholderBackgroundColor="inherit"
+            placeholderBackgroundColor="inherit"
-            placeholderIconSize={size}
+            placeholderIconSize={size}
-            placeholderIconColor="inherit"
+        />
-        />
+    )
-    )
+}
-}

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

@@ -1,39 +1,40 @@
-import { Box, TypographyStylesProvider } from "@mantine/core"
+import { Box } from "@mantine/core"
-import { Constants } from "app/constants"
+import { Constants } from "app/constants"
-import { calculatePlaceholderSize } from "app/utils"
+import { calculatePlaceholderSize } from "app/utils"
-import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
-import { Content } from "./Content"
+import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
-
+import { Content } from "./Content"
-export interface MediaProps {
+
-    thumbnailUrl: string
+export interface MediaProps {
-    thumbnailWidth?: number
+    thumbnailUrl: string
-    thumbnailHeight?: number
+    thumbnailWidth?: number
-    description?: string
+    thumbnailHeight?: number
-}
+    description?: string
-
+}
-export function Media(props: MediaProps) {
+
-    const width = props.thumbnailWidth
+export function Media(props: MediaProps) {
-    const height = props.thumbnailHeight
+    const width = props.thumbnailWidth
-    const placeholderSize = calculatePlaceholderSize({
+    const height = props.thumbnailHeight
-        width,
+    const placeholderSize = calculatePlaceholderSize({
-        height,
+        width,
-        maxWidth: Constants.layout.entryMaxWidth,
+        height,
-    })
+        maxWidth: Constants.layout.entryMaxWidth,
-    return (
+    })
-        <TypographyStylesProvider>
+    return (
-            <ImageWithPlaceholderWhileLoading
+        <BasicHtmlStyles>
-                src={props.thumbnailUrl}
+            <ImageWithPlaceholderWhileLoading
-                alt="media thumbnail"
+                src={props.thumbnailUrl}
-                width={props.thumbnailWidth}
+                alt="media thumbnail"
-                height={props.thumbnailHeight}
+                width={props.thumbnailWidth}
-                placeholderWidth={placeholderSize.width}
+                height={props.thumbnailHeight}
-                placeholderHeight={placeholderSize.height}
+                placeholderWidth={placeholderSize.width}
-            />
+                placeholderHeight={placeholderSize.height}
-            {props.description && (
+            />
-                <Box pt="md">
+            {props.description && (
-                    <Content content={props.description} />
+                <Box pt="md">
-                </Box>
+                    <Content content={props.description} />
-            )}
+                </Box>
-        </TypographyStylesProvider>
+            )}
-    )
+        </BasicHtmlStyles>
-}
+    )
+}

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

@@ -1,55 +1,113 @@
-import { ActionIcon, Box, createStyles, SimpleGrid } from "@mantine/core"
+import { Trans } from "@lingui/react/macro"
-import { Constants } from "app/constants"
+import { ActionIcon, Box, CopyButton, Divider, SimpleGrid } from "@mantine/core"
-import { useAppSelector } from "app/store"
+import { Constants } from "app/constants"
-import { SharingSettings } from "app/types"
+import { useAppSelector } from "app/store"
-import { IconType } from "react-icons"
+import type { SharingSettings } from "app/types"
-
+import { useBrowserExtension } from "hooks/useBrowserExtension"
-type Color = `#${string}`
+import { useMobile } from "hooks/useMobile"
-
+import type { IconType } from "react-icons"
-const useStyles = createStyles((theme, props: { color: Color }) => ({
+import { TbCheck, TbCopy, TbDeviceDesktopShare, TbDeviceMobileShare } from "react-icons/tb"
-    socialIcon: {
+import { tss } from "tss"
-        color: props.color,
+
-        backgroundColor: theme.colorScheme === "dark" ? theme.colors.gray[2] : "white",
+type Color = `#${string}`
-        borderRadius: "50%",
+
-    },
+const useStyles = tss
-}))
+    .withParams<{
-
+        color: Color
-function ShareButton({ url, icon, color }: { url: string; icon: IconType; color: Color }) {
+    }>()
-    const { classes } = useStyles({ color })
+    .create(({ theme, colorScheme, color }) => ({
-
+        icon: {
-    const onClick = (e: React.MouseEvent) => {
+            color,
-        e.preventDefault()
+            backgroundColor: colorScheme === "dark" ? theme.colors.gray[2] : "white",
-        window.open(url, "", "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=800,height=600")
+        },
-    }
+    }))
-
+
-    return (
+function ShareButton({ icon, color, onClick }: { icon: IconType; color: Color; onClick: () => void }) {
-        <ActionIcon>
+    const { classes } = useStyles({
-            <a href={url} target="_blank" rel="noreferrer" onClick={onClick}>
+        color,
-                <Box p={6} className={classes.socialIcon}>
+    })
-                    {icon({ size: 18 })}
+
-                </Box>
+    return (
-            </a>
+        <ActionIcon variant="transparent" radius="xl" size={32}>
-        </ActionIcon>
+            <Box p={6} className={classes.icon} onClick={onClick}>
-    )
+                {icon({ size: 18 })}
-}
+            </Box>
-
+        </ActionIcon>
-export function ShareButtons(props: { url: string; description: string }) {
+    )
-    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
+}
-    const url = encodeURIComponent(props.url)
+
-    const desc = encodeURIComponent(props.description)
+function SiteShareButton({ url, icon, color }: { icon: IconType; color: Color; url: string }) {
-
+    const onClick = () => {
-    return (
+        window.open(url, "", "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=800,height=600")
-        <SimpleGrid cols={4}>
+    }
-            {(Object.keys(Constants.sharing) as Array<keyof SharingSettings>)
+
-                .filter(site => sharingSettings && sharingSettings[site])
+    return <ShareButton icon={icon} color={color} onClick={onClick} />
-                .map(site => (
+}
-                    <ShareButton
+
-                        key={site}
+function CopyUrlButton({ url }: { url: string }) {
-                        icon={Constants.sharing[site].icon}
+    return (
-                        color={Constants.sharing[site].color}
+        <CopyButton value={url}>
-                        url={Constants.sharing[site].url(url, desc)}
+            {({ copied, copy }) => <ShareButton icon={copied ? TbCheck : TbCopy} color="#000" onClick={copy} />}
-                    />
+        </CopyButton>
-                ))}
+    )
-        </SimpleGrid>
+}
-    )
+
-}
+function BrowserNativeShareButton({ url, description }: { url: string; description: string }) {
+    const mobile = useMobile()
+    const { isBrowserExtensionPopup } = useBrowserExtension()
+    const onClick = () => {
+        navigator.share({
+            title: description,
+            url,
+        })
+    }
+
+    return (
+        <ShareButton
+            icon={mobile && !isBrowserExtensionPopup ? TbDeviceMobileShare : TbDeviceDesktopShare}
+            color="#000"
+            onClick={onClick}
+        />
+    )
+}
+
+export function ShareButtons(props: { url: string; description: string }) {
+    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
+    const enabledSharingSites = (Object.keys(Constants.sharing) as Array<keyof SharingSettings>).filter(site => sharingSettings?.[site])
+    const url = encodeURIComponent(props.url)
+    const desc = encodeURIComponent(props.description)
+    const clipboardAvailable = typeof navigator.clipboard !== "undefined"
+    const nativeSharingAvailable = typeof navigator.share !== "undefined"
+    const showNativeSection = clipboardAvailable || nativeSharingAvailable
+    const showSharingSites = enabledSharingSites.length > 0
+    const showDivider = showNativeSection && showSharingSites
+    const showNoSharingOptionsAvailable = !showNativeSection && !showSharingSites
+
+    return (
+        <>
+            {showNativeSection && (
+                <SimpleGrid cols={4}>
+                    {clipboardAvailable && <CopyUrlButton url={props.url} />}
+                    {nativeSharingAvailable && <BrowserNativeShareButton url={props.url} description={props.description} />}
+                </SimpleGrid>
+            )}
+
+            {showDivider && <Divider my="xs" />}
+
+            {showSharingSites && (
+                <SimpleGrid cols={4}>
+                    {enabledSharingSites.map(site => (
+                        <SiteShareButton
+                            key={site}
+                            icon={Constants.sharing[site].icon}
+                            color={Constants.sharing[site].color}
+                            url={Constants.sharing[site].url(url, desc)}
+                        />
+                    ))}
+                </SimpleGrid>
+            )}
+
+            {showNoSharingOptionsAvailable && <Trans>No sharing options available.</Trans>}
+        </>
+    )
+}

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

@@ -1,50 +1,53 @@
-import { t, Trans } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
-import { Box, Button, Group, Stack, TextInput } from "@mantine/core"
+import { useLingui } from "@lingui/react"
-import { useForm } from "@mantine/form"
+import { Trans } from "@lingui/react/macro"
-import { client, errorToStrings } from "app/client"
+import { Box, Button, Group, Stack, TextInput } from "@mantine/core"
-import { redirectToSelectedSource } from "app/slices/redirect"
+import { useForm } from "@mantine/form"
-import { reloadTree } from "app/slices/tree"
+import { client, errorToStrings } from "app/client"
-import { useAppDispatch } from "app/store"
+import { redirectToSelectedSource } from "app/redirect/thunks"
-import { AddCategoryRequest } from "app/types"
+import { useAppDispatch } from "app/store"
-import { Alert } from "components/Alert"
+import { reloadTree } from "app/tree/thunks"
-import { useAsyncCallback } from "react-async-hook"
+import type { AddCategoryRequest } from "app/types"
-import { TbFolderPlus } from "react-icons/tb"
+import { Alert } from "components/Alert"
-import { CategorySelect } from "./CategorySelect"
+import { useAsyncCallback } from "react-async-hook"
-
+import { TbFolderPlus } from "react-icons/tb"
-export function AddCategory() {
+import { CategorySelect } from "./CategorySelect"
-    const dispatch = useAppDispatch()
+
-
+export function AddCategory() {
-    const form = useForm<AddCategoryRequest>()
+    const dispatch = useAppDispatch()
-
+    const { _ } = useLingui()
-    const addCategory = useAsyncCallback(client.category.add, {
+
-        onSuccess: () => {
+    const form = useForm<AddCategoryRequest>()
-            dispatch(reloadTree())
+
-            dispatch(redirectToSelectedSource())
+    const addCategory = useAsyncCallback(client.category.add, {
-        },
+        onSuccess: () => {
-    })
+            dispatch(reloadTree())
-
+            dispatch(redirectToSelectedSource())
-    return (
+        },
-        <>
+    })
-            {addCategory.error && (
+
-                <Box mb="md">
+    return (
-                    <Alert messages={errorToStrings(addCategory.error)} />
+        <>
-                </Box>
+            {addCategory.error && (
-            )}
+                <Box mb="md">
-
+                    <Alert messages={errorToStrings(addCategory.error)} />
-            <form onSubmit={form.onSubmit(addCategory.execute)}>
+                </Box>
-                <Stack>
+            )}
-                    <TextInput label={<Trans>Category</Trans>} placeholder={t`Category`} {...form.getInputProps("name")} required />
+
-                    <CategorySelect label={<Trans>Parent</Trans>} {...form.getInputProps("parentId")} clearable />
+            <form onSubmit={form.onSubmit(addCategory.execute)}>
-                    <Group position="center">
+                <Stack>
-                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
+                    <TextInput label={<Trans>Category</Trans>} placeholder={_(msg`Category`)} {...form.getInputProps("name")} required />
-                            <Trans>Cancel</Trans>
+                    <CategorySelect label={<Trans>Parent</Trans>} {...form.getInputProps("parentId")} clearable />
-                        </Button>
+                    <Group justify="center">
-                        <Button type="submit" leftIcon={<TbFolderPlus size={16} />} loading={addCategory.loading}>
+                        <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>
-                            <Trans>Add</Trans>
+                            <Trans>Cancel</Trans>
-                        </Button>
+                        </Button>
-                    </Group>
+                        <Button type="submit" leftSection={<TbFolderPlus size={16} />} loading={addCategory.loading}>
-                </Stack>
+                            <Trans>Add</Trans>
-            </form>
+                        </Button>
-        </>
+                    </Group>
-    )
+                </Stack>
-}
+            </form>
+        </>
+    )
+}

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

@@ -1,31 +1,55 @@
-import { t } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
-import { Select, SelectItem, SelectProps } from "@mantine/core"
+import { useLingui } from "@lingui/react"
-import { Constants } from "app/constants"
+import { Select, type SelectProps } from "@mantine/core"
-import { useAppSelector } from "app/store"
+import type { ComboboxItem } from "@mantine/core/lib/components/Combobox/Combobox.types"
-import { flattenCategoryTree } from "app/utils"
+import { Constants } from "app/constants"
-
+import { useAppSelector } from "app/store"
-type CategorySelectProps = Partial<SelectProps> & {
+import type { Category } from "app/types"
-    withAll?: boolean
+import { flattenCategoryTree } from "app/utils"
-    withoutCategoryIds?: string[]
+
-}
+type CategorySelectProps = Partial<SelectProps> & {
-
+    withAll?: boolean
-export function CategorySelect(props: CategorySelectProps) {
+    withoutCategoryIds?: string[]
-    const rootCategory = useAppSelector(state => state.tree.rootCategory)
+}
-    const categories = rootCategory && flattenCategoryTree(rootCategory)
+
-    const selectData: SelectItem[] | undefined = categories
+export function CategorySelect(props: CategorySelectProps) {
-        ?.filter(c => c.id !== Constants.categories.all.id)
+    const rootCategory = useAppSelector(state => state.tree.rootCategory)
-        .filter(c => !props.withoutCategoryIds || !props.withoutCategoryIds.includes(c.id))
+    const { _ } = useLingui()
-        .sort((c1, c2) => c1.name.localeCompare(c2.name))
+
-        .map(c => ({
+    const categories = rootCategory && flattenCategoryTree(rootCategory)
-            label: c.parentName ? t`${c.name} (in ${c.parentName})` : c.name,
+    const categoriesById = categories?.reduce((map, c) => {
-            value: c.id,
+        map.set(c.id, c)
-        }))
+        return map
-    if (props.withAll) {
+    }, new Map<string, Category>())
-        selectData?.unshift({
+    const categoryLabel = (category: Category) => {
-            label: t`All`,
+        let cat = category
-            value: Constants.categories.all.id,
+        let label = cat.name
-        })
+
-    }
+        while (cat.parentId) {
-
+            const parent = categoriesById?.get(cat.parentId)
-    return <Select {...props} data={selectData ?? []} disabled={!selectData} />
+            if (!parent) {
-}
+                break
+            }
+            label = `${parent.name} → ${label}`
+            cat = parent
+        }
+
+        return label
+    }
+    const selectData: ComboboxItem[] | undefined = categories
+        ?.filter(c => c.id !== Constants.categories.all.id)
+        .filter(c => !props.withoutCategoryIds?.includes(c.id))
+        .map(c => ({
+            label: categoryLabel(c),
+            value: c.id,
+        }))
+        .sort((c1, c2) => c1.label.localeCompare(c2.label))
+    if (props.withAll) {
+        selectData?.unshift({
+            label: _(msg`All`),
+            value: Constants.categories.all.id,
+        })
+    }
+
+    return <Select {...props} data={selectData ?? []} disabled={!selectData} />
+}

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

@@ -1,63 +1,67 @@
-import { t, Trans } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
-import { Box, Button, FileInput, Group, Stack } from "@mantine/core"
+import { useLingui } from "@lingui/react"
-import { useForm } from "@mantine/form"
+import { Trans } from "@lingui/react/macro"
-import { client, errorToStrings } from "app/client"
+import { Box, Button, FileInput, Group, Stack } from "@mantine/core"
-import { redirectToSelectedSource } from "app/slices/redirect"
+import { isNotEmpty, useForm } from "@mantine/form"
-import { reloadTree } from "app/slices/tree"
+import { client, errorToStrings } from "app/client"
-import { useAppDispatch } from "app/store"
+import { redirectToSelectedSource } from "app/redirect/thunks"
-import { Alert } from "components/Alert"
+import { useAppDispatch } from "app/store"
-import { useAsyncCallback } from "react-async-hook"
+import { reloadTree } from "app/tree/thunks"
-import { TbFileImport } from "react-icons/tb"
+import { Alert } from "components/Alert"
-
+import { useAsyncCallback } from "react-async-hook"
-export function ImportOpml() {
+import { TbFileImport } from "react-icons/tb"
-    const dispatch = useAppDispatch()
+
-
+export function ImportOpml() {
-    const form = useForm<{ file: File }>({
+    const dispatch = useAppDispatch()
-        validate: {
+    const { _ } = useLingui()
-            file: v => (v ? null : t`file is required`),
+
-        },
+    const form = useForm<{ file: File }>({
-    })
+        validate: {
-
+            file: isNotEmpty(_(msg`OPML file is required`)),
-    const importOpml = useAsyncCallback(client.feed.importOpml, {
+        },
-        onSuccess: () => {
+    })
-            dispatch(reloadTree())
+
-            dispatch(redirectToSelectedSource())
+    const importOpml = useAsyncCallback(client.feed.importOpml, {
-        },
+        onSuccess: () => {
-    })
+            dispatch(reloadTree())
-
+            dispatch(redirectToSelectedSource())
-    return (
+        },
-        <>
+    })
-            {importOpml.error && (
+
-                <Box mb="md">
+    return (
-                    <Alert messages={errorToStrings(importOpml.error)} />
+        <>
-                </Box>
+            {importOpml.error && (
-            )}
+                <Box mb="md">
-
+                    <Alert messages={errorToStrings(importOpml.error)} />
-            <form onSubmit={form.onSubmit(v => importOpml.execute(v.file))}>
+                </Box>
-                <Stack>
+            )}
-                    <FileInput
+
-                        label={<Trans>OPML file</Trans>}
+            <form onSubmit={form.onSubmit(async v => await importOpml.execute(v.file))}>
-                        placeholder={t`OPML file`}
+                <Stack>
-                        description={
+                    <FileInput
-                            <Trans>
+                        label={<Trans>OPML file</Trans>}
-                                An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your
+                        leftSection={<TbFileImport />}
-                                data from other feed reading services.
+                        placeholder={_(msg`OPML file`)}
-                            </Trans>
+                        description={
-                        }
+                            <Trans>
-                        {...form.getInputProps("file")}
+                                An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your
-                        required
+                                data from other feed reading services.
-                        accept="application/xml"
+                            </Trans>
-                    />
+                        }
-                    <Group position="center">
+                        {...form.getInputProps("file")}
-                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
+                        required
-                            <Trans>Cancel</Trans>
+                        accept=".xml,.opml"
-                        </Button>
+                    />
-                        <Button type="submit" leftIcon={<TbFileImport size={16} />} loading={importOpml.loading}>
+                    <Group justify="center">
-                            <Trans>Import</Trans>
+                        <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>
-                        </Button>
+                            <Trans>Cancel</Trans>
-                    </Group>
+                        </Button>
-                </Stack>
+                        <Button type="submit" leftSection={<TbFileImport size={16} />} loading={importOpml.loading}>
-            </form>
+                            <Trans>Import</Trans>
-        </>
+                        </Button>
-    )
+                    </Group>
-}
+                </Stack>
+            </form>
+        </>
+    )
+}

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

@@ -1,126 +1,129 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
-import { Box, Button, Group, Stack, Stepper, TextInput } from "@mantine/core"
+import { Box, Button, Group, Stack, Stepper, TextInput } from "@mantine/core"
-import { useForm } from "@mantine/form"
+import { useForm } from "@mantine/form"
-import { client, errorToStrings } from "app/client"
+import { client, errorToStrings } from "app/client"
-import { Constants } from "app/constants"
+import { Constants } from "app/constants"
-import { redirectToFeed, redirectToSelectedSource } from "app/slices/redirect"
+import { redirectToFeed, redirectToSelectedSource } from "app/redirect/thunks"
-import { reloadTree } from "app/slices/tree"
+import { useAppDispatch } from "app/store"
-import { useAppDispatch } from "app/store"
+import { reloadTree } from "app/tree/thunks"
-import { FeedInfoRequest, SubscribeRequest } from "app/types"
+import type { FeedInfoRequest, SubscribeRequest } from "app/types"
-import { Alert } from "components/Alert"
+import { Alert } from "components/Alert"
-import { useState } from "react"
+import { useState } from "react"
-import { useAsyncCallback } from "react-async-hook"
+import { useAsyncCallback } from "react-async-hook"
-import { TbRss } from "react-icons/tb"
+import { TbRss } from "react-icons/tb"
-import { CategorySelect } from "./CategorySelect"
+import { CategorySelect } from "./CategorySelect"
-
+
-export function Subscribe() {
+export function Subscribe() {
-    const [activeStep, setActiveStep] = useState(0)
+    const [activeStep, setActiveStep] = useState(0)
-    const dispatch = useAppDispatch()
+    const dispatch = useAppDispatch()
-
+
-    const step0Form = useForm<FeedInfoRequest>({
+    const step0Form = useForm<FeedInfoRequest>({
-        initialValues: {
+        initialValues: {
-            url: "",
+            url: "",
-        },
+        },
-    })
+    })
-
+
-    const step1Form = useForm<SubscribeRequest>({
+    const step1Form = useForm<SubscribeRequest>({
-        initialValues: {
+        initialValues: {
-            url: "",
+            url: "",
-            title: "",
+            title: "",
-            categoryId: Constants.categories.all.id,
+            categoryId: Constants.categories.all.id,
-        },
+        },
-    })
+    })
-
+
-    const fetchFeed = useAsyncCallback(client.feed.fetchFeed, {
+    const fetchFeed = useAsyncCallback(client.feed.fetchFeed, {
-        onSuccess: ({ data }) => {
+        onSuccess: ({ data }) => {
-            step1Form.setFieldValue("url", data.url)
+            step1Form.setFieldValue("url", data.url)
-            step1Form.setFieldValue("title", data.title)
+            step1Form.setFieldValue("title", data.title)
-            setActiveStep(step => step + 1)
+            setActiveStep(step => step + 1)
-        },
+        },
-    })
+    })
-    const subscribe = useAsyncCallback(client.feed.subscribe, {
+    const subscribe = useAsyncCallback(client.feed.subscribe, {
-        onSuccess: sub => {
+        onSuccess: async sub => {
-            dispatch(reloadTree())
+            await dispatch(reloadTree())
-            dispatch(redirectToFeed(sub.data))
+            dispatch(redirectToFeed(sub.data))
-        },
+        },
-    })
+    })
-
+
-    const previousStep = () => {
+    const previousStep = () => {
-        if (activeStep === 0) dispatch(redirectToSelectedSource())
+        if (activeStep === 0) {
-        else setActiveStep(activeStep - 1)
+            dispatch(redirectToSelectedSource())
-    }
+        } else {
-    const nextStep = (e: React.FormEvent<HTMLFormElement>) => {
+            setActiveStep(activeStep - 1)
-        if (activeStep === 0) {
+        }
-            step0Form.onSubmit(fetchFeed.execute)(e)
+    }
-        } else if (activeStep === 1) {
+    const nextStep = (e: React.FormEvent<HTMLFormElement>) => {
-            step1Form.onSubmit(subscribe.execute)(e)
+        if (activeStep === 0) {
-        }
+            step0Form.onSubmit(fetchFeed.execute)(e)
-    }
+        } else if (activeStep === 1) {
-
+            step1Form.onSubmit(subscribe.execute)(e)
-    return (
+        }
-        <>
+    }
-            {fetchFeed.error && (
+
-                <Box mb="md">
+    return (
-                    <Alert messages={errorToStrings(fetchFeed.error)} />
+        <>
-                </Box>
+            {fetchFeed.error && (
-            )}
+                <Box mb="md">
-
+                    <Alert messages={errorToStrings(fetchFeed.error)} />
-            {subscribe.error && (
+                </Box>
-                <Box mb="md">
+            )}
-                    <Alert messages={errorToStrings(subscribe.error)} />
+
-                </Box>
+            {subscribe.error && (
-            )}
+                <Box mb="md">
-
+                    <Alert messages={errorToStrings(subscribe.error)} />
-            <form onSubmit={nextStep}>
+                </Box>
-                <Stepper active={activeStep} onStepClick={setActiveStep}>
+            )}
-                    <Stepper.Step
+
-                        label={<Trans>Analyze feed</Trans>}
+            <form onSubmit={nextStep}>
-                        description={<Trans>Check that the feed is working</Trans>}
+                <Stepper active={activeStep} onStepClick={setActiveStep}>
-                        allowStepSelect={activeStep === 1}
+                    <Stepper.Step
-                    >
+                        label={<Trans>Analyze feed</Trans>}
-                        <TextInput
+                        description={<Trans>Check that the feed is working</Trans>}
-                            label={<Trans>Feed URL</Trans>}
+                        allowStepSelect={activeStep === 1}
-                            placeholder="http://www.mysite.com/rss"
+                    >
-                            description={
+                        <TextInput
-                                <Trans>
+                            label={<Trans>Feed URL</Trans>}
-                                    The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed
+                            placeholder="https://www.mysite.com/rss"
-                                    will try to find the feed in the page.
+                            description={
-                                </Trans>
+                                <Trans>
-                            }
+                                    The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed
-                            required
+                                    will try to find the feed in the page.
-                            autoFocus
+                                </Trans>
-                            {...step0Form.getInputProps("url")}
+                            }
-                        />
+                            required
-                    </Stepper.Step>
+                            autoFocus
-                    <Stepper.Step
+                            {...step0Form.getInputProps("url")}
-                        label={<Trans>Subscribe</Trans>}
+                        />
-                        description={<Trans>Subscribe to the feed</Trans>}
+                    </Stepper.Step>
-                        allowStepSelect={false}
+                    <Stepper.Step
-                    >
+                        label={<Trans>Subscribe</Trans>}
-                        <Stack>
+                        description={<Trans>Subscribe to the feed</Trans>}
-                            <TextInput label={<Trans>Feed URL</Trans>} {...step1Form.getInputProps("url")} disabled />
+                        allowStepSelect={false}
-                            <TextInput label={<Trans>Feed name</Trans>} {...step1Form.getInputProps("title")} required autoFocus />
+                    >
-                            <CategorySelect label={<Trans>Category</Trans>} {...step1Form.getInputProps("categoryId")} clearable />
+                        <Stack>
-                        </Stack>
+                            <TextInput label={<Trans>Feed URL</Trans>} {...step1Form.getInputProps("url")} disabled />
-                    </Stepper.Step>
+                            <TextInput label={<Trans>Feed name</Trans>} {...step1Form.getInputProps("title")} required autoFocus />
-                </Stepper>
+                            <CategorySelect label={<Trans>Category</Trans>} {...step1Form.getInputProps("categoryId")} clearable />
-
+                        </Stack>
-                <Group position="center" mt="xl">
+                    </Stepper.Step>
-                    <Button variant="default" onClick={previousStep}>
+                </Stepper>
-                        <Trans>Back</Trans>
+
-                    </Button>
+                <Group justify="center" mt="xl">
-                    {activeStep === 0 && (
+                    <Button variant="default" onClick={previousStep}>
-                        <Button type="submit" loading={fetchFeed.loading}>
+                        <Trans>Back</Trans>
-                            <Trans>Next</Trans>
+                    </Button>
-                        </Button>
+                    {activeStep === 0 && (
-                    )}
+                        <Button type="submit" loading={fetchFeed.loading}>
-                    {activeStep === 1 && (
+                            <Trans>Next</Trans>
-                        <Button type="submit" leftIcon={<TbRss size={16} />} loading={fetchFeed.loading || subscribe.loading}>
+                        </Button>
-                            <Trans>Subscribe</Trans>
+                    )}
-                        </Button>
+                    {activeStep === 1 && (
-                    )}
+                        <Button type="submit" leftSection={<TbRss size={16} />} loading={fetchFeed.loading || subscribe.loading}>
-                </Group>
+                            <Trans>Subscribe</Trans>
-            </form>
+                        </Button>
-        </>
+                    )}
-    )
+                </Group>
-}
+            </form>
+        </>
+    )
+}

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

@@ -0,0 +1,72 @@
+import { Box } from "@mantine/core"
+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 { OnDesktop } from "components/responsive/OnDesktop"
+import { tss } from "tss"
+import { FeedEntryTitle } from "./FeedEntryTitle"
+
+export interface FeedEntryHeaderProps {
+    entry: Entry
+    showStarIcon?: boolean
+    showExternalLinkIcon?: boolean
+}
+
+const useStyles = tss
+    .withParams<{
+        read: boolean
+    }>()
+    .create(({ colorScheme, read }) => ({
+        wrapper: {
+            display: "flex",
+            alignItems: "center",
+            columnGap: "10px",
+        },
+        title: {
+            flexGrow: 1,
+            fontWeight: colorScheme === "light" && !read ? "bold" : "inherit",
+            whiteSpace: "nowrap",
+            overflow: "hidden",
+            textOverflow: "ellipsis",
+        },
+        feedName: {
+            width: "145px",
+            minWidth: "145px",
+            whiteSpace: "nowrap",
+            overflow: "hidden",
+            textOverflow: "ellipsis",
+        },
+        date: {
+            whiteSpace: "nowrap",
+        },
+    }))
+
+export function FeedEntryCompactHeader(props: FeedEntryHeaderProps) {
+    const { classes } = useStyles({
+        read: props.entry.read,
+    })
+    return (
+        <Box className={classes.wrapper}>
+            {props.showStarIcon && <Star entry={props.entry} />}
+            <Box>
+                <FeedFavicon url={props.entry.iconUrl} />
+            </Box>
+            <OnDesktop>
+                <Box c="dimmed" className={classes.feedName}>
+                    {props.entry.feedName}
+                </Box>
+            </OnDesktop>
+            <Box className={classes.title}>
+                <FeedEntryTitle entry={props.entry} />
+            </Box>
+            <OnDesktop>
+                <Box c="dimmed" className={classes.date}>
+                    <RelativeDate date={props.entry.date} />
+                </Box>
+            </OnDesktop>
+            {props.showExternalLinkIcon && <OpenExternalLink entry={props.entry} />}
+        </Box>
+    )
+}

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

@@ -0,0 +1,62 @@
+import { Box, Flex, Space } from "@mantine/core"
+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 { tss } from "tss"
+import { FeedEntryTitle } from "./FeedEntryTitle"
+
+export interface FeedEntryHeaderProps {
+    entry: Entry
+    expanded: boolean
+    showStarIcon?: boolean
+    showExternalLinkIcon?: boolean
+}
+
+const useStyles = tss
+    .withParams<{
+        read: boolean
+    }>()
+    .create(({ colorScheme, read }) => ({
+        main: {
+            fontWeight: colorScheme === "light" && !read ? "bold" : "inherit",
+        },
+    }))
+
+export function FeedEntryHeader(props: FeedEntryHeaderProps) {
+    const { classes } = useStyles({
+        read: props.entry.read,
+    })
+    return (
+        <Box className="cf-header">
+            <Flex align="flex-start" justify="space-between" className="cf-header-title">
+                <Flex align="flex-start" className={classes.main}>
+                    {props.showStarIcon && (
+                        <Box ml={-5}>
+                            <Star entry={props.entry} />
+                        </Box>
+                    )}
+                    <FeedEntryTitle entry={props.entry} />
+                </Flex>
+                {props.showExternalLinkIcon && <OpenExternalLink entry={props.entry} />}
+            </Flex>
+            <Flex align="center" className="cf-header-subtitle">
+                <FeedFavicon url={props.entry.iconUrl} />
+                <Space w={6} />
+                <Box c="dimmed">
+                    {props.entry.feedName}
+                    <span> · </span>
+                    <RelativeDate date={props.entry.date} />
+                </Box>
+            </Flex>
+            {props.expanded && (
+                <Box className="cf-header-details">
+                    {props.entry.author && <span>by {props.entry.author}</span>}
+                    {props.entry.author && props.entry.categories && <span>&nbsp;·&nbsp;</span>}
+                    {props.entry.categories && <span>{props.entry.categories}</span>}
+                </Box>
+            )}
+        </Box>
+    )
+}

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

@@ -1,21 +1,22 @@
-import { Highlight } from "@mantine/core"
+import { Highlight } from "@mantine/core"
-import { useAppSelector } from "app/store"
+import { useAppSelector } from "app/store"
-import { Entry } from "app/types"
+import type { Entry } from "app/types"
-
+
-export interface FeedEntryTitleProps {
+export interface FeedEntryTitleProps {
-    entry: Entry
+    entry: Entry
-}
+}
-
+
-export function FeedEntryTitle(props: FeedEntryTitleProps) {
+export function FeedEntryTitle(props: FeedEntryTitleProps) {
-    const search = useAppSelector(state => state.entries.search)
+    const search = useAppSelector(state => state.entries.search)
-    const keywords = search?.split(" ")
+    const keywords = search?.split(" ")
-    return (
+    return (
-        <Highlight
+        <Highlight
-            highlight={keywords ?? ""}
+            inherit
-            // make sure ellipsis is shown when title is too long
+            highlight={keywords ?? ""}
-            span
+            // make sure ellipsis is shown when title is too long
-        >
+            span
-            {props.entry.title}
+        >
-        </Highlight>
+            {props.entry.title}
-    )
+        </Highlight>
-}
+    )
+}

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

@@ -0,0 +1,30 @@
+import { Trans } from "@lingui/react/macro"
+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 { TbExternalLink } from "react-icons/tb"
+
+export function OpenExternalLink(props: { entry: Entry }) {
+    const dispatch = useAppDispatch()
+    const onClick = (e: React.MouseEvent) => {
+        e.stopPropagation()
+        dispatch(
+            markEntry({
+                entry: props.entry,
+                read: true,
+            })
+        )
+    }
+
+    return (
+        <Anchor href={props.entry.url} target="_blank" rel="noreferrer" onClick={onClick}>
+            <Tooltip label={<Trans>Open link</Trans>} openDelay={Constants.tooltip.delay}>
+                <ActionIcon variant="transparent" c="dimmed">
+                    <TbExternalLink size={18} />
+                </ActionIcon>
+            </Tooltip>
+        </Anchor>
+    )
+}

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

@@ -0,0 +1,29 @@
+import { Trans } from "@lingui/react/macro"
+import { ActionIcon, Tooltip } from "@mantine/core"
+import { Constants } from "app/constants"
+import { starEntry } from "app/entries/thunks"
+import { useAppDispatch } from "app/store"
+import type { Entry } from "app/types"
+import { TbStar, TbStarFilled } from "react-icons/tb"
+
+export function Star(props: { entry: Entry }) {
+    const dispatch = useAppDispatch()
+    const onClick = (e: React.MouseEvent) => {
+        e.stopPropagation()
+        e.preventDefault()
+        dispatch(
+            starEntry({
+                entry: props.entry,
+                starred: !props.entry.starred,
+            })
+        )
+    }
+
+    return (
+        <Tooltip label={props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>} openDelay={Constants.tooltip.delay}>
+            <ActionIcon variant="transparent" onClick={onClick}>
+                {props.entry.starred ? <TbStarFilled size={18} /> : <TbStar size={18} />}
+            </ActionIcon>
+        </Tooltip>
+    )
+}

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

@@ -1,174 +1,178 @@
-import { t, Trans } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
-import { ActionIcon, Box, Center, Divider, Group, Indicator, Popover, TextInput } from "@mantine/core"
+import { useLingui } from "@lingui/react"
-import { useForm } from "@mantine/form"
+import { Box, Center, CloseButton, Divider, Group, Indicator, Popover, TextInput } from "@mantine/core"
-import { reloadEntries, search, selectNextEntry, selectPreviousEntry } from "app/slices/entries"
+import { useForm } from "@mantine/form"
-import { changeReadingMode, changeReadingOrder } from "app/slices/user"
+import { markAllAsReadWithConfirmationIfRequired, reloadEntries, search, selectNextEntry, selectPreviousEntry } from "app/entries/thunks"
-import { useAppDispatch, useAppSelector } from "app/store"
+import { useAppDispatch, useAppSelector } from "app/store"
-import { ActionButton } from "components/ActionButton"
+import { changeReadingMode, changeReadingOrder } from "app/user/thunks"
-import { Loader } from "components/Loader"
+import { ActionButton } from "components/ActionButton"
-import { useActionButton } from "hooks/useActionButton"
+import { Loader } from "components/Loader"
-import { useBrowserExtension } from "hooks/useBrowserExtension"
+import { useActionButton } from "hooks/useActionButton"
-import { useMobile } from "hooks/useMobile"
+import { useBrowserExtension } from "hooks/useBrowserExtension"
-import { useEffect } from "react"
+import { useMobile } from "hooks/useMobile"
-import {
+import { useEffect } from "react"
-    TbArrowDown,
+import {
-    TbArrowUp,
+    TbArrowDown,
-    TbExternalLink,
+    TbArrowUp,
-    TbEye,
+    TbChecks,
-    TbEyeOff,
+    TbExternalLink,
-    TbRefresh,
+    TbEye,
-    TbSearch,
+    TbEyeOff,
-    TbSettings,
+    TbRefresh,
-    TbSortAscending,
+    TbSearch,
-    TbSortDescending,
+    TbSettings,
-    TbUser,
+    TbSortAscending,
-    TbX,
+    TbSortDescending,
-} from "react-icons/tb"
+    TbUser,
-import { MarkAllAsReadButton } from "./MarkAllAsReadButton"
+} from "react-icons/tb"
-import { ProfileMenu } from "./ProfileMenu"
+import { ProfileMenu } from "./ProfileMenu"
-
+
-function HeaderDivider() {
+function HeaderDivider() {
-    return <Divider orientation="vertical" />
+    return <Divider orientation="vertical" />
-}
+}
-
+
-function HeaderToolbar(props: { children: React.ReactNode }) {
+function HeaderToolbar(props: { children: React.ReactNode }) {
-    const { spacing } = useActionButton()
+    const { spacing } = useActionButton()
-    const mobile = useMobile("480px")
+    const mobile = useMobile("480px")
-    return mobile ? (
+    return mobile ? (
-        // on mobile use all available width
+        // on mobile use all available width
-        <Box
+        <Box
-            sx={{
+            style={{
-                width: "100%",
+                width: "100%",
-                display: "flex",
+                display: "flex",
-                justifyContent: "space-between",
+                justifyContent: "space-between",
-            }}
+            }}
-        >
+            className="cf-toolbar"
-            {props.children}
+        >
-        </Box>
+            {props.children}
-    ) : (
+        </Box>
-        <Group spacing={spacing}>{props.children}</Group>
+    ) : (
-    )
+        <Group gap={spacing} className="cf-toolbar">
-}
+            {props.children}
-
+        </Group>
-const iconSize = 18
+    )
-
+}
-export function Header() {
+
-    const settings = useAppSelector(state => state.user.settings)
+const iconSize = 18
-    const profile = useAppSelector(state => state.user.profile)
+
-    const searchFromStore = useAppSelector(state => state.entries.search)
+export function Header() {
-    const { isBrowserExtensionPopup, openSettingsPage, openAppInNewTab } = useBrowserExtension()
+    const settings = useAppSelector(state => state.user.settings)
-    const dispatch = useAppDispatch()
+    const profile = useAppSelector(state => state.user.profile)
-
+    const searchFromStore = useAppSelector(state => state.entries.search)
-    const searchForm = useForm<{ search: string }>({
+    const { isBrowserExtensionPopup, openSettingsPage, openAppInNewTab } = useBrowserExtension()
-        validate: {
+    const dispatch = useAppDispatch()
-            search: value => (value.length > 0 && value.length < 3 ? t`Search requires at least 3 characters` : null),
+    const { _ } = useLingui()
-        },
+
-    })
+    const searchForm = useForm<{ search: string }>({
-    const { setValues } = searchForm
+        validate: {
-
+            search: value => (value.length > 0 && value.length < 3 ? _(msg`Search requires at least 3 characters`) : null),
-    useEffect(() => {
+        },
-        setValues({
+    })
-            search: searchFromStore,
+    const { setValues } = searchForm
-        })
+
-    }, [setValues, searchFromStore])
+    useEffect(() => {
-
+        setValues({
-    if (!settings) return <Loader />
+            search: searchFromStore,
-    return (
+        })
-        <Center>
+    }, [setValues, searchFromStore])
-            <HeaderToolbar>
+
-                <ActionButton
+    if (!settings) return <Loader />
-                    icon={<TbArrowDown size={iconSize} />}
+    return (
-                    label={<Trans>Next</Trans>}
+        <Center className="cf-toolbar-wrapper">
-                    onClick={() =>
+            <HeaderToolbar>
-                        dispatch(
+                <ActionButton
-                            selectNextEntry({
+                    icon={<TbArrowUp size={iconSize} />}
-                                expand: true,
+                    label={msg`Previous`}
-                                markAsRead: true,
+                    onClick={async () =>
-                                scrollToEntry: true,
+                        await dispatch(
-                            })
+                            selectPreviousEntry({
-                        )
+                                expand: true,
-                    }
+                                markAsRead: true,
-                />
+                                scrollToEntry: true,
-                <ActionButton
+                            })
-                    icon={<TbArrowUp size={iconSize} />}
+                        )
-                    label={<Trans>Previous</Trans>}
+                    }
-                    onClick={() =>
+                />
-                        dispatch(
+                <ActionButton
-                            selectPreviousEntry({
+                    icon={<TbArrowDown size={iconSize} />}
-                                expand: true,
+                    label={msg`Next`}
-                                markAsRead: true,
+                    onClick={async () =>
-                                scrollToEntry: true,
+                        await dispatch(
-                            })
+                            selectNextEntry({
-                        )
+                                expand: true,
-                    }
+                                markAsRead: true,
-                />
+                                scrollToEntry: true,
-
+                            })
-                <HeaderDivider />
+                        )
-
+                    }
-                <ActionButton
+                />
-                    icon={<TbRefresh size={iconSize} />}
+
-                    label={<Trans>Refresh</Trans>}
+                <HeaderDivider />
-                    onClick={() => dispatch(reloadEntries())}
+
-                />
+                <ActionButton
-                <MarkAllAsReadButton iconSize={iconSize} />
+                    icon={<TbRefresh size={iconSize} />}
-
+                    label={msg`Refresh`}
-                <HeaderDivider />
+                    onClick={async () => await dispatch(reloadEntries())}
-
+                />
-                <ActionButton
+                <ActionButton
-                    icon={settings.readingMode === "all" ? <TbEye size={iconSize} /> : <TbEyeOff size={iconSize} />}
+                    icon={<TbChecks size={iconSize} />}
-                    label={settings.readingMode === "all" ? <Trans>All</Trans> : <Trans>Unread</Trans>}
+                    label={msg`Mark all as read`}
-                    onClick={() => dispatch(changeReadingMode(settings.readingMode === "all" ? "unread" : "all"))}
+                    onClick={() => dispatch(markAllAsReadWithConfirmationIfRequired())}
-                />
+                />
-                <ActionButton
+
-                    icon={settings.readingOrder === "asc" ? <TbSortAscending size={iconSize} /> : <TbSortDescending size={iconSize} />}
+                <HeaderDivider />
-                    label={settings.readingOrder === "asc" ? <Trans>Asc</Trans> : <Trans>Desc</Trans>}
+
-                    onClick={() => dispatch(changeReadingOrder(settings.readingOrder === "asc" ? "desc" : "asc"))}
+                <ActionButton
-                />
+                    icon={settings.readingMode === "all" ? <TbEye size={iconSize} /> : <TbEyeOff size={iconSize} />}
-
+                    label={settings.readingMode === "all" ? msg`All` : msg`Unread`}
-                <Popover>
+                    onClick={async () => await dispatch(changeReadingMode(settings.readingMode === "all" ? "unread" : "all"))}
-                    <Popover.Target>
+                />
-                        <Indicator disabled={!searchFromStore}>
+                <ActionButton
-                            <ActionButton icon={<TbSearch size={iconSize} />} label={<Trans>Search</Trans>} />
+                    icon={settings.readingOrder === "asc" ? <TbSortAscending size={iconSize} /> : <TbSortDescending size={iconSize} />}
-                        </Indicator>
+                    label={settings.readingOrder === "asc" ? msg`Asc` : msg`Desc`}
-                    </Popover.Target>
+                    onClick={async () => await dispatch(changeReadingOrder(settings.readingOrder === "asc" ? "desc" : "asc"))}
-                    <Popover.Dropdown>
+                />
-                        <form onSubmit={searchForm.onSubmit(values => dispatch(search(values.search)))}>
+
-                            <TextInput
+                <Popover>
-                                placeholder={t`Search`}
+                    <Popover.Target>
-                                {...searchForm.getInputProps("search")}
+                        <Indicator disabled={!searchFromStore}>
-                                icon={<TbSearch size={iconSize} />}
+                            <ActionButton icon={<TbSearch size={iconSize} />} label={msg`Search`} />
-                                rightSection={
+                        </Indicator>
-                                    <ActionIcon onClick={() => searchFromStore && dispatch(search(""))}>
+                    </Popover.Target>
-                                        <TbX />
+                    <Popover.Dropdown>
-                                    </ActionIcon>
+                        <form onSubmit={searchForm.onSubmit(async values => await dispatch(search(values.search)))}>
-                                }
+                            <TextInput
-                                autoFocus
+                                placeholder={_(msg`Search`)}
-                            />
+                                {...searchForm.getInputProps("search")}
-                        </form>
+                                leftSection={<TbSearch size={iconSize} />}
-                    </Popover.Dropdown>
+                                rightSection={<CloseButton onClick={async () => await (searchFromStore && dispatch(search("")))} />}
-                </Popover>
+                                autoFocus
-
+                            />
-                <HeaderDivider />
+                        </form>
-
+                    </Popover.Dropdown>
-                <ProfileMenu control={<ActionButton icon={<TbUser size={iconSize} />} label={profile?.name} />} />
+                </Popover>
-
+
-                {isBrowserExtensionPopup && (
+                <HeaderDivider />
-                    <>
+
-                        <HeaderDivider />
+                <ProfileMenu control={<ActionButton icon={<TbUser size={iconSize} />} label={profile?.name} />} />
-
+
-                        <ActionButton
+                {isBrowserExtensionPopup && (
-                            icon={<TbSettings size={iconSize} />}
+                    <>
-                            label={<Trans>Extension options</Trans>}
+                        <HeaderDivider />
-                            onClick={() => openSettingsPage()}
+
-                        />
+                        <ActionButton
-                        <ActionButton
+                            icon={<TbSettings size={iconSize} />}
-                            icon={<TbExternalLink size={iconSize} />}
+                            label={msg`Extension options`}
-                            label={<Trans>Open CommaFeed</Trans>}
+                            onClick={() => openSettingsPage()}
-                            onClick={() => openAppInNewTab()}
+                        />
-                        />
+                        <ActionButton
-                    </>
+                            icon={<TbExternalLink size={iconSize} />}
-                )}
+                            label={msg`Open CommaFeed`}
-            </HeaderToolbar>
+                            onClick={() => openAppInNewTab()}
-        </Center>
+                        />
-    )
+                    </>
-}
+                )}
+            </HeaderToolbar>
+        </Center>
+    )
+}

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

@@ -1,95 +0,0 @@
-import { Trans } from "@lingui/macro"
-
-import { Button, Code, Group, Modal, Slider, Stack, Text } from "@mantine/core"
-import { markAllEntries } from "app/slices/entries"
-import { useAppDispatch, useAppSelector } from "app/store"
-import { ActionButton } from "components/ActionButton"
-import { useState } from "react"
-import { TbChecks } from "react-icons/tb"
-
-export function MarkAllAsReadButton(props: { iconSize: number }) {
-    const [opened, setOpened] = useState(false)
-    const [threshold, setThreshold] = useState(0)
-    const source = useAppSelector(state => state.entries.source)
-    const sourceLabel = useAppSelector(state => state.entries.sourceLabel)
-    const entriesTimestamp = useAppSelector(state => state.entries.timestamp) ?? Date.now()
-    const markAllAsReadConfirmation = useAppSelector(state => state.user.settings?.markAllAsReadConfirmation)
-    const dispatch = useAppDispatch()
-
-    const buttonClicked = () => {
-        if (markAllAsReadConfirmation) {
-            setThreshold(0)
-            setOpened(true)
-        } else {
-            dispatch(
-                markAllEntries({
-                    sourceType: source.type,
-                    req: {
-                        id: source.id,
-                        read: true,
-                        olderThan: entriesTimestamp,
-                    },
-                })
-            )
-        }
-    }
-
-    return (
-        <>
-            <Modal opened={opened} onClose={() => setOpened(false)} title={<Trans>Mark all entries as read</Trans>}>
-                <Stack>
-                    <Text size="sm">
-                        {threshold === 0 && (
-                            <Trans>
-                                Are you sure you want to mark all entries of <Code>{sourceLabel}</Code> as read?
-                            </Trans>
-                        )}
-                        {threshold > 0 && (
-                            <Trans>
-                                Are you sure you want to mark entries older than {threshold} days of <Code>{sourceLabel}</Code> as read?
-                            </Trans>
-                        )}
-                    </Text>
-                    <Slider
-                        py="xl"
-                        min={0}
-                        max={28}
-                        marks={[
-                            { value: 0, label: "0" },
-                            { value: 7, label: "7" },
-                            { value: 14, label: "14" },
-                            { value: 21, label: "21" },
-                            { value: 28, label: "28" },
-                        ]}
-                        value={threshold}
-                        onChange={setThreshold}
-                    />
-                    <Group position="right">
-                        <Button variant="default" onClick={() => setOpened(false)}>
-                            <Trans>Cancel</Trans>
-                        </Button>
-                        <Button
-                            color="red"
-                            onClick={() => {
-                                setOpened(false)
-                                dispatch(
-                                    markAllEntries({
-                                        sourceType: source.type,
-                                        req: {
-                                            id: source.id,
-                                            read: true,
-                                            olderThan: entriesTimestamp - threshold * 24 * 60 * 60 * 1000,
-                                        },
-                                    })
-                                )
-                            }}
-                        >
-                            <Trans>Confirm</Trans>
-                        </Button>
-                    </Group>
-                </Stack>
-            </Modal>
-            <ActionButton icon={<TbChecks size={props.iconSize} />} label={<Trans>Mark all as read</Trans>} onClick={buttonClicked} />
-        </>
-    )
-}

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

@@ -1,203 +1,259 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
-import { Box, Divider, Group, Menu, SegmentedControl, SegmentedControlItem, useMantineColorScheme } from "@mantine/core"
+import {
-import { showNotification } from "@mantine/notifications"
+    Box,
-import { client } from "app/client"
+    Divider,
-import { redirectToAbout, redirectToAdminUsers, redirectToDonate, redirectToMetrics, redirectToSettings } from "app/slices/redirect"
+    Group,
-import { useAppDispatch, useAppSelector } from "app/store"
+    type MantineColorScheme,
-import { ViewMode } from "app/types"
+    Menu,
-import { useViewMode } from "hooks/useViewMode"
+    SegmentedControl,
-import { useState } from "react"
+    type SegmentedControlItem,
-import {
+    Slider,
-    TbChartLine,
+    useMantineColorScheme,
-    TbHeartFilled,
+} from "@mantine/core"
-    TbHelp,
+import { showNotification } from "@mantine/notifications"
-    TbLayoutList,
+import { client } from "app/client"
-    TbList,
+import { redirectToAbout, redirectToAdminUsers, redirectToDonate, redirectToMetrics, redirectToSettings } from "app/redirect/thunks"
-    TbListDetails,
+import { useAppDispatch, useAppSelector } from "app/store"
-    TbMoon,
+import type { ViewMode } from "app/types"
-    TbNotes,
+import { setFontSizePercentage, setViewMode } from "app/user/slice"
-    TbPower,
+import { reloadProfile } from "app/user/thunks"
-    TbSettings,
+import dayjs from "dayjs"
-    TbSun,
+import { useNow } from "hooks/useNow"
-    TbUsers,
+import { type ReactNode, useState } from "react"
-    TbWorldDownload,
+import {
-} from "react-icons/tb"
+    TbChartLine,
-
+    TbHeartFilled,
-interface ProfileMenuProps {
+    TbHelp,
-    control: React.ReactElement
+    TbLayoutList,
-}
+    TbList,
-
+    TbListDetails,
-interface ViewModeControlItem extends SegmentedControlItem {
+    TbMoon,
-    value: ViewMode
+    TbNotes,
-}
+    TbPower,
-
+    TbSettings,
-const iconSize = 16
+    TbSun,
-
+    TbSunMoon,
-const viewModeData: ViewModeControlItem[] = [
+    TbUsers,
-    {
+    TbWorldDownload,
-        value: "title",
+} from "react-icons/tb"
-        label: (
+
-            <Group>
+interface ProfileMenuProps {
-                <TbList size={iconSize} />
+    control: React.ReactElement
-                <Box ml={6}>
+}
-                    <Trans>Compact</Trans>
+
-                </Box>
+const ProfileMenuControlItem = ({ icon, label }: { icon: ReactNode; label: ReactNode }) => {
-            </Group>
+    return (
-        ),
+        <Group>
-    },
+            {icon}
-    {
+            <Box ml={6}>{label}</Box>
-        value: "cozy",
+        </Group>
-        label: (
+    )
-            <Group>
+}
-                <TbLayoutList size={iconSize} />
+
-                <Box ml={6}>
+const iconSize = 16
-                    <Trans>Cozy</Trans>
+
-                </Box>
+interface ColorSchemeControlItem extends SegmentedControlItem {
-            </Group>
+    value: MantineColorScheme
-        ),
+}
-    },
+
-    {
+const colorSchemeData: ColorSchemeControlItem[] = [
-        value: "detailed",
+    {
-        label: (
+        value: "light",
-            <Group>
+        label: <ProfileMenuControlItem icon={<TbSun size={iconSize} />} label={<Trans>Light</Trans>} />,
-                <TbListDetails size={iconSize} />
+    },
-                <Box ml={6}>
+    {
-                    <Trans>Detailed</Trans>
+        value: "dark",
-                </Box>
+        label: <ProfileMenuControlItem icon={<TbMoon size={iconSize} />} label={<Trans>Dark</Trans>} />,
-            </Group>
+    },
-        ),
+    {
-    },
+        value: "auto",
-    {
+        label: <ProfileMenuControlItem icon={<TbSunMoon size={iconSize} />} label={<Trans>System</Trans>} />,
-        value: "expanded",
+    },
-        label: (
+]
-            <Group>
+
-                <TbNotes size={iconSize} />
+interface ViewModeControlItem extends SegmentedControlItem {
-                <Box ml={6}>
+    value: ViewMode
-                    <Trans>Expanded</Trans>
+}
-                </Box>
+
-            </Group>
+const viewModeData: ViewModeControlItem[] = [
-        ),
+    {
-    },
+        value: "title",
-]
+        label: <ProfileMenuControlItem icon={<TbList size={iconSize} />} label={<Trans>Compact</Trans>} />,
-
+    },
-export function ProfileMenu(props: ProfileMenuProps) {
+    {
-    const [opened, setOpened] = useState(false)
+        value: "cozy",
-    const { viewMode, setViewMode } = useViewMode()
+        label: <ProfileMenuControlItem icon={<TbLayoutList size={iconSize} />} label={<Trans>Cozy</Trans>} />,
-    const profile = useAppSelector(state => state.user.profile)
+    },
-    const admin = useAppSelector(state => state.user.profile?.admin)
+    {
-    const dispatch = useAppDispatch()
+        value: "detailed",
-    const { colorScheme, toggleColorScheme } = useMantineColorScheme()
+        label: <ProfileMenuControlItem icon={<TbListDetails size={iconSize} />} label={<Trans>Detailed</Trans>} />,
-    const dark = colorScheme === "dark"
+    },
-
+    {
-    const logout = () => {
+        value: "expanded",
-        window.location.href = "logout"
+        label: <ProfileMenuControlItem icon={<TbNotes size={iconSize} />} label={<Trans>Expanded</Trans>} />,
-    }
+    },
-
+]
-    return (
+
-        <Menu position="bottom-end" closeOnItemClick={false} opened={opened} onChange={setOpened}>
+export function ProfileMenu(props: ProfileMenuProps) {
-            <Menu.Target>{props.control}</Menu.Target>
+    const [opened, setOpened] = useState(false)
-            <Menu.Dropdown>
+    const now = useNow()
-                {profile && <Menu.Label>{profile.name}</Menu.Label>}
+    const profile = useAppSelector(state => state.user.profile)
-                <Menu.Item
+    const admin = useAppSelector(state => state.user.profile?.admin)
-                    icon={<TbSettings size={iconSize} />}
+    const viewMode = useAppSelector(state => state.user.localSettings.viewMode)
-                    onClick={() => {
+    const forceRefreshCooldownDuration = useAppSelector(state => state.server.serverInfos?.forceRefreshCooldownDuration)
-                        dispatch(redirectToSettings())
+    const fontSizePercentage = useAppSelector(state => state.user.localSettings.fontSizePercentage)
-                        setOpened(false)
+    const dispatch = useAppDispatch()
-                    }}
+    const { colorScheme, setColorScheme } = useMantineColorScheme()
-                >
+
-                    <Trans>Settings</Trans>
+    const nextAvailableForceRefresh = profile?.lastForceRefresh
-                </Menu.Item>
+        ? profile.lastForceRefresh + (forceRefreshCooldownDuration ?? 0)
-                <Menu.Item
+        : now.getTime()
-                    icon={<TbWorldDownload size={iconSize} />}
+    const forceRefreshEnabled = nextAvailableForceRefresh <= now.getTime()
-                    onClick={() =>
+
-                        client.feed.refreshAll().then(() => {
+    const logout = () => {
-                            showNotification({
+        window.location.href = "logout"
-                                message: <Trans>Your feeds have been queued for refresh.</Trans>,
+    }
-                                color: "green",
+
-                                autoClose: 1000,
+    return (
-                            })
+        <Menu position="bottom-end" closeOnItemClick={false} opened={opened} onChange={setOpened}>
-                            setOpened(false)
+            <Menu.Target>{props.control}</Menu.Target>
-                        })
+            <Menu.Dropdown>
-                    }
+                {profile && <Menu.Label>{profile.name}</Menu.Label>}
-                >
+                <Menu.Item
-                    <Trans>Fetch all my feeds now</Trans>
+                    leftSection={<TbSettings size={iconSize} />}
-                </Menu.Item>
+                    onClick={() => {
-
+                        dispatch(redirectToSettings())
-                <Divider />
+                        setOpened(false)
-
+                    }}
-                <Menu.Label>
+                >
-                    <Trans>Theme</Trans>
+                    <Trans>Settings</Trans>
-                </Menu.Label>
+                </Menu.Item>
-                <Menu.Item icon={dark ? <TbSun size={iconSize} /> : <TbMoon size={iconSize} />} onClick={() => toggleColorScheme()}>
+                <Menu.Item
-                    {dark ? <Trans>Switch to light theme</Trans> : <Trans>Switch to dark theme</Trans>}
+                    leftSection={<TbWorldDownload size={iconSize} />}
-                </Menu.Item>
+                    disabled={!forceRefreshEnabled}
-
+                    onClick={async () => {
-                <Divider />
+                        setOpened(false)
-
+
-                <Menu.Label>
+                        try {
-                    <Trans>Display</Trans>
+                            await client.feed.refreshAll()
-                </Menu.Label>
+
-                <SegmentedControl
+                            // reload profile to update last force refresh timestamp
-                    fullWidth
+                            await dispatch(reloadProfile())
-                    orientation="vertical"
+
-                    data={viewModeData}
+                            showNotification({
-                    value={viewMode}
+                                message: <Trans>Your feeds have been queued for refresh.</Trans>,
-                    onChange={e => setViewMode(e as ViewMode)}
+                                color: "green",
-                    mb="xs"
+                                autoClose: 1000,
-                />
+                            })
-
+                        } catch (_) {
-                {admin && (
+                            showNotification({
-                    <>
+                                message: <Trans>Force fetching feeds is not yet available.</Trans>,
-                        <Divider />
+                                color: "red",
-                        <Menu.Label>
+                                autoClose: 2000,
-                            <Trans>Admin</Trans>
+                            })
-                        </Menu.Label>
+                        }
-                        <Menu.Item
+                    }}
-                            icon={<TbUsers size={iconSize} />}
+                >
-                            onClick={() => {
+                    <Trans>Fetch all my feeds now</Trans>
-                                dispatch(redirectToAdminUsers())
+                    {!forceRefreshEnabled && <span> ({dayjs.duration(nextAvailableForceRefresh - now.getTime()).format("HH:mm:ss")})</span>}
-                                setOpened(false)
+                </Menu.Item>
-                            }}
+
-                        >
+                <Divider />
-                            <Trans>Manage users</Trans>
+
-                        </Menu.Item>
+                <Menu.Label>
-                        <Menu.Item
+                    <Trans>Theme</Trans>
-                            icon={<TbChartLine size={iconSize} />}
+                </Menu.Label>
-                            onClick={() => {
+                <SegmentedControl
-                                dispatch(redirectToMetrics())
+                    fullWidth
-                                setOpened(false)
+                    orientation="vertical"
-                            }}
+                    data={colorSchemeData}
-                        >
+                    value={colorScheme}
-                            <Trans>Metrics</Trans>
+                    onChange={e => setColorScheme(e as MantineColorScheme)}
-                        </Menu.Item>
+                    mb="xs"
-                    </>
+                />
-                )}
+
-
+                <Divider />
-                <Divider />
+
-
+                <Menu.Label>
-                <Menu.Item
+                    <Trans>Display</Trans>
-                    icon={<TbHeartFilled size={iconSize} color="red" />}
+                </Menu.Label>
-                    onClick={() => {
+                <SegmentedControl
-                        dispatch(redirectToDonate())
+                    fullWidth
-                        setOpened(false)
+                    orientation="vertical"
-                    }}
+                    data={viewModeData}
-                >
+                    value={viewMode}
-                    <Trans>Donate</Trans>
+                    onChange={e => dispatch(setViewMode(e as ViewMode))}
-                </Menu.Item>
+                    mb="xs"
-
+                />
-                <Menu.Item
+
-                    icon={<TbHelp size={iconSize} />}
+                <Divider />
-                    onClick={() => {
+
-                        dispatch(redirectToAbout())
+                <Menu.Label>
-                        setOpened(false)
+                    <Trans>Font size</Trans>
-                    }}
+                </Menu.Label>
-                >
+                <Slider
-                    <Trans>About</Trans>
+                    min={50}
-                </Menu.Item>
+                    max={150}
-                <Menu.Item icon={<TbPower size={iconSize} />} onClick={logout}>
+                    step={5}
-                    <Trans>Logout</Trans>
+                    marks={[{ value: 100 }]}
-                </Menu.Item>
+                    label={v => `${v}%`}
-            </Menu.Dropdown>
+                    mb="xs"
-        </Menu>
+                    value={fontSizePercentage}
-    )
+                    onChange={value => dispatch(setFontSizePercentage(value))}
-}
+                />
+
+                {admin && (
+                    <>
+                        <Divider />
+                        <Menu.Label>
+                            <Trans>Admin</Trans>
+                        </Menu.Label>
+                        <Menu.Item
+                            leftSection={<TbUsers size={iconSize} />}
+                            onClick={() => {
+                                dispatch(redirectToAdminUsers())
+                                setOpened(false)
+                            }}
+                        >
+                            <Trans>Manage users</Trans>
+                        </Menu.Item>
+                        <Menu.Item
+                            leftSection={<TbChartLine size={iconSize} />}
+                            onClick={() => {
+                                dispatch(redirectToMetrics())
+                                setOpened(false)
+                            }}
+                        >
+                            <Trans>Metrics</Trans>
+                        </Menu.Item>
+                    </>
+                )}
+
+                <Divider />
+
+                <Menu.Item
+                    leftSection={<TbHeartFilled size={iconSize} color="red" />}
+                    onClick={() => {
+                        dispatch(redirectToDonate())
+                        setOpened(false)
+                    }}
+                >
+                    <Trans>Donate</Trans>
+                </Menu.Item>
+
+                <Menu.Item
+                    leftSection={<TbHelp size={iconSize} />}
+                    onClick={() => {
+                        dispatch(redirectToAbout())
+                        setOpened(false)
+                    }}
+                >
+                    <Trans>About</Trans>
+                </Menu.Item>
+                <Menu.Item leftSection={<TbPower size={iconSize} />} onClick={logout}>
+                    <Trans>Logout</Trans>
+                </Menu.Item>
+            </Menu.Dropdown>
+        </Menu>
+    )
+}

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

@@ -1,9 +1,10 @@
-import { MetricGauge } from "app/types"
+import { NumberFormatter } from "@mantine/core"
-
+import type { MetricGauge } from "app/types"
-interface MeterProps {
+
-    gauge: MetricGauge
+interface MeterProps {
-}
+    gauge: MetricGauge
-
+}
-export function Gauge(props: MeterProps) {
+
-    return <span>{props.gauge.value}</span>
+export function Gauge(props: MeterProps) {
-}
+    return <NumberFormatter value={props.gauge.value} thousandSeparator />
+}

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

@@ -1,19 +1,19 @@
-import { Box } from "@mantine/core"
+import { Box } from "@mantine/core"
-import { MetricMeter } from "app/types"
+import type { MetricMeter } from "app/types"
-
+
-interface MeterProps {
+interface MeterProps {
-    meter: MetricMeter
+    meter: MetricMeter
-}
+}
-
+
-export function Meter(props: MeterProps) {
+export function Meter(props: MeterProps) {
-    return (
+    return (
-        <Box>
+        <Box>
-            <Box>Mean: {props.meter.mean_rate.toFixed(2)}</Box>
+            <Box>Mean: {props.meter.mean_rate.toFixed(2)}</Box>
-            <Box>Last minute: {props.meter.m1_rate.toFixed(2)}</Box>
+            <Box>Last minute: {props.meter.m1_rate.toFixed(2)}</Box>
-            <Box>Last 5 minutes: {props.meter.m5_rate.toFixed(2)}</Box>
+            <Box>Last 5 minutes: {props.meter.m5_rate.toFixed(2)}</Box>
-            <Box>Last 15 minutes: {props.meter.m15_rate.toFixed(2)}</Box>
+            <Box>Last 15 minutes: {props.meter.m15_rate.toFixed(2)}</Box>
-            <Box>Units: {props.meter.units}</Box>
+            <Box>Units: {props.meter.units}</Box>
-            <Box>Total: {props.meter.count}</Box>
+            <Box>Total: {props.meter.count}</Box>
-        </Box>
+        </Box>
-    )
+    )
-}
+}

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

@@ -1,22 +1,22 @@
-import { Accordion, Box, Group } from "@mantine/core"
+import { Accordion, Box, Group } from "@mantine/core"
-
+
-interface MetricAccordionItemProps {
+interface MetricAccordionItemProps {
-    metricKey: string
+    metricKey: string
-    name: string
+    name: string
-    headerValue: number
+    headerValue: number
-    children: React.ReactNode
+    children: React.ReactNode
-}
+}
-
+
-export function MetricAccordionItem({ metricKey, name, headerValue, children }: MetricAccordionItemProps) {
+export function MetricAccordionItem({ metricKey, name, headerValue, children }: MetricAccordionItemProps) {
-    return (
+    return (
-        <Accordion.Item value={metricKey} key={metricKey}>
+        <Accordion.Item value={metricKey} key={metricKey}>
-            <Accordion.Control>
+            <Accordion.Control>
-                <Group position="apart">
+                <Group justify="space-between">
-                    <Box>{name}</Box>
+                    <Box>{name}</Box>
-                    <Box>{headerValue}</Box>
+                    <Box>{headerValue}</Box>
-                </Group>
+                </Group>
-            </Accordion.Control>
+            </Accordion.Control>
-            <Accordion.Panel>{children}</Accordion.Panel>
+            <Accordion.Panel>{children}</Accordion.Panel>
-        </Accordion.Item>
+        </Accordion.Item>
-    )
+    )
-}
+}

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

@@ -1,19 +1,19 @@
-import { Box } from "@mantine/core"
+import { Box } from "@mantine/core"
-import { MetricTimer } from "app/types"
+import type { MetricTimer } from "app/types"
-
+
-interface MetricTimerProps {
+interface MetricTimerProps {
-    timer: MetricTimer
+    timer: MetricTimer
-}
+}
-
+
-export function Timer(props: MetricTimerProps) {
+export function Timer(props: MetricTimerProps) {
-    return (
+    return (
-        <Box>
+        <Box>
-            <Box>Mean: {props.timer.mean_rate.toFixed(2)}</Box>
+            <Box>Mean: {props.timer.mean_rate.toFixed(2)}</Box>
-            <Box>Last minute: {props.timer.m1_rate.toFixed(2)}</Box>
+            <Box>Last minute: {props.timer.m1_rate.toFixed(2)}</Box>
-            <Box>Last 5 minutes: {props.timer.m5_rate.toFixed(2)}</Box>
+            <Box>Last 5 minutes: {props.timer.m5_rate.toFixed(2)}</Box>
-            <Box>Last 15 minutes: {props.timer.m15_rate.toFixed(2)}</Box>
+            <Box>Last 15 minutes: {props.timer.m15_rate.toFixed(2)}</Box>
-            <Box>Units: {props.timer.rate_units}</Box>
+            <Box>Units: {props.timer.rate_units}</Box>
-            <Box>Total: {props.timer.count}</Box>
+            <Box>Total: {props.timer.count}</Box>
-        </Box>
+        </Box>
-    )
+    )
-}
+}

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

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

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

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

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

@@ -1,8 +1,9 @@
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
-import { Box, Button, Group, Stack } from "@mantine/core"
+import { Anchor, Box, Button, Group, Stack } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
-import { redirectToSelectedSource } from "app/slices/redirect"
+import { Constants } from "app/constants"
+import { redirectToSelectedSource } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { Alert } from "components/Alert"
 import { CodeEditor } from "components/code/CodeEditor"
@@ -57,22 +58,36 @@ export function CustomCodeSettings() {
             <form onSubmit={form.onSubmit(saveCustomCode.execute)}>
                 <Stack>
                     <CodeEditor
-                        description={<Trans>Custom CSS rules that will be applied</Trans>}
+                        label={<Trans>Custom CSS rules that will be applied</Trans>}
+                        description={
+                            <Trans>
+                                <span>See </span>
+                                <Anchor
+                                    href={Constants.customCssDocumentationUrl}
+                                    target="_blank"
+                                    rel="noreferrer"
+                                    style={{ fontSize: "inherit" }}
+                                >
+                                    here
+                                </Anchor>
+                                <span> for more information.</span>
+                            </Trans>
+                        }
                         language="css"
                         {...form.getInputProps("customCss")}
                     />
 
                     <CodeEditor
-                        description={<Trans>Custom JS code that will be executed on page load</Trans>}
+                        label={<Trans>Custom JS code that will be executed on page load</Trans>}
                         language="javascript"
                         {...form.getInputProps("customJs")}
                     />
 
                     <Group>
-                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
+                        <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>
                             <Trans>Cancel</Trans>
                         </Button>
-                        <Button type="submit" leftIcon={<TbDeviceFloppy size={16} />} loading={saveCustomCode.loading}>
+                        <Button type="submit" leftSection={<TbDeviceFloppy size={16} />} loading={saveCustomCode.loading}>
                             <Trans>Save</Trans>
                         </Button>
                     </Group>

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

@@ -1,91 +1,227 @@
-import { Trans } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
-import { Divider, Select, SimpleGrid, Stack, Switch } from "@mantine/core"
+import { useLingui } from "@lingui/react"
-import { Constants } from "app/constants"
+import { Trans } from "@lingui/react/macro"
-import {
+import { Box, Divider, Group, NumberInput, Radio, Select, type SelectProps, SimpleGrid, Stack, Switch } from "@mantine/core"
-    changeAlwaysScrollToEntry,
+import type { ComboboxData } from "@mantine/core/lib/components/Combobox/Combobox.types"
-    changeCustomContextMenu,
+import { Constants } from "app/constants"
-    changeLanguage,
+import { useAppDispatch, useAppSelector } from "app/store"
-    changeMarkAllAsReadConfirmation,
+import type { IconDisplayMode, ScrollMode, SharingSettings } from "app/types"
-    changeScrollMarks,
+import {
-    changeScrollSpeed,
+    changeCustomContextMenu,
-    changeSharingSetting,
+    changeEntriesToKeepOnTopWhenScrolling,
-    changeShowRead,
+    changeExternalLinkIconDisplayMode,
-} from "app/slices/user"
+    changeLanguage,
-import { useAppDispatch, useAppSelector } from "app/store"
+    changeMarkAllAsReadConfirmation,
-import { SharingSettings } from "app/types"
+    changeMobileFooter,
-import { locales } from "i18n"
+    changePrimaryColor,
-
+    changeScrollMarks,
-export function DisplaySettings() {
+    changeScrollMode,
-    const language = useAppSelector(state => state.user.settings?.language)
+    changeScrollSpeed,
-    const scrollSpeed = useAppSelector(state => state.user.settings?.scrollSpeed)
+    changeSharingSetting,
-    const showRead = useAppSelector(state => state.user.settings?.showRead)
+    changeShowRead,
-    const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
+    changeStarIconDisplayMode,
-    const alwaysScrollToEntry = useAppSelector(state => state.user.settings?.alwaysScrollToEntry)
+    changeUnreadCountFavicon,
-    const markAllAsReadConfirmation = useAppSelector(state => state.user.settings?.markAllAsReadConfirmation)
+    changeUnreadCountTitle,
-    const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu)
+} from "app/user/thunks"
-    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
+import { locales } from "i18n"
-    const dispatch = useAppDispatch()
+import type { ReactNode } from "react"
-
+
-    return (
+export function DisplaySettings() {
-        <Stack>
+    const language = useAppSelector(state => state.user.settings?.language)
-            <Select
+    const scrollSpeed = useAppSelector(state => state.user.settings?.scrollSpeed)
-                description={<Trans>Language</Trans>}
+    const showRead = useAppSelector(state => state.user.settings?.showRead)
-                value={language}
+    const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
-                data={locales.map(l => ({
+    const scrollMode = useAppSelector(state => state.user.settings?.scrollMode)
-                    value: l.key,
+    const entriesToKeepOnTop = useAppSelector(state => state.user.settings?.entriesToKeepOnTopWhenScrolling)
-                    label: l.label,
+    const starIconDisplayMode = useAppSelector(state => state.user.settings?.starIconDisplayMode)
-                }))}
+    const externalLinkIconDisplayMode = useAppSelector(state => state.user.settings?.externalLinkIconDisplayMode)
-                onChange={s => s && dispatch(changeLanguage(s))}
+    const markAllAsReadConfirmation = useAppSelector(state => state.user.settings?.markAllAsReadConfirmation)
-            />
+    const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu)
-
+    const mobileFooter = useAppSelector(state => state.user.settings?.mobileFooter)
-            <Switch
+    const unreadCountTitle = useAppSelector(state => state.user.settings?.unreadCountTitle)
-                label={<Trans>Scroll smoothly when navigating between entries</Trans>}
+    const unreadCountFavicon = useAppSelector(state => state.user.settings?.unreadCountFavicon)
-                checked={scrollSpeed ? scrollSpeed > 0 : false}
+    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
-                onChange={e => dispatch(changeScrollSpeed(e.currentTarget.checked))}
+    const primaryColor = useAppSelector(state => state.user.settings?.primaryColor) || Constants.theme.defaultPrimaryColor
-            />
+    const { _ } = useLingui()
-
+    const dispatch = useAppDispatch()
-            <Switch
+
-                label={<Trans>Always scroll selected entry to the top of the page, even if it fits entirely on screen</Trans>}
+    const scrollModeOptions: Record<ScrollMode, ReactNode> = {
-                checked={alwaysScrollToEntry}
+        always: <Trans>Always</Trans>,
-                onChange={e => dispatch(changeAlwaysScrollToEntry(e.currentTarget.checked))}
+        never: <Trans>Never</Trans>,
-            />
+        if_needed: <Trans>If the entry doesn't entirely fit on the screen</Trans>,
-
+    }
-            <Switch
+
-                label={<Trans>Show feeds and categories with no unread entries</Trans>}
+    const displayModeData: ComboboxData = [
-                checked={showRead}
+        {
-                onChange={e => dispatch(changeShowRead(e.currentTarget.checked))}
+            value: "always",
-            />
+            label: _(msg`Always`),
-
+        },
-            <Switch
+        {
-                label={<Trans>In expanded view, scrolling through entries mark them as read</Trans>}
+            value: "on_desktop",
-                checked={scrollMarks}
+            label: _(msg`On desktop`),
-                onChange={e => dispatch(changeScrollMarks(e.currentTarget.checked))}
+        },
-            />
+        {
-
+            value: "on_mobile",
-            <Switch
+            label: _(msg`On mobile`),
-                label={<Trans>Show confirmation when marking all entries as read</Trans>}
+        },
-                checked={markAllAsReadConfirmation}
+        {
-                onChange={e => dispatch(changeMarkAllAsReadConfirmation(e.currentTarget.checked))}
+            value: "never",
-            />
+            label: _(msg`Never`),
-
+        },
-            <Switch
+    ]
-                label={<Trans>Show CommaFeed's own context menu on right click</Trans>}
+
-                checked={customContextMenu}
+    const colorData: ComboboxData = [
-                onChange={e => dispatch(changeCustomContextMenu(e.currentTarget.checked))}
+        { value: "dark", label: _(msg`Dark`) },
-            />
+        { value: "gray", label: _(msg`Gray`) },
-
+        { value: "red", label: _(msg`Red`) },
-            <Divider label={<Trans>Sharing sites</Trans>} labelPosition="center" />
+        { value: "pink", label: _(msg`Pink`) },
-
+        { value: "grape", label: _(msg`Grape`) },
-            <SimpleGrid cols={2}>
+        { value: "violet", label: _(msg`Violet`) },
-                {(Object.keys(Constants.sharing) as Array<keyof SharingSettings>).map(site => (
+        { value: "indigo", label: _(msg`Indigo`) },
-                    <Switch
+        { value: "blue", label: _(msg`Blue`) },
-                        key={site}
+        { value: "cyan", label: _(msg`Cyan`) },
-                        label={Constants.sharing[site].label}
+        { value: "green", label: _(msg`Green`) },
-                        checked={sharingSettings && sharingSettings[site]}
+        { value: "lime", label: _(msg`Lime`) },
-                        onChange={e => dispatch(changeSharingSetting({ site, value: e.currentTarget.checked }))}
+        { value: "yellow", label: _(msg`Yellow`) },
-                    />
+        { value: "orange", label: _(msg`Orange`) },
-                ))}
+        { value: "teal", label: _(msg`Teal`) },
-            </SimpleGrid>
+    ].sort((a, b) => a.label.localeCompare(b.label))
-        </Stack>
+    const colorRenderer: SelectProps["renderOption"] = ({ option }) => (
-    )
+        <Group>
-}
+            <Box h={18} w={18} bg={option.value} />
+            <Box>{option.label}</Box>
+        </Group>
+    )
+
+    return (
+        <Stack>
+            <Divider label={<Trans>Display</Trans>} labelPosition="center" />
+
+            <Select
+                label={<Trans>Language</Trans>}
+                value={language}
+                data={locales.map(l => ({
+                    value: l.key,
+                    label: l.label,
+                }))}
+                onChange={async s => await (s && dispatch(changeLanguage(s)))}
+            />
+
+            <Select
+                label={<Trans>Primary color</Trans>}
+                data={colorData}
+                value={primaryColor}
+                onChange={async value => value && (await dispatch(changePrimaryColor(value)))}
+                renderOption={colorRenderer}
+            />
+
+            <Switch
+                label={<Trans>Show feeds and categories with no unread entries</Trans>}
+                checked={showRead}
+                onChange={async e => await dispatch(changeShowRead(e.currentTarget.checked))}
+            />
+
+            <Switch
+                label={<Trans>Show confirmation when marking all entries as read</Trans>}
+                checked={markAllAsReadConfirmation}
+                onChange={async e => await dispatch(changeMarkAllAsReadConfirmation(e.currentTarget.checked))}
+            />
+
+            <Switch
+                label={<Trans>On mobile, show action buttons at the bottom of the screen</Trans>}
+                checked={mobileFooter}
+                onChange={async e => await dispatch(changeMobileFooter(e.currentTarget.checked))}
+            />
+
+            <Divider label={<Trans>Browser tab</Trans>} labelPosition="center" />
+
+            <Switch
+                label={<Trans>Show unread count in tab title</Trans>}
+                checked={unreadCountTitle}
+                onChange={async e => await dispatch(changeUnreadCountTitle(e.currentTarget.checked))}
+            />
+
+            <Switch
+                label={<Trans>Show unread count in tab favicon</Trans>}
+                checked={unreadCountFavicon}
+                onChange={async e => await dispatch(changeUnreadCountFavicon(e.currentTarget.checked))}
+            />
+
+            <Divider label={<Trans>Entry headers</Trans>} labelPosition="center" />
+
+            <Select
+                label={<Trans>Show star icon</Trans>}
+                value={starIconDisplayMode}
+                data={displayModeData}
+                onChange={async s => await dispatch(changeStarIconDisplayMode(s as IconDisplayMode))}
+            />
+
+            <Select
+                label={<Trans>Show external link icon</Trans>}
+                value={externalLinkIconDisplayMode}
+                data={displayModeData}
+                onChange={async s => await dispatch(changeExternalLinkIconDisplayMode(s as IconDisplayMode))}
+            />
+
+            <Switch
+                label={<Trans>Show CommaFeed's own context menu on right click</Trans>}
+                checked={customContextMenu}
+                onChange={async e => await dispatch(changeCustomContextMenu(e.currentTarget.checked))}
+            />
+
+            <Divider label={<Trans>Scrolling</Trans>} labelPosition="center" />
+
+            <Radio.Group
+                label={<Trans>Scroll selected entry to the top of the page</Trans>}
+                value={scrollMode}
+                onChange={async value => await dispatch(changeScrollMode(value as ScrollMode))}
+            >
+                <Group mt="xs">
+                    {Object.entries(scrollModeOptions).map(e => (
+                        <Radio key={e[0]} value={e[0]} label={e[1]} />
+                    ))}
+                </Group>
+            </Radio.Group>
+
+            <NumberInput
+                label={<Trans>Entries to keep above the selected entry when scrolling</Trans>}
+                description={<Trans>Only applies to compact, cozy and detailed modes</Trans>}
+                min={0}
+                value={entriesToKeepOnTop}
+                onChange={async value => await dispatch(changeEntriesToKeepOnTopWhenScrolling(+value))}
+            />
+
+            <Switch
+                label={<Trans>Scroll smoothly when navigating between entries</Trans>}
+                checked={scrollSpeed ? scrollSpeed > 0 : false}
+                onChange={async e => await dispatch(changeScrollSpeed(e.currentTarget.checked))}
+            />
+
+            <Switch
+                label={<Trans>In expanded view, scrolling through entries mark them as read</Trans>}
+                checked={scrollMarks}
+                onChange={async e => await dispatch(changeScrollMarks(e.currentTarget.checked))}
+            />
+
+            <Divider label={<Trans>Sharing sites</Trans>} labelPosition="center" />
+
+            <SimpleGrid cols={2}>
+                {(Object.keys(Constants.sharing) as Array<keyof SharingSettings>).map(site => (
+                    <Switch
+                        key={site}
+                        label={Constants.sharing[site].label}
+                        checked={sharingSettings?.[site]}
+                        onChange={async e =>
+                            await dispatch(
+                                changeSharingSetting({
+                                    site,
+                                    value: e.currentTarget.checked,
+                                })
+                            )
+                        }
+                    />
+                ))}
+            </SimpleGrid>
+        </Stack>
+    )
+}

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

@@ -1,152 +1,165 @@
-import { t, Trans } from "@lingui/macro"
+import { msg } from "@lingui/core/macro"
-import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
+import { useLingui } from "@lingui/react"
-import { useForm } from "@mantine/form"
+import { Trans } from "@lingui/react/macro"
-import { openConfirmModal } from "@mantine/modals"
+import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
-import { client, errorToStrings } from "app/client"
+import { useForm } from "@mantine/form"
-import { redirectToLogin, redirectToSelectedSource } from "app/slices/redirect"
+import { openConfirmModal } from "@mantine/modals"
-import { reloadProfile } from "app/slices/user"
+import { client, errorToStrings } from "app/client"
-import { useAppDispatch, useAppSelector } from "app/store"
+import { redirectToLogin, redirectToSelectedSource } from "app/redirect/thunks"
-import { ProfileModificationRequest } from "app/types"
+import { useAppDispatch, useAppSelector } from "app/store"
-import { Alert } from "components/Alert"
+import type { ProfileModificationRequest } from "app/types"
-import { useEffect } from "react"
+import { reloadProfile } from "app/user/thunks"
-import { useAsyncCallback } from "react-async-hook"
+import { Alert } from "components/Alert"
-import { TbDeviceFloppy, TbTrash } from "react-icons/tb"
+import { useEffect } from "react"
-
+import { useAsyncCallback } from "react-async-hook"
-interface FormData extends ProfileModificationRequest {
+import { TbDeviceFloppy, TbTrash } from "react-icons/tb"
-    newPasswordConfirmation?: string
+
-}
+interface FormData extends ProfileModificationRequest {
-
+    newPasswordConfirmation?: string
-export function ProfileSettings() {
+}
-    const profile = useAppSelector(state => state.user.profile)
+
-    const dispatch = useAppDispatch()
+export function ProfileSettings() {
-
+    const profile = useAppSelector(state => state.user.profile)
-    const form = useForm<FormData>({
+    const dispatch = useAppDispatch()
-        validate: {
+    const { _ } = useLingui()
-            newPasswordConfirmation: (value, values) => (value !== values.newPassword ? t`Passwords do not match` : null),
+
-        },
+    const form = useForm<FormData>({
-    })
+        validate: {
-    const { setValues } = form
+            newPasswordConfirmation: (value, values) => (value !== values.newPassword ? _(msg`Passwords do not match`) : null),
-
+        },
-    const saveProfile = useAsyncCallback(client.user.saveProfile, {
+    })
-        onSuccess: () => {
+    const { setValues } = form
-            dispatch(reloadProfile())
+
-            dispatch(redirectToSelectedSource())
+    const saveProfile = useAsyncCallback(client.user.saveProfile, {
-        },
+        onSuccess: () => {
-    })
+            dispatch(reloadProfile())
-    const deleteProfile = useAsyncCallback(client.user.deleteProfile, {
+            dispatch(redirectToSelectedSource())
-        onSuccess: () => {
+        },
-            dispatch(redirectToLogin())
+    })
-        },
+    const deleteProfile = useAsyncCallback(client.user.deleteProfile, {
-    })
+        onSuccess: () => {
-
+            dispatch(redirectToLogin())
-    const openDeleteProfileModal = () =>
+        },
-        openConfirmModal({
+    })
-            title: <Trans>Delete account</Trans>,
+
-            children: (
+    const openDeleteProfileModal = () =>
-                <Text size="sm">
+        openConfirmModal({
-                    <Trans>Are you sure you want to delete your account? There's no turning back!</Trans>
+            title: <Trans>Delete account</Trans>,
-                </Text>
+            children: (
-            ),
+                <Text size="sm">
-            labels: { confirm: <Trans>Confirm</Trans>, cancel: <Trans>Cancel</Trans> },
+                    <Trans>Are you sure you want to delete your account? There's no turning back!</Trans>
-            confirmProps: { color: "red" },
+                </Text>
-            onConfirm: () => deleteProfile.execute(),
+            ),
-        })
+            labels: { confirm: <Trans>Confirm</Trans>, cancel: <Trans>Cancel</Trans> },
-
+            confirmProps: { color: "red" },
-    useEffect(() => {
+            onConfirm: async () => await deleteProfile.execute(),
-        if (!profile) return
+        })
-        setValues({
+
-            currentPassword: "",
+    useEffect(() => {
-            email: profile.email ?? "",
+        if (!profile) return
-            newApiKey: false,
+        setValues({
-        })
+            currentPassword: "",
-    }, [setValues, profile])
+            email: profile.email ?? "",
-
+            newApiKey: false,
-    return (
+        })
-        <>
+    }, [setValues, profile])
-            {saveProfile.error && (
+
-                <Box mb="md">
+    return (
-                    <Alert messages={errorToStrings(saveProfile.error)} />
+        <>
-                </Box>
+            {saveProfile.error && (
-            )}
+                <Box mb="md">
-
+                    <Alert messages={errorToStrings(saveProfile.error)} />
-            {deleteProfile.error && (
+                </Box>
-                <Box mb="md">
+            )}
-                    <Alert messages={errorToStrings(deleteProfile.error)} />
+
-                </Box>
+            {deleteProfile.error && (
-            )}
+                <Box mb="md">
-
+                    <Alert messages={errorToStrings(deleteProfile.error)} />
-            <form onSubmit={form.onSubmit(saveProfile.execute)}>
+                </Box>
-                <Stack>
+            )}
-                    <TextInput label={<Trans>User name</Trans>} readOnly value={profile?.name} />
+
-                    <TextInput label={<Trans>API key</Trans>} readOnly value={profile?.apiKey} />
+            <form onSubmit={form.onSubmit(saveProfile.execute)}>
-
+                <Stack>
-                    <Input.Wrapper
+                    <TextInput label={<Trans>User name</Trans>} readOnly value={profile?.name} />
-                        label={<Trans>OPML export</Trans>}
+                    <TextInput
-                        description={
+                        label={<Trans>API key</Trans>}
-                            <Trans>
+                        description={
-                                Export your subscriptions and categories as an OPML file that can be imported in other feed reading services
+                            <Trans>
-                            </Trans>
+                                This is your API key. It can be used for some read-only API operations and grants access to the Fever API.
-                        }
+                                Use the form at the bottom of the page to generate a new API key
-                    >
+                            </Trans>
-                        <Box>
+                        }
-                            <Anchor href="rest/feed/export" download="commafeed_opml.xml">
+                        readOnly
-                                <Trans>Download</Trans>
+                        value={profile?.apiKey}
-                            </Anchor>
+                    />
-                        </Box>
+
-                    </Input.Wrapper>
+                    <Input.Wrapper
-
+                        label={<Trans>OPML export</Trans>}
-                    <Input.Wrapper
+                        description={
-                        label={<Trans>Fever API</Trans>}
+                            <Trans>
-                        description={
+                                Export your subscriptions and categories as an OPML file that can be imported in other feed reading services
-                            <Trans>
+                            </Trans>
-                                CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client.
+                        }
-                                The username is your user name and the password is your API key.
+                    >
-                            </Trans>
+                        <Box>
-                        }
+                            <Anchor href="rest/feed/export" download="commafeed.opml">
-                    >
+                                <Trans>Download</Trans>
-                        <Box>
+                            </Anchor>
-                            <Anchor href={`rest/fever/user/${profile?.id}`} target="_blank">
+                        </Box>
-                                <Trans>Fever API URL</Trans>
+                    </Input.Wrapper>
-                            </Anchor>
+
-                        </Box>
+                    <Input.Wrapper
-                    </Input.Wrapper>
+                        label={<Trans>Fever API</Trans>}
-
+                        description={
-                    <Divider />
+                            <Trans>
-
+                                CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client.
-                    <PasswordInput
+                                Login with your username and your <u>API key</u>.
-                        label={<Trans>Current password</Trans>}
+                            </Trans>
-                        description={<Trans>Enter your current password to change profile settings</Trans>}
+                        }
-                        required
+                    >
-                        {...form.getInputProps("currentPassword")}
+                        <Box>
-                    />
+                            <Anchor href={`rest/fever/user/${profile?.id}`} target="_blank">
-                    <TextInput type="email" label={<Trans>E-mail</Trans>} {...form.getInputProps("email")} required />
+                                <Trans>Fever API URL</Trans>
-                    <PasswordInput
+                            </Anchor>
-                        label={<Trans>New password</Trans>}
+                        </Box>
-                        description={<Trans>Changing password will generate a new API key</Trans>}
+                    </Input.Wrapper>
-                        {...form.getInputProps("newPassword")}
+
-                    />
+                    <Divider />
-                    <PasswordInput label={<Trans>Confirm password</Trans>} {...form.getInputProps("newPasswordConfirmation")} />
+
-                    <Checkbox label={<Trans>Generate new API key</Trans>} {...form.getInputProps("newApiKey", { type: "checkbox" })} />
+                    <PasswordInput
-
+                        label={<Trans>Current password</Trans>}
-                    <Group>
+                        description={<Trans>Enter your current password to change profile settings</Trans>}
-                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
+                        required
-                            <Trans>Cancel</Trans>
+                        {...form.getInputProps("currentPassword")}
-                        </Button>
+                    />
-                        <Button type="submit" leftIcon={<TbDeviceFloppy size={16} />} loading={saveProfile.loading}>
+                    <TextInput type="email" label={<Trans>E-mail</Trans>} {...form.getInputProps("email")} required />
-                            <Trans>Save</Trans>
+                    <PasswordInput
-                        </Button>
+                        label={<Trans>New password</Trans>}
-                        <Divider orientation="vertical" />
+                        description={<Trans>Changing password will generate a new API key</Trans>}
-                        <Button
+                        {...form.getInputProps("newPassword")}
-                            color="red"
+                    />
-                            leftIcon={<TbTrash size={16} />}
+                    <PasswordInput label={<Trans>Confirm password</Trans>} {...form.getInputProps("newPasswordConfirmation")} />
-                            onClick={() => openDeleteProfileModal()}
+                    <Checkbox label={<Trans>Generate new API key</Trans>} {...form.getInputProps("newApiKey", { type: "checkbox" })} />
-                            loading={deleteProfile.loading}
+
-                        >
+                    <Group>
-                            <Trans>Delete account</Trans>
+                        <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>
-                        </Button>
+                            <Trans>Cancel</Trans>
-                    </Group>
+                        </Button>
-                </Stack>
+                        <Button type="submit" leftSection={<TbDeviceFloppy size={16} />} loading={saveProfile.loading}>
-            </form>
+                            <Trans>Save</Trans>
-        </>
+                        </Button>
-    )
+                        <Divider orientation="vertical" />
-}
+                        <Button
+                            color="red"
+                            leftSection={<TbTrash size={16} />}
+                            onClick={() => openDeleteProfileModal()}
+                            loading={deleteProfile.loading}
+                        >
+                            <Trans>Delete account</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </form>
+        </>
+    )
+}