release 5.0.0

Migrate to Quarkus (#1517)

.dockerignore

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

.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", "21" ]
-
-    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,183 @@
+name: ci
+
+on: [ push ]
+
+env:
+  JAVA_VERSION: 21
+  DOCKER_BUILD_SUMMARY: false
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        database: [ "h2", "postgresql", "mysql", "mariadb" ]
+
+    steps:
+      # Checkout
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Setup
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set up GraalVM
+        uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: "graalvm"
+          cache: "maven"
+
+      # Build & Test
+      - name: Build with Maven
+        run: mvn --batch-mode --no-transfer-progress install -Pnative -P${{ matrix.database }}
+
+      # Upload artifacts
+      - name: Upload cross-platform app
+        uses: actions/upload-artifact@v4
+        with:
+          name: commafeed-${{ matrix.database }}-jvm
+          path: commafeed-server/target/commafeed-*.zip
+
+      - name: Upload native executable
+        uses: actions/upload-artifact@v4
+        with:
+          name: commafeed-${{ matrix.database }}-${{ runner.os }}-${{ runner.arch }}
+          path: commafeed-server/target/commafeed-*-runner
+
+      # Docker
+      - name: Login to Container Registry
+        uses: docker/login-action@v3
+        if: ${{ github.ref_type == 'tag' || github.ref_name == 'master' }}
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      ## tags
+      - name: Docker build and push tag - native
+        uses: docker/build-push-action@v6
+        if: ${{ github.ref_type == 'tag' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.native
+          push: true
+          platforms: linux/amd64
+          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@v6
+        if: ${{ github.ref_type == 'tag' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.jvm
+          push: true
+          platforms: linux/amd64,linux/arm64/v8
+          tags: |
+            athou/commafeed:latest-${{ matrix.database }}-jvm
+            athou/commafeed:${{ github.ref_name }}-${{ matrix.database }}-jvm
+
+      ## master
+      - name: Docker build and push master - native
+        uses: docker/build-push-action@v6
+        if: ${{ github.ref_name == 'master' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.native
+          push: true
+          platforms: linux/amd64
+          tags: athou/commafeed:master-${{ matrix.database }}
+
+      - name: Docker build and push master - jvm
+        uses: docker/build-push-action@v6
+        if: ${{ github.ref_name == 'master' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.jvm
+          push: true
+          platforms: linux/amd64,linux/arm64/v8
+          tags: athou/commafeed:master-${{ matrix.database }}-jvm
+
+  build-windows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        database: [ "h2", "postgresql", "mysql", "mariadb" ]
+
+    steps:
+      # Checkout
+      - name: Configure git to checkout as-is
+        run: git config --global core.autocrlf false
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Setup
+      - name: Set up GraalVM
+        uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: "graalvm"
+          cache: "maven"
+
+      # Build & Test
+      - name: Build with Maven
+        run: mvn --batch-mode --no-transfer-progress install -Pnative -P${{ matrix.database }} -DskipTests=${{ matrix.database != 'h2' }}
+
+      # Upload artifacts
+      - name: Upload native executable
+        uses: actions/upload-artifact@v4
+        with:
+          name: commafeed-${{ matrix.database }}-${{ runner.os }}-${{ runner.arch }}
+          path: commafeed-server/target/commafeed-*-runner.exe
+
+  release:
+    runs-on: ubuntu-latest
+    needs:
+      - build-linux
+      - build-windows
+    if: github.ref_type == 'tag'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: commafeed-*
+          path: ./artifacts
+          merge-multiple: true
+
+      - name: Extract Changelog Entry
+        uses: mindsers/changelog-reader-action@v2
+        id: changelog_reader
+        with:
+          version: ${{ github.ref_name }}
+
+      - name: Create GitHub release
+        uses: ncipollo/release-action@v1
+        with:
+          name: CommaFeed ${{ github.ref_name }}
+          body: ${{ steps.changelog_reader.outputs.changes }}
+          artifacts: ./artifacts/*
+
+      - name: Update Docker Hub Description
+        uses: peter-evans/dockerhub-description@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

.gitignore

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

.mvn/wrapper/maven-wrapper.properties

@@ -6,7 +6,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#   https://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
+distributionType=only-script
+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,5 +1,148 @@
 # Changelog
 
+## [5.0.0]
+
+CommaFeed is now powered by Quarkus instead of Dropwizard. Read the rationale behind this change in
+the [announcement](https://github.com/Athou/commafeed/discussions/1517).
+The gist of it is that CommaFeed can now be compiled to a native binary, resulting in blazing fast startup times (around
+0.3s) and very low memory footprint (< 50M).
+
+- CommaFeed now has a different package for each supported database.
+    - If you are deploying CommaFeed with a precompiled package, please
+      read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#download-a-precompiled-package).
+    - If you are building CommaFeed from sources, please
+      read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#build-from-sources).
+    - If you are using the Docker image, please read the instructions on
+      the [Docker Hub page](https://hub.docker.com/r/athou/commafeed).
+- Due to the switch to Quarkus, the way CommaFeed is configured is very different (the `config.yml` file is gone).
+  Please
+  read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#configuration).
+  Note that a lot of configuration elements have been removed or renamed and are now nested/grouped by feature.
+- Added a setting to prevent parsing large feeds to avoid out of memory errors. The default is 5MB.
+- 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)
+- 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.
+- The H2 migration tool that automatically upgrades H2 databases from format 2 to 3 has been removed. If you're using
+  the H2 embedded database, please upgrade to at least version 4.3.0 before upgrading to CommaFeed 5.0.0.
+
+## [4.6.0]
+
+- switched from Temurin to OpenJ9 as the JVM used in the Docker image, resulting in memory usage reduction by up to 50%
+- fix an issue that could cause old entries to reappear if they were updated by their author (#1486)
+- show all entries regardless of their read status when searching with keywords, even if the ui is configured to show
+  unread entries only
+
+## [4.5.0]
+
+- significantly reduce the time needed to retrieve entries or mark them as read, especially when there are a lot of
+  entries (#1452)
+- fix a race condition where a feed could be refreshed before it was created in the database
+- fix an issue that could cause the websocket notification to contain the wrong number of unread entries when using
+  mysql/mariadb
+- 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
+- remove support for microsoft sqlserver because it's not covered with integration tests (please open an issue if you'd
+  like it back)
+
+## [4.4.1]
+
+- fix vertical scrolling issues with Safari (#1168)
+- the default value for new users for the "star entry" button and the "open in new tab" button in the entry headers is
+  now "on desktop" instead of "always"
+- the "keyboard shortcuts" help page now shows "Cmd" instead of "Ctrl" on macOS (#1389)
+- remove a superfluous feed fetch when subscribing to a feed (#1431)
+- the Docker image now uses Java 21
+
+## [4.4.0]
+
+- add support for sharing using the browser native capabilities if available (#1255)
+- 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)
+- add two options in the settings to toggle those buttons
+- accept .opml file extension when importing and export with the .opml extension
+- the "mark as read" option is no longer shown in the context menu for entries that are too old to be marked as read (
+  older than `keepStatusDays`) (#1303)
+
+## [4.3.3]
+
+- fix OPML import (#1279)
+
+## [4.3.2]
+
+- added support for unix sockets (#1278)
+
+## [4.3.1]
+
+- fix an issue that prevents new feeds from being added when mysql/mariadb is used as the database and the database
+  timezone is not UTC (#1239)
+- videos in enclosures can no longer have a width larger than the page (#1240)
+
+## [4.3.0]
+
+- h2 (the embedded database) has been upgraded to 2.2.224
+    - this version uses a different file format than 2.1.x, the first time you start CommaFeed with this version, the
+      database will be automatically converted to the new format
+- add a setting to completely disable scrolling to selected entry (#1157)
+- 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)
+
+## [4.2.1]
+
+- fix an issue that caused the tree to show an incorrect unread count after a websocket notification because entries
+  that were already marked as read by a filtering expression were not ignored (#1191)
+
+## [4.2.0]
+
+- add a setting to display the action buttons in the footer instead of in the header on mobile (#1121)
+- the websocket notification now contains everything needed to update the UI, the client no longer needs to make an API
+  call to get the latest data when receiving the notification
+- add a workaround to the Fever API for the Unread iOS app (#1188)
+- fix an issue that caused dates to be saved incorrectly if the database server and the application server were in
+  different timezones (#1187)
+
+## [4.1.0]
+
+- it is now possible to open the sidebar on mobile by swiping to the right (#1098)
+- swiping to mark entries as read/unread changed from swiping right to left because swiping right now opens the sidebar
+- the full hierarchy of categories are now displayed in the category dropdown (#1045)
+- added a setting `maxEntriesAgeDays` to delete old entries based on their age during database cleanup.
+  The setting is disabled by default for existing installations, except for the docker image where it is enabled and set
+  to 365 days
+- 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 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
+- 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 openapi documentation is no longer cached by the browser so you always have access to the latest version
+- added a memory management section to the readme, reading it is recommended if you are running CommaFeed on a server
+  with limited memory
+- fixed an issue that caused users without an email address set to be unable to edit their profile (#1184)
+
+## [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)
@@ -11,7 +154,8 @@
 
 ## [3.10.0]
 
-- added a Fever-compatible API that is usable with mobile clients that support the Fever API (see instructions in Settings -> Profile)
+- 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)
@@ -126,7 +270,8 @@
 ## [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
+- 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`
 

Dockerfile

@@ -1,12 +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 .
-
-ENV JAVA_TOOL_OPTIONS -Djava.net.preferIPv4Stack=true -Xms20m -XX:+UseG1GC -XX:-ShrinkHeapInSteps -XX:G1PeriodicGCInterval=10000 -XX:-G1PeriodicGCInvokesConcurrent -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10
-CMD ["java", "-jar", "commafeed.jar", "server", "config.yml"]

README.md

@@ -1,6 +1,6 @@
 # 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)
 
@@ -8,14 +8,22 @@ Google Reader inspired self-hosted RSS reader, based on Dropwizard and React/Typ
 
 - 4 different layouts
 - 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 and a Fever-compatible API for native mobile apps
+- REST API
+- Fever-compatible API for native mobile apps
+- Can automatically mark articles as read based on user-defined rules
 - [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
 
@@ -33,26 +41,105 @@ PikaPods shares 20% of the revenue back to CommaFeed.
 
 [![PikaPods](https://www.pikapods.com/static/run-button.svg)](https://www.pikapods.com/pods?run=commafeed)
 
-### Download precompiled package
+### Download a precompiled package
 
-    mkdir commafeed && cd commafeed
-    wget https://github.com/Athou/commafeed/releases/latest/download/commafeed.jar
-    wget https://github.com/Athou/commafeed/releases/latest/download/config.yml.example -O config.yml
-    java -Djava.net.preferIPv4Stack=true -jar commafeed.jar server config.yml
+Go to the [release page](https://github.com/Athou/commafeed/releases) and download the latest version for your operating
+system and database of choice.
 
-The server will listen on http://localhost:8082. The default
-user is `admin` and the default password is `admin`.
+There are two types of packages:
+
+- The `linux-x86_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 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
-    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
+    ./mvnw clean package [-P<database>] [-Pnative] [-DskipTests]
 
-The server will listen on http://localhost:8082. The default
-user is `admin` and the default password is `admin`.
+- `<database>` can be one of `h2`, `postgresql`, `mysql` or `mariadb`. The default is `h2`.
+- `-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]`
+
+## 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 [properties](https://en.wikipedia.org/wiki/.properties) file in `config/application.properties` (keys in kebab-case)
+- Command line arguments prefixed with `-D` (keys in kebab-case)
+- Environment variables (keys in UPPER_CASE)
+- an .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.
+
+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 [CommaFeed settings](commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java)
+are optional and have sensible default values.
+
+When started, the server will listen on http://localhost:8082.
+The default user is `admin` and the default password is `admin`.
+
+### Memory management (`jvm` package only)
+
+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
+
+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
+
+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
+
+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/Dockerfile).
 
 ## Translation
 
@@ -76,7 +163,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
 
@@ -86,19 +173,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,19 @@
+{
+    "$schema": "https://biomejs.dev/schemas/1.8.3/schema.json",
+    "formatter": {
+        "indentStyle": "space",
+        "indentWidth": 4,
+        "lineEnding": "lf",
+        "lineWidth": 140
+    },
+    "javascript": {
+        "formatter": {
+            "trailingCommas": "es5",
+            "semicolons": "asNeeded",
+            "arrowParentheses": "asNeeded"
+        }
+    },
+    "files": {
+        "ignore": ["dist", "node_modules", "target", "target-ide"]
+    }
+}

commafeed-client/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,79 @@
 {
-  "name": "commafeed-client",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite --host",
-    "dev:typescript": "tsc --watch",
-    "build": "tsc && vite build",
-    "preview": "vite preview",
-    "test": "vitest",
-    "test:ci": "vitest run",
-    "eslint": "eslint --ext=.js,.jsx,.ts,.tsx src",
-    "i18n:extract": "lingui extract --clean"
-  },
-  "dependencies": {
-    "@emotion/react": "^11.11.0",
-    "@fontsource/open-sans": "^5.0.1",
-    "@lingui/core": "^4.1.2",
-    "@lingui/macro": "^4.1.2",
-    "@lingui/react": "^4.1.2",
-    "@mantine/core": "^6.0.11",
-    "@mantine/form": "^6.0.11",
-    "@mantine/hooks": "^6.0.11",
-    "@mantine/modals": "^6.0.11",
-    "@mantine/notifications": "^6.0.11",
-    "@mantine/spotlight": "^6.0.11",
-    "@mantine/styles": "^6.0.11",
-    "@monaco-editor/react": "^4.5.1",
-    "@reduxjs/toolkit": "^1.9.5",
-    "axios": "^1.4.0",
-    "dayjs": "^1.11.7",
-    "escape-string-regexp": "^5.0.0",
-    "interweave": "^13.1.0",
-    "monaco-editor": "^0.38.0",
-    "mousetrap": "^1.6.5",
-    "re-resizable": "^6.9.9",
-    "react": "^18.2.0",
-    "react-async-hook": "^4.0.0",
-    "react-contexify": "^6.0.0",
-    "react-dom": "^18.2.0",
-    "react-ga4": "^2.1.0",
-    "react-icons": "^4.8.0",
-    "react-infinite-scroller": "^1.2.6",
-    "react-redux": "^8.0.5",
-    "react-router-dom": "^6.11.2",
-    "react-swipeable": "^7.0.0",
-    "swagger-ui-react": "^4.18.3",
-    "throttle-debounce": "^5.0.0",
-    "tinycon": "^0.6.8",
-    "use-local-storage": "^3.0.0",
-    "websocket-heartbeat-js": "^1.1.2"
-  },
-  "devDependencies": {
-    "@lingui/cli": "^4.1.2",
-    "@lingui/vite-plugin": "^4.1.2",
-    "@types/eslint": "^8.40.0",
-    "@types/mousetrap": "^1.6.11",
-    "@types/react": "^18.2.6",
-    "@types/react-dom": "^18.2.4",
-    "@types/react-infinite-scroller": "^1.2.3",
-    "@types/swagger-ui-react": "^4.18.0",
-    "@types/throttle-debounce": "^5.0.0",
-    "@types/tinycon": "^0.6.3",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
-    "@vitejs/plugin-react": "^4.0.0",
-    "babel-plugin-macros": "^3.1.0",
-    "eslint": "^8.41.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-hooks": "^0.4.3",
-    "eslint-plugin-prettier": "^4.2.1",
-    "prettier": "^2.8.8",
-    "rollup-plugin-visualizer": "^5.9.0",
-    "typescript": "^5.0.4",
-    "vite": "^4.3.9",
-    "vite-plugin-eslint": "^1.8.1",
-    "vite-tsconfig-paths": "^4.2.0",
-    "vitest": "^0.31.1",
-    "vitest-mock-extended": "^1.1.3"
-  }
+    "name": "commafeed-client",
+    "private": true,
+    "version": "0.0.0",
+    "type": "module",
+    "scripts": {
+        "dev": "vite --host",
+        "dev:typescript": "tsc --watch",
+        "build": "tsc && vite build",
+        "preview": "vite preview",
+        "test": "vitest",
+        "test:ci": "vitest run",
+        "lint": "biome check ./src",
+        "lint:fix": "biome check --write ./src",
+        "i18n:extract": "lingui extract --clean"
+    },
+    "dependencies": {
+        "@emotion/react": "^11.13.0",
+        "@fontsource/open-sans": "^5.0.29",
+        "@lingui/core": "^4.11.3",
+        "@lingui/macro": "^4.11.3",
+        "@lingui/react": "^4.11.3",
+        "@mantine/core": "^7.12.1",
+        "@mantine/form": "^7.12.1",
+        "@mantine/hooks": "^7.12.1",
+        "@mantine/modals": "^7.12.1",
+        "@mantine/notifications": "^7.12.1",
+        "@mantine/spotlight": "^7.12.1",
+        "@monaco-editor/react": "^4.6.0",
+        "@reduxjs/toolkit": "^2.2.7",
+        "axios": "^1.7.4",
+        "dayjs": "^1.11.12",
+        "escape-string-regexp": "^5.0.0",
+        "interweave": "^13.1.0",
+        "monaco-editor": "^0.50.0",
+        "mousetrap": "^1.6.5",
+        "react": "^18.3.1",
+        "react-async-hook": "^4.0.0",
+        "react-contexify": "^6.0.0",
+        "react-device-detect": "^2.2.3",
+        "react-dom": "^18.3.1",
+        "react-draggable": "^4.4.6",
+        "react-ga4": "^2.1.0",
+        "react-helmet": "^6.1.0",
+        "react-icons": "^5.2.1",
+        "react-infinite-scroller": "^1.2.6",
+        "react-redux": "^9.1.2",
+        "react-router-dom": "^6.26.1",
+        "react-swipeable": "^7.0.1",
+        "redoc": "^2.1.5",
+        "throttle-debounce": "^5.0.2",
+        "tinycon": "^0.6.8",
+        "tss-react": "^4.9.12",
+        "use-local-storage": "^3.0.0",
+        "vite-plugin-biome": "^1.0.12",
+        "websocket-heartbeat-js": "^1.1.3"
+    },
+    "devDependencies": {
+        "@biomejs/biome": "^1.8.3",
+        "@lingui/cli": "^4.11.3",
+        "@lingui/vite-plugin": "^4.11.3",
+        "@types/mousetrap": "^1.6.15",
+        "@types/react": "^18.3.3",
+        "@types/react-dom": "^18.3.0",
+        "@types/react-helmet": "^6.1.11",
+        "@types/react-infinite-scroller": "^1.2.5",
+        "@types/swagger-ui-react": "^4.18.3",
+        "@types/throttle-debounce": "^5.0.2",
+        "@types/tinycon": "^0.6.5",
+        "@vitejs/plugin-react": "^4.3.1",
+        "babel-plugin-macros": "^3.1.0",
+        "rollup-plugin-visualizer": "^5.12.0",
+        "typescript": "^5.5.4",
+        "vite": "^5.4.1",
+        "vite-tsconfig-paths": "^5.0.1",
+        "vitest": "^2.0.5",
+        "vitest-mock-extended": "^2.0.0"
+    }
 }

commafeed-client/pom.xml

@@ -1,21 +1,29 @@
-<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>
 
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>3.10.1</version>
+		<version>5.0.0</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>
 
+	<properties>
+		<!-- renovate: datasource=node-version depName=node -->
+		<node.version>v20.16.0</node.version>
+		<!-- renovate: datasource=npm depName=npm -->
+		<npm.version>10.8.2</npm.version>
+	</properties>
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>com.github.eirslett</groupId>
 				<artifactId>frontend-maven-plugin</artifactId>
-				<version>1.12.1</version>
+				<version>1.15.0</version>
 				<?m2e ignore?>
 				<executions>
 					<execution>
@@ -25,8 +33,8 @@
 						</goals>
 						<phase>compile</phase>
 						<configuration>
-							<nodeVersion>v16.16.0</nodeVersion>
-							<npmVersion>8.15.0</npmVersion>
+							<nodeVersion>${node.version}</nodeVersion>
+							<npmVersion>${npm.version}</npmVersion>
 						</configuration>
 					</execution>
 					<execution>
@@ -39,16 +47,6 @@
 							<arguments>ci</arguments>
 						</configuration>
 					</execution>
-					<execution>
-						<id>npm run eslint</id>
-						<goals>
-							<goal>npm</goal>
-						</goals>
-						<phase>compile</phase>
-						<configuration>
-							<arguments>run eslint</arguments>
-						</configuration>
-					</execution>
 					<execution>
 						<id>npm run test</id>
 						<goals>
@@ -73,7 +71,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.3.1</version>
 				<executions>
 					<execution>
 						<id>copy web interface to resources</id>
@@ -82,7 +80,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}/classes/assets</outputDirectory>
+							<outputDirectory>${project.build.directory}/classes/META-INF/resources</outputDirectory>
 							<resources>
 								<resource>
 									<directory>dist</directory>

commafeed-client/src/App.tsx

@@ -1,19 +1,20 @@
 import { i18n } from "@lingui/core"
 import { I18nProvider } from "@lingui/react"
-import { ColorScheme, ColorSchemeProvider, MantineProvider } from "@mantine/core"
-import { useColorScheme } from "@mantine/hooks"
+import { MantineProvider } from "@mantine/core"
 import { ModalsProvider } from "@mantine/modals"
 import { Notifications } from "@mantine/notifications"
 import { Constants } from "app/constants"
-import { redirectTo } from "app/slices/redirect"
-import { reloadServerInfos } from "app/slices/server"
+import { redirectTo } from "app/redirect/slice"
+import { reloadServerInfos } from "app/server/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { categoryUnreadCount } from "app/utils"
+import { DisablePullToRefresh } from "components/DisablePullToRefresh"
 import { ErrorBoundary } from "components/ErrorBoundary"
 import { Header } from "components/header/Header"
 import { Tree } from "components/sidebar/Tree"
 import { useBrowserExtension } from "hooks/useBrowserExtension"
 import { useI18n } from "i18n"
+import { WelcomePage } from "pages/WelcomePage"
 import { AdminUsersPage } from "pages/admin/AdminUsersPage"
 import { MetricsPage } from "pages/admin/MetricsPage"
 import { AboutPage } from "pages/app/AboutPage"
@@ -28,45 +29,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 } from "react"
+import { isSafari } from "react-device-detect"
 import ReactGA from "react-ga4"
+import { Helmet } from "react-helmet"
 import { HashRouter, Navigate, Route, Routes, useLocation, useNavigate } from "react-router-dom"
 import Tinycon from "tinycon"
-import useLocalStorage from "use-local-storage"
 
 function Providers(props: { children: React.ReactNode }) {
-    const preferredColorScheme = useColorScheme()
-    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
-                    withGlobalStyles
-                    withNormalizeCSS
-                    theme={{
-                        primaryColor: "orange",
-                        colorScheme,
-                        fontFamily: "Open Sans",
-                    }}
-                >
-                    <ModalsProvider>
-                        <Notifications position="bottom-right" zIndex={9999} />
-                        <ErrorBoundary>{props.children}</ErrorBoundary>
-                    </ModalsProvider>
-                </MantineProvider>
-            </ColorSchemeProvider>
+            <MantineProvider
+                defaultColorScheme="auto"
+                theme={{
+                    primaryColor: "orange",
+                    fontFamily: "Open Sans",
+                    colors: {
+                        // keep using dark colors from mantine v6
+                        // https://v6.mantine.dev/theming/colors/#default-colors
+                        dark: [
+                            "#C1C2C5",
+                            "#A6A7AB",
+                            "#909296",
+                            "#5c5f66",
+                            "#373A40",
+                            "#2C2E33",
+                            "#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
-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 +85,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 />} />
@@ -160,6 +168,15 @@ function BrowserExtensionBadgeUnreadCountHandler() {
     return null
 }
 
+function CustomCode() {
+    return (
+        <Helmet>
+            <link rel="stylesheet" type="text/css" href="custom_css.css" />
+            <script type="text/javascript" src="custom_js.js" />
+        </Helmet>
+    )
+}
+
 export function App() {
     useI18n()
     const dispatch = useAppDispatch()
@@ -177,6 +194,12 @@ export function App() {
                     <GoogleAnalyticsHandler />
                     <RedirectHandler />
                     <AppRoutes />
+                    <CustomCode />
+                    {/* disable pull-to-refresh as it messes with vertical scrolling
+                        safari behaves weirdly when overscroll-behavior is set to none so we disable it only for other browsers
+                        https://github.com/Athou/commafeed/issues/1168
+                    */}
+                    {!isSafari && <DisablePullToRefresh />}
                 </HashRouter>
             </>
         </Providers>

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

@@ -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 {
-    AddCategoryRequest,
-    Category,
-    CategoryModificationRequest,
-    CollapseRequest,
-    Entries,
-    FeedInfo,
-    FeedInfoRequest,
-    FeedModificationRequest,
-    GetEntriesPaginatedRequest,
-    IDRequest,
-    LoginRequest,
-    MarkRequest,
-    Metrics,
-    MultipleMarkRequest,
-    PasswordResetRequest,
-    ProfileModificationRequest,
-    RegistrationRequest,
-    ServerInfo,
-    Settings,
-    StarRequest,
-    SubscribeRequest,
-    Subscription,
-    TagRequest,
-    UserModel,
-} from "./types"
-
-const axiosInstance = axios.create({ baseURL: "./rest", withCredentials: true })
-axiosInstance.interceptors.response.use(
-    response => response,
-    error => {
-        if (
-            (error.response.status === 401 && error.response.data === "Credentials are required to access this resource.") ||
-            (error.response.status === 403 && error.response.data === "You don't have the required role to access this resource.")
-        ) {
-            window.location.hash = "/welcome"
-        }
-        throw error
-    }
-)
-
-export const client = {
-    category: {
-        getRoot: () => axiosInstance.get<Category>("category/get"),
-        modify: (req: CategoryModificationRequest) => axiosInstance.post("category/modify", req),
-        collapse: (req: CollapseRequest) => axiosInstance.post("category/collapse", req),
-        getEntries: (req: GetEntriesPaginatedRequest) => axiosInstance.get<Entries>("category/entries", { params: req }),
-        markEntries: (req: MarkRequest) => axiosInstance.post("category/mark", req),
-        add: (req: AddCategoryRequest) => axiosInstance.post("category/add", req),
-        delete: (req: IDRequest) => axiosInstance.post("category/delete", req),
-    },
-    entry: {
-        mark: (req: MarkRequest) => axiosInstance.post("entry/mark", req),
-        markMultiple: (req: MultipleMarkRequest) => axiosInstance.post("entry/markMultiple", req),
-        star: (req: StarRequest) => axiosInstance.post("entry/star", req),
-        getTags: () => axiosInstance.get<string[]>("entry/tags"),
-        tag: (req: TagRequest) => axiosInstance.post("entry/tag", req),
-    },
-    feed: {
-        get: (id: string) => axiosInstance.get<Subscription>(`feed/get/${id}`),
-        modify: (req: FeedModificationRequest) => axiosInstance.post("feed/modify", req),
-        getEntries: (req: GetEntriesPaginatedRequest) => axiosInstance.get<Entries>("feed/entries", { params: req }),
-        markEntries: (req: MarkRequest) => axiosInstance.post("feed/mark", req),
-        fetchFeed: (req: FeedInfoRequest) => axiosInstance.post<FeedInfo>("feed/fetch", req),
-        refreshAll: () => axiosInstance.get("feed/refreshAll"),
-        subscribe: (req: SubscribeRequest) => axiosInstance.post<number>("feed/subscribe", req),
-        unsubscribe: (req: IDRequest) => axiosInstance.post("feed/unsubscribe", req),
-        importOpml: (req: File) => {
-            const formData = new FormData()
-            formData.append("file", req)
-            return 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"),
-        saveSettings: (settings: Settings) => axiosInstance.post("user/settings", settings),
-        getProfile: () => axiosInstance.get<UserModel>("user/profile"),
-        saveProfile: (req: ProfileModificationRequest) => axiosInstance.post("user/profile", req),
-        deleteProfile: () => axiosInstance.post("user/profile/deleteAccount"),
-    },
-    server: {
-        getServerInfos: () => axiosInstance.get<ServerInfo>("server/get"),
-    },
-    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),
-        getMetrics: () => axiosInstance.get<Metrics>("admin/metrics"),
-    },
-}
-
-/**
- * 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)
- * @returns an array of messages to show the user
- */
-export const errorToStrings = (err: unknown) => {
-    let strings: string[] = []
-
-    if (axios.isAxiosError(err)) {
-        if (err.response) {
-            const { data } = err.response
-            if (typeof data === "string") strings.push(data)
-            if (typeof data === "object" && data.message) strings.push(data.message)
-            if (typeof data === "object" && data.errors) strings = [...strings, ...data.errors]
-        }
-    }
-
-    return strings
-}
+import axios, { type AxiosError } from "axios"
+import type {
+    AddCategoryRequest,
+    AdminSaveUserRequest,
+    AuthenticationError,
+    Category,
+    CategoryModificationRequest,
+    CollapseRequest,
+    Entries,
+    FeedInfo,
+    FeedInfoRequest,
+    FeedModificationRequest,
+    GetEntriesPaginatedRequest,
+    IDRequest,
+    LoginRequest,
+    MarkRequest,
+    Metrics,
+    MultipleMarkRequest,
+    PasswordResetRequest,
+    ProfileModificationRequest,
+    RegistrationRequest,
+    ServerInfo,
+    Settings,
+    StarRequest,
+    SubscribeRequest,
+    Subscription,
+    TagRequest,
+    UserModel,
+} from "./types"
+
+const axiosInstance = axios.create({ baseURL: "./rest", withCredentials: true })
+axiosInstance.interceptors.response.use(
+    response => response,
+    error => {
+        if (isAuthenticationError(error)) {
+            const data = error.response?.data
+            window.location.hash = data?.allowRegistrations ? "/welcome" : "/login"
+        }
+        throw error
+    }
+)
+
+function isAuthenticationError(error: unknown): error is AxiosError<AuthenticationError> {
+    return axios.isAxiosError(error) && !!error.response && [401, 403].includes(error.response.status)
+}
+
+export const client = {
+    category: {
+        getRoot: async () => await axiosInstance.get<Category>("category/get"),
+        modify: async (req: CategoryModificationRequest) => await axiosInstance.post("category/modify", req),
+        collapse: async (req: CollapseRequest) => await axiosInstance.post("category/collapse", req),
+        getEntries: async (req: GetEntriesPaginatedRequest) => await axiosInstance.get<Entries>("category/entries", { params: req }),
+        markEntries: async (req: MarkRequest) => await axiosInstance.post("category/mark", req),
+        add: async (req: AddCategoryRequest) => await axiosInstance.post("category/add", req),
+        delete: async (req: IDRequest) => await axiosInstance.post("category/delete", req),
+    },
+    entry: {
+        mark: async (req: MarkRequest) => await axiosInstance.post("entry/mark", req),
+        markMultiple: async (req: MultipleMarkRequest) => await axiosInstance.post("entry/markMultiple", req),
+        star: async (req: StarRequest) => await axiosInstance.post("entry/star", req),
+        getTags: async () => await axiosInstance.get<string[]>("entry/tags"),
+        tag: async (req: TagRequest) => await axiosInstance.post("entry/tag", req),
+    },
+    feed: {
+        get: async (id: string) => await axiosInstance.get<Subscription>(`feed/get/${id}`),
+        modify: async (req: FeedModificationRequest) => await axiosInstance.post("feed/modify", req),
+        getEntries: async (req: GetEntriesPaginatedRequest) => await axiosInstance.get<Entries>("feed/entries", { params: req }),
+        markEntries: async (req: MarkRequest) => await axiosInstance.post("feed/mark", req),
+        fetchFeed: async (req: FeedInfoRequest) => await axiosInstance.post<FeedInfo>("feed/fetch", req),
+        refreshAll: async () => await axiosInstance.get("feed/refreshAll"),
+        subscribe: async (req: SubscribeRequest) => await axiosInstance.post<number>("feed/subscribe", req),
+        unsubscribe: async (req: IDRequest) => await axiosInstance.post("feed/unsubscribe", req),
+        importOpml: async (req: File) => {
+            const formData = new FormData()
+            formData.append("file", req)
+            return await axiosInstance.post("feed/import", formData, {
+                headers: {
+                    "Content-Type": "multipart/form-data",
+                },
+            })
+        },
+    },
+    user: {
+        login: async (req: LoginRequest) => {
+            const formData = new URLSearchParams()
+            formData.append("j_username", req.name)
+            formData.append("j_password", req.password)
+            return await axiosInstance.post("j_security_check", formData, {
+                baseURL: ".",
+                headers: {
+                    "Content-Type": "application/x-www-form-urlencoded",
+                },
+            })
+        },
+        register: async (req: RegistrationRequest) => await axiosInstance.post("user/register", req),
+        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),
+        deleteProfile: async () => await axiosInstance.post("user/profile/deleteAccount"),
+    },
+    server: {
+        getServerInfos: async () => await axiosInstance.get<ServerInfo>("server/get"),
+    },
+    admin: {
+        getAllUsers: async () => await axiosInstance.get<UserModel[]>("admin/user/getAll"),
+        saveUser: async (req: AdminSaveUserRequest) => await axiosInstance.post("admin/user/save", req),
+        deleteUser: async (req: IDRequest) => await axiosInstance.post("admin/user/delete", req),
+        getMetrics: async () => await axiosInstance.get<Metrics>("admin/metrics"),
+    },
+}
+
+/**
+ * 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)
+ * @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,112 @@
-import { t } from "@lingui/macro"
-import { DEFAULT_THEME } from "@mantine/core"
-import { IconType } from "react-icons"
-import { FaAt } from "react-icons/fa"
-import { SiBuffer, SiFacebook, SiGmail, SiInstapaper, SiPocket, SiTumblr, SiTwitter } from "react-icons/si"
-import { Category, Entry, SharingSettings } from "./types"
-
-const categories: { [key: string]: Category } = {
-    all: {
-        id: "all",
-        name: t`All`,
-        expanded: false,
-        children: [],
-        feeds: [],
-        position: 0,
-    },
-    starred: {
-        id: "starred",
-        name: t`Starred`,
-        expanded: false,
-        children: [],
-        feeds: [],
-        position: 1,
-    },
-}
-
-const sharing: {
-    [key in keyof SharingSettings]: {
-        label: string
-        icon: IconType
-        color: `#${string}`
-        url: (url: string, description: string) => string
-    }
-} = {
-    email: {
-        label: "Email",
-        icon: FaAt,
-        color: "#000000",
-        url: (url, desc) => `mailto:?subject=${desc}&body=${url}`,
-    },
-    gmail: {
-        label: "Gmail",
-        icon: SiGmail,
-        color: "#EA4335",
-        url: (url, desc) => `https://mail.google.com/mail/?view=cm&fs=1&tf=1&source=mailto&su=${desc}&body=${url}`,
-    },
-    facebook: {
-        label: "Facebook",
-        icon: SiFacebook,
-        color: "#1B74E4",
-        url: url => `https://www.facebook.com/sharer/sharer.php?u=${url}`,
-    },
-    twitter: {
-        label: "Twitter",
-        icon: SiTwitter,
-        color: "#1D9BF0",
-        url: (url, desc) => `https://twitter.com/share?text=${desc}&url=${url}`,
-    },
-    tumblr: {
-        label: "Tumblr",
-        icon: SiTumblr,
-        color: "#375672",
-        url: (url, desc) => `https://www.tumblr.com/share/link?url=${url}&name=${desc}`,
-    },
-    pocket: {
-        label: "Pocket",
-        icon: SiPocket,
-        color: "#EF4154",
-        url: (url, desc) => `https://getpocket.com/save?url=${url}&title=${desc}`,
-    },
-    instapaper: {
-        label: "Instapaper",
-        icon: SiInstapaper,
-        color: "#010101",
-        url: (url, desc) => `https://www.instapaper.com/hello2?url=${url}&title=${desc}`,
-    },
-    buffer: {
-        label: "Buffer",
-        icon: SiBuffer,
-        color: "#000000",
-        url: (url, desc) => `https://bufferapp.com/add?url=${url}&text=${desc}`,
-    },
-}
-
-export const Constants = {
-    categories,
-    sharing,
-    layout: {
-        mobileBreakpoint: DEFAULT_THEME.breakpoints.md,
-        headerHeight: 60,
-        entryMaxWidth: 650,
-        isTopVisible: (div: HTMLElement) => div.getBoundingClientRect().top >= Constants.layout.headerHeight,
-        isBottomVisible: (div: HTMLElement) => div.getBoundingClientRect().bottom <= window.innerHeight,
-    },
-    dom: {
-        entryId: (entry: Entry) => `entry-id-${entry.id}`,
-        entryContextMenuId: (entry: Entry) => entry.id,
-    },
-    browserExtensionUrl: "https://github.com/Athou/commafeed-browser-extension",
-    bitcoinWalletAddress: "1dymfUxqCWpyD7a6rQSqNy4rLVDBsAr5e",
-}
+import { t } from "@lingui/macro"
+import type { IconType } from "react-icons"
+import { FaAt } from "react-icons/fa"
+import { SiBuffer, SiFacebook, SiGmail, SiInstapaper, SiPocket, SiTumblr, SiTwitter } from "react-icons/si"
+import type { Category, Entry, SharingSettings } from "./types"
+
+const categories: Record<string, Category> = {
+    all: {
+        id: "all",
+        name: t`All`,
+        expanded: false,
+        children: [],
+        feeds: [],
+        position: 0,
+    },
+    starred: {
+        id: "starred",
+        name: t`Starred`,
+        expanded: false,
+        children: [],
+        feeds: [],
+        position: 1,
+    },
+}
+
+const sharing: {
+    [key in keyof SharingSettings]: {
+        label: string
+        icon: IconType
+        color: `#${string}`
+        url: (url: string, description: string) => string
+    }
+} = {
+    email: {
+        label: "Email",
+        icon: FaAt,
+        color: "#000000",
+        url: (url, desc) => `mailto:?subject=${desc}&body=${url}`,
+    },
+    gmail: {
+        label: "Gmail",
+        icon: SiGmail,
+        color: "#EA4335",
+        url: (url, desc) => `https://mail.google.com/mail/?view=cm&fs=1&tf=1&source=mailto&su=${desc}&body=${url}`,
+    },
+    facebook: {
+        label: "Facebook",
+        icon: SiFacebook,
+        color: "#1B74E4",
+        url: url => `https://www.facebook.com/sharer/sharer.php?u=${url}`,
+    },
+    twitter: {
+        label: "Twitter",
+        icon: SiTwitter,
+        color: "#1D9BF0",
+        url: (url, desc) => `https://twitter.com/share?text=${desc}&url=${url}`,
+    },
+    tumblr: {
+        label: "Tumblr",
+        icon: SiTumblr,
+        color: "#375672",
+        url: (url, desc) => `https://www.tumblr.com/share/link?url=${url}&name=${desc}`,
+    },
+    pocket: {
+        label: "Pocket",
+        icon: SiPocket,
+        color: "#EF4154",
+        url: (url, desc) => `https://getpocket.com/save?url=${url}&title=${desc}`,
+    },
+    instapaper: {
+        label: "Instapaper",
+        icon: SiInstapaper,
+        color: "#010101",
+        url: (url, desc) => `https://www.instapaper.com/hello2?url=${url}&title=${desc}`,
+    },
+    buffer: {
+        label: "Buffer",
+        icon: SiBuffer,
+        color: "#000000",
+        url: (url, desc) => `https://bufferapp.com/add?url=${url}&text=${desc}`,
+    },
+}
+
+export const Constants = {
+    categories,
+    sharing,
+    layout: {
+        mobileBreakpoint: 992,
+        mobileBreakpointName: "md",
+        headerHeight: 60,
+        entryMaxWidth: 650,
+        isTopVisible: (div: HTMLElement) => {
+            const header = document.getElementById(Constants.dom.headerId)?.getBoundingClientRect()
+            return div.getBoundingClientRect().top >= (header?.bottom ?? 0)
+        },
+        isBottomVisible: (div: HTMLElement) => {
+            const footer = document.getElementById(Constants.dom.footerId)?.getBoundingClientRect()
+            return div.getBoundingClientRect().bottom <= (footer?.top ?? window.innerHeight)
+        },
+    },
+    dom: {
+        headerId: "header",
+        footerId: "footer",
+        entryId: (entry: Entry) => `entry-id-${entry.id}`,
+        entryContextMenuId: (entry: Entry) => entry.id,
+    },
+    tooltip: {
+        delay: 500,
+    },
+    browserExtensionUrl: "https://github.com/Athou/commafeed-browser-extension",
+    bitcoinWalletAddress: "1dymfUxqCWpyD7a6rQSqNy4rLVDBsAr5e",
+}

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

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

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

@@ -0,0 +1,247 @@
+import { createAppAsyncThunk } from "app/async-thunk"
+import { client } from "app/client"
+import { Constants } from "app/constants"
+import { type EntrySource, type EntrySourceType, entriesSlice, setSearch } from "app/entries/slice"
+import type { RootState } from "app/store"
+import { reloadTree } from "app/tree/thunks"
+import type { Entry, MarkRequest, TagRequest } from "app/types"
+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", (arg, 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 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 entryElement = document.getElementById(Constants.dom.entryId(entry))
+            if (entryElement) {
+                const scrollMode = state.user.settings?.scrollMode
+                const entryEntirelyVisible = Constants.layout.isTopVisible(entryElement) && Constants.layout.isBottomVisible(entryElement)
+                if (scrollMode === "always" || (scrollMode === "if_needed" && !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) => {
+    const header = document.getElementById(Constants.dom.headerId)?.getBoundingClientRect()
+    const offset = (header?.bottom ?? 0) + 3
+    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",
+    (
+        arg: {
+            expand: boolean
+            markAsRead: boolean
+            scrollToEntry: boolean
+        },
+        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 = 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 { describe, expect, it } from "vitest"
-import { redirectToCategory } from "./redirect"
-
-describe("redirects", () => {
-    it("redirects to category", async () => {
-        await store.dispatch(redirectToCategory("1"))
-        expect(store.getState().redirect.to).toBe("/app/category/1")
-    })
-})
+import { redirectToCategory } from "app/redirect/thunks"
+import { store } from "app/store"
+import { describe, expect, it } from "vitest"
+
+describe("redirects", () => {
+    it("redirects to category", async () => {
+        await store.dispatch(redirectToCategory("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,45 @@
+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 redirectToPasswordRecovery = createAppAsyncThunk("redirect/passwordRecovery", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/passwordRecovery"))
+)
+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

@@ -1,31 +1,29 @@
-import { PayloadAction, createAsyncThunk, createSlice } from "@reduxjs/toolkit"
-import { client } from "app/client"
-import { ServerInfo } from "app/types"
-
-interface ServerState {
-    serverInfos?: ServerInfo
-    webSocketConnected: boolean
-}
-
-const initialState: ServerState = {
-    webSocketConnected: false,
-}
-
-export const reloadServerInfos = createAsyncThunk("server/infos", () => client.server.getServerInfos().then(r => r.data))
-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
-export default serverSlice.reducer
+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/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,23 @@
-import { configureStore } from "@reduxjs/toolkit"
-import { setupListeners } from "@reduxjs/toolkit/query"
-import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"
-import entriesReducer from "./slices/entries"
-import redirectReducer from "./slices/redirect"
-import serverReducer from "./slices/server"
-import treeReducer from "./slices/tree"
-import userReducer from "./slices/user"
-
-export const reducers = {
-    entries: entriesReducer,
-    redirect: redirectReducer,
-    tree: treeReducer,
-    server: serverReducer,
-    user: userReducer,
-}
-
-export const store = configureStore({ reducer: reducers })
-
-setupListeners(store.dispatch)
-
-export type RootState = ReturnType<typeof store.getState>
-export type AppDispatch = typeof store.dispatch
-
-export const useAppDispatch: () => AppDispatch = useDispatch
-export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
+import { configureStore } from "@reduxjs/toolkit"
+import { entriesSlice } from "app/entries/slice"
+import { redirectSlice } from "app/redirect/slice"
+import { serverSlice } from "app/server/slice"
+import { treeSlice } from "app/tree/slice"
+import { userSlice } from "app/user/slice"
+import { type TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"
+
+export const reducers = {
+    entries: entriesSlice.reducer,
+    redirect: redirectSlice.reducer,
+    tree: treeSlice.reducer,
+    server: serverSlice.reducer,
+    user: userSlice.reducer,
+}
+
+export const store = configureStore({ reducer: reducers })
+
+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 { client } from "app/client"
-import { Category, CollapseRequest } from "app/types"
-import { visitCategoryTree } from "app/utils"
-// eslint-disable-next-line import/no-cycle
-import { markEntry } from "./entries"
-import { redirectTo } from "./redirect"
-
-interface TreeState {
-    rootCategory?: Category
-    mobileMenuOpen: boolean
-    sidebarWidth: number
-    sidebarVisible: boolean
-}
-
-const initialState: TreeState = {
-    mobileMenuOpen: false,
-    sidebarWidth: 350,
-    sidebarVisible: true,
-}
-
-export const reloadTree = createAsyncThunk("tree/reload", () => client.category.getRoot().then(r => r.data))
-export const collapseTreeCategory = createAsyncThunk("tree/category/collapse", async (req: CollapseRequest) =>
-    client.category.collapse(req)
-)
-
-export const treeSlice = createSlice({
-    name: "tree",
-    initialState,
-    reducers: {
-        setMobileMenuOpen: (state, action: PayloadAction<boolean>) => {
-            state.mobileMenuOpen = action.payload
-        },
-        setSidebarWidth: (state, action: PayloadAction<number>) => {
-            state.sidebarWidth = action.payload
-        },
-        toggleSidebar: state => {
-            state.sidebarVisible = !state.sidebarVisible
-        },
-    },
-    extraReducers: builder => {
-        builder.addCase(reloadTree.fulfilled, (state, action) => {
-            state.rootCategory = action.payload
-        })
-        builder.addCase(collapseTreeCategory.pending, (state, action) => {
-            if (!state.rootCategory) return
-            visitCategoryTree(state.rootCategory, c => {
-                if (+c.id === action.meta.arg.id) c.expanded = !action.meta.arg.collapse
-            })
-        })
-        builder.addCase(markEntry.pending, (state, action) => {
-            if (!state.rootCategory) return
-            visitCategoryTree(state.rootCategory, c =>
-                c.feeds
-                    .filter(f => f.id === +action.meta.arg.entry.feedId)
-                    .forEach(f => {
-                        f.unread = action.meta.arg.read ? f.unread - 1 : f.unread + 1
-                    })
-            )
-        })
-        builder.addCase(redirectTo, state => {
-            state.mobileMenuOpen = false
-        })
-    },
-})
-
-export const { setMobileMenuOpen, setSidebarWidth, toggleSidebar } = treeSlice.actions
-export default treeSlice.reducer
+import { type PayloadAction, createSlice } from "@reduxjs/toolkit"
+import { markEntry } from "app/entries/thunks"
+import { redirectTo } from "app/redirect/slice"
+import { collapseTreeCategory, reloadTree } from "app/tree/thunks"
+import type { Category } from "app/types"
+import { visitCategoryTree } from "app/utils"
+
+interface TreeState {
+    rootCategory?: Category
+    mobileMenuOpen: boolean
+    sidebarVisible: boolean
+}
+
+const initialState: TreeState = {
+    mobileMenuOpen: false,
+    sidebarVisible: true,
+}
+
+export const treeSlice = createSlice({
+    name: "tree",
+    initialState,
+    reducers: {
+        setMobileMenuOpen: (state, action: PayloadAction<boolean>) => {
+            state.mobileMenuOpen = action.payload
+        },
+        toggleSidebar: state => {
+            state.sidebarVisible = !state.sidebarVisible
+        },
+        incrementUnreadCount: (
+            state,
+            action: PayloadAction<{
+                feedId: number
+                amount: number
+            }>
+        ) => {
+            if (!state.rootCategory) return
+            visitCategoryTree(state.rootCategory, c => {
+                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
+        })
+        builder.addCase(collapseTreeCategory.pending, (state, action) => {
+            if (!state.rootCategory) return
+            visitCategoryTree(state.rootCategory, c => {
+                if (+c.id === action.meta.arg.id) c.expanded = !action.meta.arg.collapse
+            })
+        })
+        builder.addCase(markEntry.pending, (state, action) => {
+            if (!state.rootCategory) return
+            visitCategoryTree(state.rootCategory, c => {
+                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
+        })
+    },
+})
+
+export const { setMobileMenuOpen, toggleSidebar, incrementUnreadCount } = treeSlice.actions

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

@@ -0,0 +1,9 @@
+import { createAppAsyncThunk } from "app/async-thunk"
+import { client } from "app/client"
+import type { CollapseRequest } from "app/types"
+
+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)
+)

commafeed-client/src/app/types.ts

@@ -1,277 +1,295 @@
-export interface AddCategoryRequest {
-    name: string
-    parentId?: string
-}
-
-export interface Category {
-    id: string
-    parentId?: string
-    parentName?: string
-    name: string
-    children: Category[]
-    feeds: Subscription[]
-    expanded: boolean
-    position: number
-}
-
-export interface CategoryModificationRequest {
-    id: number
-    name?: string
-    parentId?: string
-    position?: number
-}
-
-export interface CollapseRequest {
-    id: number
-    collapse: boolean
-}
-
-export interface Entries {
-    name: string
-    message?: string
-    errorCount: number
-    feedLink: string
-    timestamp: number
-    hasMore: boolean
-    offset?: number
-    limit?: number
-    entries: Entry[]
-    ignoredReadStatus: boolean
-}
-
-export interface Entry {
-    id: string
-    guid: string
-    title: string
-    content: string
-    categories?: string
-    rtl: boolean
-    author?: string
-    enclosureUrl?: string
-    enclosureType?: string
-    mediaDescription?: string
-    mediaThumbnailUrl?: string
-    mediaThumbnailWidth?: number
-    mediaThumbnailHeight?: number
-    date: number
-    insertedDate: number
-    feedId: string
-    feedName: string
-    feedUrl: string
-    feedLink: string
-    iconUrl: string
-    url: string
-    read: boolean
-    starred: boolean
-    markable: boolean
-    tags: string[]
-}
-
-export interface FeedInfo {
-    url: string
-    title: string
-}
-
-export interface FeedInfoRequest {
-    url: string
-}
-
-export interface FeedModificationRequest {
-    id: number
-    name?: string
-    categoryId?: string
-    position?: number
-    filter?: string
-}
-
-export interface GetEntriesRequest {
-    id: string
-    readType?: ReadingMode
-    newerThan?: number
-    order?: ReadingOrder
-    keywords?: string
-    onlyIds?: boolean
-    excludedSubscriptionIds?: string
-    tag?: string
-}
-
-export interface GetEntriesPaginatedRequest extends GetEntriesRequest {
-    offset: number
-    limit: number
-}
-
-export interface IDRequest {
-    id: number
-}
-
-export interface LoginRequest {
-    name: string
-    password: string
-}
-
-export interface MarkRequest {
-    id: string
-    read: boolean
-    olderThan?: number
-    keywords?: string
-    excludedSubscriptions?: number[]
-}
-
-export interface MetricCounter {
-    count: number
-}
-
-export interface MetricGauge {
-    value: number
-}
-
-export interface MetricMeter {
-    count: number
-    m15_rate: number
-    m1_rate: number
-    m5_rate: number
-    mean_rate: number
-    units: string
-}
-
-export type MetricTimer = {
-    count: number
-    max: number
-    mean: number
-    min: number
-    p50: number
-    p75: number
-    p95: number
-    p98: number
-    p99: number
-    p999: number
-    stddev: number
-    m15_rate: number
-    m1_rate: number
-    m5_rate: number
-    mean_rate: number
-    duration_units: string
-    rate_units: string
-}
-
-export interface Metrics {
-    counters: { [key: string]: MetricCounter }
-    gauges: { [key: string]: MetricGauge }
-    meters: { [key: string]: MetricMeter }
-    timers: { [key: string]: MetricTimer }
-}
-
-export interface MultipleMarkRequest {
-    requests: MarkRequest[]
-}
-
-export interface PasswordResetRequest {
-    email: string
-}
-
-export interface ProfileModificationRequest {
-    currentPassword: string
-    email: string
-    newPassword?: string
-    newApiKey?: boolean
-}
-
-export interface RegistrationRequest {
-    name: string
-    password: string
-    email: string
-}
-
-export interface ServerInfo {
-    announcement?: string
-    version: string
-    gitCommit: string
-    allowRegistrations: boolean
-    googleAnalyticsCode?: string
-    smtpEnabled: boolean
-    demoAccountEnabled: boolean
-}
-
-export interface Settings {
-    language: string
-    readingMode: ReadingMode
-    readingOrder: ReadingOrder
-    showRead: boolean
-    scrollMarks: boolean
-    customCss?: string
-    customJs?: string
-    scrollSpeed: number
-    alwaysScrollToEntry: boolean
-    markAllAsReadConfirmation: boolean
-    customContextMenu: boolean
-    sharingSettings: SharingSettings
-}
-
-export interface SharingSettings {
-    email: boolean
-    gmail: boolean
-    facebook: boolean
-    twitter: boolean
-    tumblr: boolean
-    pocket: boolean
-    instapaper: boolean
-    buffer: boolean
-}
-
-export interface StarRequest {
-    id: string
-    feedId: number
-    starred: boolean
-}
-
-export interface SubscribeRequest {
-    url: string
-    title: string
-    categoryId?: string
-}
-
-export interface Subscription {
-    id: number
-    name: string
-    message?: string
-    errorCount: number
-    lastRefresh?: number
-    nextRefresh?: number
-    feedUrl: string
-    feedLink: string
-    iconUrl: string
-    unread: number
-    categoryId?: string
-    position: number
-    newestItemTime?: number
-    filter?: string
-}
-
-export interface TagRequest {
-    entryId: number
-    tags: string[]
-}
-
-export interface UnreadCount {
-    feedId?: number
-    unreadCount?: number
-    newestItemTime?: number
-}
-
-export interface UserModel {
-    id: number
-    name: string
-    email?: string
-    apiKey?: string
-    password?: string
-    enabled: boolean
-    created: number
-    lastLogin?: number
-    admin: boolean
-}
-
-export type ReadingMode = "all" | "unread"
-
-export type ReadingOrder = "asc" | "desc"
-
-export type ViewMode = "title" | "cozy" | "detailed" | "expanded"
+export type ReadingMode = "all" | "unread"
+
+export type ReadingOrder = "asc" | "desc"
+
+export type ViewMode = "title" | "cozy" | "detailed" | "expanded"
+
+export type ScrollMode = "always" | "never" | "if_needed"
+
+export type IconDisplayMode = "always" | "never" | "on_desktop" | "on_mobile"
+
+export interface AddCategoryRequest {
+    name: string
+    parentId?: string
+}
+
+export interface Subscription {
+    id: number
+    name: string
+    message?: string
+    errorCount: number
+    lastRefresh?: number
+    nextRefresh?: number
+    feedUrl: string
+    feedLink: string
+    iconUrl: string
+    unread: number
+    categoryId?: string
+    position: number
+    newestItemTime?: number
+    filter?: string
+}
+
+export interface Category {
+    id: string
+    parentId?: string
+    parentName?: string
+    name: string
+    children: Category[]
+    feeds: Subscription[]
+    expanded: boolean
+    position: number
+}
+
+export interface CategoryModificationRequest {
+    id: number
+    name?: string
+    parentId?: string
+    position?: number
+}
+
+export interface CollapseRequest {
+    id: number
+    collapse: boolean
+}
+
+export interface Entry {
+    id: string
+    guid: string
+    title: string
+    content: string
+    categories?: string
+    rtl: boolean
+    author?: string
+    enclosureUrl?: string
+    enclosureType?: string
+    mediaDescription?: string
+    mediaThumbnailUrl?: string
+    mediaThumbnailWidth?: number
+    mediaThumbnailHeight?: number
+    date: number
+    insertedDate: number
+    feedId: string
+    feedName: string
+    feedUrl: string
+    feedLink: string
+    iconUrl: string
+    url: string
+    read: boolean
+    starred: boolean
+    markable: boolean
+    tags: string[]
+}
+
+export interface Entries {
+    name: string
+    message?: string
+    errorCount: number
+    feedLink: string
+    timestamp: number
+    hasMore: boolean
+    offset?: number
+    limit?: number
+    entries: Entry[]
+    ignoredReadStatus: boolean
+}
+
+export interface FeedInfo {
+    url: string
+    title: string
+}
+
+export interface FeedInfoRequest {
+    url: string
+}
+
+export interface FeedModificationRequest {
+    id: number
+    name?: string
+    categoryId?: string
+    position?: number
+    filter?: string
+}
+
+export interface GetEntriesRequest {
+    id: string
+    readType?: ReadingMode
+    newerThan?: number
+    order?: ReadingOrder
+    keywords?: string
+    excludedSubscriptionIds?: string
+    tag?: string
+}
+
+export interface GetEntriesPaginatedRequest extends GetEntriesRequest {
+    offset: number
+    limit: number
+}
+
+export interface IDRequest {
+    id: number
+}
+
+export interface LoginRequest {
+    name: string
+    password: string
+}
+
+export interface MarkRequest {
+    id: string
+    read: boolean
+    olderThan?: number
+    insertedBefore?: number
+    keywords?: string
+    excludedSubscriptions?: number[]
+}
+
+export interface MetricCounter {
+    count: number
+}
+
+export interface MetricGauge {
+    value: number
+}
+
+export interface MetricMeter {
+    count: number
+    m15_rate: number
+    m1_rate: number
+    m5_rate: number
+    mean_rate: number
+    units: string
+}
+
+export interface MetricTimer {
+    count: number
+    max: number
+    mean: number
+    min: number
+    p50: number
+    p75: number
+    p95: number
+    p98: number
+    p99: number
+    p999: number
+    stddev: number
+    m15_rate: number
+    m1_rate: number
+    m5_rate: number
+    mean_rate: number
+    duration_units: string
+    rate_units: string
+}
+
+export interface Metrics {
+    counters: Record<string, MetricCounter>
+    gauges: Record<string, MetricGauge>
+    meters: Record<string, MetricMeter>
+    timers: Record<string, MetricTimer>
+}
+
+export interface MultipleMarkRequest {
+    requests: MarkRequest[]
+}
+
+export interface PasswordResetRequest {
+    email: string
+}
+
+export interface ProfileModificationRequest {
+    currentPassword: string
+    email: string
+    newPassword?: string
+    newApiKey?: boolean
+}
+
+export interface RegistrationRequest {
+    name: string
+    password: string
+    email: string
+}
+
+export interface ServerInfo {
+    announcement?: string
+    version: string
+    gitCommit: string
+    allowRegistrations: boolean
+    googleAnalyticsCode?: string
+    smtpEnabled: boolean
+    demoAccountEnabled: boolean
+    websocketEnabled: boolean
+    websocketPingInterval: number
+    treeReloadInterval: number
+}
+
+export interface SharingSettings {
+    email: boolean
+    gmail: boolean
+    facebook: boolean
+    twitter: boolean
+    tumblr: boolean
+    pocket: boolean
+    instapaper: boolean
+    buffer: boolean
+}
+
+export interface Settings {
+    language: string
+    readingMode: ReadingMode
+    readingOrder: ReadingOrder
+    showRead: boolean
+    scrollMarks: boolean
+    customCss?: string
+    customJs?: string
+    scrollSpeed: number
+    scrollMode: ScrollMode
+    starIconDisplayMode: IconDisplayMode
+    externalLinkIconDisplayMode: IconDisplayMode
+    markAllAsReadConfirmation: boolean
+    customContextMenu: boolean
+    mobileFooter: boolean
+    sharingSettings: SharingSettings
+}
+
+export interface StarRequest {
+    id: string
+    feedId: number
+    starred: boolean
+}
+
+export interface SubscribeRequest {
+    url: string
+    title: string
+    categoryId?: string
+}
+
+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
+}
+
+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,120 @@
+import { t } from "@lingui/macro"
+import { showNotification } from "@mantine/notifications"
+import { createSlice, isAnyOf } from "@reduxjs/toolkit"
+import type { Settings, UserModel } from "app/types"
+import {
+    changeCustomContextMenu,
+    changeExternalLinkIconDisplayMode,
+    changeLanguage,
+    changeMarkAllAsReadConfirmation,
+    changeMobileFooter,
+    changeReadingMode,
+    changeReadingOrder,
+    changeScrollMarks,
+    changeScrollMode,
+    changeScrollSpeed,
+    changeSharingSetting,
+    changeShowRead,
+    changeStarIconDisplayMode,
+    reloadProfile,
+    reloadSettings,
+    reloadTags,
+} from "./thunks"
+
+interface UserState {
+    settings?: Settings
+    profile?: UserModel
+    tags?: string[]
+}
+
+const initialState: UserState = {}
+
+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(changeScrollMode.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.scrollMode = 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(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,
+                changeStarIconDisplayMode.fulfilled,
+                changeExternalLinkIconDisplayMode.fulfilled,
+                changeMarkAllAsReadConfirmation.fulfilled,
+                changeCustomContextMenu.fulfilled,
+                changeMobileFooter.fulfilled,
+                changeSharingSetting.fulfilled
+            ),
+            () => {
+                showNotification({
+                    message: t`Settings saved.`,
+                    color: "green",
+                })
+            }
+        )
+    },
+})

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

@@ -0,0 +1,99 @@
+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 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 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,49 @@
-import { throttle } from "throttle-debounce"
-import { Category } from "./types"
-
-export function visitCategoryTree(category: Category, visitor: (category: Category) => void): void {
-    visitor(category)
-    category.children.forEach(child => visitCategoryTree(child, visitor))
-}
-
-export function flattenCategoryTree(category: Category): Category[] {
-    const categories: Category[] = []
-    visitCategoryTree(category, c => categories.push(c))
-    return categories
-}
-
-export function categoryUnreadCount(category?: Category): number {
-    if (!category) return 0
-
-    return flattenCategoryTree(category)
-        .flatMap(c => c.feeds)
-        .map(f => f.unread)
-        .reduce((total, current) => total + current, 0)
-}
-
-export const calculatePlaceholderSize = ({ width, height, maxWidth }: { width?: number; height?: number; maxWidth: number }) => {
-    const placeholderWidth = width && Math.min(width, maxWidth)
-    const placeholderHeight = height && width && width > maxWidth ? height * (maxWidth / width) : height
-    return { width: placeholderWidth, height: placeholderHeight }
-}
-
-export const scrollToWithCallback = ({ options, onScrollEnded }: { options: ScrollToOptions; onScrollEnded: () => void }) => {
-    const offset = (options.top ?? 0).toFixed()
-
-    const onScroll = throttle(100, () => {
-        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)
+import { throttle } from "throttle-debounce"
+import type { Category } from "./types"
+
+export function visitCategoryTree(category: Category, visitor: (category: Category) => void): void {
+    visitor(category)
+    for (const child of category.children) {
+        visitCategoryTree(child, visitor)
+    }
+}
+
+export function flattenCategoryTree(category: Category): Category[] {
+    const categories: Category[] = []
+    visitCategoryTree(category, c => categories.push(c))
+    return categories
+}
+
+export function categoryUnreadCount(category?: Category): number {
+    if (!category) return 0
+
+    return flattenCategoryTree(category)
+        .flatMap(c => c.feeds)
+        .map(f => f.unread)
+        .reduce((total, current) => total + current, 0)
+}
+
+export const calculatePlaceholderSize = ({ width, height, maxWidth }: { width?: number; height?: number; maxWidth: number }) => {
+    const placeholderWidth = width && Math.min(width, maxWidth)
+    const placeholderHeight = height && width && width > maxWidth ? height * (maxWidth / width) : height
+    return { width: placeholderWidth, height: placeholderHeight }
+}
+
+export const scrollToWithCallback = ({ options, onScrollEnded }: { options: ScrollToOptions; onScrollEnded: () => void }) => {
+    const offset = (options.top ?? 0).toFixed()
+
+    const onScroll = throttle(100, () => {
+        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">
- <sodipodi:namedview guidetolerance="10">
-  <sodipodi:guide position="154.17325,117.15254" orientation="0,1"/>
-  <sodipodi:guide position="154.17325,166.44575" orientation="0,1"/>
-  <sodipodi:guide position="154.17325,288.40369" orientation="0,1"/>
-  <sodipodi:guide position="380.44742,392.71992" orientation="0,1"/>
-  <sodipodi:guide position="101.9661,166.44575" orientation="1,0"/>
-  <sodipodi:guide position="276.13119,288.40369" orientation="1,0"/>
-  <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 height="512" width="512" viewBox="0 0 6.5625 6.5625" xmlns="http://www.w3.org/2000/svg">
+	<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.tsx

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

commafeed-client/src/components/Alert.tsx

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

commafeed-client/src/components/AnnouncementDialog.tsx

@@ -24,7 +24,7 @@ export function AnnouncementDialog() {
     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.tsx

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

commafeed-client/src/components/ErrorBoundary.tsx

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

commafeed-client/src/components/ImageWithPlaceholderWhileLoading.tsx

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

commafeed-client/src/components/KeyboardShortcutsHelp.tsx

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

commafeed-client/src/components/Logo.tsx

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

commafeed-client/src/components/RelativeDate.tsx

@@ -1,20 +1,21 @@
-import { Trans } from "@lingui/macro"
-import { Tooltip } from "@mantine/core"
-import dayjs from "dayjs"
-import { useEffect, useState } from "react"
-
-export function RelativeDate(props: { date: Date | number | undefined }) {
-    const [now, setNow] = useState(new Date())
-    useEffect(() => {
-        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 (
-        <Tooltip label={date.toDate().toLocaleString()} openDelay={500}>
-            <span>{date.from(dayjs(now))}</span>
-        </Tooltip>
-    )
-}
+import { Trans } from "@lingui/macro"
+import { Tooltip } from "@mantine/core"
+import { Constants } from "app/constants"
+import dayjs from "dayjs"
+import { useEffect, useState } from "react"
+
+export function RelativeDate(props: { date: Date | number | undefined }) {
+    const [now, setNow] = useState(new Date())
+    useEffect(() => {
+        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 (
+        <Tooltip label={date.toDate().toLocaleString()} openDelay={Constants.tooltip.delay}>
+            <span>{date.from(dayjs(now))}</span>
+        </Tooltip>
+    )
+}

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

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

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

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

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

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

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

@@ -0,0 +1,11 @@
+import { TypographyStylesProvider } from "@mantine/core"
+import type { ReactNode } from "react"
+
+/**
+ * This component is used to provide basic styles to html typography elements.
+ *
+ * see https://mantine.dev/core/typography-styles-provider/
+ */
+export const BasicHtmlStyles = (props: { children: ReactNode }) => {
+    return <TypographyStylesProvider pl={0}>{props.children}</TypographyStylesProvider>
+}

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

@@ -1,101 +1,103 @@
-import { Box, createStyles, Mark, TypographyStylesProvider } from "@mantine/core"
-import { Constants } from "app/constants"
-import { calculatePlaceholderSize } from "app/utils"
-import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
-import escapeStringRegexp from "escape-string-regexp"
-import { ChildrenNode, Interweave, Matcher, MatchResponse, Node, TransformCallback } from "interweave"
-import React from "react"
-
-export interface ContentProps {
-    content: string
-    highlight?: string
-}
-
-const useStyles = createStyles(theme => ({
-    content: {
-        // break long links or long words
-        overflowWrap: "anywhere",
-        "& a": {
-            color: theme.fn.variant({ color: theme.primaryColor, variant: "subtle" }).color,
-        },
-        "& 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 alt = node.getAttribute("alt") ?? "image"
-        const title = node.getAttribute("title") ?? undefined
-        const nodeWidth = node.getAttribute("width")
-        const nodeHeight = node.getAttribute("height")
-        const width = nodeWidth ? parseInt(nodeWidth, 10) : undefined
-        const height = nodeHeight ? parseInt(nodeHeight, 10) : undefined
-        const placeholderSize = calculatePlaceholderSize({
-            width,
-            height,
-            maxWidth: Constants.layout.entryMaxWidth,
-        })
-
-        return (
-            <ImageWithPlaceholderWhileLoading
-                src={src}
-                alt={alt}
-                title={title}
-                width={width}
-                height="auto"
-                placeholderWidth={placeholderSize.width}
-                placeholderHeight={placeholderSize.height}
-            />
-        )
-    }
-    return undefined
-}
-
-class HighlightMatcher extends Matcher {
-    private search: string
-
-    constructor(search: string) {
-        super("highlight")
-        this.search = escapeStringRegexp(search)
-    }
-
-    match(string: string): MatchResponse<unknown> | null {
-        const pattern = this.search.split(" ").join("|")
-        return this.doMatch(string, new RegExp(pattern, "i"), () => ({}))
-    }
-
-    // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-unused-vars
-    replaceWith(children: ChildrenNode, props: unknown): Node {
-        return <Mark>{children}</Mark>
-    }
-
-    // eslint-disable-next-line class-methods-use-this
-    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)] : []
-
-    return (
-        <TypographyStylesProvider>
-            <Box className={classes.content}>
-                <Interweave content={props.content} transform={transform} matchers={matchers} />
-            </Box>
-        </TypographyStylesProvider>
-    )
-})
-
-export { Content }
+import { Box, Mark } from "@mantine/core"
+import { Constants } from "app/constants"
+import { calculatePlaceholderSize } from "app/utils"
+import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
+import escapeStringRegexp from "escape-string-regexp"
+import { type ChildrenNode, Interweave, type MatchResponse, Matcher, type Node, type TransformCallback } from "interweave"
+import React from "react"
+import { tss } from "tss"
+
+export interface ContentProps {
+    content: string
+    highlight?: string
+}
+
+const useStyles = tss.create(() => ({
+    content: {
+        // break long links or long words
+        overflowWrap: "anywhere",
+        "& a": {
+            color: "inherit",
+            textDecoration: "underline",
+        },
+        "& 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 alt = node.getAttribute("alt") ?? "image"
+        const title = node.getAttribute("title") ?? undefined
+        const nodeWidth = node.getAttribute("width")
+        const nodeHeight = node.getAttribute("height")
+        const width = nodeWidth ? Number.parseInt(nodeWidth, 10) : undefined
+        const height = nodeHeight ? Number.parseInt(nodeHeight, 10) : undefined
+        const placeholderSize = calculatePlaceholderSize({
+            width,
+            height,
+            maxWidth: Constants.layout.entryMaxWidth,
+        })
+
+        return (
+            <ImageWithPlaceholderWhileLoading
+                src={src}
+                alt={alt}
+                title={title}
+                width={width}
+                height="auto"
+                placeholderWidth={placeholderSize.width}
+                placeholderHeight={placeholderSize.height}
+            />
+        )
+    }
+    return undefined
+}
+
+class HighlightMatcher extends Matcher {
+    private readonly search: string
+
+    constructor(search: string) {
+        super("highlight")
+        this.search = escapeStringRegexp(search)
+    }
+
+    match(string: string): MatchResponse<unknown> | null {
+        const pattern = this.search.split(" ").join("|")
+        return this.doMatch(string, new RegExp(pattern, "i"), () => ({}))
+    }
+
+    replaceWith(children: ChildrenNode): Node {
+        return <Mark>{children}</Mark>
+    }
+
+    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)] : []
+
+    return (
+        <BasicHtmlStyles>
+            <Box className={classes.content}>
+                <Interweave content={props.content} transform={transform} matchers={matchers} />
+            </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"
-
-export function Enclosure(props: { enclosureType: string; enclosureUrl: string }) {
-    const hasVideo = props.enclosureType && props.enclosureType.indexOf("video") === 0
-    const hasAudio = props.enclosureType && props.enclosureType.indexOf("audio") === 0
-    const hasImage = props.enclosureType && props.enclosureType.indexOf("image") === 0
-
-    return (
-        <TypographyStylesProvider>
-            {hasVideo && (
-                // eslint-disable-next-line jsx-a11y/media-has-caption
-                <video controls>
-                    <source src={props.enclosureUrl} type={props.enclosureType} />
-                </video>
-            )}
-            {hasAudio && (
-                // eslint-disable-next-line jsx-a11y/media-has-caption
-                <audio controls>
-                    <source src={props.enclosureUrl} type={props.enclosureType} />
-                </audio>
-            )}
-            {hasImage && <ImageWithPlaceholderWhileLoading src={props.enclosureUrl} alt="enclosure" />}
-        </TypographyStylesProvider>
-    )
-}
+import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+import { BasicHtmlStyles } from "components/content/BasicHtmlStyles"
+
+export function Enclosure(props: {
+    enclosureType: string
+    enclosureUrl: string
+}) {
+    const hasVideo = props.enclosureType.startsWith("video")
+    const hasAudio = props.enclosureType.startsWith("audio")
+    const hasImage = props.enclosureType.startsWith("image")
+
+    return (
+        <BasicHtmlStyles>
+            {hasVideo && (
+                // biome-ignore lint/a11y/useMediaCaption: we don't have any captions for videos
+                <video controls width="100%">
+                    <source src={props.enclosureUrl} type={props.enclosureType} />
+                </video>
+            )}
+            {hasAudio && (
+                // biome-ignore lint/a11y/useMediaCaption: we don't have any captions for audio
+                <audio controls>
+                    <source src={props.enclosureUrl} type={props.enclosureType} />
+                </audio>
+            )}
+            {hasImage && <ImageWithPlaceholderWhileLoading src={props.enclosureUrl} alt="enclosure" />}
+        </BasicHtmlStyles>
+    )
+}

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

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

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

@@ -1,151 +1,191 @@
-import { Box, createStyles, Divider, Paper } from "@mantine/core"
-import { MantineNumberSize } from "@mantine/styles"
-import { Constants } from "app/constants"
-import { Entry, ViewMode } from "app/types"
-import { useViewMode } from "hooks/useViewMode"
-import React from "react"
-import { useSwipeable } from "react-swipeable"
-import { FeedEntryBody } from "./FeedEntryBody"
-import { FeedEntryCompactHeader } from "./FeedEntryCompactHeader"
-import { FeedEntryContextMenu } from "./FeedEntryContextMenu"
-import { FeedEntryFooter } from "./FeedEntryFooter"
-import { FeedEntryHeader } from "./FeedEntryHeader"
-
-interface FeedEntryProps {
-    entry: Entry
-    expanded: boolean
-    selected: boolean
-    showSelectionIndicator: boolean
-    maxWidth?: number
-    onHeaderClick: (e: React.MouseEvent) => void
-    onHeaderRightClick: (e: React.MouseEvent) => void
-    onBodyClick: (e: React.MouseEvent) => void
-    onSwipedRight: () => void
-}
-
-const useStyles = createStyles((theme, props: FeedEntryProps & { viewMode?: ViewMode }) => {
-    let backgroundColor
-    if (theme.colorScheme === "dark") {
-        backgroundColor = props.entry.read ? "inherit" : theme.colors.dark[5]
-    } else {
-        backgroundColor = props.entry.read && !props.expanded ? theme.colors.gray[0] : "inherit"
-    }
-
-    let marginY = 10
-    if (props.viewMode === "title") {
-        marginY = 2
-    } else if (props.viewMode === "cozy") {
-        marginY = 6
-    }
-
-    let mobileMarginY = 6
-    if (props.viewMode === "title") {
-        mobileMarginY = 2
-    } else if (props.viewMode === "cozy") {
-        mobileMarginY = 4
-    }
-
-    let backgroundHoverColor = backgroundColor
-    if (!props.expanded && !props.entry.read) {
-        backgroundHoverColor = theme.colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[1]
-    }
-
-    let paperBorderLeftColor
-    if (props.showSelectionIndicator) {
-        const borderLeftColor = theme.colorScheme === "dark" ? theme.colors.orange[4] : theme.colors.orange[6]
-        paperBorderLeftColor = `${borderLeftColor} !important`
-    }
-
-    return {
-        paper: {
-            backgroundColor,
-            borderLeftColor: paperBorderLeftColor,
-            marginTop: marginY,
-            marginBottom: marginY,
-            [theme.fn.smallerThan(Constants.layout.mobileBreakpoint)]: {
-                marginTop: mobileMarginY,
-                marginBottom: mobileMarginY,
-            },
-            "@media (hover: hover)": {
-                "&:hover": {
-                    backgroundColor: backgroundHoverColor,
-                },
-            },
-        },
-        headerLink: {
-            color: "inherit",
-            textDecoration: "none",
-        },
-        body: {
-            direction: props.entry.rtl ? "rtl" : "ltr",
-            maxWidth: props.maxWidth ?? "100%",
-        },
-    }
-})
-
-export function FeedEntry(props: FeedEntryProps) {
-    const { viewMode } = useViewMode()
-    const { classes, cx } = useStyles({ ...props, viewMode })
-
-    const swipeHandlers = useSwipeable({
-        onSwipedRight: props.onSwipedRight,
-    })
-
-    let paddingX: MantineNumberSize = "xs"
-    if (viewMode === "title" || viewMode === "cozy") paddingX = 6
-
-    let paddingY: MantineNumberSize = "xs"
-    if (viewMode === "title") {
-        paddingY = 4
-    } else if (viewMode === "cozy") {
-        paddingY = 8
-    }
-
-    let borderRadius: MantineNumberSize = "sm"
-    if (viewMode === "title") {
-        borderRadius = 0
-    } else if (viewMode === "cozy") {
-        borderRadius = "xs"
-    }
-
-    const compactHeader = !props.expanded && (viewMode === "title" || viewMode === "cozy")
-    return (
-        <Paper
-            withBorder
-            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} />}
-                    {!compactHeader && <FeedEntryHeader entry={props.entry} expanded={props.expanded} />}
-                </Box>
-            </a>
-            {props.expanded && (
-                <Box px={paddingX} pb={paddingY} onClick={props.onBodyClick}>
-                    <Box className={classes.body}>
-                        <FeedEntryBody entry={props.entry} />
-                    </Box>
-                    <Divider variant="dashed" my={paddingY} />
-                    <FeedEntryFooter entry={props.entry} />
-                </Box>
-            )}
-
-            <FeedEntryContextMenu entry={props.entry} />
-        </Paper>
-    )
-}
+import { Box, Divider, type MantineRadius, type MantineSpacing, Paper } from "@mantine/core"
+import { Constants } from "app/constants"
+import { useAppSelector } from "app/store"
+import type { Entry, ViewMode } from "app/types"
+import { FeedEntryCompactHeader } from "components/content/header/FeedEntryCompactHeader"
+import { FeedEntryHeader } from "components/content/header/FeedEntryHeader"
+import { useMobile } from "hooks/useMobile"
+import { useViewMode } from "hooks/useViewMode"
+import type React from "react"
+import { useSwipeable } from "react-swipeable"
+import { tss } from "tss"
+import { FeedEntryBody } from "./FeedEntryBody"
+import { FeedEntryContextMenu } from "./FeedEntryContextMenu"
+import { FeedEntryFooter } from "./FeedEntryFooter"
+
+interface FeedEntryProps {
+    entry: Entry
+    expanded: boolean
+    selected: boolean
+    showSelectionIndicator: boolean
+    maxWidth?: number
+    onHeaderClick: (e: React.MouseEvent) => void
+    onHeaderRightClick: (e: React.MouseEvent) => void
+    onBodyClick: (e: React.MouseEvent) => void
+    onSwipedLeft: () => void
+}
+
+const useStyles = tss
+    .withParams<{
+        read: boolean
+        expanded: boolean
+        viewMode: ViewMode
+        rtl: boolean
+        showSelectionIndicator: boolean
+        maxWidth?: number
+    }>()
+    .create(({ theme, colorScheme, read, expanded, viewMode, rtl, showSelectionIndicator, maxWidth }) => {
+        let backgroundColor: string
+        if (colorScheme === "dark") {
+            backgroundColor = read ? "inherit" : theme.colors.dark[5]
+        } else {
+            backgroundColor = read && !expanded ? theme.colors.gray[0] : "inherit"
+        }
+
+        let marginY = 10
+        if (viewMode === "title") {
+            marginY = 2
+        } else if (viewMode === "cozy") {
+            marginY = 6
+        }
+
+        let mobileMarginY = 6
+        if (viewMode === "title") {
+            mobileMarginY = 2
+        } else if (viewMode === "cozy") {
+            mobileMarginY = 4
+        }
+
+        let backgroundHoverColor = backgroundColor
+        if (!expanded && !read) {
+            backgroundHoverColor = colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[1]
+        }
+
+        let paperBorderLeftColor = ""
+        if (showSelectionIndicator) {
+            const borderLeftColor = colorScheme === "dark" ? theme.colors[theme.primaryColor][4] : theme.colors[theme.primaryColor][6]
+            paperBorderLeftColor = `${borderLeftColor} !important`
+        }
+
+        return {
+            paper: {
+                backgroundColor,
+                borderLeftColor: paperBorderLeftColor,
+                marginTop: marginY,
+                marginBottom: marginY,
+                [`@media (max-width: ${Constants.layout.mobileBreakpoint}px)`]: {
+                    marginTop: mobileMarginY,
+                    marginBottom: mobileMarginY,
+                },
+                "@media (hover: hover)": {
+                    "&:hover": {
+                        backgroundColor: backgroundHoverColor,
+                    },
+                },
+            },
+            headerLink: {
+                color: "inherit",
+                textDecoration: "none",
+            },
+            body: {
+                direction: rtl ? "rtl" : "ltr",
+                maxWidth: maxWidth ?? "100%",
+            },
+        }
+    })
+
+export function FeedEntry(props: FeedEntryProps) {
+    const { viewMode } = useViewMode()
+    const { classes, cx } = useStyles({
+        read: props.entry.read,
+        expanded: props.expanded,
+        viewMode,
+        rtl: props.entry.rtl,
+        showSelectionIndicator: props.showSelectionIndicator,
+        maxWidth: props.maxWidth,
+    })
+
+    const externalLinkDisplayMode = useAppSelector(state => state.user.settings?.externalLinkIconDisplayMode)
+    const starIconDisplayMode = useAppSelector(state => state.user.settings?.starIconDisplayMode)
+    const mobile = useMobile()
+
+    const showExternalLinkIcon =
+        externalLinkDisplayMode && ["always", mobile ? "on_mobile" : "on_desktop"].includes(externalLinkDisplayMode)
+    const showStarIcon =
+        props.entry.markable && starIconDisplayMode && ["always", mobile ? "on_mobile" : "on_desktop"].includes(starIconDisplayMode)
+
+    const swipeHandlers = useSwipeable({
+        onSwipedLeft: props.onSwipedLeft,
+    })
+
+    let paddingX: MantineSpacing = "xs"
+    if (viewMode === "title" || viewMode === "cozy") paddingX = 6
+
+    let paddingY: MantineSpacing = "xs"
+    if (viewMode === "title") {
+        paddingY = 4
+    } else if (viewMode === "cozy") {
+        paddingY = 8
+    }
+
+    let borderRadius: MantineRadius = "sm"
+    if (viewMode === "title") {
+        borderRadius = 0
+    } else if (viewMode === "cozy") {
+        borderRadius = "xs"
+    }
+
+    const compactHeader = !props.expanded && (viewMode === "title" || viewMode === "cozy")
+    return (
+        <Paper
+            withBorder
+            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}>
+                        <FeedEntryBody entry={props.entry} />
+                    </Box>
+                    <Divider variant="dashed" my={paddingY} />
+                    <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 { useAppSelector } from "app/store"
-import { Entry } from "app/types"
-import { Content } from "./Content"
-import { Enclosure } from "./Enclosure"
-import { Media } from "./Media"
-
-export interface FeedEntryBodyProps {
-    entry: Entry
-}
-
-export function FeedEntryBody(props: FeedEntryBodyProps) {
-    const search = useAppSelector(state => state.entries.search)
-    return (
-        <Box>
-            <Box>
-                <Content content={props.entry.content} highlight={search} />
-            </Box>
-            {props.entry.enclosureType && props.entry.enclosureUrl && (
-                <Box pt="md">
-                    <Enclosure enclosureType={props.entry.enclosureType} enclosureUrl={props.entry.enclosureUrl} />
-                </Box>
-            )}
-            {/* show media only if we don't have content to avoid duplicate content */}
-            {!props.entry.content && props.entry.mediaThumbnailUrl && (
-                <Box pt="md">
-                    <Media
-                        thumbnailUrl={props.entry.mediaThumbnailUrl}
-                        thumbnailWidth={props.entry.mediaThumbnailWidth}
-                        thumbnailHeight={props.entry.mediaThumbnailHeight}
-                        description={props.entry.mediaDescription}
-                    />
-                </Box>
-            )}
-        </Box>
-    )
-}
+import { Box } from "@mantine/core"
+import { useAppSelector } from "app/store"
+import type { Entry } from "app/types"
+import { Content } from "./Content"
+import { Enclosure } from "./Enclosure"
+import { Media } from "./Media"
+
+export interface FeedEntryBodyProps {
+    entry: Entry
+}
+
+export function FeedEntryBody(props: FeedEntryBodyProps) {
+    const search = useAppSelector(state => state.entries.search)
+    return (
+        <Box>
+            <Box>
+                <Content content={props.entry.content} highlight={search} />
+            </Box>
+            {props.entry.enclosureType && props.entry.enclosureUrl && (
+                <Box pt="md">
+                    <Enclosure enclosureType={props.entry.enclosureType} enclosureUrl={props.entry.enclosureUrl} />
+                </Box>
+            )}
+            {/* show media only if we don't have content to avoid duplicate content */}
+            {!props.entry.content && props.entry.mediaThumbnailUrl && (
+                <Box pt="md">
+                    <Media
+                        thumbnailUrl={props.entry.mediaThumbnailUrl}
+                        thumbnailWidth={props.entry.mediaThumbnailWidth}
+                        thumbnailHeight={props.entry.mediaThumbnailHeight}
+                        description={props.entry.mediaDescription}
+                    />
+                </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 { createStyles, Group } from "@mantine/core"
-import { Constants } from "app/constants"
-import { markEntriesUpToEntry, markEntry, starEntry } from "app/slices/entries"
-import { redirectToFeed } from "app/slices/redirect"
-import { useAppDispatch, useAppSelector } from "app/store"
-import { Entry } from "app/types"
-import { truncate } from "app/utils"
-import { useBrowserExtension } from "hooks/useBrowserExtension"
-import { Item, Menu, Separator } from "react-contexify"
-import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbRss, TbStar, TbStarOff } from "react-icons/tb"
-
-interface FeedEntryContextMenuProps {
-    entry: Entry
-}
-
-const iconSize = 16
-const useStyles = createStyles(theme => ({
-    menu: {
-        // apply mantine theme from MenuItem.styles.ts
-        fontSize: theme.fontSizes.sm,
-        "--contexify-item-color": `${theme.colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
-        "--contexify-activeItem-color": `${theme.colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
-        "--contexify-activeItem-bgColor": `${
-            theme.colorScheme === "dark" ? theme.fn.rgba(theme.colors.dark[3], 0.35) : theme.colors.gray[1]
-        } !important`,
-    },
-}))
-
-export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) {
-    const { classes, theme } = useStyles()
-    const sourceType = useAppSelector(state => state.entries.source.type)
-    const dispatch = useAppDispatch()
-    const { openLinkInBackgroundTab } = useBrowserExtension()
-
-    return (
-        <Menu id={Constants.dom.entryContextMenuId(props.entry)} theme={theme.colorScheme} animation={false} className={classes.menu}>
-            <Item
-                onClick={() => {
-                    window.open(props.entry.url, "_blank", "noreferrer")
-                    dispatch(markEntry({ entry: props.entry, read: true }))
-                }}
-            >
-                <Group>
-                    <TbExternalLink size={iconSize} />
-                    <Trans>Open link in new tab</Trans>
-                </Group>
-            </Item>
-            <Item
-                onClick={() => {
-                    openLinkInBackgroundTab(props.entry.url)
-                    dispatch(markEntry({ entry: props.entry, read: true }))
-                }}
-            >
-                <Group>
-                    <TbExternalLink size={iconSize} />
-                    <Trans>Open link in new background tab</Trans>
-                </Group>
-            </Item>
-
-            <Separator />
-
-            <Item onClick={() => dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))}>
-                <Group>
-                    {props.entry.starred ? <TbStarOff size={iconSize} /> : <TbStar size={iconSize} />}
-                    {props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
-                </Group>
-            </Item>
-            <Item onClick={() => dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}>
-                <Group>
-                    {props.entry.read ? <TbEyeOff size={iconSize} /> : <TbEyeCheck size={iconSize} />}
-                    {props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}
-                </Group>
-            </Item>
-            <Item onClick={() => dispatch(markEntriesUpToEntry(props.entry))}>
-                <Group>
-                    <TbArrowBarToDown size={iconSize} />
-                    <Trans>Mark as read up to here</Trans>
-                </Group>
-            </Item>
-
-            {sourceType === "category" && (
-                <>
-                    <Separator />
-
-                    <Item
-                        onClick={() => {
-                            dispatch(redirectToFeed(props.entry.feedId))
-                        }}
-                    >
-                        <Group>
-                            <TbRss size={iconSize} />
-                            <Trans>Go to {truncate(props.entry.feedName, 30)}</Trans>
-                        </Group>
-                    </Item>
-                </>
-            )}
-        </Menu>
-    )
-}
+import { Trans } from "@lingui/macro"
+import { Group } from "@mantine/core"
+import { Constants } from "app/constants"
+import { markEntriesUpToEntry, markEntry, starEntry } from "app/entries/thunks"
+import { redirectToFeed } from "app/redirect/thunks"
+import { useAppDispatch, useAppSelector } from "app/store"
+import type { Entry } from "app/types"
+import { truncate } from "app/utils"
+import { useBrowserExtension } from "hooks/useBrowserExtension"
+import { useColorScheme } from "hooks/useColorScheme"
+import { Item, Menu, Separator } from "react-contexify"
+import { TbArrowBarToDown, TbExternalLink, TbMail, TbMailOpened, TbRss, TbStar, TbStarOff } from "react-icons/tb"
+import { tss } from "tss"
+
+interface FeedEntryContextMenuProps {
+    entry: Entry
+}
+
+const iconSize = 16
+const useStyles = tss.create(({ theme, colorScheme }) => ({
+    menu: {
+        // apply mantine theme from MenuItem.styles.ts
+        fontSize: theme.fontSizes.sm,
+        "--contexify-item-color": `${colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
+        "--contexify-activeItem-color": `${colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
+        "--contexify-activeItem-bgColor": `${colorScheme === "dark" ? theme.colors.dark[4] : theme.colors.gray[1]} !important`,
+    },
+}))
+
+export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) {
+    const colorScheme = useColorScheme()
+    const { classes } = useStyles()
+    const sourceType = useAppSelector(state => state.entries.source.type)
+    const dispatch = useAppDispatch()
+    const { openLinkInBackgroundTab } = useBrowserExtension()
+
+    return (
+        <Menu id={Constants.dom.entryContextMenuId(props.entry)} theme={colorScheme} animation={false} className={classes.menu}>
+            <Item
+                onClick={() => {
+                    window.open(props.entry.url, "_blank", "noreferrer")
+                    dispatch(markEntry({ entry: props.entry, read: true }))
+                }}
+            >
+                <Group>
+                    <TbExternalLink size={iconSize} />
+                    <Trans>Open link in new tab</Trans>
+                </Group>
+            </Item>
+            <Item
+                onClick={() => {
+                    openLinkInBackgroundTab(props.entry.url)
+                    dispatch(markEntry({ entry: props.entry, read: true }))
+                }}
+            >
+                <Group>
+                    <TbExternalLink size={iconSize} />
+                    <Trans>Open link in new background tab</Trans>
+                </Group>
+            </Item>
+
+            <Separator />
+
+            <Item onClick={async () => await dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))}>
+                <Group>
+                    {props.entry.starred ? <TbStarOff size={iconSize} /> : <TbStar size={iconSize} />}
+                    {props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
+                </Group>
+            </Item>
+            {props.entry.markable && (
+                <Item onClick={async () => await dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}>
+                    <Group>
+                        {props.entry.read ? <TbMail size={iconSize} /> : <TbMailOpened size={iconSize} />}
+                        {props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}
+                    </Group>
+                </Item>
+            )}
+            <Item onClick={async () => await dispatch(markEntriesUpToEntry(props.entry))}>
+                <Group>
+                    <TbArrowBarToDown size={iconSize} />
+                    <Trans>Mark as read up to here</Trans>
+                </Group>
+            </Item>
+
+            {sourceType === "category" && (
+                <>
+                    <Separator />
+
+                    <Item
+                        onClick={() => {
+                            dispatch(redirectToFeed(props.entry.feedId))
+                        }}
+                    >
+                        <Group>
+                            <TbRss size={iconSize} />
+                            <Trans>Go to {truncate(props.entry.feedName, 30)}</Trans>
+                        </Group>
+                    </Item>
+                </>
+            )}
+        </Menu>
+    )
+}

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

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

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

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

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

@@ -1,55 +1,113 @@
-import { ActionIcon, Box, createStyles, SimpleGrid } from "@mantine/core"
-import { Constants } from "app/constants"
-import { useAppSelector } from "app/store"
-import { SharingSettings } from "app/types"
-import { IconType } from "react-icons"
-
-type Color = `#${string}`
-
-const useStyles = createStyles((theme, props: { color: Color }) => ({
-    socialIcon: {
-        color: props.color,
-        backgroundColor: theme.colorScheme === "dark" ? theme.colors.gray[2] : "white",
-        borderRadius: "50%",
-    },
-}))
-
-function ShareButton({ url, icon, color }: { url: string; icon: IconType; color: Color }) {
-    const { classes } = useStyles({ color })
-
-    const onClick = (e: React.MouseEvent) => {
-        e.preventDefault()
-        window.open(url, "", "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=800,height=600")
-    }
-
-    return (
-        <ActionIcon>
-            <a href={url} target="_blank" rel="noreferrer" onClick={onClick}>
-                <Box p={6} className={classes.socialIcon}>
-                    {icon({ size: 18 })}
-                </Box>
-            </a>
-        </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)
-
-    return (
-        <SimpleGrid cols={4}>
-            {(Object.keys(Constants.sharing) as Array<keyof SharingSettings>)
-                .filter(site => sharingSettings && sharingSettings[site])
-                .map(site => (
-                    <ShareButton
-                        key={site}
-                        icon={Constants.sharing[site].icon}
-                        color={Constants.sharing[site].color}
-                        url={Constants.sharing[site].url(url, desc)}
-                    />
-                ))}
-        </SimpleGrid>
-    )
-}
+import { Trans } from "@lingui/macro"
+import { ActionIcon, Box, CopyButton, Divider, SimpleGrid } from "@mantine/core"
+import { Constants } from "app/constants"
+import { useAppSelector } from "app/store"
+import type { SharingSettings } from "app/types"
+import { useBrowserExtension } from "hooks/useBrowserExtension"
+import { useMobile } from "hooks/useMobile"
+import type { IconType } from "react-icons"
+import { TbCheck, TbCopy, TbDeviceDesktopShare, TbDeviceMobileShare } from "react-icons/tb"
+import { tss } from "tss"
+
+type Color = `#${string}`
+
+const useStyles = tss
+    .withParams<{
+        color: Color
+    }>()
+    .create(({ theme, colorScheme, color }) => ({
+        icon: {
+            color,
+            backgroundColor: colorScheme === "dark" ? theme.colors.gray[2] : "white",
+        },
+    }))
+
+function ShareButton({ icon, color, onClick }: { icon: IconType; color: Color; onClick: () => void }) {
+    const { classes } = useStyles({
+        color,
+    })
+
+    return (
+        <ActionIcon variant="transparent" radius="xl" size={32}>
+            <Box p={6} className={classes.icon} onClick={onClick}>
+                {icon({ size: 18 })}
+            </Box>
+        </ActionIcon>
+    )
+}
+
+function SiteShareButton({ url, icon, color }: { icon: IconType; color: Color; url: string }) {
+    const onClick = () => {
+        window.open(url, "", "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=800,height=600")
+    }
+
+    return <ShareButton icon={icon} color={color} onClick={onClick} />
+}
+
+function CopyUrlButton({ url }: { url: string }) {
+    return (
+        <CopyButton value={url}>
+            {({ copied, copy }) => <ShareButton icon={copied ? TbCheck : TbCopy} color="#000" onClick={copy} />}
+        </CopyButton>
+    )
+}
+
+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,52 @@
-import { t, Trans } from "@lingui/macro"
-import { Box, Button, Group, Stack, TextInput } from "@mantine/core"
-import { useForm } from "@mantine/form"
-import { client, errorToStrings } from "app/client"
-import { redirectToSelectedSource } from "app/slices/redirect"
-import { reloadTree } from "app/slices/tree"
-import { useAppDispatch } from "app/store"
-import { AddCategoryRequest } from "app/types"
-import { Alert } from "components/Alert"
-import { useAsyncCallback } from "react-async-hook"
-import { TbFolderPlus } from "react-icons/tb"
-import { CategorySelect } from "./CategorySelect"
-
-export function AddCategory() {
-    const dispatch = useAppDispatch()
-
-    const form = useForm<AddCategoryRequest>()
-
-    const addCategory = useAsyncCallback(client.category.add, {
-        onSuccess: () => {
-            dispatch(reloadTree())
-            dispatch(redirectToSelectedSource())
-        },
-    })
-
-    return (
-        <>
-            {addCategory.error && (
-                <Box mb="md">
-                    <Alert messages={errorToStrings(addCategory.error)} />
-                </Box>
-            )}
-
-            <form onSubmit={form.onSubmit(addCategory.execute)}>
-                <Stack>
-                    <TextInput label={<Trans>Category</Trans>} placeholder={t`Category`} {...form.getInputProps("name")} required />
-                    <CategorySelect label={<Trans>Parent</Trans>} {...form.getInputProps("parentId")} clearable />
-                    <Group position="center">
-                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
-                            <Trans>Cancel</Trans>
-                        </Button>
-                        <Button type="submit" leftIcon={<TbFolderPlus size={16} />} loading={addCategory.loading}>
-                            <Trans>Add</Trans>
-                        </Button>
-                    </Group>
-                </Stack>
-            </form>
-        </>
-    )
-}
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
+import { Box, Button, Group, Stack, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { client, errorToStrings } from "app/client"
+import { redirectToSelectedSource } from "app/redirect/thunks"
+import { useAppDispatch } from "app/store"
+import { reloadTree } from "app/tree/thunks"
+import type { AddCategoryRequest } from "app/types"
+import { Alert } from "components/Alert"
+import { useAsyncCallback } from "react-async-hook"
+import { TbFolderPlus } from "react-icons/tb"
+import { CategorySelect } from "./CategorySelect"
+
+export function AddCategory() {
+    const dispatch = useAppDispatch()
+    const { _ } = useLingui()
+
+    const form = useForm<AddCategoryRequest>()
+
+    const addCategory = useAsyncCallback(client.category.add, {
+        onSuccess: () => {
+            dispatch(reloadTree())
+            dispatch(redirectToSelectedSource())
+        },
+    })
+
+    return (
+        <>
+            {addCategory.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(addCategory.error)} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(addCategory.execute)}>
+                <Stack>
+                    <TextInput label={<Trans>Category</Trans>} placeholder={_(msg`Category`)} {...form.getInputProps("name")} required />
+                    <CategorySelect label={<Trans>Parent</Trans>} {...form.getInputProps("parentId")} clearable />
+                    <Group justify="center">
+                        <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftSection={<TbFolderPlus size={16} />} loading={addCategory.loading}>
+                            <Trans>Add</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </form>
+        </>
+    )
+}

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

@@ -1,31 +1,55 @@
-import { t } from "@lingui/macro"
-import { Select, SelectItem, SelectProps } from "@mantine/core"
-import { Constants } from "app/constants"
-import { useAppSelector } from "app/store"
-import { flattenCategoryTree } from "app/utils"
-
-type CategorySelectProps = Partial<SelectProps> & {
-    withAll?: boolean
-    withoutCategoryIds?: string[]
-}
-
-export function CategorySelect(props: CategorySelectProps) {
-    const rootCategory = useAppSelector(state => state.tree.rootCategory)
-    const categories = rootCategory && flattenCategoryTree(rootCategory)
-    const selectData: SelectItem[] | undefined = categories
-        ?.filter(c => c.id !== Constants.categories.all.id)
-        .filter(c => !props.withoutCategoryIds || !props.withoutCategoryIds.includes(c.id))
-        .sort((c1, c2) => c1.name.localeCompare(c2.name))
-        .map(c => ({
-            label: c.parentName ? t`${c.name} (in ${c.parentName})` : c.name,
-            value: c.id,
-        }))
-    if (props.withAll) {
-        selectData?.unshift({
-            label: t`All`,
-            value: Constants.categories.all.id,
-        })
-    }
-
-    return <Select {...props} data={selectData ?? []} disabled={!selectData} />
-}
+import { msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
+import { Select, type SelectProps } from "@mantine/core"
+import type { ComboboxItem } from "@mantine/core/lib/components/Combobox/Combobox.types"
+import { Constants } from "app/constants"
+import { useAppSelector } from "app/store"
+import type { Category } from "app/types"
+import { flattenCategoryTree } from "app/utils"
+
+type CategorySelectProps = Partial<SelectProps> & {
+    withAll?: boolean
+    withoutCategoryIds?: string[]
+}
+
+export function CategorySelect(props: CategorySelectProps) {
+    const rootCategory = useAppSelector(state => state.tree.rootCategory)
+    const { _ } = useLingui()
+
+    const categories = rootCategory && flattenCategoryTree(rootCategory)
+    const categoriesById = categories?.reduce((map, c) => {
+        map.set(c.id, c)
+        return map
+    }, new Map<string, Category>())
+    const categoryLabel = (category: Category) => {
+        let cat = category
+        let label = cat.name
+
+        while (cat.parentId) {
+            const parent = categoriesById?.get(cat.parentId)
+            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,66 @@
-import { t, Trans } from "@lingui/macro"
-import { Box, Button, FileInput, Group, Stack } from "@mantine/core"
-import { useForm } from "@mantine/form"
-import { client, errorToStrings } from "app/client"
-import { redirectToSelectedSource } from "app/slices/redirect"
-import { reloadTree } from "app/slices/tree"
-import { useAppDispatch } from "app/store"
-import { Alert } from "components/Alert"
-import { useAsyncCallback } from "react-async-hook"
-import { TbFileImport } from "react-icons/tb"
-
-export function ImportOpml() {
-    const dispatch = useAppDispatch()
-
-    const form = useForm<{ file: File }>({
-        validate: {
-            file: v => (v ? null : t`file is required`),
-        },
-    })
-
-    const importOpml = useAsyncCallback(client.feed.importOpml, {
-        onSuccess: () => {
-            dispatch(reloadTree())
-            dispatch(redirectToSelectedSource())
-        },
-    })
-
-    return (
-        <>
-            {importOpml.error && (
-                <Box mb="md">
-                    <Alert messages={errorToStrings(importOpml.error)} />
-                </Box>
-            )}
-
-            <form onSubmit={form.onSubmit(v => importOpml.execute(v.file))}>
-                <Stack>
-                    <FileInput
-                        label={<Trans>OPML file</Trans>}
-                        placeholder={t`OPML file`}
-                        description={
-                            <Trans>
-                                An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your
-                                data from other feed reading services.
-                            </Trans>
-                        }
-                        {...form.getInputProps("file")}
-                        required
-                        accept="application/xml"
-                    />
-                    <Group position="center">
-                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
-                            <Trans>Cancel</Trans>
-                        </Button>
-                        <Button type="submit" leftIcon={<TbFileImport size={16} />} loading={importOpml.loading}>
-                            <Trans>Import</Trans>
-                        </Button>
-                    </Group>
-                </Stack>
-            </form>
-        </>
-    )
-}
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
+import { Box, Button, FileInput, Group, Stack } from "@mantine/core"
+import { isNotEmpty, useForm } from "@mantine/form"
+import { client, errorToStrings } from "app/client"
+import { redirectToSelectedSource } from "app/redirect/thunks"
+import { useAppDispatch } from "app/store"
+import { reloadTree } from "app/tree/thunks"
+import { Alert } from "components/Alert"
+import { useAsyncCallback } from "react-async-hook"
+import { TbFileImport } from "react-icons/tb"
+
+export function ImportOpml() {
+    const dispatch = useAppDispatch()
+    const { _ } = useLingui()
+
+    const form = useForm<{ file: File }>({
+        validate: {
+            file: isNotEmpty(_(msg`OPML file is required`)),
+        },
+    })
+
+    const importOpml = useAsyncCallback(client.feed.importOpml, {
+        onSuccess: () => {
+            dispatch(reloadTree())
+            dispatch(redirectToSelectedSource())
+        },
+    })
+
+    return (
+        <>
+            {importOpml.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(importOpml.error)} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(async v => await importOpml.execute(v.file))}>
+                <Stack>
+                    <FileInput
+                        label={<Trans>OPML file</Trans>}
+                        leftSection={<TbFileImport />}
+                        placeholder={_(msg`OPML file`)}
+                        description={
+                            <Trans>
+                                An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your
+                                data from other feed reading services.
+                            </Trans>
+                        }
+                        {...form.getInputProps("file")}
+                        required
+                        accept=".xml,.opml"
+                    />
+                    <Group justify="center">
+                        <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftSection={<TbFileImport size={16} />} loading={importOpml.loading}>
+                            <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 { Box, Button, Group, Stack, Stepper, TextInput } from "@mantine/core"
-import { useForm } from "@mantine/form"
-import { client, errorToStrings } from "app/client"
-import { Constants } from "app/constants"
-import { redirectToFeed, redirectToSelectedSource } from "app/slices/redirect"
-import { reloadTree } from "app/slices/tree"
-import { useAppDispatch } from "app/store"
-import { FeedInfoRequest, SubscribeRequest } from "app/types"
-import { Alert } from "components/Alert"
-import { useState } from "react"
-import { useAsyncCallback } from "react-async-hook"
-import { TbRss } from "react-icons/tb"
-import { CategorySelect } from "./CategorySelect"
-
-export function Subscribe() {
-    const [activeStep, setActiveStep] = useState(0)
-    const dispatch = useAppDispatch()
-
-    const step0Form = useForm<FeedInfoRequest>({
-        initialValues: {
-            url: "",
-        },
-    })
-
-    const step1Form = useForm<SubscribeRequest>({
-        initialValues: {
-            url: "",
-            title: "",
-            categoryId: Constants.categories.all.id,
-        },
-    })
-
-    const fetchFeed = useAsyncCallback(client.feed.fetchFeed, {
-        onSuccess: ({ data }) => {
-            step1Form.setFieldValue("url", data.url)
-            step1Form.setFieldValue("title", data.title)
-            setActiveStep(step => step + 1)
-        },
-    })
-    const subscribe = useAsyncCallback(client.feed.subscribe, {
-        onSuccess: sub => {
-            dispatch(reloadTree())
-            dispatch(redirectToFeed(sub.data))
-        },
-    })
-
-    const previousStep = () => {
-        if (activeStep === 0) dispatch(redirectToSelectedSource())
-        else setActiveStep(activeStep - 1)
-    }
-    const nextStep = (e: React.FormEvent<HTMLFormElement>) => {
-        if (activeStep === 0) {
-            step0Form.onSubmit(fetchFeed.execute)(e)
-        } else if (activeStep === 1) {
-            step1Form.onSubmit(subscribe.execute)(e)
-        }
-    }
-
-    return (
-        <>
-            {fetchFeed.error && (
-                <Box mb="md">
-                    <Alert messages={errorToStrings(fetchFeed.error)} />
-                </Box>
-            )}
-
-            {subscribe.error && (
-                <Box mb="md">
-                    <Alert messages={errorToStrings(subscribe.error)} />
-                </Box>
-            )}
-
-            <form onSubmit={nextStep}>
-                <Stepper active={activeStep} onStepClick={setActiveStep}>
-                    <Stepper.Step
-                        label={<Trans>Analyze feed</Trans>}
-                        description={<Trans>Check that the feed is working</Trans>}
-                        allowStepSelect={activeStep === 1}
-                    >
-                        <TextInput
-                            label={<Trans>Feed URL</Trans>}
-                            placeholder="http://www.mysite.com/rss"
-                            description={
-                                <Trans>
-                                    The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed
-                                    will try to find the feed in the page.
-                                </Trans>
-                            }
-                            required
-                            autoFocus
-                            {...step0Form.getInputProps("url")}
-                        />
-                    </Stepper.Step>
-                    <Stepper.Step
-                        label={<Trans>Subscribe</Trans>}
-                        description={<Trans>Subscribe to the feed</Trans>}
-                        allowStepSelect={false}
-                    >
-                        <Stack>
-                            <TextInput label={<Trans>Feed URL</Trans>} {...step1Form.getInputProps("url")} disabled />
-                            <TextInput label={<Trans>Feed name</Trans>} {...step1Form.getInputProps("title")} required autoFocus />
-                            <CategorySelect label={<Trans>Category</Trans>} {...step1Form.getInputProps("categoryId")} clearable />
-                        </Stack>
-                    </Stepper.Step>
-                </Stepper>
-
-                <Group position="center" mt="xl">
-                    <Button variant="default" onClick={previousStep}>
-                        <Trans>Back</Trans>
-                    </Button>
-                    {activeStep === 0 && (
-                        <Button type="submit" loading={fetchFeed.loading}>
-                            <Trans>Next</Trans>
-                        </Button>
-                    )}
-                    {activeStep === 1 && (
-                        <Button type="submit" leftIcon={<TbRss size={16} />} loading={fetchFeed.loading || subscribe.loading}>
-                            <Trans>Subscribe</Trans>
-                        </Button>
-                    )}
-                </Group>
-            </form>
-        </>
-    )
-}
+import { Trans } from "@lingui/macro"
+import { Box, Button, Group, Stack, Stepper, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { client, errorToStrings } from "app/client"
+import { Constants } from "app/constants"
+import { redirectToFeed, redirectToSelectedSource } from "app/redirect/thunks"
+import { useAppDispatch } from "app/store"
+import { reloadTree } from "app/tree/thunks"
+import type { FeedInfoRequest, SubscribeRequest } from "app/types"
+import { Alert } from "components/Alert"
+import { useState } from "react"
+import { useAsyncCallback } from "react-async-hook"
+import { TbRss } from "react-icons/tb"
+import { CategorySelect } from "./CategorySelect"
+
+export function Subscribe() {
+    const [activeStep, setActiveStep] = useState(0)
+    const dispatch = useAppDispatch()
+
+    const step0Form = useForm<FeedInfoRequest>({
+        initialValues: {
+            url: "",
+        },
+    })
+
+    const step1Form = useForm<SubscribeRequest>({
+        initialValues: {
+            url: "",
+            title: "",
+            categoryId: Constants.categories.all.id,
+        },
+    })
+
+    const fetchFeed = useAsyncCallback(client.feed.fetchFeed, {
+        onSuccess: ({ data }) => {
+            step1Form.setFieldValue("url", data.url)
+            step1Form.setFieldValue("title", data.title)
+            setActiveStep(step => step + 1)
+        },
+    })
+    const subscribe = useAsyncCallback(client.feed.subscribe, {
+        onSuccess: sub => {
+            dispatch(reloadTree())
+            dispatch(redirectToFeed(sub.data))
+        },
+    })
+
+    const previousStep = () => {
+        if (activeStep === 0) {
+            dispatch(redirectToSelectedSource())
+        } else {
+            setActiveStep(activeStep - 1)
+        }
+    }
+    const nextStep = (e: React.FormEvent<HTMLFormElement>) => {
+        if (activeStep === 0) {
+            step0Form.onSubmit(fetchFeed.execute)(e)
+        } else if (activeStep === 1) {
+            step1Form.onSubmit(subscribe.execute)(e)
+        }
+    }
+
+    return (
+        <>
+            {fetchFeed.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(fetchFeed.error)} />
+                </Box>
+            )}
+
+            {subscribe.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(subscribe.error)} />
+                </Box>
+            )}
+
+            <form onSubmit={nextStep}>
+                <Stepper active={activeStep} onStepClick={setActiveStep}>
+                    <Stepper.Step
+                        label={<Trans>Analyze feed</Trans>}
+                        description={<Trans>Check that the feed is working</Trans>}
+                        allowStepSelect={activeStep === 1}
+                    >
+                        <TextInput
+                            label={<Trans>Feed URL</Trans>}
+                            placeholder="https://www.mysite.com/rss"
+                            description={
+                                <Trans>
+                                    The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed
+                                    will try to find the feed in the page.
+                                </Trans>
+                            }
+                            required
+                            autoFocus
+                            {...step0Form.getInputProps("url")}
+                        />
+                    </Stepper.Step>
+                    <Stepper.Step
+                        label={<Trans>Subscribe</Trans>}
+                        description={<Trans>Subscribe to the feed</Trans>}
+                        allowStepSelect={false}
+                    >
+                        <Stack>
+                            <TextInput label={<Trans>Feed URL</Trans>} {...step1Form.getInputProps("url")} disabled />
+                            <TextInput label={<Trans>Feed name</Trans>} {...step1Form.getInputProps("title")} required autoFocus />
+                            <CategorySelect label={<Trans>Category</Trans>} {...step1Form.getInputProps("categoryId")} clearable />
+                        </Stack>
+                    </Stepper.Step>
+                </Stepper>
+
+                <Group justify="center" mt="xl">
+                    <Button variant="default" onClick={previousStep}>
+                        <Trans>Back</Trans>
+                    </Button>
+                    {activeStep === 0 && (
+                        <Button type="submit" loading={fetchFeed.loading}>
+                            <Trans>Next</Trans>
+                        </Button>
+                    )}
+                    {activeStep === 1 && (
+                        <Button type="submit" leftSection={<TbRss size={16} />} loading={fetchFeed.loading || subscribe.loading}>
+                            <Trans>Subscribe</Trans>
+                        </Button>
+                    )}
+                </Group>
+            </form>
+        </>
+    )
+}

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

@@ -0,0 +1,72 @@
+import { Box, Text } 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>
+                <Text c="dimmed" className={classes.feedName}>
+                    {props.entry.feedName}
+                </Text>
+            </OnDesktop>
+            <Box className={classes.title}>
+                <FeedEntryTitle entry={props.entry} />
+            </Box>
+            <OnDesktop>
+                <Text c="dimmed" className={classes.date}>
+                    <RelativeDate date={props.entry.date} />
+                </Text>
+            </OnDesktop>
+            {props.showExternalLinkIcon && <OpenExternalLink entry={props.entry} />}
+        </Box>
+    )
+}

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

@@ -0,0 +1,67 @@
+import { Box, Flex, Space, Text } 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",
+        },
+        details: {
+            fontSize: "90%",
+        },
+    }))
+
+export function FeedEntryHeader(props: FeedEntryHeaderProps) {
+    const { classes } = useStyles({
+        read: props.entry.read,
+    })
+    return (
+        <Box>
+            <Flex align="flex-start" justify="space-between">
+                <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={classes.details}>
+                <FeedFavicon url={props.entry.iconUrl} />
+                <Space w={6} />
+                <Text c="dimmed">
+                    {props.entry.feedName}
+                    <span> · </span>
+                    <RelativeDate date={props.entry.date} />
+                </Text>
+            </Flex>
+            {props.expanded && (
+                <Box className={classes.details}>
+                    <Text c="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/header/FeedEntryTitle.tsx

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

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

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

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

@@ -1,95 +1,97 @@
-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} />
-        </>
-    )
-}
+import { Trans, msg } from "@lingui/macro"
+
+import { Button, Code, Group, Modal, Slider, Stack, Text } from "@mantine/core"
+import { markAllEntries } from "app/entries/thunks"
+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: Date.now(),
+                        insertedBefore: 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 justify="flex-end">
+                        <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: Date.now() - threshold * 24 * 60 * 60 * 1000,
+                                            insertedBefore: entriesTimestamp,
+                                        },
+                                    })
+                                )
+                            }}
+                        >
+                            <Trans>Confirm</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </Modal>
+            <ActionButton icon={<TbChecks size={props.iconSize} />} label={msg`Mark all as read`} onClick={buttonClicked} />
+        </>
+    )
+}

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

@@ -1,203 +1,217 @@
-import { Trans } from "@lingui/macro"
-import { Box, Divider, Group, Menu, SegmentedControl, SegmentedControlItem, useMantineColorScheme } from "@mantine/core"
-import { showNotification } from "@mantine/notifications"
-import { client } from "app/client"
-import { redirectToAbout, redirectToAdminUsers, redirectToDonate, redirectToMetrics, redirectToSettings } from "app/slices/redirect"
-import { useAppDispatch, useAppSelector } from "app/store"
-import { ViewMode } from "app/types"
-import { useViewMode } from "hooks/useViewMode"
-import { useState } from "react"
-import {
-    TbChartLine,
-    TbHeartFilled,
-    TbHelp,
-    TbLayoutList,
-    TbList,
-    TbListDetails,
-    TbMoon,
-    TbNotes,
-    TbPower,
-    TbSettings,
-    TbSun,
-    TbUsers,
-    TbWorldDownload,
-} from "react-icons/tb"
-
-interface ProfileMenuProps {
-    control: React.ReactElement
-}
-
-interface ViewModeControlItem extends SegmentedControlItem {
-    value: ViewMode
-}
-
-const iconSize = 16
-
-const viewModeData: ViewModeControlItem[] = [
-    {
-        value: "title",
-        label: (
-            <Group>
-                <TbList size={iconSize} />
-                <Box ml={6}>
-                    <Trans>Compact</Trans>
-                </Box>
-            </Group>
-        ),
-    },
-    {
-        value: "cozy",
-        label: (
-            <Group>
-                <TbLayoutList size={iconSize} />
-                <Box ml={6}>
-                    <Trans>Cozy</Trans>
-                </Box>
-            </Group>
-        ),
-    },
-    {
-        value: "detailed",
-        label: (
-            <Group>
-                <TbListDetails size={iconSize} />
-                <Box ml={6}>
-                    <Trans>Detailed</Trans>
-                </Box>
-            </Group>
-        ),
-    },
-    {
-        value: "expanded",
-        label: (
-            <Group>
-                <TbNotes size={iconSize} />
-                <Box ml={6}>
-                    <Trans>Expanded</Trans>
-                </Box>
-            </Group>
-        ),
-    },
-]
-
-export function ProfileMenu(props: ProfileMenuProps) {
-    const [opened, setOpened] = useState(false)
-    const { viewMode, setViewMode } = useViewMode()
-    const profile = useAppSelector(state => state.user.profile)
-    const admin = useAppSelector(state => state.user.profile?.admin)
-    const dispatch = useAppDispatch()
-    const { colorScheme, toggleColorScheme } = useMantineColorScheme()
-    const dark = colorScheme === "dark"
-
-    const logout = () => {
-        window.location.href = "logout"
-    }
-
-    return (
-        <Menu position="bottom-end" closeOnItemClick={false} opened={opened} onChange={setOpened}>
-            <Menu.Target>{props.control}</Menu.Target>
-            <Menu.Dropdown>
-                {profile && <Menu.Label>{profile.name}</Menu.Label>}
-                <Menu.Item
-                    icon={<TbSettings size={iconSize} />}
-                    onClick={() => {
-                        dispatch(redirectToSettings())
-                        setOpened(false)
-                    }}
-                >
-                    <Trans>Settings</Trans>
-                </Menu.Item>
-                <Menu.Item
-                    icon={<TbWorldDownload size={iconSize} />}
-                    onClick={() =>
-                        client.feed.refreshAll().then(() => {
-                            showNotification({
-                                message: <Trans>Your feeds have been queued for refresh.</Trans>,
-                                color: "green",
-                                autoClose: 1000,
-                            })
-                            setOpened(false)
-                        })
-                    }
-                >
-                    <Trans>Fetch all my feeds now</Trans>
-                </Menu.Item>
-
-                <Divider />
-
-                <Menu.Label>
-                    <Trans>Theme</Trans>
-                </Menu.Label>
-                <Menu.Item icon={dark ? <TbSun size={iconSize} /> : <TbMoon size={iconSize} />} onClick={() => toggleColorScheme()}>
-                    {dark ? <Trans>Switch to light theme</Trans> : <Trans>Switch to dark theme</Trans>}
-                </Menu.Item>
-
-                <Divider />
-
-                <Menu.Label>
-                    <Trans>Display</Trans>
-                </Menu.Label>
-                <SegmentedControl
-                    fullWidth
-                    orientation="vertical"
-                    data={viewModeData}
-                    value={viewMode}
-                    onChange={e => setViewMode(e as ViewMode)}
-                    mb="xs"
-                />
-
-                {admin && (
-                    <>
-                        <Divider />
-                        <Menu.Label>
-                            <Trans>Admin</Trans>
-                        </Menu.Label>
-                        <Menu.Item
-                            icon={<TbUsers size={iconSize} />}
-                            onClick={() => {
-                                dispatch(redirectToAdminUsers())
-                                setOpened(false)
-                            }}
-                        >
-                            <Trans>Manage users</Trans>
-                        </Menu.Item>
-                        <Menu.Item
-                            icon={<TbChartLine size={iconSize} />}
-                            onClick={() => {
-                                dispatch(redirectToMetrics())
-                                setOpened(false)
-                            }}
-                        >
-                            <Trans>Metrics</Trans>
-                        </Menu.Item>
-                    </>
-                )}
-
-                <Divider />
-
-                <Menu.Item
-                    icon={<TbHeartFilled size={iconSize} color="red" />}
-                    onClick={() => {
-                        dispatch(redirectToDonate())
-                        setOpened(false)
-                    }}
-                >
-                    <Trans>Donate</Trans>
-                </Menu.Item>
-
-                <Menu.Item
-                    icon={<TbHelp size={iconSize} />}
-                    onClick={() => {
-                        dispatch(redirectToAbout())
-                        setOpened(false)
-                    }}
-                >
-                    <Trans>About</Trans>
-                </Menu.Item>
-                <Menu.Item icon={<TbPower size={iconSize} />} onClick={logout}>
-                    <Trans>Logout</Trans>
-                </Menu.Item>
-            </Menu.Dropdown>
-        </Menu>
-    )
-}
+import { Trans } from "@lingui/macro"
+import {
+    Box,
+    Divider,
+    Group,
+    type MantineColorScheme,
+    Menu,
+    SegmentedControl,
+    type SegmentedControlItem,
+    useMantineColorScheme,
+} from "@mantine/core"
+import { showNotification } from "@mantine/notifications"
+import { client } from "app/client"
+import { redirectToAbout, redirectToAdminUsers, redirectToDonate, redirectToMetrics, redirectToSettings } from "app/redirect/thunks"
+import { useAppDispatch, useAppSelector } from "app/store"
+import type { ViewMode } from "app/types"
+import { useViewMode } from "hooks/useViewMode"
+import { type ReactNode, useState } from "react"
+import {
+    TbChartLine,
+    TbHeartFilled,
+    TbHelp,
+    TbLayoutList,
+    TbList,
+    TbListDetails,
+    TbMoon,
+    TbNotes,
+    TbPower,
+    TbSettings,
+    TbSun,
+    TbSunMoon,
+    TbUsers,
+    TbWorldDownload,
+} from "react-icons/tb"
+
+interface ProfileMenuProps {
+    control: React.ReactElement
+}
+
+const ProfileMenuControlItem = ({ icon, label }: { icon: ReactNode; label: ReactNode }) => {
+    return (
+        <Group>
+            {icon}
+            <Box ml={6}>{label}</Box>
+        </Group>
+    )
+}
+
+const iconSize = 16
+
+interface ColorSchemeControlItem extends SegmentedControlItem {
+    value: MantineColorScheme
+}
+
+const colorSchemeData: ColorSchemeControlItem[] = [
+    {
+        value: "light",
+        label: <ProfileMenuControlItem icon={<TbSun size={iconSize} />} label={<Trans>Light</Trans>} />,
+    },
+    {
+        value: "dark",
+        label: <ProfileMenuControlItem icon={<TbMoon size={iconSize} />} label={<Trans>Dark</Trans>} />,
+    },
+    {
+        value: "auto",
+        label: <ProfileMenuControlItem icon={<TbSunMoon size={iconSize} />} label={<Trans>System</Trans>} />,
+    },
+]
+
+interface ViewModeControlItem extends SegmentedControlItem {
+    value: ViewMode
+}
+
+const viewModeData: ViewModeControlItem[] = [
+    {
+        value: "title",
+        label: <ProfileMenuControlItem icon={<TbList size={iconSize} />} label={<Trans>Compact</Trans>} />,
+    },
+    {
+        value: "cozy",
+        label: <ProfileMenuControlItem icon={<TbLayoutList size={iconSize} />} label={<Trans>Cozy</Trans>} />,
+    },
+    {
+        value: "detailed",
+        label: <ProfileMenuControlItem icon={<TbListDetails size={iconSize} />} label={<Trans>Detailed</Trans>} />,
+    },
+    {
+        value: "expanded",
+        label: <ProfileMenuControlItem icon={<TbNotes size={iconSize} />} label={<Trans>Expanded</Trans>} />,
+    },
+]
+
+export function ProfileMenu(props: ProfileMenuProps) {
+    const [opened, setOpened] = useState(false)
+    const { viewMode, setViewMode } = useViewMode()
+    const profile = useAppSelector(state => state.user.profile)
+    const admin = useAppSelector(state => state.user.profile?.admin)
+    const dispatch = useAppDispatch()
+    const { colorScheme, setColorScheme } = useMantineColorScheme()
+
+    const logout = () => {
+        window.location.href = "logout"
+    }
+
+    return (
+        <Menu position="bottom-end" closeOnItemClick={false} opened={opened} onChange={setOpened}>
+            <Menu.Target>{props.control}</Menu.Target>
+            <Menu.Dropdown>
+                {profile && <Menu.Label>{profile.name}</Menu.Label>}
+                <Menu.Item
+                    leftSection={<TbSettings size={iconSize} />}
+                    onClick={() => {
+                        dispatch(redirectToSettings())
+                        setOpened(false)
+                    }}
+                >
+                    <Trans>Settings</Trans>
+                </Menu.Item>
+                <Menu.Item
+                    leftSection={<TbWorldDownload size={iconSize} />}
+                    onClick={async () =>
+                        await client.feed.refreshAll().then(() => {
+                            showNotification({
+                                message: <Trans>Your feeds have been queued for refresh.</Trans>,
+                                color: "green",
+                                autoClose: 1000,
+                            })
+                            setOpened(false)
+                        })
+                    }
+                >
+                    <Trans>Fetch all my feeds now</Trans>
+                </Menu.Item>
+
+                <Divider />
+
+                <Menu.Label>
+                    <Trans>Theme</Trans>
+                </Menu.Label>
+                <SegmentedControl
+                    fullWidth
+                    orientation="vertical"
+                    data={colorSchemeData}
+                    value={colorScheme}
+                    onChange={e => setColorScheme(e as MantineColorScheme)}
+                    mb="xs"
+                />
+
+                <Divider />
+
+                <Menu.Label>
+                    <Trans>Display</Trans>
+                </Menu.Label>
+                <SegmentedControl
+                    fullWidth
+                    orientation="vertical"
+                    data={viewModeData}
+                    value={viewMode}
+                    onChange={e => setViewMode(e as ViewMode)}
+                    mb="xs"
+                />
+
+                {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,9 @@
-import { MetricGauge } from "app/types"
-
-interface MeterProps {
-    gauge: MetricGauge
-}
-
-export function Gauge(props: MeterProps) {
-    return <span>{props.gauge.value}</span>
-}
+import type { MetricGauge } from "app/types"
+
+interface MeterProps {
+    gauge: MetricGauge
+}
+
+export function Gauge(props: MeterProps) {
+    return <span>{props.gauge.value}</span>
+}

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

@@ -1,19 +1,19 @@
-import { Box } from "@mantine/core"
-import { MetricMeter } from "app/types"
-
-interface MeterProps {
-    meter: MetricMeter
-}
-
-export function Meter(props: MeterProps) {
-    return (
-        <Box>
-            <Box>Mean: {props.meter.mean_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 15 minutes: {props.meter.m15_rate.toFixed(2)}</Box>
-            <Box>Units: {props.meter.units}</Box>
-            <Box>Total: {props.meter.count}</Box>
-        </Box>
-    )
-}
+import { Box } from "@mantine/core"
+import type { MetricMeter } from "app/types"
+
+interface MeterProps {
+    meter: MetricMeter
+}
+
+export function Meter(props: MeterProps) {
+    return (
+        <Box>
+            <Box>Mean: {props.meter.mean_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 15 minutes: {props.meter.m15_rate.toFixed(2)}</Box>
+            <Box>Units: {props.meter.units}</Box>
+            <Box>Total: {props.meter.count}</Box>
+        </Box>
+    )
+}

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

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

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

@@ -1,19 +1,19 @@
-import { Box } from "@mantine/core"
-import { MetricTimer } from "app/types"
-
-interface MetricTimerProps {
-    timer: MetricTimer
-}
-
-export function Timer(props: MetricTimerProps) {
-    return (
-        <Box>
-            <Box>Mean: {props.timer.mean_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 15 minutes: {props.timer.m15_rate.toFixed(2)}</Box>
-            <Box>Units: {props.timer.rate_units}</Box>
-            <Box>Total: {props.timer.count}</Box>
-        </Box>
-    )
-}
+import { Box } from "@mantine/core"
+import type { MetricTimer } from "app/types"
+
+interface MetricTimerProps {
+    timer: MetricTimer
+}
+
+export function Timer(props: MetricTimerProps) {
+    return (
+        <Box>
+            <Box>Mean: {props.timer.mean_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 15 minutes: {props.timer.m15_rate.toFixed(2)}</Box>
+            <Box>Units: {props.timer.rate_units}</Box>
+            <Box>Total: {props.timer.count}</Box>
+        </Box>
+    )
+}

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

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

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

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

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

@@ -2,7 +2,7 @@ import { Trans } from "@lingui/macro"
 import { 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 { redirectToSelectedSource } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { Alert } from "components/Alert"
 import { CodeEditor } from "components/code/CodeEditor"
@@ -69,10 +69,10 @@ export function CustomCodeSettings() {
                     />
 
                     <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,163 @@
-import { Trans } from "@lingui/macro"
-import { Divider, Select, SimpleGrid, Stack, Switch } from "@mantine/core"
-import { Constants } from "app/constants"
-import {
-    changeAlwaysScrollToEntry,
-    changeCustomContextMenu,
-    changeLanguage,
-    changeMarkAllAsReadConfirmation,
-    changeScrollMarks,
-    changeScrollSpeed,
-    changeSharingSetting,
-    changeShowRead,
-} from "app/slices/user"
-import { useAppDispatch, useAppSelector } from "app/store"
-import { SharingSettings } from "app/types"
-import { locales } from "i18n"
-
-export function DisplaySettings() {
-    const language = useAppSelector(state => state.user.settings?.language)
-    const scrollSpeed = useAppSelector(state => state.user.settings?.scrollSpeed)
-    const showRead = useAppSelector(state => state.user.settings?.showRead)
-    const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
-    const alwaysScrollToEntry = useAppSelector(state => state.user.settings?.alwaysScrollToEntry)
-    const markAllAsReadConfirmation = useAppSelector(state => state.user.settings?.markAllAsReadConfirmation)
-    const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu)
-    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
-    const dispatch = useAppDispatch()
-
-    return (
-        <Stack>
-            <Select
-                description={<Trans>Language</Trans>}
-                value={language}
-                data={locales.map(l => ({
-                    value: l.key,
-                    label: l.label,
-                }))}
-                onChange={s => s && dispatch(changeLanguage(s))}
-            />
-
-            <Switch
-                label={<Trans>Scroll smoothly when navigating between entries</Trans>}
-                checked={scrollSpeed ? scrollSpeed > 0 : false}
-                onChange={e => dispatch(changeScrollSpeed(e.currentTarget.checked))}
-            />
-
-            <Switch
-                label={<Trans>Always scroll selected entry to the top of the page, even if it fits entirely on screen</Trans>}
-                checked={alwaysScrollToEntry}
-                onChange={e => dispatch(changeAlwaysScrollToEntry(e.currentTarget.checked))}
-            />
-
-            <Switch
-                label={<Trans>Show feeds and categories with no unread entries</Trans>}
-                checked={showRead}
-                onChange={e => dispatch(changeShowRead(e.currentTarget.checked))}
-            />
-
-            <Switch
-                label={<Trans>In expanded view, scrolling through entries mark them as read</Trans>}
-                checked={scrollMarks}
-                onChange={e => dispatch(changeScrollMarks(e.currentTarget.checked))}
-            />
-
-            <Switch
-                label={<Trans>Show confirmation when marking all entries as read</Trans>}
-                checked={markAllAsReadConfirmation}
-                onChange={e => dispatch(changeMarkAllAsReadConfirmation(e.currentTarget.checked))}
-            />
-
-            <Switch
-                label={<Trans>Show CommaFeed's own context menu on right click</Trans>}
-                checked={customContextMenu}
-                onChange={e => dispatch(changeCustomContextMenu(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 && sharingSettings[site]}
-                        onChange={e => dispatch(changeSharingSetting({ site, value: e.currentTarget.checked }))}
-                    />
-                ))}
-            </SimpleGrid>
-        </Stack>
-    )
-}
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
+import { Divider, Group, Radio, Select, SimpleGrid, Stack, Switch } from "@mantine/core"
+import type { ComboboxData } from "@mantine/core/lib/components/Combobox/Combobox.types"
+import { Constants } from "app/constants"
+import { useAppDispatch, useAppSelector } from "app/store"
+import type { IconDisplayMode, ScrollMode, SharingSettings } from "app/types"
+import {
+    changeCustomContextMenu,
+    changeExternalLinkIconDisplayMode,
+    changeLanguage,
+    changeMarkAllAsReadConfirmation,
+    changeMobileFooter,
+    changeScrollMarks,
+    changeScrollMode,
+    changeScrollSpeed,
+    changeSharingSetting,
+    changeShowRead,
+    changeStarIconDisplayMode,
+} from "app/user/thunks"
+import { locales } from "i18n"
+import type { ReactNode } from "react"
+
+export function DisplaySettings() {
+    const language = useAppSelector(state => state.user.settings?.language)
+    const scrollSpeed = useAppSelector(state => state.user.settings?.scrollSpeed)
+    const showRead = useAppSelector(state => state.user.settings?.showRead)
+    const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
+    const scrollMode = useAppSelector(state => state.user.settings?.scrollMode)
+    const starIconDisplayMode = useAppSelector(state => state.user.settings?.starIconDisplayMode)
+    const externalLinkIconDisplayMode = useAppSelector(state => state.user.settings?.externalLinkIconDisplayMode)
+    const markAllAsReadConfirmation = useAppSelector(state => state.user.settings?.markAllAsReadConfirmation)
+    const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu)
+    const mobileFooter = useAppSelector(state => state.user.settings?.mobileFooter)
+    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
+    const dispatch = useAppDispatch()
+    const { _ } = useLingui()
+
+    const scrollModeOptions: Record<ScrollMode, ReactNode> = {
+        always: <Trans>Always</Trans>,
+        never: <Trans>Never</Trans>,
+        if_needed: <Trans>If the entry doesn't entirely fit on the screen</Trans>,
+    }
+
+    const displayModeData: ComboboxData = [
+        {
+            value: "always",
+            label: _(msg`Always`),
+        },
+        {
+            value: "on_desktop",
+            label: _(msg`On desktop`),
+        },
+        {
+            value: "on_mobile",
+            label: _(msg`On mobile`),
+        },
+        {
+            value: "never",
+            label: _(msg`Never`),
+        },
+    ]
+
+    return (
+        <Stack>
+            <Select
+                description={<Trans>Language</Trans>}
+                value={language}
+                data={locales.map(l => ({
+                    value: l.key,
+                    label: l.label,
+                }))}
+                onChange={async s => await (s && dispatch(changeLanguage(s)))}
+            />
+
+            <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>Entry headers</Trans>} labelPosition="center" />
+
+            <Select
+                description={<Trans>Show star icon</Trans>}
+                value={starIconDisplayMode}
+                data={displayModeData}
+                onChange={async s => await dispatch(changeStarIconDisplayMode(s as IconDisplayMode))}
+            />
+
+            <Select
+                description={<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>
+
+            <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,164 @@
-import { t, Trans } from "@lingui/macro"
-import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
-import { useForm } from "@mantine/form"
-import { openConfirmModal } from "@mantine/modals"
-import { client, errorToStrings } from "app/client"
-import { redirectToLogin, redirectToSelectedSource } from "app/slices/redirect"
-import { reloadProfile } from "app/slices/user"
-import { useAppDispatch, useAppSelector } from "app/store"
-import { ProfileModificationRequest } from "app/types"
-import { Alert } from "components/Alert"
-import { useEffect } from "react"
-import { useAsyncCallback } from "react-async-hook"
-import { TbDeviceFloppy, TbTrash } from "react-icons/tb"
-
-interface FormData extends ProfileModificationRequest {
-    newPasswordConfirmation?: string
-}
-
-export function ProfileSettings() {
-    const profile = useAppSelector(state => state.user.profile)
-    const dispatch = useAppDispatch()
-
-    const form = useForm<FormData>({
-        validate: {
-            newPasswordConfirmation: (value, values) => (value !== values.newPassword ? t`Passwords do not match` : null),
-        },
-    })
-    const { setValues } = form
-
-    const saveProfile = useAsyncCallback(client.user.saveProfile, {
-        onSuccess: () => {
-            dispatch(reloadProfile())
-            dispatch(redirectToSelectedSource())
-        },
-    })
-    const deleteProfile = useAsyncCallback(client.user.deleteProfile, {
-        onSuccess: () => {
-            dispatch(redirectToLogin())
-        },
-    })
-
-    const openDeleteProfileModal = () =>
-        openConfirmModal({
-            title: <Trans>Delete account</Trans>,
-            children: (
-                <Text size="sm">
-                    <Trans>Are you sure you want to delete your account? There's no turning back!</Trans>
-                </Text>
-            ),
-            labels: { confirm: <Trans>Confirm</Trans>, cancel: <Trans>Cancel</Trans> },
-            confirmProps: { color: "red" },
-            onConfirm: () => deleteProfile.execute(),
-        })
-
-    useEffect(() => {
-        if (!profile) return
-        setValues({
-            currentPassword: "",
-            email: profile.email ?? "",
-            newApiKey: false,
-        })
-    }, [setValues, profile])
-
-    return (
-        <>
-            {saveProfile.error && (
-                <Box mb="md">
-                    <Alert messages={errorToStrings(saveProfile.error)} />
-                </Box>
-            )}
-
-            {deleteProfile.error && (
-                <Box mb="md">
-                    <Alert messages={errorToStrings(deleteProfile.error)} />
-                </Box>
-            )}
-
-            <form onSubmit={form.onSubmit(saveProfile.execute)}>
-                <Stack>
-                    <TextInput label={<Trans>User name</Trans>} readOnly value={profile?.name} />
-                    <TextInput label={<Trans>API key</Trans>} readOnly value={profile?.apiKey} />
-
-                    <Input.Wrapper
-                        label={<Trans>OPML export</Trans>}
-                        description={
-                            <Trans>
-                                Export your subscriptions and categories as an OPML file that can be imported in other feed reading services
-                            </Trans>
-                        }
-                    >
-                        <Box>
-                            <Anchor href="rest/feed/export" download="commafeed_opml.xml">
-                                <Trans>Download</Trans>
-                            </Anchor>
-                        </Box>
-                    </Input.Wrapper>
-
-                    <Input.Wrapper
-                        label={<Trans>Fever API</Trans>}
-                        description={
-                            <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/fever/user/${profile?.id}`} target="_blank">
-                                <Trans>Fever API URL</Trans>
-                            </Anchor>
-                        </Box>
-                    </Input.Wrapper>
-
-                    <Divider />
-
-                    <PasswordInput
-                        label={<Trans>Current password</Trans>}
-                        description={<Trans>Enter your current password to change profile settings</Trans>}
-                        required
-                        {...form.getInputProps("currentPassword")}
-                    />
-                    <TextInput type="email" label={<Trans>E-mail</Trans>} {...form.getInputProps("email")} required />
-                    <PasswordInput
-                        label={<Trans>New password</Trans>}
-                        description={<Trans>Changing password will generate a new API key</Trans>}
-                        {...form.getInputProps("newPassword")}
-                    />
-                    <PasswordInput label={<Trans>Confirm password</Trans>} {...form.getInputProps("newPasswordConfirmation")} />
-                    <Checkbox label={<Trans>Generate new API key</Trans>} {...form.getInputProps("newApiKey", { type: "checkbox" })} />
-
-                    <Group>
-                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
-                            <Trans>Cancel</Trans>
-                        </Button>
-                        <Button type="submit" leftIcon={<TbDeviceFloppy size={16} />} loading={saveProfile.loading}>
-                            <Trans>Save</Trans>
-                        </Button>
-                        <Divider orientation="vertical" />
-                        <Button
-                            color="red"
-                            leftIcon={<TbTrash size={16} />}
-                            onClick={() => openDeleteProfileModal()}
-                            loading={deleteProfile.loading}
-                        >
-                            <Trans>Delete account</Trans>
-                        </Button>
-                    </Group>
-                </Stack>
-            </form>
-        </>
-    )
-}
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
+import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { openConfirmModal } from "@mantine/modals"
+import { client, errorToStrings } from "app/client"
+import { redirectToLogin, redirectToSelectedSource } from "app/redirect/thunks"
+import { useAppDispatch, useAppSelector } from "app/store"
+import type { ProfileModificationRequest } from "app/types"
+import { reloadProfile } from "app/user/thunks"
+import { Alert } from "components/Alert"
+import { useEffect } from "react"
+import { useAsyncCallback } from "react-async-hook"
+import { TbDeviceFloppy, TbTrash } from "react-icons/tb"
+
+interface FormData extends ProfileModificationRequest {
+    newPasswordConfirmation?: string
+}
+
+export function ProfileSettings() {
+    const profile = useAppSelector(state => state.user.profile)
+    const dispatch = useAppDispatch()
+    const { _ } = useLingui()
+
+    const form = useForm<FormData>({
+        validate: {
+            newPasswordConfirmation: (value, values) => (value !== values.newPassword ? _(msg`Passwords do not match`) : null),
+        },
+    })
+    const { setValues } = form
+
+    const saveProfile = useAsyncCallback(client.user.saveProfile, {
+        onSuccess: () => {
+            dispatch(reloadProfile())
+            dispatch(redirectToSelectedSource())
+        },
+    })
+    const deleteProfile = useAsyncCallback(client.user.deleteProfile, {
+        onSuccess: () => {
+            dispatch(redirectToLogin())
+        },
+    })
+
+    const openDeleteProfileModal = () =>
+        openConfirmModal({
+            title: <Trans>Delete account</Trans>,
+            children: (
+                <Text size="sm">
+                    <Trans>Are you sure you want to delete your account? There's no turning back!</Trans>
+                </Text>
+            ),
+            labels: { confirm: <Trans>Confirm</Trans>, cancel: <Trans>Cancel</Trans> },
+            confirmProps: { color: "red" },
+            onConfirm: async () => await deleteProfile.execute(),
+        })
+
+    useEffect(() => {
+        if (!profile) return
+        setValues({
+            currentPassword: "",
+            email: profile.email ?? "",
+            newApiKey: false,
+        })
+    }, [setValues, profile])
+
+    return (
+        <>
+            {saveProfile.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(saveProfile.error)} />
+                </Box>
+            )}
+
+            {deleteProfile.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(deleteProfile.error)} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(saveProfile.execute)}>
+                <Stack>
+                    <TextInput label={<Trans>User name</Trans>} readOnly value={profile?.name} />
+                    <TextInput
+                        label={<Trans>API key</Trans>}
+                        description={
+                            <Trans>
+                                This is your API key. It can be used for some read-only API operations and grants access to the Fever API.
+                                Use the form at the bottom of the page to generate a new API key
+                            </Trans>
+                        }
+                        readOnly
+                        value={profile?.apiKey}
+                    />
+
+                    <Input.Wrapper
+                        label={<Trans>OPML export</Trans>}
+                        description={
+                            <Trans>
+                                Export your subscriptions and categories as an OPML file that can be imported in other feed reading services
+                            </Trans>
+                        }
+                    >
+                        <Box>
+                            <Anchor href="rest/feed/export" download="commafeed.opml">
+                                <Trans>Download</Trans>
+                            </Anchor>
+                        </Box>
+                    </Input.Wrapper>
+
+                    <Input.Wrapper
+                        label={<Trans>Fever API</Trans>}
+                        description={
+                            <Trans>
+                                CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client.
+                                Login with your username and your <u>API key</u>.
+                            </Trans>
+                        }
+                    >
+                        <Box>
+                            <Anchor href={`rest/fever/user/${profile?.id}`} target="_blank">
+                                <Trans>Fever API URL</Trans>
+                            </Anchor>
+                        </Box>
+                    </Input.Wrapper>
+
+                    <Divider />
+
+                    <PasswordInput
+                        label={<Trans>Current password</Trans>}
+                        description={<Trans>Enter your current password to change profile settings</Trans>}
+                        required
+                        {...form.getInputProps("currentPassword")}
+                    />
+                    <TextInput type="email" label={<Trans>E-mail</Trans>} {...form.getInputProps("email")} required />
+                    <PasswordInput
+                        label={<Trans>New password</Trans>}
+                        description={<Trans>Changing password will generate a new API key</Trans>}
+                        {...form.getInputProps("newPassword")}
+                    />
+                    <PasswordInput label={<Trans>Confirm password</Trans>} {...form.getInputProps("newPasswordConfirmation")} />
+                    <Checkbox label={<Trans>Generate new API key</Trans>} {...form.getInputProps("newApiKey", { type: "checkbox" })} />
+
+                    <Group>
+                        <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftSection={<TbDeviceFloppy size={16} />} loading={saveProfile.loading}>
+                            <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>
+        </>
+    )
+}

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

@@ -1,169 +1,180 @@
-import { Trans } from "@lingui/macro"
-import { Box, Stack } from "@mantine/core"
-import { Constants } from "app/constants"
-import {
-    redirectToCategory,
-    redirectToCategoryDetails,
-    redirectToFeed,
-    redirectToFeedDetails,
-    redirectToTag,
-    redirectToTagDetails,
-} from "app/slices/redirect"
-import { collapseTreeCategory } from "app/slices/tree"
-import { useAppDispatch, useAppSelector } from "app/store"
-import { Category, Subscription } from "app/types"
-import { categoryUnreadCount, flattenCategoryTree } from "app/utils"
-import { Loader } from "components/Loader"
-import { OnDesktop } from "components/responsive/OnDesktop"
-import React from "react"
-import { TbChevronDown, TbChevronRight, TbInbox, TbStar, TbTag } from "react-icons/tb"
-import { TreeNode } from "./TreeNode"
-import { TreeSearch } from "./TreeSearch"
-
-const allIcon = <TbInbox size={16} />
-const starredIcon = <TbStar size={16} />
-const tagIcon = <TbTag size={16} />
-const expandedIcon = <TbChevronDown size={16} />
-const collapsedIcon = <TbChevronRight size={16} />
-
-const errorThreshold = 9
-
-export function Tree() {
-    const root = useAppSelector(state => state.tree.rootCategory)
-    const source = useAppSelector(state => state.entries.source)
-    const tags = useAppSelector(state => state.user.tags)
-    const showRead = useAppSelector(state => state.user.settings?.showRead)
-    const dispatch = useAppDispatch()
-
-    const feedClicked = (e: React.MouseEvent, id: string) => {
-        if (e.detail === 2) dispatch(redirectToFeedDetails(id))
-        else dispatch(redirectToFeed(id))
-    }
-    const categoryClicked = (e: React.MouseEvent, id: string) => {
-        if (e.detail === 2) {
-            dispatch(redirectToCategoryDetails(id))
-        } else {
-            dispatch(redirectToCategory(id))
-        }
-    }
-    const categoryIconClicked = (e: React.MouseEvent, category: Category) => {
-        e.stopPropagation()
-
-        dispatch(
-            collapseTreeCategory({
-                id: +category.id,
-                collapse: category.expanded,
-            })
-        )
-    }
-    const tagClicked = (e: React.MouseEvent, id: string) => {
-        if (e.detail === 2) dispatch(redirectToTagDetails(id))
-        else dispatch(redirectToTag(id))
-    }
-
-    const allCategoryNode = () => (
-        <TreeNode
-            id={Constants.categories.all.id}
-            name={<Trans>All</Trans>}
-            icon={allIcon}
-            unread={categoryUnreadCount(root)}
-            selected={source.type === "category" && source.id === Constants.categories.all.id}
-            expanded={false}
-            level={0}
-            hasError={false}
-            onClick={categoryClicked}
-        />
-    )
-    const starredCategoryNode = () => (
-        <TreeNode
-            id={Constants.categories.starred.id}
-            name={<Trans>Starred</Trans>}
-            icon={starredIcon}
-            unread={0}
-            selected={source.type === "category" && source.id === Constants.categories.starred.id}
-            expanded={false}
-            level={0}
-            hasError={false}
-            onClick={categoryClicked}
-        />
-    )
-
-    const categoryNode = (category: Category, level = 0) => {
-        const unreadCount = categoryUnreadCount(category)
-        if (unreadCount === 0 && !showRead) return null
-
-        const hasError = !category.expanded && flattenCategoryTree(category).some(c => c.feeds.some(f => f.errorCount > errorThreshold))
-        return (
-            <TreeNode
-                id={category.id}
-                name={category.name}
-                icon={category.expanded ? expandedIcon : collapsedIcon}
-                unread={unreadCount}
-                selected={source.type === "category" && source.id === category.id}
-                expanded={category.expanded}
-                level={level}
-                hasError={hasError}
-                onClick={categoryClicked}
-                onIconClick={e => categoryIconClicked(e, category)}
-                key={category.id}
-            />
-        )
-    }
-
-    const feedNode = (feed: Subscription, level = 0) => {
-        if (feed.unread === 0 && !showRead) return null
-
-        return (
-            <TreeNode
-                id={String(feed.id)}
-                name={feed.name}
-                icon={feed.iconUrl}
-                unread={feed.unread}
-                selected={source.type === "feed" && source.id === String(feed.id)}
-                level={level}
-                hasError={feed.errorCount > errorThreshold}
-                onClick={feedClicked}
-                key={feed.id}
-            />
-        )
-    }
-
-    const tagNode = (tag: string) => (
-        <TreeNode
-            id={tag}
-            name={tag}
-            icon={tagIcon}
-            unread={0}
-            selected={source.type === "tag" && source.id === tag}
-            level={0}
-            hasError={false}
-            onClick={tagClicked}
-            key={tag}
-        />
-    )
-
-    const recursiveCategoryNode = (category: Category, level = 0) => (
-        <React.Fragment key={`recursiveCategoryNode-${category.id}`}>
-            {categoryNode(category, level)}
-            {category.expanded && category.children.map(c => recursiveCategoryNode(c, level + 1))}
-            {category.expanded && category.feeds.map(f => feedNode(f, level + 1))}
-        </React.Fragment>
-    )
-
-    if (!root) return <Loader />
-    const feeds = flattenCategoryTree(root).flatMap(c => c.feeds)
-    return (
-        <Stack>
-            <OnDesktop>
-                <TreeSearch feeds={feeds} />
-            </OnDesktop>
-            <Box>
-                {allCategoryNode()}
-                {starredCategoryNode()}
-                {root.children.map(c => recursiveCategoryNode(c))}
-                {root.feeds.map(f => feedNode(f))}
-                {tags?.map(tag => tagNode(tag))}
-            </Box>
-        </Stack>
-    )
-}
+import { Trans } from "@lingui/macro"
+import { Box, Stack } from "@mantine/core"
+import { Constants } from "app/constants"
+import {
+    redirectToCategory,
+    redirectToCategoryDetails,
+    redirectToFeed,
+    redirectToFeedDetails,
+    redirectToTag,
+    redirectToTagDetails,
+} from "app/redirect/thunks"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { collapseTreeCategory } from "app/tree/thunks"
+import type { Category, Subscription } from "app/types"
+import { categoryUnreadCount, flattenCategoryTree } from "app/utils"
+import { Loader } from "components/Loader"
+import { OnDesktop } from "components/responsive/OnDesktop"
+import React from "react"
+import { TbChevronDown, TbChevronRight, TbInbox, TbStar, TbTag } from "react-icons/tb"
+import { TreeNode } from "./TreeNode"
+import { TreeSearch } from "./TreeSearch"
+
+const allIcon = <TbInbox size={16} />
+const starredIcon = <TbStar size={16} />
+const tagIcon = <TbTag size={16} />
+const expandedIcon = <TbChevronDown size={16} />
+const collapsedIcon = <TbChevronRight size={16} />
+
+const errorThreshold = 9
+
+export function Tree() {
+    const root = useAppSelector(state => state.tree.rootCategory)
+    const source = useAppSelector(state => state.entries.source)
+    const tags = useAppSelector(state => state.user.tags)
+    const showRead = useAppSelector(state => state.user.settings?.showRead)
+    const dispatch = useAppDispatch()
+
+    const feedClicked = (e: React.MouseEvent, id: string) => {
+        if (e.detail === 2) {
+            dispatch(redirectToFeedDetails(id))
+        } else {
+            dispatch(redirectToFeed(id))
+        }
+    }
+    const categoryClicked = (e: React.MouseEvent, id: string) => {
+        if (e.detail === 2) {
+            dispatch(redirectToCategoryDetails(id))
+        } else {
+            dispatch(redirectToCategory(id))
+        }
+    }
+    const categoryIconClicked = (e: React.MouseEvent, category: Category) => {
+        e.stopPropagation()
+
+        dispatch(
+            collapseTreeCategory({
+                id: +category.id,
+                collapse: category.expanded,
+            })
+        )
+    }
+    const tagClicked = (e: React.MouseEvent, id: string) => {
+        if (e.detail === 2) {
+            dispatch(redirectToTagDetails(id))
+        } else {
+            dispatch(redirectToTag(id))
+        }
+    }
+
+    const allCategoryNode = () => (
+        <TreeNode
+            id={Constants.categories.all.id}
+            type="category"
+            name={<Trans>All</Trans>}
+            icon={allIcon}
+            unread={categoryUnreadCount(root)}
+            selected={source.type === "category" && source.id === Constants.categories.all.id}
+            expanded={false}
+            level={0}
+            hasError={false}
+            onClick={categoryClicked}
+        />
+    )
+    const starredCategoryNode = () => (
+        <TreeNode
+            id={Constants.categories.starred.id}
+            type="category"
+            name={<Trans>Starred</Trans>}
+            icon={starredIcon}
+            unread={0}
+            selected={source.type === "category" && source.id === Constants.categories.starred.id}
+            expanded={false}
+            level={0}
+            hasError={false}
+            onClick={categoryClicked}
+        />
+    )
+
+    const categoryNode = (category: Category, level = 0) => {
+        const unreadCount = categoryUnreadCount(category)
+        if (unreadCount === 0 && !showRead) return null
+
+        const hasError = !category.expanded && flattenCategoryTree(category).some(c => c.feeds.some(f => f.errorCount > errorThreshold))
+        return (
+            <TreeNode
+                id={category.id}
+                type="category"
+                name={category.name}
+                icon={category.expanded ? expandedIcon : collapsedIcon}
+                unread={unreadCount}
+                selected={source.type === "category" && source.id === category.id}
+                expanded={category.expanded}
+                level={level}
+                hasError={hasError}
+                onClick={categoryClicked}
+                onIconClick={e => categoryIconClicked(e, category)}
+                key={category.id}
+            />
+        )
+    }
+
+    const feedNode = (feed: Subscription, level = 0) => {
+        if (feed.unread === 0 && !showRead) return null
+
+        return (
+            <TreeNode
+                id={String(feed.id)}
+                type="feed"
+                name={feed.name}
+                icon={feed.iconUrl}
+                unread={feed.unread}
+                selected={source.type === "feed" && source.id === String(feed.id)}
+                level={level}
+                hasError={feed.errorCount > errorThreshold}
+                onClick={feedClicked}
+                key={feed.id}
+            />
+        )
+    }
+
+    const tagNode = (tag: string) => (
+        <TreeNode
+            id={tag}
+            type="tag"
+            name={tag}
+            icon={tagIcon}
+            unread={0}
+            selected={source.type === "tag" && source.id === tag}
+            level={0}
+            hasError={false}
+            onClick={tagClicked}
+            key={tag}
+        />
+    )
+
+    const recursiveCategoryNode = (category: Category, level = 0) => (
+        <React.Fragment key={`recursiveCategoryNode-${category.id}`}>
+            {categoryNode(category, level)}
+            {category.expanded && category.children.map(c => recursiveCategoryNode(c, level + 1))}
+            {category.expanded && category.feeds.map(f => feedNode(f, level + 1))}
+        </React.Fragment>
+    )
+
+    if (!root) return <Loader />
+    const feeds = flattenCategoryTree(root).flatMap(c => c.feeds)
+    return (
+        <Stack>
+            <OnDesktop>
+                <TreeSearch feeds={feeds} />
+            </OnDesktop>
+            <Box>
+                {allCategoryNode()}
+                {starredCategoryNode()}
+                {root.children.map(c => recursiveCategoryNode(c))}
+                {root.feeds.map(f => feedNode(f))}
+                {tags?.map(tag => tagNode(tag))}
+            </Box>
+        </Stack>
+    )
+}

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

@@ -1,63 +1,88 @@
-import { Box, Center, createStyles } from "@mantine/core"
-import { FeedFavicon } from "components/content/FeedFavicon"
-import React, { ReactNode } from "react"
-import { UnreadCount } from "./UnreadCount"
-
-interface TreeNodeProps {
-    id: string
-    name: ReactNode
-    icon: ReactNode
-    unread: number
-    selected: boolean
-    expanded?: boolean
-    level: number
-    hasError: boolean
-    onClick: (e: React.MouseEvent, id: string) => void
-    onIconClick?: (e: React.MouseEvent, id: string) => void
-}
-
-const useStyles = createStyles((theme, props: TreeNodeProps) => {
-    let backgroundColor = "inherit"
-    if (props.selected) backgroundColor = theme.colorScheme === "dark" ? theme.colors.dark[4] : theme.colors.gray[3]
-
-    let color
-    if (props.hasError) color = theme.colors.red[6]
-    else if (theme.colorScheme === "dark") color = props.unread > 0 ? theme.colors.dark[0] : theme.colors.dark[3]
-    else color = props.unread > 0 ? theme.black : theme.colors.gray[6]
-
-    return {
-        node: {
-            display: "flex",
-            alignItems: "center",
-            cursor: "pointer",
-            color,
-            backgroundColor,
-            "&:hover": {
-                backgroundColor: theme.colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[0],
-            },
-        },
-        nodeText: {
-            flexGrow: 1,
-            whiteSpace: "nowrap",
-            overflow: "hidden",
-            textOverflow: "ellipsis",
-        },
-    }
-})
-
-export function TreeNode(props: TreeNodeProps) {
-    const { classes } = useStyles(props)
-    return (
-        <Box py={1} pl={props.level * 20} className={classes.node} onClick={(e: React.MouseEvent) => props.onClick(e, props.id)}>
-            <Box mr={6} onClick={(e: React.MouseEvent) => props.onIconClick && props.onIconClick(e, props.id)}>
-                <Center>{typeof props.icon === "string" ? <FeedFavicon url={props.icon} /> : props.icon}</Center>
-            </Box>
-            <Box className={classes.nodeText}>{props.name}</Box>
-            {!props.expanded && (
-                <Box>
-                    <UnreadCount unreadCount={props.unread} />
-                </Box>
-            )}
-        </Box>
-    )
-}
+import { Box, Center } from "@mantine/core"
+import type { EntrySourceType } from "app/entries/slice"
+import { FeedFavicon } from "components/content/FeedFavicon"
+import type React from "react"
+import { tss } from "tss"
+import { UnreadCount } from "./UnreadCount"
+
+interface TreeNodeProps {
+    id: string
+    type: EntrySourceType
+    name: React.ReactNode
+    icon: React.ReactNode
+    unread: number
+    selected: boolean
+    expanded?: boolean
+    level: number
+    hasError: boolean
+    onClick: (e: React.MouseEvent, id: string) => void
+    onIconClick?: (e: React.MouseEvent, id: string) => void
+}
+
+const useStyles = tss
+    .withParams<{
+        selected: boolean
+        hasError: boolean
+        hasUnread: boolean
+    }>()
+    .create(({ theme, colorScheme, selected, hasError, hasUnread }) => {
+        let backgroundColor = "inherit"
+        if (selected) backgroundColor = colorScheme === "dark" ? theme.colors.dark[4] : theme.colors.gray[1]
+
+        let color: string
+        if (hasError) {
+            color = theme.colors.red[6]
+        } else if (colorScheme === "dark") {
+            color = hasUnread ? theme.colors.dark[0] : theme.colors.dark[3]
+        } else {
+            color = hasUnread ? theme.black : theme.colors.gray[6]
+        }
+
+        return {
+            node: {
+                display: "flex",
+                alignItems: "center",
+                cursor: "pointer",
+                color,
+                backgroundColor,
+                "&:hover": {
+                    backgroundColor: colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[0],
+                },
+            },
+            nodeText: {
+                flexGrow: 1,
+                whiteSpace: "nowrap",
+                overflow: "hidden",
+                textOverflow: "ellipsis",
+            },
+        }
+    })
+
+export function TreeNode(props: TreeNodeProps) {
+    const { classes } = useStyles({
+        selected: props.selected,
+        hasError: props.hasError,
+        hasUnread: props.unread > 0,
+    })
+    return (
+        <Box
+            py={1}
+            pl={props.level * 20}
+            className={classes.node}
+            onClick={(e: React.MouseEvent) => props.onClick(e, props.id)}
+            data-id={props.id}
+            data-type={props.type}
+            data-unread-count={props.unread}
+        >
+            <Box mr={6} onClick={(e: React.MouseEvent) => props.onIconClick?.(e, props.id)}>
+                <Center>{typeof props.icon === "string" ? <FeedFavicon url={props.icon} /> : props.icon}</Center>
+            </Box>
+            <Box className={classes.nodeText}>{props.name}</Box>
+            {!props.expanded && (
+                <Box>
+                    <UnreadCount unreadCount={props.unread} />
+                </Box>
+            )}
+        </Box>
+    )
+}

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

@@ -1,62 +1,62 @@
-import { t, Trans } from "@lingui/macro"
-import { Box, Center, Kbd, TextInput } from "@mantine/core"
-import { openSpotlight, SpotlightAction, SpotlightProvider } from "@mantine/spotlight"
-import { redirectToFeed } from "app/slices/redirect"
-import { useAppDispatch } from "app/store"
-import { Subscription } from "app/types"
-import { FeedFavicon } from "components/content/FeedFavicon"
-import { useMousetrap } from "hooks/useMousetrap"
-import { TbSearch } from "react-icons/tb"
-
-export interface TreeSearchProps {
-    feeds: Subscription[]
-}
-
-export function TreeSearch(props: TreeSearchProps) {
-    const dispatch = useAppDispatch()
-
-    const actions: SpotlightAction[] = props.feeds
-        .sort((f1, f2) => f1.name.localeCompare(f2.name))
-        .map(f => ({
-            title: f.name,
-            icon: <FeedFavicon url={f.iconUrl} />,
-            onTrigger: () => dispatch(redirectToFeed(f.id)),
-        }))
-
-    const searchIcon = <TbSearch size={18} />
-    const rightSection = (
-        <Center>
-            <Kbd>Ctrl</Kbd>
-            <Box mx={5}>+</Box>
-            <Kbd>K</Kbd>
-        </Center>
-    )
-
-    // additional keyboard shortcut used by commafeed v1
-    useMousetrap("g u", () => openSpotlight())
-
-    return (
-        <SpotlightProvider
-            actions={actions}
-            searchIcon={searchIcon}
-            searchPlaceholder={t`Search`}
-            shortcut="ctrl+k"
-            nothingFoundMessage={<Trans>Nothing found</Trans>}
-        >
-            <TextInput
-                placeholder={t`Search`}
-                icon={searchIcon}
-                rightSectionWidth={100}
-                rightSection={rightSection}
-                styles={{
-                    input: { cursor: "pointer" },
-                    rightSection: { pointerEvents: "none" },
-                }}
-                onClick={() => openSpotlight()}
-                // prevent focus
-                onFocus={e => e.target.blur()}
-                readOnly
-            />
-        </SpotlightProvider>
-    )
-}
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
+import { TextInput } from "@mantine/core"
+import { Spotlight, type SpotlightActionData, spotlight } from "@mantine/spotlight"
+import { redirectToFeed } from "app/redirect/thunks"
+import { useAppDispatch } from "app/store"
+import type { Subscription } from "app/types"
+import { FeedFavicon } from "components/content/FeedFavicon"
+import { useMousetrap } from "hooks/useMousetrap"
+import { TbSearch } from "react-icons/tb"
+
+export interface TreeSearchProps {
+    feeds: Subscription[]
+}
+
+export function TreeSearch(props: TreeSearchProps) {
+    const dispatch = useAppDispatch()
+    const { _ } = useLingui()
+
+    const actions: SpotlightActionData[] = props.feeds
+        .map(f => ({
+            id: `${f.id}`,
+            label: f.name,
+            leftSection: <FeedFavicon url={f.iconUrl} />,
+            onClick: async () => await dispatch(redirectToFeed(f.id)),
+        }))
+        .sort((f1, f2) => f1.label.localeCompare(f2.label))
+
+    const searchIcon = <TbSearch size={18} />
+
+    // additional keyboard shortcut used by commafeed v1
+    useMousetrap("g u", () => spotlight.open())
+
+    return (
+        <>
+            <TextInput
+                placeholder={_(msg`Search`)}
+                leftSection={searchIcon}
+                rightSectionWidth={100}
+                styles={{
+                    input: {
+                        cursor: "pointer",
+                    },
+                }}
+                onClick={() => spotlight.open()}
+                // prevent focus
+                onFocus={e => e.target.blur()}
+                readOnly
+            />
+            <Spotlight
+                actions={actions}
+                limit={10}
+                shortcut="mod+k"
+                searchProps={{
+                    leftSection: searchIcon,
+                    placeholder: _(msg`Search`),
+                }}
+                nothingFound={<Trans>Nothing found</Trans>}
+            />
+        </>
+    )
+}

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

@@ -1,22 +1,26 @@
-import { Badge, createStyles, Tooltip } from "@mantine/core"
-
-const useStyles = createStyles(() => ({
-    badge: {
-        width: "3.2rem",
-        // for some reason, mantine Badge has "cursor: 'default'"
-        cursor: "pointer",
-    },
-}))
-
-export function UnreadCount(props: { unreadCount: number }) {
-    const { classes } = useStyles()
-
-    if (props.unreadCount <= 0) return null
-
-    const count = props.unreadCount >= 10000 ? "10k+" : props.unreadCount
-    return (
-        <Tooltip label={props.unreadCount} disabled={props.unreadCount === count}>
-            <Badge className={classes.badge}>{count}</Badge>
-        </Tooltip>
-    )
-}
+import { Badge, Tooltip } from "@mantine/core"
+import { Constants } from "app/constants"
+import { tss } from "tss"
+
+const useStyles = tss.create(() => ({
+    badge: {
+        width: "3.2rem",
+        // for some reason, mantine Badge has "cursor: 'default'"
+        cursor: "pointer",
+    },
+}))
+
+export function UnreadCount(props: { unreadCount: number }) {
+    const { classes } = useStyles()
+
+    if (props.unreadCount <= 0) return null
+
+    const count = props.unreadCount >= 10000 ? "10k+" : props.unreadCount
+    return (
+        <Tooltip label={props.unreadCount} disabled={props.unreadCount === count} openDelay={Constants.tooltip.delay}>
+            <Badge className={classes.badge} variant="light" fullWidth>
+                {count}
+            </Badge>
+        </Tooltip>
+    )
+}

commafeed-client/src/hooks/useActionButton.ts

@@ -1,9 +1,9 @@
-import { useMantineTheme } from "@mantine/core"
-import { useMobile } from "hooks/useMobile"
-
-export const useActionButton = () => {
-    const theme = useMantineTheme()
-    const mobile = useMobile(theme.breakpoints.xl)
-    const spacing = mobile ? 14 : 0
-    return { mobile, spacing }
-}
+import { useMantineTheme } from "@mantine/core"
+import { useMobile } from "hooks/useMobile"
+
+export const useActionButton = () => {
+    const theme = useMantineTheme()
+    const mobile = useMobile(theme.breakpoints.xl)
+    const spacing = mobile ? 14 : 0
+    return { mobile, spacing }
+}

commafeed-client/src/hooks/useAppLoading.ts

@@ -1,39 +1,41 @@
-import { t } from "@lingui/macro"
-import { useAppSelector } from "app/store"
-
-interface Step {
-    label: string
-    done: boolean
-}
-
-export const useAppLoading = () => {
-    const profile = useAppSelector(state => state.user.profile)
-    const settings = useAppSelector(state => state.user.settings)
-    const rootCategory = useAppSelector(state => state.tree.rootCategory)
-    const tags = useAppSelector(state => state.user.tags)
-
-    const steps: Step[] = [
-        {
-            label: t`Loading settings...`,
-            done: !!settings,
-        },
-        {
-            label: t`Loading profile...`,
-            done: !!profile,
-        },
-        {
-            label: t`Loading subscriptions...`,
-            done: !!rootCategory,
-        },
-        {
-            label: t`Loading tags...`,
-            done: !!tags,
-        },
-    ]
-
-    const loading = steps.some(s => !s.done)
-    const loadingPercentage = Math.round((100.0 * steps.filter(s => s.done).length) / steps.length)
-    const loadingStepLabel = steps.find(s => !s.done)?.label
-
-    return { steps, loading, loadingPercentage, loadingStepLabel }
-}
+import { msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
+import { useAppSelector } from "app/store"
+
+interface Step {
+    label: string
+    done: boolean
+}
+
+export const useAppLoading = () => {
+    const profile = useAppSelector(state => state.user.profile)
+    const settings = useAppSelector(state => state.user.settings)
+    const rootCategory = useAppSelector(state => state.tree.rootCategory)
+    const tags = useAppSelector(state => state.user.tags)
+    const { _ } = useLingui()
+
+    const steps: Step[] = [
+        {
+            label: _(msg`Loading settings...`),
+            done: !!settings,
+        },
+        {
+            label: _(msg`Loading profile...`),
+            done: !!profile,
+        },
+        {
+            label: _(msg`Loading subscriptions...`),
+            done: !!rootCategory,
+        },
+        {
+            label: _(msg`Loading tags...`),
+            done: !!tags,
+        },
+    ]
+
+    const loading = steps.some(s => !s.done)
+    const loadingPercentage = Math.round((100.0 * steps.filter(s => s.done).length) / steps.length)
+    const loadingStepLabel = steps.find(s => !s.done)?.label
+
+    return { steps, loading, loadingPercentage, loadingStepLabel }
+}

commafeed-client/src/hooks/useBrowserExtension.ts

@@ -1,64 +1,64 @@
-import { useEffect, useState } from "react"
-
-export const useBrowserExtension = () => {
-    // the extension will set the "browser-extension-installed" attribute on the root element
-    const [browserExtensionVersion, setBrowserExtensionVersion] = useState(
-        document.documentElement.getAttribute("browser-extension-installed")
-    )
-
-    // monitor the attribute on the root element as it may change after the page was loaded
-    useEffect(() => {
-        const observer = new MutationObserver(mutations => {
-            mutations.forEach(mutation => {
-                if (mutation.type === "attributes") {
-                    const element = mutation.target as Element
-                    const version = element.getAttribute("browser-extension-installed")
-                    if (version) setBrowserExtensionVersion(version)
-                }
-            })
-        })
-
-        observer.observe(document.documentElement, {
-            attributes: true,
-        })
-
-        return () => observer.disconnect()
-    }, [])
-
-    // when not in an iframe, window.parent is a reference to window
-    const isBrowserExtensionPopup = window.parent !== window
-    const isBrowserExtensionInstalled = isBrowserExtensionPopup || !!browserExtensionVersion
-    const isBrowserExtensionInstallable = !isBrowserExtensionPopup
-
-    const w = isBrowserExtensionPopup ? window.parent : window
-    const openSettingsPage = () => w.postMessage("open-settings-page", "*")
-    const openAppInNewTab = () => w.postMessage("open-app-in-new-tab", "*")
-    const openLinkInBackgroundTab = (url: string) => {
-        if (isBrowserExtensionInstalled) {
-            w.postMessage(`open-link-in-background-tab:${url}`, "*")
-        } else {
-            // fallback to ctrl+click simulation
-            const a = document.createElement("a")
-            a.href = url
-            a.rel = "noreferrer"
-            a.dispatchEvent(
-                new MouseEvent("click", {
-                    ctrlKey: true,
-                    metaKey: true,
-                })
-            )
-        }
-    }
-    const setBadgeUnreadCount = (count: number) => w.postMessage(`set-badge-unread-count:${count}`, "*")
-
-    return {
-        browserExtensionVersion,
-        isBrowserExtensionInstallable,
-        isBrowserExtensionInstalled,
-        isBrowserExtensionPopup,
-        openSettingsPage,
-        openAppInNewTab,
-        openLinkInBackgroundTab,
-        setBadgeUnreadCount,
-    }
-}
+import { useEffect, useState } from "react"
+
+export const useBrowserExtension = () => {
+    // the extension will set the "browser-extension-installed" attribute on the root element
+    const [browserExtensionVersion, setBrowserExtensionVersion] = useState(
+        document.documentElement.getAttribute("browser-extension-installed")
+    )
+
+    // monitor the attribute on the root element as it may change after the page was loaded
+    useEffect(() => {
+        const observer = new MutationObserver(mutations => {
+            for (const mutation of mutations) {
+                if (mutation.type === "attributes") {
+                    const element = mutation.target as Element
+                    const version = element.getAttribute("browser-extension-installed")
+                    if (version) setBrowserExtensionVersion(version)
+                }
+            }
+        })
+
+        observer.observe(document.documentElement, {
+            attributes: true,
+        })
+
+        return () => observer.disconnect()
+    }, [])
+
+    // when not in an iframe, window.parent is a reference to window
+    const isBrowserExtensionPopup = window.parent !== window
+    const isBrowserExtensionInstalled = isBrowserExtensionPopup || !!browserExtensionVersion
+    const isBrowserExtensionInstallable = !isBrowserExtensionPopup
+
+    const w = isBrowserExtensionPopup ? window.parent : window
+    const openSettingsPage = () => w.postMessage("open-settings-page", "*")
+    const openAppInNewTab = () => w.postMessage("open-app-in-new-tab", "*")
+    const openLinkInBackgroundTab = (url: string) => {
+        if (isBrowserExtensionInstalled) {
+            w.postMessage(`open-link-in-background-tab:${url}`, "*")
+        } else {
+            // fallback to ctrl+click simulation
+            const a = document.createElement("a")
+            a.href = url
+            a.rel = "noreferrer"
+            a.dispatchEvent(
+                new MouseEvent("click", {
+                    ctrlKey: true,
+                    metaKey: true,
+                })
+            )
+        }
+    }
+    const setBadgeUnreadCount = (count: number | string) => w.postMessage(`set-badge-unread-count:${count}`, "*")
+
+    return {
+        browserExtensionVersion,
+        isBrowserExtensionInstallable,
+        isBrowserExtensionInstalled,
+        isBrowserExtensionPopup,
+        openSettingsPage,
+        openAppInNewTab,
+        openLinkInBackgroundTab,
+        setBadgeUnreadCount,
+    }
+}

commafeed-client/src/hooks/useColorScheme.ts

@@ -0,0 +1,20 @@
+// the color scheme to use to render components
+import { useMantineColorScheme } from "@mantine/core"
+import { useMediaQuery } from "@mantine/hooks"
+
+export const useColorScheme = () => {
+    const systemColorScheme = useMediaQuery(
+        "(prefers-color-scheme: dark)",
+        // passing undefined will use window.matchMedia(query) as default value
+        undefined,
+        {
+            // get initial value synchronously and not in useEffect to avoid flash of light theme
+            getInitialValueInEffect: false,
+        }
+    )
+        ? "dark"
+        : "light"
+
+    const { colorScheme } = useMantineColorScheme()
+    return colorScheme === "auto" ? systemColorScheme : colorScheme
+}

commafeed-client/src/hooks/useMobile.ts

@@ -1,7 +1,9 @@
-import { useMediaQuery } from "@mantine/hooks"
-import { Constants } from "app/constants"
-
-export const useMobile = (breakpoint: string = Constants.layout.mobileBreakpoint) =>
-    !useMediaQuery(`(min-width: ${breakpoint})`, undefined, {
-        getInitialValueInEffect: false,
-    })
+import { useMediaQuery } from "@mantine/hooks"
+import { Constants } from "app/constants"
+
+export const useMobile = (breakpoint: string | number = Constants.layout.mobileBreakpoint) => {
+    const bp = typeof breakpoint === "number" ? `${breakpoint}px` : breakpoint
+    return !useMediaQuery(`(min-width: ${bp})`, undefined, {
+        getInitialValueInEffect: false,
+    })
+}

commafeed-client/src/hooks/useMousetrap.ts

@@ -1,22 +1,22 @@
-import mousetrap, { ExtendedKeyboardEvent } from "mousetrap"
-import { useEffect, useRef } from "react"
-
-type Callback = (e: ExtendedKeyboardEvent, combo: string) => void
-
-export const useMousetrap = (key: string | string[], callback: Callback) => {
-    // use a ref to avoid unbinding/rebinding every time the callback changes
-    const callbackRef = useRef(callback)
-    callbackRef.current = callback
-
-    useEffect(() => {
-        mousetrap.bind(key, (event, combo) => {
-            callbackRef.current(event, combo)
-
-            // prevent default behavior
-            return false
-        })
-        return () => {
-            mousetrap.unbind(key)
-        }
-    }, [key])
-}
+import mousetrap, { type ExtendedKeyboardEvent } from "mousetrap"
+import { useEffect, useRef } from "react"
+
+type Callback = (e: ExtendedKeyboardEvent, combo: string) => void
+
+export const useMousetrap = (key: string | string[], callback: Callback) => {
+    // use a ref to avoid unbinding/rebinding every time the callback changes
+    const callbackRef = useRef(callback)
+    callbackRef.current = callback
+
+    useEffect(() => {
+        mousetrap.bind(key, (event, combo) => {
+            callbackRef.current(event, combo)
+
+            // prevent default behavior
+            return false
+        })
+        return () => {
+            mousetrap.unbind(key)
+        }
+    }, [key])
+}

commafeed-client/src/hooks/useViewMode.ts

@@ -1,7 +1,7 @@
-import { ViewMode } from "app/types"
-import useLocalStorage from "use-local-storage"
-
-export function useViewMode() {
-    const [viewMode, setViewMode] = useLocalStorage<ViewMode>("view-mode", "detailed")
-    return { viewMode, setViewMode }
-}
+import type { ViewMode } from "app/types"
+import useLocalStorage from "use-local-storage"
+
+export function useViewMode() {
+    const [viewMode, setViewMode] = useLocalStorage<ViewMode>("view-mode", "detailed")
+    return { viewMode, setViewMode }
+}

commafeed-client/src/hooks/useWebSocket.ts

@@ -1,32 +1,49 @@
-import { setWebSocketConnected } from "app/slices/server"
-import { reloadTree } from "app/slices/tree"
-import { useAppDispatch } from "app/store"
-import { useEffect } from "react"
-import WebsocketHeartbeatJs from "websocket-heartbeat-js"
-
-export const useWebSocket = () => {
-    const dispatch = useAppDispatch()
-
-    useEffect(() => {
-        const currentUrl = new URL(window.location.href)
-        const wsProtocol = currentUrl.protocol === "http:" ? "ws" : "wss"
-        const wsUrl = `${wsProtocol}://${currentUrl.hostname}:${currentUrl.port}/ws`
-
-        const ws = new WebsocketHeartbeatJs({
-            url: wsUrl,
-            pingMsg: "ping",
-            // ping interval, just under a minute to prevent firewalls from closing idle connections
-            pingTimeout: 55000,
-        })
-        ws.onopen = () => dispatch(setWebSocketConnected(true))
-        ws.onclose = () => dispatch(setWebSocketConnected(false))
-        ws.onmessage = event => {
-            const { data } = event
-            if (typeof data === "string") {
-                if (data.startsWith("new-feed-entries:")) dispatch(reloadTree())
-            }
-        }
-
-        return () => ws.close()
-    }, [dispatch])
-}
+import { setWebSocketConnected } from "app/server/slice"
+import { type AppDispatch, useAppDispatch, useAppSelector } from "app/store"
+import { incrementUnreadCount } from "app/tree/slice"
+import { useEffect } from "react"
+import WebsocketHeartbeatJs from "websocket-heartbeat-js"
+
+const handleMessage = (dispatch: AppDispatch, message: string) => {
+    const parts = message.split(":")
+    const type = parts[0]
+    if (type === "new-feed-entries") {
+        dispatch(
+            incrementUnreadCount({
+                feedId: +parts[1],
+                amount: +parts[2],
+            })
+        )
+    }
+}
+
+export const useWebSocket = () => {
+    const websocketEnabled = useAppSelector(state => state.server.serverInfos?.websocketEnabled)
+    const websocketPingInterval = useAppSelector(state => state.server.serverInfos?.websocketPingInterval)
+    const dispatch = useAppDispatch()
+
+    useEffect(() => {
+        let ws: WebsocketHeartbeatJs | undefined
+
+        if (websocketEnabled && websocketPingInterval) {
+            const currentUrl = new URL(window.location.href)
+            const wsProtocol = currentUrl.protocol === "http:" ? "ws" : "wss"
+            const wsUrl = `${wsProtocol}://${currentUrl.hostname}:${currentUrl.port}${currentUrl.pathname}ws`
+
+            ws = new WebsocketHeartbeatJs({
+                url: wsUrl,
+                pingMsg: "ping",
+                pingTimeout: websocketPingInterval,
+            })
+            ws.onopen = () => dispatch(setWebSocketConnected(true))
+            ws.onclose = () => dispatch(setWebSocketConnected(false))
+            ws.onmessage = event => {
+                if (typeof event.data === "string") {
+                    handleMessage(dispatch, event.data)
+                }
+            }
+        }
+
+        return () => ws?.close()
+    }, [dispatch, websocketEnabled, websocketPingInterval])
+}