release 3.1.0

hopefully removes the error that happens sometimes:
Illegal attempt to associate a collection with two open sessions. Collection : [com.commafeed.backend.model.Feed.subscriptions]

.dockerignore

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

.github/workflows/build.yml

@@ -1,28 +1,81 @@
 name: Java CI
 
-on: [push]
+on: [ push ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ["8", "11", "17"]
+        java: [ "8", "11", "17" ]
 
     steps:
-      - uses: actions/checkout@v3
+      - 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
-      - uses: actions/upload-artifact@v3
+
+      - name: Upload JAR
+        uses: actions/upload-artifact@v3
         if: ${{ matrix.java == '8' }}
         with:
           name: commafeed.jar
           path: commafeed-server/target/commafeed.jar
+
+      - name: Create release
+        uses: softprops/action-gh-release@v1
+        if: ${{ matrix.java == '8' && github.ref_type == 'tag' }}
+        with:
+          name: CommaFeed ${{ github.ref_name }}
+          body: See changelog at https://github.com/Athou/commafeed/blob/master/CHANGELOG.md
+          draft: false
+          prerelease: false
+          files: |
+            commafeed-server/target/commafeed.jar
+            commafeed-server/config.yml.example
+
+          # 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
+          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
+          tags: athou/commafeed:master

CHANGELOG

@@ -1,80 +0,0 @@
-v 3.0.0
-  - complete overhaul of the UI
-  - backend and frontend are now in separate maven modules
-  - no changes to the api or the database
-
-v 2.6.0
-  - add support for media content as a backup for missing content (useful for youtube feeds)
-  - correctly follow http error code 308 redirects
-  - fixed a bug that prevented users from deleting their account
-  - fixed a bug that made commafeed store entry contents multiple times
-  - fixed a bug that prevented the app to be used as an installed app on mobile devices if the context path of commafeed was not "/"
-  - fixed a bug that prevented entries from being "marked as read older than xxx" for a feed that was just added
-  - removed support for google+ and readability as those services no longer exist
-  - removed support for deploying on openshift
-  - removed alphabetical sorting of entries because of really poor performance (title cannot be indexed)
-  - improve performance for instances with the heavy load setting enabled by preventing CommaFeed from fetching feeds from users that did not log in for a long time
-  - various dependencies upgrades (notably dropwizard from 1.3 to 2.1)
-  - add support for mariadb
-  - add support for java17+ runtime
-  - various security improvements
-v 2.5.0
-  - unread count is now displayed in a favicon badge when supported
-  - the user agent string for the bot fetching feeds is now configurable
-  - feed parsing performance improvements
-  - support for java9+ runtime
-  - can now properly start from an empty postgresql database
-v 2.4.0
-  - users were not able to change password or delete account
-  - fix api key generation
-  - feed entries can now be sorted alphabetically
-  - fix facebook sharing
-  - fix layout on iOS
-  - postgresql driver update (fix for postgres 9.6)
-  - various internationalization fixes
-  - security fixes
-v 2.3.0
-  - dropwizard upgrade 0.9.1
-  - feed enclosures are hidden if they already displayed in the content 
-  - fix youtube favicons
-  - various internationalization fixes
-v 2.2.0
-  - fix youtube and instagram favicon fetching
-  - mark as read filter was lost when a feed was rearranged with drag&drop
-  - feed entry categories are now displayed if available
-  - various performance and dependencies upgrades
-  - java8 is now required
-v 2.1.0
-  - dropwizard upgrade to 0.8.0
-  - you have to remove the "app.contextPath" setting from your yml file, you can optionally use server.applicationContextPath instead
-  - new setting app.maxFeedCapacity for deleting old entries
-  - ability to set filtering expressions for subscriptions to automatically mark new entries as read based on title, content, author or url.
-  - ability to use !keyword or -keyword to exclude a keyword from a search query
-  - facebook feeds now show user favicon instead of facebook favicon
-  - new dark theme 'nightsky'
-v 2.0.3
-  - internet explorer ajax cache workaround
-  - categories are now deletable again
-  - openshift support is back
-  - youtube feeds now show user favicon instead of youtube favicon
-v 2.0.2
-  - api using the api key is now working again
-  - context path is now configurable in config.yml (see app.contextPath in config.yml.example)
-  - fix login on firefox when fields are autofilled by the browser
-  - fix scrolling of subscriptions list on mobile
-  - user is now logged in after registration
-  - fix link to documentation on home page and about page
-  - fields autocomplete is disabled on the profile page
-  - users are able to delete their account again
-  - chinese and malaysian translation files are now correctly loaded
-  - software version in user-agent when fetching feeds is no longer hardcoded
-  - admin settings page is now read only, settings are configured in config.yml 
-  - added link to metrics on the admin settings page
-  - Rome (rss library) upgrade to 1.5.0
-v 2.0.1
-  - the redis pool no longer throws an exception when it is unable to aquire a new connection
-v2.0.0
-  - The backend has been completely rewritten using Dropwizard instead of TomEE, resulting in a lot less memory consumption and better overall performances.
-    See the README on how to build CommaFeed from now on.
-  - CommaFeed should no longer fetch the same feed multiple times in a row  
-  - Users can use their username or email to log in  

CHANGELOG.md

@@ -0,0 +1,139 @@
+Changelog
+=========
+
+3.1.0
+-----
+
+- add an even more compact layout
+- restore hover effect from commafeed 2.x
+- view mode (compact, expanded, ...) is now stored on the device so you can have a different view mode on desktop and
+  mobile
+- fix for the "Illegal attempt to associate a collection with two open sessions." error
+- feed fetching workflow is now orchestrated with rxjava, removing a lot of code
+
+3.0.1
+-----
+
+- allow env variable substitution in config.yml
+    - e.g. having a custom config.yml file with `app.session.path=${SOME_ENV_VAR}` will substitute `SOME_ENV_VAR` with
+      its value
+- allow env variable prefixed with `CF_` to override config.yml properties
+    - e.g. setting `CF_APP_ALLOWREGISTRATIONS=true` will set `app.allowRegistrations` to `true`
+
+3.0.0
+-----
+
+- complete overhaul of the UI
+- backend and frontend are now in separate maven modules
+- no changes to the api or the database
+- Docker images are now automatically built and available at https://hub.docker.com/r/athou/commafeed
+
+2.6.0
+-----
+
+- add support for media content as a backup for missing content (useful for youtube feeds)
+- correctly follow http error code 308 redirects
+- fixed a bug that prevented users from deleting their account
+- fixed a bug that made commafeed store entry contents multiple times
+- fixed a bug that prevented the app to be used as an installed app on mobile devices if the context path of commafeed
+  was not "/"
+- fixed a bug that prevented entries from being "marked as read older than xxx" for a feed that was just added
+- removed support for google+ and readability as those services no longer exist
+- removed support for deploying on openshift
+- removed alphabetical sorting of entries because of really poor performance (title cannot be indexed)
+- improve performance for instances with the heavy load setting enabled by preventing CommaFeed from fetching feeds from
+  users that did not log in for a long time
+- various dependencies upgrades (notably dropwizard from 1.3 to 2.1)
+- add support for mariadb
+- add support for java17+ runtime
+- various security improvements
+
+2.5.0
+-----
+
+- unread count is now displayed in a favicon badge when supported
+- the user agent string for the bot fetching feeds is now configurable
+- feed parsing performance improvements
+- support for java9+ runtime
+- can now properly start from an empty postgresql database
+
+2.4.0
+-----
+
+- users were not able to change password or delete account
+- fix api key generation
+- feed entries can now be sorted alphabetically
+- fix facebook sharing
+- fix layout on iOS
+- postgresql driver update (fix for postgres 9.6)
+- various internationalization fixes
+- security fixes
+
+2.3.0
+-----
+
+- dropwizard upgrade 0.9.1
+- feed enclosures are hidden if they already displayed in the content
+- fix youtube favicons
+- various internationalization fixes
+
+2.2.0
+-----
+
+- fix youtube and instagram favicon fetching
+- mark as read filter was lost when a feed was rearranged with drag&drop
+- feed entry categories are now displayed if available
+- various performance and dependencies upgrades
+- java8 is now required
+
+2.1.0
+-----
+
+- dropwizard upgrade to 0.8.0
+- you have to remove the "app.contextPath" setting from your yml file, you can optionally use
+  server.applicationContextPath instead
+- new setting app.maxFeedCapacity for deleting old entries
+- ability to set filtering expressions for subscriptions to automatically mark new entries as read based on title,
+  content, author or url.
+- ability to use !keyword or -keyword to exclude a keyword from a search query
+- facebook feeds now show user favicon instead of facebook favicon
+- new dark theme 'nightsky'
+
+2.0.3
+-----
+
+- internet explorer ajax cache workaround
+- categories are now deletable again
+- openshift support is back
+- youtube feeds now show user favicon instead of youtube favicon
+
+2.0.2
+-----
+
+- api using the api key is now working again
+- context path is now configurable in config.yml (see app.contextPath in config.yml.example)
+- fix login on firefox when fields are autofilled by the browser
+- fix scrolling of subscriptions list on mobile
+- user is now logged in after registration
+- fix link to documentation on home page and about page
+- fields autocomplete is disabled on the profile page
+- users are able to delete their account again
+- chinese and malaysian translation files are now correctly loaded
+- software version in user-agent when fetching feeds is no longer hardcoded
+- admin settings page is now read only, settings are configured in config.yml
+- added link to metrics on the admin settings page
+- Rome (rss library) upgrade to 1.5.0
+
+2.0.1
+-----
+
+- the redis pool no longer throws an exception when it is unable to aquire a new connection
+
+2.0.0
+-----
+
+- The backend has been completely rewritten using Dropwizard instead of TomEE, resulting in a lot less memory
+  consumption and better overall performances.
+  See the README on how to build CommaFeed from now on.
+- CommaFeed should no longer fetch the same feed multiple times in a row
+- Users can use their username or email to log in  

Dockerfile

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

README.md

@@ -1,9 +1,20 @@
 # CommaFeed
 
-Sources for [CommaFeed.com](http://www.commafeed.com/).
+Google Reader inspired self-hosted RSS reader, based on Dropwizard and React/TypeScript.
 
-Google Reader inspired self-hosted RSS reader, based on Dropwizard and AngularJS.
-CommaFeed is now considered feature-complete and is in maintenance mode.
+![preview](https://user-images.githubusercontent.com/1256795/184886828-1973f148-58a9-4c6d-9587-ee5e5d3cc2cb.png)
+
+## Features
+
+- 4 different layouts
+- Dark theme
+- Fully responsive
+- 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
 
 ## Related open-source projects
 
@@ -16,84 +27,53 @@ Browser extensions:
 
 ## Deployment on your own server
 
-### The very short version (download precompiled package)
+### Docker
+
+Docker images are built automatically and are available at https://hub.docker.com/r/athou/commafeed
+
+### Download precompiled package
 
     mkdir commafeed && cd commafeed
-    wget https://github.com/Athou/commafeed/releases/download/3.0.0/commafeed.jar
-    wget https://raw.githubusercontent.com/Athou/commafeed/3.0.0/commafeed-server/config.yml.example -O config.yml
-    vi config.yml
+    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
 
-### The short version (build from sources)
+The server will listen on http://localhost:8082. The default
+user is `admin` and the default password is `admin`.
+
+### Build from sources
 
     git clone https://github.com/Athou/commafeed.git
     cd commafeed
     ./mvnw clean package
     cp commafeed-server/config.yml.example config.yml
-    vi config.yml
     java -Djava.net.preferIPv4Stack=true -jar commafeed-server/target/commafeed.jar server config.yml
 
-### The long version (same as the short version, but more detailed)
+The server will listen on http://localhost:8082. The default
+user is `admin` and the default password is `admin`.
 
-CommaFeed 2.0 has been rewritten to use Dropwizard and gulp instead of using tomee and wro4j. The latest version of the 1.x branch is available [here](https://github.com/Athou/commafeed/tree/1.x).
+## Translation
 
-For storage, you can either use an embedded file-based H2 database or an external MySQL, PostgreSQL or SQLServer database.
-You also need the Java 1.8+ JDK in order to build the application.
-
-To install the required packages to build CommaFeed on Ubuntu, issue the following commands
-
-    # if this commands works and returns a version >= 1.8.0 you're good to go and you can skip JDK installation
-    javac -version
-
-    # if openjdk-8-jdk is not available on your ubuntu version (14.04 LTS), add the following repo first
-    sudo add-apt-repository ppa:openjdk-r/ppa
-    sudo apt-get update
-
-    sudo apt-get install g++ build-essential openjdk-8-jdk
-
-    # Make sure java8 is the selected java version
-    sudo update-alternatives --config java
-    sudo update-alternatives --config javac
-
-Clone this repository. If you don't have git you can download the sources as a zip file from [here](https://github.com/Athou/commafeed/archive/master.zip)
-
-    git clone https://github.com/Athou/commafeed.git
-    cd commafeed
-
-Now build the application
-
-    ./mvnw clean package
-
-Copy `commafeed-server/config.yml.example` to `./config.yml` then edit the file to your liking.
-Issue the following command to run the app, the server will listen by default on `http://localhost:8082`. The default user is `admin` and the default password is `admin`.
-
-    java -Djava.net.preferIPv4Stack=true -jar commafeed-server/target/commafeed.jar server config.yml
-
-You can use a proxy http server such as nginx or apache.
-
-## Translate CommaFeed into your language
-
-Files for internationalization are located [here](https://github.com/Athou/commafeed/tree/master/commafeed-client/src/locales).
+Files for internationalization are
+located [here](https://github.com/Athou/commafeed/tree/master/commafeed-client/src/locales).
 
 To add a new language:
 
 - edit `commafeed-client/src/i18n.ts`
-  - add the new locale to the `locales` array.
-  - import the dayjs locale
+    - add the new locale to the `locales` array.
+    - import the dayjs locale
 - edit `commafeed-client/.linguirc` and add the new locale to the `locales` array.
 - run `npm run i18n` and add translations to the newly created `commafeed-client/src/locales/[locale]/messages.po` file
 
-The name of the locale should be the two-letters [ISO-639-1 language code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
+The name of the locale should be the
+two-letters [ISO-639-1 language code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
 
 ## Local development
 
-- `git clone https://github.com/Athou/CommaFeed`
-
 ### Backend
 
 - Open `commafeed-server` in your preferred Java IDE.
-  - CommaFeed uses Lombok, you need the Lombok plugin for your IDE.
-  - If using Eclipse, Go to Window → Preferences → Maven → Annotation Processing and check "Automatically configure JDT APT"
+    - CommaFeed uses Lombok, you need the Lombok plugin for your IDE.
 - Start `CommaFeedApplication.java` in debug mode with `server config.dev.yml` as arguments
 
 ### Frontend
@@ -101,11 +81,13 @@ The name of the locale should be the two-letters [ISO-639-1 language code](http:
 - Open `commafeed-client` in your preferred JavaScript IDE.
 - run `npm install`
 - run `npm run dev`
-- the frontend server is now running at http://localhost:8082 and is proxying REST requests to the backend running on port 8083
+
+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-2022 CommaFeed.
+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.

commafeed-client/package.json

@@ -1,79 +1,82 @@
 {
-    "name": "commafeed-client",
-    "private": true,
-    "version": "0.0.0",
-    "type": "module",
-    "scripts": {
-        "dev": "vite --host",
-        "build": "npm run i18n:compile && tsc && vite build",
-        "preview": "vite preview",
-        "test": "vitest",
-        "test:ci": "vitest run",
-        "eslint": "eslint --ext=.js,.jsx,.ts,.tsx src",
-        "i18n": "npm run i18n:extract && npm run i18n:compile",
-        "i18n:extract": "lingui extract --clean",
-        "i18n:compile": "lingui compile --typescript",
-        "postinstall": "npm run i18n:compile"
-    },
-    "dependencies": {
-        "@emotion/react": "^11.10.5",
-        "@fontsource/open-sans": "^4.5.14",
-        "@lingui/core": "^3.17.0",
-        "@lingui/macro": "^3.17.0",
-        "@lingui/react": "^3.17.0",
-        "@mantine/core": "^5.10.3",
-        "@mantine/form": "^5.10.3",
-        "@mantine/hooks": "^5.10.3",
-        "@mantine/modals": "^5.10.3",
-        "@mantine/notifications": "^5.10.3",
-        "@mantine/spotlight": "^5.10.3",
-        "@reduxjs/toolkit": "^1.9.2",
-        "axios": "^1.3.2",
-        "dayjs": "^1.11.7",
-        "interweave": "^13.0.0",
-        "lodash": "^4.17.21",
-        "make-plural": "^7.2.0",
-        "mousetrap": "^1.6.5",
-        "react": "^18.2.0",
-        "react-async-hook": "^4.0.0",
-        "react-contexify": "^6.0.0",
-        "react-dom": "^18.2.0",
-        "react-icons": "^4.7.1",
-        "react-infinite-scroller": "^1.2.6",
-        "react-redux": "^8.0.5",
-        "react-router-dom": "^6.8.0",
-        "react-swipeable": "^7.0.0",
-        "swagger-ui-react": "^4.15.5",
-        "tinycon": "^0.6.8",
-        "websocket-heartbeat-js": "^1.1.1"
-    },
-    "devDependencies": {
-        "@lingui/cli": "^3.17.0",
-        "@types/eslint": "^8.21.0",
-        "@types/lodash": "^4.14.191",
-        "@types/mousetrap": "^1.6.11",
-        "@types/react": "^18.0.27",
-        "@types/react-dom": "^18.0.10",
-        "@types/react-infinite-scroller": "^1.2.3",
-        "@types/swagger-ui-react": "^4.11.0",
-        "@types/tinycon": "^0.6.3",
-        "@typescript-eslint/eslint-plugin": "^5.50.0",
-        "@typescript-eslint/parser": "^5.50.0",
-        "@vitejs/plugin-react": "^3.1.0",
-        "eslint": "^8.33.0",
-        "eslint-config-airbnb": "^19.0.4",
-        "eslint-config-airbnb-typescript": "^17.0.0",
-        "eslint-config-prettier": "^8.6.0",
-        "eslint-config-react-app": "^7.0.1",
-        "eslint-plugin-hooks": "^0.4.3",
-        "eslint-plugin-prettier": "^4.2.1",
-        "prettier": "^2.8.3",
-        "rollup-plugin-visualizer": "^5.9.0",
-        "typescript": "^4.9.5",
-        "vite": "^4.1.1",
-        "vite-plugin-eslint": "^1.8.1",
-        "vite-tsconfig-paths": "^4.0.5",
-        "vitest": "^0.28.4",
-        "vitest-mock-extended": "^1.0.9"
-    }
+  "name": "commafeed-client",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite --host",
+    "dev:typescript": "tsc --watch",
+    "build": "npm run i18n:compile && tsc && vite build",
+    "preview": "vite preview",
+    "test": "vitest",
+    "test:ci": "vitest run",
+    "eslint": "eslint --ext=.js,.jsx,.ts,.tsx src",
+    "i18n": "npm run i18n:extract && npm run i18n:compile",
+    "i18n:extract": "lingui extract --clean",
+    "i18n:compile": "lingui compile --typescript",
+    "postinstall": "npm run i18n:compile"
+  },
+  "dependencies": {
+    "@emotion/react": "^11.10.5",
+    "@fontsource/open-sans": "^4.5.14",
+    "@lingui/core": "^3.17.0",
+    "@lingui/macro": "^3.17.0",
+    "@lingui/react": "^3.17.0",
+    "@mantine/core": "^5.10.3",
+    "@mantine/form": "^5.10.3",
+    "@mantine/hooks": "^5.10.3",
+    "@mantine/modals": "^5.10.3",
+    "@mantine/notifications": "^5.10.3",
+    "@mantine/spotlight": "^5.10.3",
+    "@mantine/styles": "^5.10.3",
+    "@reduxjs/toolkit": "^1.9.2",
+    "axios": "^1.3.2",
+    "dayjs": "^1.11.7",
+    "interweave": "^13.0.0",
+    "lodash": "^4.17.21",
+    "make-plural": "^7.2.0",
+    "mousetrap": "^1.6.5",
+    "react": "^18.2.0",
+    "react-async-hook": "^4.0.0",
+    "react-contexify": "^6.0.0",
+    "react-dom": "^18.2.0",
+    "react-icons": "^4.7.1",
+    "react-infinite-scroller": "^1.2.6",
+    "react-redux": "^8.0.5",
+    "react-router-dom": "^6.8.0",
+    "react-swipeable": "^7.0.0",
+    "swagger-ui-react": "^4.15.5",
+    "tinycon": "^0.6.8",
+    "use-local-storage": "^3.0.0",
+    "websocket-heartbeat-js": "^1.1.1"
+  },
+  "devDependencies": {
+    "@lingui/cli": "^3.17.0",
+    "@types/eslint": "^8.21.0",
+    "@types/lodash": "^4.14.191",
+    "@types/mousetrap": "^1.6.11",
+    "@types/react": "^18.0.27",
+    "@types/react-dom": "^18.0.10",
+    "@types/react-infinite-scroller": "^1.2.3",
+    "@types/swagger-ui-react": "^4.11.0",
+    "@types/tinycon": "^0.6.3",
+    "@typescript-eslint/eslint-plugin": "^5.50.0",
+    "@typescript-eslint/parser": "^5.50.0",
+    "@vitejs/plugin-react": "^3.1.0",
+    "eslint": "^8.33.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-typescript": "^17.0.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-react-app": "^7.0.1",
+    "eslint-plugin-hooks": "^0.4.3",
+    "eslint-plugin-prettier": "^4.2.1",
+    "prettier": "^2.8.3",
+    "rollup-plugin-visualizer": "^5.9.0",
+    "typescript": "^4.9.5",
+    "vite": "^4.1.1",
+    "vite-plugin-eslint": "^1.8.1",
+    "vite-tsconfig-paths": "^4.0.5",
+    "vitest": "^0.28.4",
+    "vitest-mock-extended": "^1.0.9"
+  }
 }

commafeed-client/pom.xml

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

commafeed-client/src/App.tsx

@@ -1,7 +1,8 @@
 import { i18n } from "@lingui/core"
 import { I18nProvider } from "@lingui/react"
 import { ColorScheme, ColorSchemeProvider, MantineProvider } from "@mantine/core"
-import { useColorScheme, useLocalStorage } from "@mantine/hooks"
+import { useColorScheme } from "@mantine/hooks"
+import useLocalStorage from "use-local-storage"
 import { ModalsProvider } from "@mantine/modals"
 import { NotificationsProvider } from "@mantine/notifications"
 import { Constants } from "app/constants"
@@ -32,11 +33,7 @@ import Tinycon from "tinycon"
 
 function Providers(props: { children: React.ReactNode }) {
     const preferredColorScheme = useColorScheme()
-    const [colorScheme, setColorScheme] = useLocalStorage<ColorScheme>({
-        key: "color-scheme",
-        defaultValue: preferredColorScheme,
-        getInitialValueInEffect: true,
-    })
+    const [colorScheme, setColorScheme] = useLocalStorage<ColorScheme>("color-scheme", preferredColorScheme)
     const toggleColorScheme = (value?: ColorScheme) => setColorScheme(value || (colorScheme === "dark" ? "light" : "dark"))
 
     return (

commafeed-client/src/app/constants.ts

@@ -97,4 +97,5 @@ export const Constants = {
         mainScrollAreaId: "main-scroll-area-id",
         entryId: (entry: Entry) => `entry-id-${entry.id}`,
     },
+    bitcoinWalletAddress: "1dymfUxqCWpyD7a6rQSqNy4rLVDBsAr5e",
 }

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

@@ -3,7 +3,7 @@ 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, ViewMode } from "app/types"
+import { ReadingMode, ReadingOrder, Settings, SharingSettings, UserModel } from "app/types"
 // eslint-disable-next-line import/no-cycle
 import { reloadEntries } from "./entries"
 
@@ -36,46 +36,67 @@ export const changeReadingOrder = createAsyncThunk<void, ReadingOrder, { state:
         thunkApi.dispatch(reloadEntries())
     }
 )
-export const changeViewMode = createAsyncThunk<void, ViewMode, { state: RootState }>("settings/viewMode", (viewMode, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, viewMode })
-    thunkApi.dispatch(reloadEntries())
-})
-export const changeLanguage = createAsyncThunk<void, string, { state: RootState }>("settings/language", (language, thunkApi) => {
+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) => {
+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) => {
+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) => {
+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 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 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",
@@ -99,10 +120,6 @@ export const userSlice = createSlice({
             if (!state.settings) return
             state.settings.readingOrder = action.meta.arg
         })
-        builder.addCase(changeViewMode.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.viewMode = action.meta.arg
-        })
         builder.addCase(changeLanguage.pending, (state, action) => {
             if (!state.settings) return
             state.settings.language = action.meta.arg

commafeed-client/src/app/types.ts

@@ -38,6 +38,7 @@ export interface ApplicationSettings {
 export interface Category {
     id: string
     parentId?: string
+    parentName?: string
     name: string
     children: Category[]
     feeds: Subscription[]
@@ -227,7 +228,6 @@ export interface Settings {
     language: string
     readingMode: ReadingMode
     readingOrder: ReadingOrder
-    viewMode: ViewMode
     showRead: boolean
     scrollMarks: boolean
     theme?: string
@@ -305,4 +305,4 @@ export type ReadingMode = "all" | "unread"
 
 export type ReadingOrder = "asc" | "desc"
 
-export type ViewMode = "title" | "cozy" | "expanded"
+export type ViewMode = "title" | "cozy" | "detailed" | "expanded"

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

@@ -21,6 +21,7 @@ import throttle from "lodash/throttle"
 import { useEffect } from "react"
 import InfiniteScroll from "react-infinite-scroller"
 import { FeedEntry } from "./FeedEntry"
+import { useViewMode } from "../../hooks/useViewMode"
 
 export function FeedEntries() {
     const source = useAppSelector(state => state.entries.source)
@@ -28,7 +29,7 @@ export function FeedEntries() {
     const entriesTimestamp = useAppSelector(state => state.entries.timestamp)
     const selectedEntryId = useAppSelector(state => state.entries.selectedEntryId)
     const hasMore = useAppSelector(state => state.entries.hasMore)
-    const viewMode = useAppSelector(state => state.user.settings?.viewMode)
+    const { viewMode } = useViewMode()
     const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
     const scrollingToEntry = useAppSelector(state => state.entries.scrollingToEntry)
     const dispatch = useAppDispatch()

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

@@ -1,15 +1,17 @@
 import { Anchor, Box, createStyles, Divider, Paper } from "@mantine/core"
 import { Constants } from "app/constants"
 import { markEntry } from "app/slices/entries"
-import { useAppDispatch, useAppSelector } from "app/store"
-import { Entry } from "app/types"
+import { useAppDispatch } from "app/store"
+import { Entry, ViewMode } from "app/types"
 import React from "react"
 import { useSwipeable } from "react-swipeable"
+import { MantineNumberSize } from "@mantine/styles"
 import { FeedEntryBody } from "./FeedEntryBody"
 import { FeedEntryCompactHeader } from "./FeedEntryCompactHeader"
 import { FeedEntryContextMenu, useFeedEntryContextMenu } from "./FeedEntryContextMenu"
 import { FeedEntryFooter } from "./FeedEntryFooter"
 import { FeedEntryHeader } from "./FeedEntryHeader"
+import { useViewMode } from "../../hooks/useViewMode"
 
 interface FeedEntryProps {
     entry: Entry
@@ -18,16 +20,23 @@ interface FeedEntryProps {
     onHeaderClick: (e: React.MouseEvent) => void
 }
 
-const useStyles = createStyles((theme, props: FeedEntryProps & { compact: boolean }) => {
+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 = theme.spacing.xs
-    if (props.compact) marginY = 6
+    if (props.viewMode === "title") marginY = 2
+    else if (props.viewMode === "cozy") marginY = 6
 
     let mobileMarginY = 6
-    if (props.compact) mobileMarginY = 4
+    if (props.viewMode === "title") mobileMarginY = 2
+    else if (props.viewMode === "cozy") mobileMarginY = 4
+
+    let backgroundHoverColor = backgroundColor
+    if (!props.expanded) {
+        backgroundHoverColor = theme.colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[1]
+    }
 
     const styles = {
         paper: {
@@ -38,6 +47,11 @@ const useStyles = createStyles((theme, props: FeedEntryProps & { compact: boolea
                 marginTop: mobileMarginY,
                 marginBottom: mobileMarginY,
             },
+            "@media (hover: hover)": {
+                "&:hover": {
+                    backgroundColor: backgroundHoverColor,
+                },
+            },
         },
         body: {
             maxWidth: Constants.layout.entryMaxWidth,
@@ -52,11 +66,8 @@ const useStyles = createStyles((theme, props: FeedEntryProps & { compact: boolea
 })
 
 export function FeedEntry(props: FeedEntryProps) {
-    const viewMode = useAppSelector(state => state.user.settings?.viewMode)
-    const compact = viewMode === "title"
-    const compactHeader = compact && !props.expanded
-
-    const { classes } = useStyles({ ...props, compact })
+    const { viewMode } = useViewMode()
+    const { classes } = useStyles({ ...props, viewMode })
 
     const dispatch = useAppDispatch()
 
@@ -66,9 +77,18 @@ export function FeedEntry(props: FeedEntryProps) {
 
     const { onContextMenu } = useFeedEntryContextMenu(props.entry)
 
-    const spacing = compact ? 8 : "xs"
-    const borderRadius = compact ? "xs" : "sm"
+    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={classes.paper}>
             <Anchor
@@ -80,17 +100,17 @@ export function FeedEntry(props: FeedEntryProps) {
                 onAuxClick={props.onHeaderClick}
                 onContextMenu={onContextMenu}
             >
-                <Box p={spacing} {...swipeHandlers}>
+                <Box px={paddingX} py={paddingY} {...swipeHandlers}>
                     {compactHeader && <FeedEntryCompactHeader entry={props.entry} />}
                     {!compactHeader && <FeedEntryHeader entry={props.entry} expanded={props.expanded} />}
                 </Box>
             </Anchor>
             {props.expanded && (
-                <Box px={spacing} pb={spacing}>
+                <Box px={paddingX} pb={paddingY}>
                     <Box className={classes.body} sx={{ direction: props.entry.rtl ? "rtl" : "ltr" }}>
                         <FeedEntryBody entry={props.entry} />
                     </Box>
-                    <Divider variant="dashed" my={spacing} />
+                    <Divider variant="dashed" my={paddingY} />
                     <FeedEntryFooter entry={props.entry} />
                 </Box>
             )}

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

@@ -4,16 +4,20 @@ import { Constants } from "app/constants"
 import { useAppSelector } from "app/store"
 import { flattenCategoryTree } from "app/utils"
 
-type CategorySelectProps = Partial<SelectProps> & { withAll?: boolean }
+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.name,
+            label: c.parentName ? t`${c.name} (in ${c.parentName})` : c.name,
             value: c.id,
         }))
     if (props.withAll) {

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

@@ -1,7 +1,7 @@
 import { t } from "@lingui/macro"
 import { ActionIcon, Center, Divider, Indicator, Popover, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
-import { search } from "app/slices/entries"
+import { reloadEntries, search } from "app/slices/entries"
 import { changeReadingMode, changeReadingOrder } from "app/slices/user"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { ActionButton } from "components/ActionButtton"
@@ -11,7 +11,6 @@ import { useEffect } from "react"
 import { TbArrowDown, TbArrowUp, TbEye, TbEyeOff, TbRefresh, TbSearch, TbUser, TbX } from "react-icons/tb"
 import { MarkAllAsReadButton } from "./MarkAllAsReadButton"
 import { ProfileMenu } from "./ProfileMenu"
-import { RefreshMenu } from "./RefreshMenu"
 
 function HeaderDivider() {
     return <Divider orientation="vertical" />
@@ -41,7 +40,7 @@ export function Header() {
     return (
         <Center>
             <ButtonToolbar>
-                <RefreshMenu control={<ActionButton icon={<TbRefresh size={iconSize} />} label={t`Refresh`} />} />
+                <ActionButton icon={<TbRefresh size={iconSize} />} label={t`Refresh`} onClick={() => dispatch(reloadEntries())} />
                 <MarkAllAsReadButton iconSize={iconSize} />
 
                 <HeaderDivider />

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

@@ -1,11 +1,26 @@
-import { Trans } from "@lingui/macro"
+import { t, 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, redirectToMetrics, redirectToSettings } from "app/slices/redirect"
-import { changeViewMode } from "app/slices/user"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { ViewMode } from "app/types"
 import { useState } from "react"
-import { TbChartLine, TbHelp, TbLayoutList, TbList, TbMoon, TbNotes, TbPower, TbSettings, TbSun, TbUsers } from "react-icons/tb"
+import {
+    TbChartLine,
+    TbHelp,
+    TbLayoutList,
+    TbList,
+    TbListDetails,
+    TbMoon,
+    TbNotes,
+    TbPower,
+    TbSettings,
+    TbSun,
+    TbUsers,
+    TbWorldDownload,
+} from "react-icons/tb"
+import { useViewMode } from "../../hooks/useViewMode"
 
 interface ProfileMenuProps {
     control: React.ReactElement
@@ -40,6 +55,17 @@ const viewModeData: ViewModeControlItem[] = [
             </Group>
         ),
     },
+    {
+        value: "detailed",
+        label: (
+            <Group>
+                <TbListDetails size={iconSize} />
+                <Box ml={6}>
+                    <Trans>Detailed</Trans>
+                </Box>
+            </Group>
+        ),
+    },
     {
         value: "expanded",
         label: (
@@ -55,7 +81,8 @@ const viewModeData: ViewModeControlItem[] = [
 
 export function ProfileMenu(props: ProfileMenuProps) {
     const [opened, setOpened] = useState(false)
-    const viewMode = useAppSelector(state => state.user.settings?.viewMode)
+    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()
@@ -69,6 +96,7 @@ export function ProfileMenu(props: ProfileMenuProps) {
         <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={() => {
@@ -78,6 +106,21 @@ export function ProfileMenu(props: ProfileMenuProps) {
                 >
                     <Trans>Settings</Trans>
                 </Menu.Item>
+                <Menu.Item
+                    icon={<TbWorldDownload size={iconSize} />}
+                    onClick={() =>
+                        client.feed.refreshAll().then(() => {
+                            showNotification({
+                                message: t`Your feeds have been queued for refresh.`,
+                                color: "green",
+                                autoClose: 1000,
+                            })
+                            setOpened(false)
+                        })
+                    }
+                >
+                    <Trans>Fetch all my feeds now</Trans>
+                </Menu.Item>
 
                 <Divider />
                 <Menu.Label>
@@ -96,7 +139,7 @@ export function ProfileMenu(props: ProfileMenuProps) {
                     orientation="vertical"
                     data={viewModeData}
                     value={viewMode}
-                    onChange={e => dispatch(changeViewMode(e as ViewMode))}
+                    onChange={e => setViewMode(e as ViewMode)}
                     mb="xs"
                 />
 

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

@@ -1,41 +0,0 @@
-import { t, Trans } from "@lingui/macro"
-import { Menu } from "@mantine/core"
-import { showNotification } from "@mantine/notifications"
-import { client } from "app/client"
-import { reloadEntries } from "app/slices/entries"
-import { useAppDispatch } from "app/store"
-import { TbRotateClockwise, TbWorldDownload } from "react-icons/tb"
-
-interface RefreshMenuProps {
-    control: React.ReactElement
-}
-
-const iconSize = 16
-
-export function RefreshMenu(props: RefreshMenuProps) {
-    const dispatch = useAppDispatch()
-
-    return (
-        <Menu>
-            <Menu.Target>{props.control}</Menu.Target>
-            <Menu.Dropdown>
-                <Menu.Item icon={<TbRotateClockwise size={iconSize} />} onClick={() => dispatch(reloadEntries())}>
-                    <Trans>Reload</Trans>
-                </Menu.Item>
-                <Menu.Item
-                    icon={<TbWorldDownload size={iconSize} />}
-                    onClick={() =>
-                        client.feed.refreshAll().then(() =>
-                            showNotification({
-                                message: t`Your feeds have been queued for refresh.`,
-                                color: "green",
-                            })
-                        )
-                    }
-                >
-                    <Trans>Fetch all my feeds now</Trans>
-                </Menu.Item>
-            </Menu.Dropdown>
-        </Menu>
-    )
-}

commafeed-client/src/hooks/useViewMode.ts

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

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

@@ -219,6 +219,10 @@ msgstr "حذف المستخدم"
 msgid "Desc"
 msgstr "تنازلي"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "موجز URL"
 msgid "Feed name"
 msgstr "اسم الخلاصة"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "تصفية التعبير"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "هل نسيت كلمة المرور؟"
@@ -608,10 +616,6 @@ msgstr "تحديث"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "تم إغلاق التسجيلات في مثيل CommaFeed هذا"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "موقع الكتروني"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "ليس لديك أي اشتراكات حتى الآن. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "الملف مطلوب"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Suprimeix l'usuari"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL del canal"
 msgid "Feed name"
 msgstr "Nom del canal"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Expressió de filtratge"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Heu oblidat la contrasenya?"
@@ -608,10 +616,6 @@ msgstr "Actualitzar"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Els registres estan tancats en aquesta instància de CommaFeed"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Lloc web"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Encara no teniu cap subscripció. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "el fitxer és necessari"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Smazat uživatele"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL zdroje"
 msgid "Feed name"
 msgstr "Název zdroje"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrování výrazu"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Zapomněli jste heslo?"
@@ -608,10 +616,6 @@ msgstr "Obnovit"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "V této instanci CommaFeed jsou registrace uzavřeny"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Webové stránky"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Zatím nemáte žádné předplatné. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr ""
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Dileu defnyddiwr"
 msgid "Desc"
 msgstr "Rhag"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL porthiant"
 msgid "Feed name"
 msgstr "Enw porthiant"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Hidlo mynegiant"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Wedi anghofio cyfrinair?"
@@ -608,10 +616,6 @@ msgstr "Adnewyddu"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Mae cofrestriadau ar gau ar yr achos CommaFeed hwn"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Gwefan"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Nid oes gennych unrhyw danysgrifiadau eto. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "mae angen y ffeil"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Slet bruger"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr ""
 msgid "Feed name"
 msgstr "Feednavn"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrerende udtryk"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Glemt adgangskode?"
@@ -608,10 +616,6 @@ msgstr "Opdater"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Registreringer er lukket på denne CommaFeed-instans"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Hjemmeside"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Du har ingen abonnementer endnu. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "fil er påkrævet"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Benutzer löschen"
 msgid "Desc"
 msgstr "Beschr"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "Feed-URL"
 msgid "Feed name"
 msgstr "Feedname"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filterausdruck"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Passwort vergessen?"
@@ -608,10 +616,6 @@ msgstr "Aktualisieren"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Registrierungen sind für diese CommaFeed-Instanz geschlossen"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Webseite"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Sie haben noch keine Abonnements. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "Datei ist erforderlich"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Delete user"
 msgid "Desc"
 msgstr "Desc"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr "Detailed"
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "Feed URL"
 msgid "Feed name"
 msgstr "Feed name"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr "Fetch all my feeds now"
 
@@ -296,6 +300,10 @@ msgstr "Fetch all my feeds now"
 msgid "Filtering expression"
 msgstr "Filtering expression"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Forgot password?"
@@ -608,10 +616,6 @@ msgstr "Refresh"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Registrations are closed on this CommaFeed instance"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr "Reload"
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr "Right click"
@@ -792,10 +796,14 @@ msgstr "Website"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr "Your feeds have been queued for refresh."
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "file is required"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr "{0} (in {1})"

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

@@ -219,6 +219,10 @@ msgstr "Borrar usuario"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL de fuente"
 msgid "Feed name"
 msgstr "Nombre de alimentación"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Expresión de filtrado"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "¿Olvidaste la contraseña?"
@@ -608,10 +616,6 @@ msgstr "Actualizar"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Los registros están cerrados en esta instancia de CommaFeed"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Sitio web"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Todavía no tienes ninguna suscripción. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "archivo requerido"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "حذف کاربر"
 msgid "Desc"
 msgstr "توصیف"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL فید"
 msgid "Feed name"
 msgstr "نام فید"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "بیان فیلتر"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "رمز عبور را فراموش کرده اید؟"
@@ -608,10 +616,6 @@ msgstr "تازه کردن"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "ثبت نام در این نمونه CommaFeed بسته شده است"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "وب سایت"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "شما هنوز هیچ اشتراکی ندارید. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "فایل مورد نیاز است"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Poista käyttäjä"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "Syötteen URL-osoite"
 msgid "Feed name"
 msgstr "Syötteen nimi"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Suodattava lauseke"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Unohditko salasanan?"
@@ -608,10 +616,6 @@ msgstr "Päivitä"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Tämän CommaFeed-esiintymän rekisteröinnit on suljettu"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Verkkosivusto"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Sinulla ei ole vielä tilauksia. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "tiedosto vaaditaan"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Effacer l'utilisateur"
 msgid "Desc"
 msgstr "Descendant"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr "Vue détaillée"
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL du flux"
 msgid "Feed name"
 msgstr "Nom du flux"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Expression de filtrage"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Mot de passe oublié ?"
@@ -608,10 +616,6 @@ msgstr "Rafraîchir"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Les inscriptions sont fermées sur cette instance de CommaFeed"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Site web"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Vous n'avez pas encore d'abonnements. Pourquoi ne pas essayer d'en ajouter un en cliquant sur le signe + en haut de la page ?"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "fichier requis"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Eliminar usuario"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL da fonte"
 msgid "Feed name"
 msgstr "Nome do feed"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Expresión de filtrado"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Esqueceches o contrasinal?"
@@ -608,10 +616,6 @@ msgstr "Actualizar"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Os rexistros están pechados nesta instancia de CommaFeed"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Páxina web"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Aínda non tes ningunha subscrición. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "é necesario o ficheiro"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Felhasználó törlése"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr ""
 msgid "Feed name"
 msgstr "Hírcsatorna neve"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Szűrő kifejezés"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Elfelejtette a jelszavát?"
@@ -608,10 +616,6 @@ msgstr "Frissítés"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "A regisztrációk le vannak zárva ezen a CommaFeed példányon"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Webhely"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Még nincs előfizetése. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "fájl szükséges"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Hapus pengguna"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL Umpan"
 msgid "Feed name"
 msgstr "Nama umpan"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Memfilter ekspresi"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Lupa kata sandi?"
@@ -608,10 +616,6 @@ msgstr "Segarkan"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Pendaftaran ditutup pada instans CommaFeed ini"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Situs Web"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Anda belum memiliki langganan. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "file diperlukan"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Elimina utente"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL feed"
 msgid "Feed name"
 msgstr "Nome del feed"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Espressione filtrante"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Password dimenticata?"
@@ -608,10 +616,6 @@ msgstr "Aggiorna"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Le registrazioni sono chiuse su questa istanza CommaFeed"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Sito web"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Non hai ancora abbonamenti. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "è richiesto il file"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "ユーザーの削除"
 msgid "Desc"
 msgstr "説明"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "フィード URL"
 msgid "Feed name"
 msgstr "フィード名"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "フィルタリング式"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "パスワードをお忘れですか?"
@@ -608,10 +616,6 @@ msgstr "リフレッシュ"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "この CommaFeed インスタンスの登録は終了しています"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "ウェブサイト"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "まだサブスクリプションがありません。"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "ファイルが必要です"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "사용자 삭제"
 msgid "Desc"
 msgstr "설명"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "피드 URL"
 msgid "Feed name"
 msgstr "피드 이름"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "필터링 표현식"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "비밀번호를 잊으셨나요?"
@@ -608,10 +616,6 @@ msgstr "새로 고침"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "이 CommaFeed 인스턴스에 대한 등록이 마감되었습니다."
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "웹사이트"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "아직 구독이 없습니다. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "파일이 필요합니다"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Padam pengguna"
 msgid "Desc"
 msgstr "Dec"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL Suapan"
 msgid "Feed name"
 msgstr "Nama suapan"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Ungkapan penapisan"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Lupa kata laluan?"
@@ -608,10 +616,6 @@ msgstr "Muat semula"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Pendaftaran ditutup pada contoh CommaFeed ini"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Laman web"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Anda belum mempunyai sebarang langganan lagi. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "fail diperlukan"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Slett bruker"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "Feed-URL"
 msgid "Feed name"
 msgstr "Feednavn"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrerende uttrykk"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Glemt passord?"
@@ -608,10 +616,6 @@ msgstr "Oppdater"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Registreringer er stengt på denne CommaFeed-forekomsten"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Nettsted"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Du har ingen abonnementer ennå. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "fil kreves"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Gebruiker verwijderen"
 msgid "Desc"
 msgstr "Beschrijving"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "Feed-URL"
 msgid "Feed name"
 msgstr "Feednaam"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Uitdrukking filteren"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Wachtwoord vergeten?"
@@ -608,10 +616,6 @@ msgstr "Vernieuwen"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Registraties zijn gesloten op deze CommaFeed-instantie"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr ""
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Je hebt nog geen abonnementen. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "bestand is vereist"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Slett bruker"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "Feed-URL"
 msgid "Feed name"
 msgstr "Feednavn"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrerende uttrykk"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Glemt passord?"
@@ -608,10 +616,6 @@ msgstr "Oppdater"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Registreringer er stengt på denne CommaFeed-forekomsten"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Nettsted"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Du har ingen abonnementer ennå. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "fil kreves"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Usuń użytkownika"
 msgid "Desc"
 msgstr "Opis"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL kanału"
 msgid "Feed name"
 msgstr "nazwa kanału"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Wyrażenie filtrujące"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Zapomniałeś hasła?"
@@ -608,10 +616,6 @@ msgstr "Odśwież"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Rejestracje są zamknięte w tej instancji CommaFeed"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Strona internetowa"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Nie masz jeszcze żadnych subskrypcji. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "plik jest wymagany"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Excluir usuário"
 msgid "Desc"
 msgstr "Descrição"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL do feed"
 msgid "Feed name"
 msgstr "Nome do feed"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrando expressão"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Esqueceu a senha?"
@@ -608,10 +616,6 @@ msgstr "Atualizar"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Os registros estão fechados nesta instância do CommaFeed"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Site"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Você ainda não tem nenhuma assinatura. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "o arquivo é obrigatório"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Удалить пользователя"
 msgid "Desc"
 msgstr "По убыванию"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL-адрес фида"
 msgid "Feed name"
 msgstr "Имя фида"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Выражение фильтрации"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Забыли пароль?"
@@ -608,10 +616,6 @@ msgstr "Обновить"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Регистрация закрыта для этого экземпляра CommaFeed."
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Веб-сайт"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "У вас пока нет подписок. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "требуется файл"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Vymažte používateľa"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "URL informačného kanála"
 msgid "Feed name"
 msgstr "Názov informačného kanála"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrovanie výrazu"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Zabudli ste heslo?"
@@ -608,10 +616,6 @@ msgstr "Obnoviť"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "V tejto inštancii CommaFeed sú registrácie uzavreté"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Webová stránka"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Zatiaľ nemáte žiadne odbery. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr ""
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Ta bort användare"
 msgid "Desc"
 msgstr ""
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "Flödes-URL"
 msgid "Feed name"
 msgstr "Flödesnamn"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtrerande uttryck"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Glömt lösenord?"
@@ -608,10 +616,6 @@ msgstr "Uppdatera"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Registreringar är stängda på denna CommaFeed-instans"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Webbplats"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Du har inga prenumerationer än. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "fil krävs"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "Kullanıcıyı sil"
 msgid "Desc"
 msgstr "Açılış"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "Feed URL'si"
 msgid "Feed name"
 msgstr "Yayın adı"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "Filtreleme ifadesi"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Parolanızı mı unuttunuz?"
@@ -608,10 +616,6 @@ msgstr "Yenile"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Bu CommaFeed örneğinde kayıtlar kapalı"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "Web sitesi"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "Henüz aboneliğiniz yok. "
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "dosya gerekli"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -219,6 +219,10 @@ msgstr "删除用户"
 msgid "Desc"
 msgstr "描述"
 
+#: src/components/header/ProfileMenu.tsx
+msgid "Detailed"
+msgstr ""
+
 #: src/components/header/ProfileMenu.tsx
 #: src/pages/app/SettingsPage.tsx
 msgid "Display"
@@ -288,7 +292,7 @@ msgstr "供稿网址"
 msgid "Feed name"
 msgstr "提要名称"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Fetch all my feeds now"
 msgstr ""
 
@@ -296,6 +300,10 @@ msgstr ""
 msgid "Filtering expression"
 msgstr "过滤表达式"
 
+#: src/pages/app/AboutPage.tsx
+msgid "For those of you who prefer bitcoin, here is the address: {bitcoinAddress}"
+msgstr ""
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "忘记密码？"
@@ -608,10 +616,6 @@ msgstr "刷新"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "此 CommaFeed 实例上的注册已关闭"
 
-#: src/components/header/RefreshMenu.tsx
-msgid "Reload"
-msgstr ""
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr ""
@@ -792,10 +796,14 @@ msgstr "网站"
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
 msgstr "您还没有任何订阅。"
 
-#: src/components/header/RefreshMenu.tsx
+#: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr ""
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "file is required"
 msgstr "文件是必需的"
+
+#: src/components/content/add/CategorySelect.tsx
+msgid "{0} (in {1})"
+msgstr ""

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

@@ -1,7 +1,6 @@
-import { Accordion, Box, Tabs } from "@mantine/core"
+import { Accordion, Tabs } from "@mantine/core"
 import { client } from "app/client"
 import { Loader } from "components/Loader"
-import { Gauge } from "components/metrics/Gauge"
 import { Meter } from "components/metrics/Meter"
 import { MetricAccordionItem } from "components/metrics/MetricAccordionItem"
 import { Timer } from "components/metrics/Timer"
@@ -9,26 +8,18 @@ import { useAsync } from "react-async-hook"
 import { TbChartAreaLine, TbClock } from "react-icons/tb"
 
 const shownMeters: { [key: string]: string } = {
-    "com.commafeed.backend.feed.FeedQueues.refill": "Refresh queue refill rate",
-    "com.commafeed.backend.feed.FeedRefreshTaskGiver.feedRefreshed": "Feed refreshed",
-    "com.commafeed.backend.feed.FeedRefreshUpdater.feedUpdated": "Feed updated",
-    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheHit": "Entry cache hit",
-    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheMiss": "Entry cache miss",
-}
-
-const shownGauges: { [key: string]: string } = {
-    "com.commafeed.backend.feed.FeedRefreshExecutor.feed-refresh-updater.active": "Feed Updater active",
-    "com.commafeed.backend.feed.FeedRefreshExecutor.feed-refresh-updater.pending": "Feed Updater queued",
-    "com.commafeed.backend.feed.FeedRefreshExecutor.feed-refresh-worker.active": "Feed Worker active",
-    "com.commafeed.backend.feed.FeedRefreshExecutor.feed-refresh-worker.pending": "Feed Worker queued",
-    "com.commafeed.backend.feed.FeedQueues.queue": "Feed Refresh queue size",
+    "com.commafeed.backend.feed.FeedRefreshEngine.refill": "Feed queue refill rate",
+    "com.commafeed.backend.feed.FeedRefreshWorker.feedFetched": "Feed fetching rate",
+    "com.commafeed.backend.feed.FeedRefreshUpdater.feedUpdated": "Feed update rate",
+    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheHit": "Entry cache hit rate",
+    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheMiss": "Entry cache miss rate",
 }
 
 export function MetricsPage() {
     const query = useAsync(() => client.admin.getMetrics(), [])
 
     if (!query.result) return <Loader />
-    const { meters, gauges, timers } = query.result.data
+    const { meters, timers } = query.result.data
     return (
         <Tabs defaultValue="stats">
             <Tabs.List>
@@ -48,15 +39,6 @@ export function MetricsPage() {
                         </MetricAccordionItem>
                     ))}
                 </Accordion>
-
-                <Box pt="xs">
-                    {Object.keys(shownGauges).map(g => (
-                        <Box key={g}>
-                            <span>{shownGauges[g]}&nbsp;</span>
-                            <Gauge gauge={gauges[g]} />
-                        </Box>
-                    ))}
-                </Box>
             </Tabs.Panel>
 
             <Tabs.Panel value="timers" pt="xs">

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

@@ -1,5 +1,5 @@
 import { t, Trans } from "@lingui/macro"
-import { Anchor, Box, Center, Container, createStyles, List, NativeSelect, SimpleGrid, Title } from "@mantine/core"
+import { Anchor, Box, Center, Code, Container, createStyles, List, NativeSelect, SimpleGrid, Title } from "@mantine/core"
 import { Constants } from "app/constants"
 import { redirectToApiDocumentation } from "app/slices/redirect"
 import { useAppDispatch, useAppSelector } from "app/store"
@@ -57,6 +57,7 @@ function NextUnreadBookmarklet() {
     )
 }
 
+const bitcoinAddress = <Code>{Constants.bitcoinWalletAddress}</Code>
 export function AboutPage() {
     const version = useAppSelector(state => state.server.serverInfos?.version)
     const revision = useAppSelector(state => state.server.serverInfos?.gitCommit)
@@ -70,7 +71,7 @@ export function AboutPage() {
                             CommaFeed version {version} ({revision})
                         </Trans>
                     </Box>
-                    <Box>
+                    <Box mt="md">
                         <Trans>
                             CommaFeed is an open-source project. Sources are hosted on&nbsp;
                             <Anchor href="https://github.com/Athou/commafeed" target="_blank" rel="noreferrer">
@@ -114,6 +115,9 @@ export function AboutPage() {
                             </Center>
                         </form>
                     </Box>
+                    <Box mt="xs">
+                        <Trans>For those of you who prefer bitcoin, here is the address: {bitcoinAddress}</Trans>
+                    </Box>
                 </Section>
                 <Section title={t`Goodies`} icon={<TbPuzzle size={24} />}>
                     <List>

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

@@ -109,7 +109,12 @@ export function CategoryDetailsPage() {
                     {editable && (
                         <>
                             <TextInput label={t`Name`} {...form.getInputProps("name")} required />
-                            <CategorySelect label={t`Parent Category`} {...form.getInputProps("parentId")} clearable />
+                            <CategorySelect
+                                label={t`Parent Category`}
+                                {...form.getInputProps("parentId")}
+                                clearable
+                                withoutCategoryIds={[id]}
+                            />
                             <NumberInput label={t`Position`} {...form.getInputProps("position")} required min={0} />
                         </>
                     )}

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

@@ -17,7 +17,7 @@ import { TbDeviceFloppy, TbTrash } from "react-icons/tb"
 import { useParams } from "react-router-dom"
 
 function FilteringExpressionDescription() {
-    const example = <Code>url.contains('youtube') or (author eq 'athou' and title.contains('github')</Code>
+    const example = <Code>url.contains('youtube') or (author eq 'athou' and title.contains('github'))</Code>
     return (
         <div>
             <div>

commafeed-server/config.dev.yml

@@ -69,7 +69,7 @@ app:
   
   # user-agent string that will be used by the http client, leave empty for the default one
   userAgent:
-  
+
 # Database connection
 # -------------------  
 # for MySQL
@@ -92,7 +92,7 @@ database:
   properties:
     charSet: UTF-8
   validationQuery: "/* CommaFeed Health Check */ SELECT 1"
-    
+
 server:
   applicationConnectors:
     - type: http
@@ -100,7 +100,7 @@ server:
   adminConnectors:
     - type: http
       port: 8084
-      
+
 logging:
   level: INFO
   loggers:
@@ -108,6 +108,7 @@ logging:
     liquibase: INFO
     org.hibernate.SQL: INFO # or ALL for sql debugging
     org.hibernate.engine.internal.StatisticalLoggingSessionEventListener: WARN
+    org.hibernate.orm.deprecation: "OFF"
   appenders:
     - type: console
     - type: file
@@ -117,14 +118,14 @@ logging:
       archivedLogFilenamePattern: log/commafeed-%d.log
       archivedFileCount: 5
       timeZone: UTC
-      
+
 # Redis pool configuration
 # (only used if app.cache is 'redis')
 # -----------------------------------
 redis:
   host: localhost
   port: 6379
-  password: 
+  password:
   timeout: 2000
   database: 0
   maxTotal: 500

commafeed-server/config.yml.example

@@ -87,7 +87,7 @@ app:
 
 database:
   driverClass: org.h2.Driver
-  url: jdbc:h2:/home/commafeed/db
+  url: jdbc:h2:/commafeed/data/db
   user: sa
   password: sa
   properties:
@@ -104,9 +104,11 @@ server:
   adminConnectors:
     - type: http
       port: 8084
+  requestLog:
+    appenders: [ ]
       
 logging:
-  level: WARN
+  level: ERROR
   loggers:
     com.commafeed: INFO
     liquibase: INFO

commafeed-server/pom.xml

@@ -1,19 +1,20 @@
-<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.0.0</version>
+		<version>3.1.0</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
 
 	<properties>
 		<guice.version>5.1.0</guice.version>
-		<querydsl.version>4.2.1</querydsl.version>
-		<rome.version>1.18.0</rome.version>
+		<querydsl.version>4.4.0</querydsl.version>
+		<rome.version>2.1.0</rome.version>
 	</properties>
 
 	<dependencyManagement>
@@ -21,7 +22,7 @@
 			<dependency>
 				<groupId>io.dropwizard</groupId>
 				<artifactId>dropwizard-dependencies</artifactId>
-				<version>2.1.1</version>
+				<version>2.1.6</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -38,6 +39,13 @@
 		</resources>
 
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<parameters>true</parameters>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -105,8 +113,10 @@
 						</goals>
 						<configuration>
 							<transformers>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+								<transformer
+										implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+								<transformer
+										implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									<mainClass>com.commafeed.CommaFeedApplication</mainClass>
 								</transformer>
 								<transformer implementation="org.kordamp.shade.resources.PropertiesFileTransformer">
@@ -223,13 +233,13 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>3.0.0</version>
+			<version>3.1.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.22</version>
+			<version>1.18.26</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -283,7 +293,18 @@
 		<dependency>
 			<groupId>be.tomcools</groupId>
 			<artifactId>dropwizard-websocket-jee7-bundle</artifactId>
-			<version>2.0.0</version>
+			<version>2.1.6</version>
+		</dependency>
+		<dependency>
+			<groupId>io.whitfin</groupId>
+			<artifactId>dropwizard-environment-substitutor</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>io.reactivex.rxjava3</groupId>
+			<artifactId>rxjava</artifactId>
+			<version>3.1.6</version>
 		</dependency>
 
 		<dependency>
@@ -398,50 +419,38 @@
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
-			<version>1.14.3</version>
+			<version>1.15.4</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
-			<version>70.1</version>
+			<version>73.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.cssparser</groupId>
 			<artifactId>cssparser</artifactId>
-			<version>0.9.29</version>
+			<version>0.9.30</version>
 		</dependency>
 		<dependency>
-			<groupId>edu.uci.ics</groupId>
-			<artifactId>crawler4j</artifactId>
-			<version>3.5</version>
-			<exclusions>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
-				</exclusion>
-			</exclusions>
+			<groupId>org.netpreserve</groupId>
+			<artifactId>urlcanon</artifactId>
+			<version>0.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-servlet</artifactId>
-			<version>2.9.0</version>
+			<version>2.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>io.github.hakky54</groupId>
 			<artifactId>sslcontext-kickstart</artifactId>
-			<version>7.2.0</version>
+			<version>7.4.11</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.google.apis</groupId>
 			<artifactId>google-api-services-youtube</artifactId>
-			<version>v3-rev139-1.20.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.google.guava</groupId>
-					<artifactId>guava-jdk5</artifactId>
-				</exclusion>
-			</exclusions>
+			<version>v3-rev222-1.25.0</version>
 		</dependency>
 
 		<dependency>
@@ -451,12 +460,12 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>8.0.28</version>
+			<version>8.0.33</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.4.1</version>
+			<version>42.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jtds</groupId>
@@ -482,7 +491,7 @@
 		<dependency>
 			<groupId>org.mock-server</groupId>
 			<artifactId>mockserver-junit-jupiter</artifactId>
-			<version>5.13.2</version>
+			<version>5.15.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -498,7 +507,7 @@
 		<dependency>
 			<groupId>com.microsoft.playwright</groupId>
 			<artifactId>playwright</artifactId>
-			<version>1.24.1</version>
+			<version>1.32.0</version>
 			<scope>test</scope>
 		</dependency>
 

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

@@ -18,9 +18,7 @@ import javax.websocket.server.ServerEndpointConfig;
 import org.hibernate.cfg.AvailableSettings;
 
 import com.codahale.metrics.json.MetricsModule;
-import com.commafeed.backend.feed.FeedRefreshTaskGiver;
-import com.commafeed.backend.feed.FeedRefreshUpdater;
-import com.commafeed.backend.feed.FeedRefreshWorker;
+import com.commafeed.backend.feed.FeedRefreshEngine;
 import com.commafeed.backend.model.AbstractModel;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
@@ -32,7 +30,7 @@ import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserRole;
 import com.commafeed.backend.model.UserSettings;
-import com.commafeed.backend.service.StartupService;
+import com.commafeed.backend.service.DatabaseStartupService;
 import com.commafeed.backend.service.UserService;
 import com.commafeed.backend.task.ScheduledTask;
 import com.commafeed.frontend.auth.SecurityCheckFactoryProvider;
@@ -50,6 +48,8 @@ import com.commafeed.frontend.servlet.NextUnreadServlet;
 import com.commafeed.frontend.session.SessionHelperFactoryProvider;
 import com.commafeed.frontend.ws.WebSocketConfigurator;
 import com.commafeed.frontend.ws.WebSocketEndpoint;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Key;
@@ -58,6 +58,7 @@ import com.google.inject.TypeLiteral;
 import be.tomcools.dropwizard.websocket.WebsocketBundle;
 import io.dropwizard.Application;
 import io.dropwizard.assets.AssetsBundle;
+import io.dropwizard.configuration.DefaultConfigurationFactoryFactory;
 import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
 import io.dropwizard.configuration.SubstitutingSourceProvider;
 import io.dropwizard.db.DataSourceFactory;
@@ -69,6 +70,7 @@ import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
 import io.dropwizard.web.WebBundle;
 import io.dropwizard.web.conf.WebConfiguration;
+import io.whitfin.dropwizard.configuration.EnvironmentSubstitutor;
 
 public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 
@@ -87,6 +89,24 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 
 	@Override
 	public void initialize(Bootstrap<CommaFeedConfiguration> bootstrap) {
+		bootstrap.setConfigurationFactoryFactory(new DefaultConfigurationFactoryFactory<CommaFeedConfiguration>() {
+			@Override
+			protected ObjectMapper configureObjectMapper(ObjectMapper objectMapper) {
+				// disable case sensitivity because EnvironmentSubstitutor maps MYPROPERTY to myproperty and not to myProperty
+				return objectMapper
+						.setConfig(objectMapper.getDeserializationConfig().with(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES));
+			}
+		});
+
+		// enable config.yml string substitution
+		// e.g. having a custom config.yml file with app.session.path=${SOME_ENV_VAR} will substitute SOME_ENV_VAR
+		SubstitutingSourceProvider substitutingSourceProvider = new SubstitutingSourceProvider(bootstrap.getConfigurationSourceProvider(),
+				new EnvironmentVariableSubstitutor(false));
+		// enable config.yml properties override with env variables prefixed with CF_
+		// e.g. setting CF_APP_ALLOWREGISTRATIONS=true will set app.allowRegistrations to true
+		EnvironmentSubstitutor environmentSubstitutor = new EnvironmentSubstitutor("CF", substitutingSourceProvider);
+		bootstrap.setConfigurationSourceProvider(environmentSubstitutor);
+
 		bootstrap.getObjectMapper().registerModule(new MetricsModule(TimeUnit.SECONDS, TimeUnit.SECONDS, false));
 
 		bootstrap.addBundle(websocketBundle = new WebsocketBundle<>());
@@ -124,10 +144,6 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 
 		bootstrap.addBundle(new AssetsBundle("/assets/", "/", "index.html"));
 		bootstrap.addBundle(new MultiPartBundle());
-
-		// Enable variable substitution with environment variables
-		bootstrap.setConfigurationSourceProvider(
-				new SubstitutingSourceProvider(bootstrap.getConfigurationSourceProvider(), new EnvironmentVariableSubstitutor(false)));
 	}
 
 	@Override
@@ -177,12 +193,10 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 		}
 
 		// database init/changelogs
-		environment.lifecycle().manage(injector.getInstance(StartupService.class));
+		environment.lifecycle().manage(injector.getInstance(DatabaseStartupService.class));
 
-		// background feed fetching
-		environment.lifecycle().manage(injector.getInstance(FeedRefreshTaskGiver.class));
-		environment.lifecycle().manage(injector.getInstance(FeedRefreshWorker.class));
-		environment.lifecycle().manage(injector.getInstance(FeedRefreshUpdater.class));
+		// start feed fetching engine
+		environment.lifecycle().manage(injector.getInstance(FeedRefreshEngine.class));
 
 		// prevent caching index.html, so that the webapp is always up to date
 		environment.servlets()

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

@@ -14,7 +14,6 @@ import org.apache.http.HttpHeaders;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.HttpStatus;
-import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpResponseException;
 import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.client.config.RequestConfig;
@@ -59,7 +58,7 @@ public class HttpGetter {
 		}
 	}
 
-	public HttpResult getBinary(String url, int timeout) throws ClientProtocolException, IOException, NotModifiedException {
+	public HttpResult getBinary(String url, int timeout) throws IOException, NotModifiedException {
 		return getBinary(url, null, null, timeout);
 	}
 
@@ -71,14 +70,10 @@ public class HttpGetter {
 	 *            header we got last time we queried that url, or null
 	 * @param eTag
 	 *            header we got last time we queried that url, or null
-	 * @return
-	 * @throws ClientProtocolException
-	 * @throws IOException
 	 * @throws NotModifiedException
 	 *             if the url hasn't changed since we asked for it last time
 	 */
-	public HttpResult getBinary(String url, String lastModified, String eTag, int timeout)
-			throws ClientProtocolException, IOException, NotModifiedException {
+	public HttpResult getBinary(String url, String lastModified, String eTag, int timeout) throws IOException, NotModifiedException {
 		HttpResult result = null;
 		long start = System.currentTimeMillis();
 
@@ -175,13 +170,6 @@ public class HttpGetter {
 		return builder.build();
 	}
 
-	public static void main(String[] args) throws Exception {
-		CommaFeedConfiguration config = new CommaFeedConfiguration();
-		HttpGetter getter = new HttpGetter(config);
-		HttpResult result = getter.getBinary("https://sourceforge.net/projects/mpv-player-windows/rss", 30000);
-		System.out.println(new String(result.content));
-	}
-
 	@Getter
 	public static class NotModifiedException extends Exception {
 		private static final long serialVersionUID = 1L;
@@ -189,12 +177,12 @@ public class HttpGetter {
 		/**
 		 * if the value of this header changed, this is its new value
 		 */
-		private String newLastModifiedHeader;
+		private final String newLastModifiedHeader;
 
 		/**
 		 * if the value of this header changed, this is its new value
 		 */
-		private String newEtagHeader;
+		private final String newEtagHeader;
 
 		public NotModifiedException(String message) {
 			this(message, null, null);

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

@@ -36,7 +36,7 @@ public class FeedDAO extends GenericDAO<Feed> {
 			QFeedSubscription subs = QFeedSubscription.feedSubscription;
 			QUser user = QUser.user;
 
-			query.join(feed.subscriptions, subs).join(subs.user, user).where(user.lastLogin.gt(lastLoginThreshold));
+			query.join(subs).on(subs.feed.id.eq(feed.id)).join(subs.user, user).where(user.lastLogin.gt(lastLoginThreshold));
 		}
 
 		return query.orderBy(feed.disabledUntil.asc()).limit(count).fetch();

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

@@ -2,6 +2,7 @@ package com.commafeed.backend.feed;
 
 import java.io.IOException;
 import java.util.Date;
+import java.util.List;
 import java.util.Set;
 
 import javax.inject.Inject;
@@ -13,13 +14,19 @@ import org.apache.commons.codec.digest.DigestUtils;
 import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.HttpGetter.NotModifiedException;
+import com.commafeed.backend.feed.FeedParser.FeedParserResult;
 import com.commafeed.backend.model.Feed;
+import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.urlprovider.FeedURLProvider;
 import com.rometools.rome.io.FeedException;
 
 import lombok.RequiredArgsConstructor;
+import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 
+/**
+ * Fetches a feed then parses it
+ */
 @Slf4j
 @RequiredArgsConstructor(onConstructor = @__({ @Inject }))
 @Singleton
@@ -29,18 +36,18 @@ public class FeedFetcher {
 	private final HttpGetter getter;
 	private final Set<FeedURLProvider> urlProviders;
 
-	public FetchedFeed fetch(String feedUrl, boolean extractFeedUrlFromHtml, String lastModified, String eTag, Date lastPublishedDate,
+	public FeedFetcherResult fetch(String feedUrl, boolean extractFeedUrlFromHtml, String lastModified, String eTag, Date lastPublishedDate,
 			String lastContentHash) throws FeedException, IOException, NotModifiedException {
 		log.debug("Fetching feed {}", feedUrl);
-		FetchedFeed fetchedFeed = null;
 
 		int timeout = 20000;
 
 		HttpResult result = getter.getBinary(feedUrl, lastModified, eTag, timeout);
 		byte[] content = result.getContent();
 
+		FeedParserResult parserResult;
 		try {
-			fetchedFeed = parser.parse(result.getUrlAfterRedirect(), content);
+			parserResult = parser.parse(result.getUrlAfterRedirect(), content);
 		} catch (FeedException e) {
 			if (extractFeedUrlFromHtml) {
 				String extractedUrl = extractFeedUrl(urlProviders, feedUrl, StringUtils.newStringUtf8(result.getContent()));
@@ -49,7 +56,7 @@ public class FeedFetcher {
 
 					result = getter.getBinary(extractedUrl, lastModified, eTag, timeout);
 					content = result.getContent();
-					fetchedFeed = parser.parse(result.getUrlAfterRedirect(), content);
+					parserResult = parser.parse(result.getUrlAfterRedirect(), content);
 				} else {
 					throw e;
 				}
@@ -73,21 +80,20 @@ public class FeedFetcher {
 					etagHeaderValueChanged ? result.getETag() : null);
 		}
 
-		if (lastPublishedDate != null && fetchedFeed.getFeed().getLastPublishedDate() != null
-				&& lastPublishedDate.getTime() == fetchedFeed.getFeed().getLastPublishedDate().getTime()) {
+		if (lastPublishedDate != null && parserResult.getFeed().getLastPublishedDate() != null
+				&& lastPublishedDate.getTime() == parserResult.getFeed().getLastPublishedDate().getTime()) {
 			log.debug("publishedDate not modified: {}", feedUrl);
 			throw new NotModifiedException("publishedDate not modified",
 					lastModifiedHeaderValueChanged ? result.getLastModifiedSince() : null,
 					etagHeaderValueChanged ? result.getETag() : null);
 		}
 
-		Feed feed = fetchedFeed.getFeed();
+		Feed feed = parserResult.getFeed();
 		feed.setLastModifiedHeader(result.getLastModifiedSince());
 		feed.setEtagHeader(FeedUtils.truncate(result.getETag(), 255));
 		feed.setLastContentHash(hash);
-		fetchedFeed.setFetchDuration(result.getDuration());
-		fetchedFeed.setUrlAfterRedirect(result.getUrlAfterRedirect());
-		return fetchedFeed;
+		return new FeedFetcherResult(parserResult.getFeed(), parserResult.getEntries(), parserResult.getTitle(),
+				result.getUrlAfterRedirect(), result.getDuration());
 	}
 
 	private static String extractFeedUrl(Set<FeedURLProvider> urlProviders, String url, String urlContent) {
@@ -100,4 +106,14 @@ public class FeedFetcher {
 
 		return null;
 	}
+
+	@Value
+	public static class FeedFetcherResult {
+		Feed feed;
+		List<FeedEntry> entries;
+		String title;
+		String urlAfterRedirect;
+		long fetchDuration;
+	}
+
 }

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

@@ -3,6 +3,7 @@ package com.commafeed.backend.feed;
 import java.io.StringReader;
 import java.nio.charset.Charset;
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -37,8 +38,12 @@ import com.rometools.rome.io.SyndFeedInput;
 
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
+import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 
+/**
+ * Parses raw xml as a Feed object
+ */
 @Slf4j
 @RequiredArgsConstructor(onConstructor = @__({ @Inject }))
 @Singleton
@@ -50,10 +55,7 @@ public class FeedParser {
 	private static final Date START = new Date(86400000);
 	private static final Date END = new Date(1000L * Integer.MAX_VALUE - 86400000);
 
-	public FetchedFeed parse(String feedUrl, byte[] xml) throws FeedException {
-		FetchedFeed fetchedFeed = new FetchedFeed();
-		Feed feed = fetchedFeed.getFeed();
-		List<FeedEntry> entries = fetchedFeed.getEntries();
+	public FeedParserResult parse(String feedUrl, byte[] xml) throws FeedException {
 
 		try {
 			Charset encoding = FeedUtils.guessEncoding(xml);
@@ -63,17 +65,19 @@ public class FeedParser {
 			}
 			xmlString = FeedUtils.replaceHtmlEntitiesWithNumericEntities(xmlString);
 			InputSource source = new InputSource(new StringReader(xmlString));
+
 			SyndFeed rss = new SyndFeedInput().build(source);
 			handleForeignMarkup(rss);
 
-			fetchedFeed.setTitle(rss.getTitle());
+			String title = rss.getTitle();
+			Feed feed = new Feed();
 			feed.setPushHub(findHub(rss));
 			feed.setPushTopic(findSelf(rss));
 			feed.setUrl(feedUrl);
 			feed.setLink(rss.getLink());
-			List<SyndEntry> items = rss.getEntries();
 
-			for (SyndEntry item : items) {
+			List<FeedEntry> entries = new ArrayList<>();
+			for (SyndEntry item : rss.getEntries()) {
 				FeedEntry entry = new FeedEntry();
 
 				String guid = item.getUri();
@@ -121,6 +125,7 @@ public class FeedParser {
 
 				entries.add(entry);
 			}
+
 			Date lastEntryDate = null;
 			Date publishedDate = validateDate(rss.getPublishedDate(), false);
 			if (!entries.isEmpty()) {
@@ -133,10 +138,10 @@ public class FeedParser {
 			feed.setAverageEntryInterval(FeedUtils.averageTimeBetweenEntries(entries));
 			feed.setLastEntryDate(lastEntryDate);
 
+			return new FeedParserResult(feed, entries, title);
 		} catch (Exception e) {
 			throw new FeedException(String.format("Could not parse feed from %s : %s", feedUrl, e.getMessage()), e);
 		}
-		return fetchedFeed;
 	}
 
 	/**
@@ -273,4 +278,11 @@ public class FeedParser {
 		}
 	}
 
+	@Value
+	public static class FeedParserResult {
+		Feed feed;
+		List<FeedEntry> entries;
+		String title;
+	}
+
 }

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

@@ -1,124 +0,0 @@
-package com.commafeed.backend.feed;
-
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.BlockingDeque;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.TimeUnit;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.time.DateUtils;
-import org.hibernate.SessionFactory;
-
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricRegistry;
-import com.commafeed.CommaFeedConfiguration;
-import com.commafeed.backend.dao.FeedDAO;
-import com.commafeed.backend.dao.UnitOfWork;
-import com.commafeed.backend.model.Feed;
-
-@Singleton
-public class FeedQueues {
-
-	private final SessionFactory sessionFactory;
-	private final FeedDAO feedDAO;
-	private final CommaFeedConfiguration config;
-	private final BlockingDeque<FeedRefreshContext> queue = new LinkedBlockingDeque<>();
-	private final Meter refill;
-
-	@Inject
-	public FeedQueues(SessionFactory sessionFactory, FeedDAO feedDAO, CommaFeedConfiguration config, MetricRegistry metrics) {
-		this.sessionFactory = sessionFactory;
-		this.config = config;
-		this.feedDAO = feedDAO;
-		this.refill = metrics.meter(MetricRegistry.name(getClass(), "refill"));
-
-		metrics.register(MetricRegistry.name(getClass(), "queue"), (Gauge<Integer>) queue::size);
-	}
-
-	/**
-	 * take a feed from the refresh queue
-	 */
-	public synchronized FeedRefreshContext take() {
-		FeedRefreshContext context = queue.poll();
-		if (context != null) {
-			return context;
-		}
-
-		refill();
-		try {
-			// try to get something from the queue
-			// if the queue is empty, wait a bit
-			// polling the queue instead of sleeping gives us the opportunity to process a feed immediately if it was added manually with
-			// add()
-			return queue.poll(15, TimeUnit.SECONDS);
-		} catch (InterruptedException e) {
-			throw new RuntimeException("interrupted while waiting for a feed in the queue", e);
-		}
-	}
-
-	/**
-	 * add a feed to the refresh queue
-	 */
-	public void add(Feed feed, boolean urgent) {
-		if (isFeedAlreadyQueued(feed)) {
-			return;
-		}
-
-		FeedRefreshContext context = new FeedRefreshContext(feed, urgent);
-		if (urgent) {
-			queue.addFirst(context);
-		} else {
-			queue.addLast(context);
-		}
-	}
-
-	/**
-	 * refills the refresh queue
-	 */
-	private void refill() {
-		refill.mark();
-
-		// add feeds that are up to refresh from the database
-		int batchSize = Math.min(100, 3 * config.getApplicationSettings().getBackgroundThreads());
-		List<Feed> feeds = UnitOfWork.call(sessionFactory, () -> {
-			List<Feed> list = feedDAO.findNextUpdatable(batchSize, getLastLoginThreshold());
-
-			// set the disabledDate as we use it in feedDAO.findNextUpdatable() to decide what to refresh next
-			Date nextRefreshDate = DateUtils.addMinutes(new Date(), config.getApplicationSettings().getRefreshIntervalMinutes());
-			list.forEach(f -> f.setDisabledUntil(nextRefreshDate));
-			feedDAO.saveOrUpdate(list);
-
-			return list;
-		});
-
-		feeds.forEach(f -> add(f, false));
-	}
-
-	public void giveBack(Feed feed) {
-		String normalized = FeedUtils.normalizeURL(feed.getUrl());
-		feed.setNormalizedUrl(normalized);
-		feed.setNormalizedUrlHash(DigestUtils.sha1Hex(normalized));
-		feed.setLastUpdated(new Date());
-		UnitOfWork.run(sessionFactory, () -> feedDAO.saveOrUpdate(feed));
-
-		// we just finished updating the feed, remove it from the queue
-		queue.removeIf(c -> isFeedAlreadyQueued(c.getFeed()));
-	}
-
-	private Date getLastLoginThreshold() {
-		if (config.getApplicationSettings().getHeavyLoad()) {
-			return DateUtils.addDays(new Date(), -30);
-		} else {
-			return null;
-		}
-	}
-
-	private boolean isFeedAlreadyQueued(Feed feed) {
-		return queue.stream().anyMatch(c -> c.getFeed().getId().equals(feed.getId()));
-	}
-}

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

@@ -1,22 +0,0 @@
-package com.commafeed.backend.feed;
-
-import java.util.List;
-
-import com.commafeed.backend.model.Feed;
-import com.commafeed.backend.model.FeedEntry;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class FeedRefreshContext {
-	private Feed feed;
-	private List<FeedEntry> entries;
-	private boolean urgent;
-
-	public FeedRefreshContext(Feed feed, boolean isUrgent) {
-		this.feed = feed;
-		this.urgent = isUrgent;
-	}
-}

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

@@ -0,0 +1,108 @@
+package com.commafeed.backend.feed;
+
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.lang3.time.DateUtils;
+import org.hibernate.SessionFactory;
+
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.MetricRegistry;
+import com.commafeed.CommaFeedConfiguration;
+import com.commafeed.backend.dao.FeedDAO;
+import com.commafeed.backend.dao.UnitOfWork;
+import com.commafeed.backend.model.Feed;
+
+import io.dropwizard.lifecycle.Managed;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Singleton
+public class FeedRefreshEngine implements Managed {
+
+	private final SessionFactory sessionFactory;
+	private final FeedDAO feedDAO;
+	private final FeedRefreshWorker worker;
+	private final FeedRefreshUpdater updater;
+	private final CommaFeedConfiguration config;
+	private final Meter refill;
+
+	private final PublishProcessor<Feed> priorityQueue;
+	private Disposable flow;
+
+	@Inject
+	public FeedRefreshEngine(SessionFactory sessionFactory, FeedDAO feedDAO, FeedRefreshWorker worker, FeedRefreshUpdater updater,
+			CommaFeedConfiguration config, MetricRegistry metrics) {
+		this.sessionFactory = sessionFactory;
+		this.feedDAO = feedDAO;
+		this.worker = worker;
+		this.updater = updater;
+		this.config = config;
+		this.refill = metrics.meter(MetricRegistry.name(getClass(), "refill"));
+		this.priorityQueue = PublishProcessor.create();
+	}
+
+	@Override
+	public void start() {
+		Flowable<Feed> database = Flowable.fromCallable(() -> findNextUpdatableFeeds(getBatchSize(), getLastLoginThreshold()))
+				.onErrorResumeNext(e -> {
+					log.error("error while fetching next updatable feeds", e);
+					return Flowable.empty();
+				})
+				// repeat query 15s after the flowable has been emptied
+				// https://github.com/ReactiveX/RxJava/issues/448#issuecomment-233244964
+				.repeatWhen(o -> o.concatMap(v -> Flowable.timer(15, TimeUnit.SECONDS)))
+				.flatMap(Flowable::fromIterable);
+		Flowable<Feed> source = Flowable.merge(priorityQueue, database);
+
+		this.flow = source.subscribeOn(Schedulers.io())
+				// feed fetching
+				.parallel(config.getApplicationSettings().getBackgroundThreads())
+				.runOn(Schedulers.io())
+				.flatMap(f -> Flowable.fromCallable(() -> worker.update(f)).onErrorResumeNext(e -> {
+					log.error("error while fetching feed", e);
+					return Flowable.empty();
+				}))
+				.sequential()
+				// database updating
+				.parallel(config.getApplicationSettings().getDatabaseUpdateThreads())
+				.runOn(Schedulers.io())
+				.flatMap(fae -> Flowable.fromCallable(() -> updater.update(fae.getFeed(), fae.getEntries())).onErrorResumeNext(e -> {
+					log.error("error while updating database", e);
+					return Flowable.empty();
+				}))
+				.sequential()
+				// end flow
+				.subscribe();
+	}
+
+	public void refreshImmediately(Feed feed) {
+		priorityQueue.onNext(feed);
+	}
+
+	private List<Feed> findNextUpdatableFeeds(int max, Date lastLoginThreshold) {
+		refill.mark();
+		return UnitOfWork.call(sessionFactory, () -> feedDAO.findNextUpdatable(max, lastLoginThreshold));
+	}
+
+	private int getBatchSize() {
+		return Math.min(Flowable.bufferSize(), 3 * config.getApplicationSettings().getBackgroundThreads());
+	}
+
+	private Date getLastLoginThreshold() {
+		return Boolean.TRUE.equals(config.getApplicationSettings().getHeavyLoad()) ? DateUtils.addDays(new Date(), -30) : null;
+	}
+
+	@Override
+	public void stop() {
+		flow.dispose();
+	}
+}

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

@@ -1,99 +0,0 @@
-package com.commafeed.backend.feed;
-
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.MetricRegistry;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Wraps a {@link ThreadPoolExecutor} instance. Blocks when queue is full instead of rejecting the task. Allow priority queueing by using
- * {@link Task} instead of {@link Runnable}
- * 
- */
-@Slf4j
-public class FeedRefreshExecutor {
-
-	private String poolName;
-	private ThreadPoolExecutor pool;
-	private LinkedBlockingDeque<Runnable> queue;
-
-	public FeedRefreshExecutor(final String poolName, int threads, int queueCapacity, MetricRegistry metrics) {
-		log.info("Creating pool {} with {} threads", poolName, threads);
-		this.poolName = poolName;
-		pool = new ThreadPoolExecutor(threads, threads, 0, TimeUnit.MILLISECONDS, queue = new LinkedBlockingDeque<Runnable>(queueCapacity) {
-			private static final long serialVersionUID = 1L;
-
-			@Override
-			public boolean offer(Runnable r) {
-				Task task = (Task) r;
-				if (task.isUrgent()) {
-					return offerFirst(r);
-				} else {
-					return offerLast(r);
-				}
-			}
-		}) {
-			@Override
-			protected void afterExecute(Runnable r, Throwable t) {
-				if (t != null) {
-					log.error("thread from pool {} threw a runtime exception", poolName, t);
-				}
-			}
-		};
-		pool.setRejectedExecutionHandler(new RejectedExecutionHandler() {
-			@Override
-			public void rejectedExecution(Runnable r, ThreadPoolExecutor e) {
-				log.debug("{} thread queue full, waiting...", poolName);
-				try {
-					Task task = (Task) r;
-					if (task.isUrgent()) {
-						queue.putFirst(r);
-					} else {
-						queue.put(r);
-					}
-				} catch (InterruptedException e1) {
-					log.error(poolName + " interrupted while waiting for queue.", e1);
-				}
-			}
-		});
-
-		metrics.register(MetricRegistry.name(getClass(), poolName, "active"), new Gauge<Integer>() {
-			@Override
-			public Integer getValue() {
-				return pool.getActiveCount();
-			}
-		});
-
-		metrics.register(MetricRegistry.name(getClass(), poolName, "pending"), new Gauge<Integer>() {
-			@Override
-			public Integer getValue() {
-				return queue.size();
-			}
-		});
-	}
-
-	public void execute(Task task) {
-		pool.execute(task);
-	}
-
-	public void shutdown() {
-		pool.shutdownNow();
-		while (!pool.isTerminated()) {
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException e) {
-				log.error("{} interrupted while waiting for threads to finish.", poolName);
-			}
-		}
-	}
-
-	public interface Task extends Runnable {
-		boolean isUrgent();
-	}
-
-}

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

@@ -22,9 +22,9 @@ public class FeedRefreshIntervalCalculator {
 		this.refreshIntervalMinutes = config.getApplicationSettings().getRefreshIntervalMinutes();
 	}
 
-	public Date onFetchSuccess(FetchedFeed fetchedFeed) {
+	public Date onFetchSuccess(Feed feed) {
 		Date defaultRefreshInterval = getDefaultRefreshInterval();
-		return heavyLoad ? computeRefreshIntervalForHeavyLoad(fetchedFeed.getFeed(), defaultRefreshInterval) : defaultRefreshInterval;
+		return heavyLoad ? computeRefreshIntervalForHeavyLoad(feed, defaultRefreshInterval) : defaultRefreshInterval;
 	}
 
 	public Date onFeedNotModified(Feed feed) {

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

@@ -1,75 +0,0 @@
-package com.commafeed.backend.feed;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricRegistry;
-import com.commafeed.CommaFeedConfiguration;
-import com.commafeed.backend.dao.FeedDAO;
-
-import io.dropwizard.lifecycle.Managed;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Infinite loop fetching feeds from @FeedQueues and queuing them to the {@link FeedRefreshWorker} pool.
- * 
- */
-@Slf4j
-@Singleton
-public class FeedRefreshTaskGiver implements Managed {
-
-	private final FeedQueues queues;
-	private final FeedRefreshWorker worker;
-
-	private final ExecutorService executor;
-
-	private final Meter feedRefreshed;
-
-	@Inject
-	public FeedRefreshTaskGiver(FeedQueues queues, FeedDAO feedDAO, FeedRefreshWorker worker, CommaFeedConfiguration config,
-			MetricRegistry metrics) {
-		this.queues = queues;
-		this.worker = worker;
-
-		executor = Executors.newFixedThreadPool(1);
-		feedRefreshed = metrics.meter(MetricRegistry.name(getClass(), "feedRefreshed"));
-	}
-
-	@Override
-	public void stop() {
-		log.info("shutting down feed refresh task giver");
-		executor.shutdownNow();
-		while (!executor.isTerminated()) {
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException e) {
-				log.error("interrupted while waiting for threads to finish.");
-			}
-		}
-	}
-
-	@Override
-	public void start() {
-		log.info("starting feed refresh task giver");
-		executor.execute(new Runnable() {
-			@Override
-			public void run() {
-				while (!executor.isShutdown()) {
-					try {
-						FeedRefreshContext context = queues.take();
-						if (context != null) {
-							feedRefreshed.mark();
-							worker.updateFeed(context);
-						}
-					} catch (Exception e) {
-						log.error(e.getMessage(), e);
-					}
-				}
-			}
-		});
-	}
-}

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

@@ -20,17 +20,16 @@ import org.hibernate.SessionFactory;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.commafeed.CommaFeedConfiguration;
-import com.commafeed.CommaFeedConfiguration.ApplicationSettings;
 import com.commafeed.backend.cache.CacheService;
 import com.commafeed.backend.dao.FeedSubscriptionDAO;
 import com.commafeed.backend.dao.UnitOfWork;
-import com.commafeed.backend.feed.FeedRefreshExecutor.Task;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.FeedEntryContent;
 import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.User;
-import com.commafeed.backend.service.FeedUpdateService;
+import com.commafeed.backend.service.FeedEntryService;
+import com.commafeed.backend.service.FeedService;
 import com.commafeed.backend.service.PubSubService;
 import com.commafeed.frontend.ws.WebSocketMessageBuilder;
 import com.commafeed.frontend.ws.WebSocketSessions;
@@ -40,20 +39,22 @@ import io.dropwizard.lifecycle.Managed;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+/**
+ * Updates the feed in the database and inserts new entries
+ */
 @Slf4j
 @Singleton
 public class FeedRefreshUpdater implements Managed {
 
 	private final SessionFactory sessionFactory;
-	private final FeedUpdateService feedUpdateService;
+	private final FeedService feedService;
+	private final FeedEntryService feedEntryService;
 	private final PubSubService pubSubService;
-	private final FeedQueues queues;
 	private final CommaFeedConfiguration config;
 	private final FeedSubscriptionDAO feedSubscriptionDAO;
 	private final CacheService cache;
 	private final WebSocketSessions webSocketSessions;
 
-	private final FeedRefreshExecutor pool;
 	private final Striped<Lock> locks;
 
 	private final Meter entryCacheMiss;
@@ -62,22 +63,19 @@ public class FeedRefreshUpdater implements Managed {
 	private final Meter entryInserted;
 
 	@Inject
-	public FeedRefreshUpdater(SessionFactory sessionFactory, FeedUpdateService feedUpdateService, PubSubService pubSubService,
-			FeedQueues queues, CommaFeedConfiguration config, MetricRegistry metrics, FeedSubscriptionDAO feedSubscriptionDAO,
+	public FeedRefreshUpdater(SessionFactory sessionFactory, FeedService feedService, FeedEntryService feedEntryService,
+			PubSubService pubSubService, CommaFeedConfiguration config, MetricRegistry metrics, FeedSubscriptionDAO feedSubscriptionDAO,
 			CacheService cache, WebSocketSessions webSocketSessions) {
 		this.sessionFactory = sessionFactory;
-		this.feedUpdateService = feedUpdateService;
+		this.feedService = feedService;
+		this.feedEntryService = feedEntryService;
 		this.pubSubService = pubSubService;
-		this.queues = queues;
 		this.config = config;
 		this.feedSubscriptionDAO = feedSubscriptionDAO;
 		this.cache = cache;
 		this.webSocketSessions = webSocketSessions;
 
-		ApplicationSettings settings = config.getApplicationSettings();
-		int threads = Math.max(settings.getDatabaseUpdateThreads(), 1);
-		pool = new FeedRefreshExecutor("feed-refresh-updater", threads, Math.min(50 * threads, 1000), metrics);
-		locks = Striped.lazyWeakLock(threads * 100000);
+		locks = Striped.lazyWeakLock(100000);
 
 		entryCacheMiss = metrics.meter(MetricRegistry.name(getClass(), "entryCacheMiss"));
 		entryCacheHit = metrics.meter(MetricRegistry.name(getClass(), "entryCacheHit"));
@@ -85,20 +83,6 @@ public class FeedRefreshUpdater implements Managed {
 		entryInserted = metrics.meter(MetricRegistry.name(getClass(), "entryInserted"));
 	}
 
-	@Override
-	public void start() throws Exception {
-	}
-
-	@Override
-	public void stop() throws Exception {
-		log.info("shutting down feed refresh updater");
-		pool.shutdown();
-	}
-
-	public void updateFeed(FeedRefreshContext context) {
-		pool.execute(new EntryTask(context));
-	}
-
 	private AddEntryResult addEntry(final Feed feed, final FeedEntry entry, final List<FeedSubscription> subscriptions) {
 		boolean processed = false;
 		boolean inserted = false;
@@ -123,7 +107,7 @@ public class FeedRefreshUpdater implements Managed {
 			locked2 = lock2.tryLock(1, TimeUnit.MINUTES);
 			if (locked1 && locked2) {
 				processed = true;
-				inserted = UnitOfWork.call(sessionFactory, () -> feedUpdateService.addEntry(feed, entry, subscriptions));
+				inserted = UnitOfWork.call(sessionFactory, () -> feedEntryService.addEntry(feed, entry, subscriptions));
 				if (inserted) {
 					entryInserted.mark();
 				}
@@ -166,76 +150,63 @@ public class FeedRefreshUpdater implements Managed {
 		}
 	}
 
-	private class EntryTask implements Task {
+	public boolean update(Feed feed, List<FeedEntry> entries) {
+		boolean processed = true;
+		boolean insertedAtLeastOneEntry = false;
 
-		private final FeedRefreshContext context;
+		if (!entries.isEmpty()) {
+			List<String> lastEntries = cache.getLastEntries(feed);
+			List<String> currentEntries = new ArrayList<>();
 
-		public EntryTask(FeedRefreshContext context) {
-			this.context = context;
-		}
-
-		@Override
-		public void run() {
-			boolean processed = true;
-			boolean insertedAtLeastOneEntry = false;
-
-			final Feed feed = context.getFeed();
-			List<FeedEntry> entries = context.getEntries();
-			if (entries.isEmpty()) {
-				feed.setMessage("Feed has no entries");
-			} else {
-				List<String> lastEntries = cache.getLastEntries(feed);
-				List<String> currentEntries = new ArrayList<>();
-
-				List<FeedSubscription> subscriptions = null;
-				for (FeedEntry entry : entries) {
-					String cacheKey = cache.buildUniqueEntryKey(feed, entry);
-					if (!lastEntries.contains(cacheKey)) {
-						log.debug("cache miss for {}", entry.getUrl());
-						if (subscriptions == null) {
-							subscriptions = UnitOfWork.call(sessionFactory, () -> feedSubscriptionDAO.findByFeed(feed));
-						}
-						AddEntryResult addEntryResult = addEntry(feed, entry, subscriptions);
-						processed &= addEntryResult.processed;
-						insertedAtLeastOneEntry |= addEntryResult.inserted;
-
-						entryCacheMiss.mark();
-					} else {
-						log.debug("cache hit for {}", entry.getUrl());
-						entryCacheHit.mark();
+			List<FeedSubscription> subscriptions = null;
+			for (FeedEntry entry : entries) {
+				String cacheKey = cache.buildUniqueEntryKey(feed, entry);
+				if (!lastEntries.contains(cacheKey)) {
+					log.debug("cache miss for {}", entry.getUrl());
+					if (subscriptions == null) {
+						subscriptions = UnitOfWork.call(sessionFactory, () -> feedSubscriptionDAO.findByFeed(feed));
 					}
+					AddEntryResult addEntryResult = addEntry(feed, entry, subscriptions);
+					processed &= addEntryResult.processed;
+					insertedAtLeastOneEntry |= addEntryResult.inserted;
 
-					currentEntries.add(cacheKey);
+					entryCacheMiss.mark();
+				} else {
+					log.debug("cache hit for {}", entry.getUrl());
+					entryCacheHit.mark();
 				}
-				cache.setLastEntries(feed, currentEntries);
 
-				if (subscriptions == null) {
-					feed.setMessage("No new entries found");
-				} else if (insertedAtLeastOneEntry) {
-					List<User> users = subscriptions.stream().map(FeedSubscription::getUser).collect(Collectors.toList());
-					cache.invalidateUnreadCount(subscriptions.toArray(new FeedSubscription[0]));
-					cache.invalidateUserRootCategory(users.toArray(new User[0]));
+				currentEntries.add(cacheKey);
+			}
+			cache.setLastEntries(feed, currentEntries);
 
-					// notify over websocket
-					subscriptions.forEach(sub -> webSocketSessions.sendMessage(sub.getUser(), WebSocketMessageBuilder.newFeedEntries(sub)));
-				}
-			}
+			if (subscriptions == null) {
+				feed.setMessage("No new entries found");
+			} else if (insertedAtLeastOneEntry) {
+				List<User> users = subscriptions.stream().map(FeedSubscription::getUser).collect(Collectors.toList());
+				cache.invalidateUnreadCount(subscriptions.toArray(new FeedSubscription[0]));
+				cache.invalidateUserRootCategory(users.toArray(new User[0]));
 
-			if (config.getApplicationSettings().getPubsubhubbub()) {
-				handlePubSub(feed);
-			}
-			if (!processed) {
-				// requeue asap
-				feed.setDisabledUntil(new Date(0));
+				// notify over websocket
+				subscriptions.forEach(sub -> webSocketSessions.sendMessage(sub.getUser(), WebSocketMessageBuilder.newFeedEntries(sub)));
 			}
+		}
+
+		if (Boolean.TRUE.equals(config.getApplicationSettings().getPubsubhubbub())) {
+			handlePubSub(feed);
+		}
+		if (!processed) {
+			// requeue asap
+			feed.setDisabledUntil(new Date(0));
+		}
+
+		if (insertedAtLeastOneEntry) {
 			feedUpdated.mark();
-			queues.giveBack(feed);
 		}
 
-		@Override
-		public boolean isUrgent() {
-			return context.isUrgent();
-		}
+		UnitOfWork.run(sessionFactory, () -> feedService.save(feed));
+
+		return processed;
 	}
 
 	@AllArgsConstructor

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

@@ -1,5 +1,6 @@
 package com.commafeed.backend.feed;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -10,91 +11,72 @@ import javax.inject.Singleton;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.HttpGetter.NotModifiedException;
-import com.commafeed.backend.feed.FeedRefreshExecutor.Task;
+import com.commafeed.backend.feed.FeedFetcher.FeedFetcherResult;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedEntry;
 
-import io.dropwizard.lifecycle.Managed;
+import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * Calls {@link FeedFetcher} and handles its outcome
- * 
+ * Calls {@link FeedFetcher} and updates the Feed object, but does not update the database ({@link FeedRefreshUpdater} does that)
  */
 @Slf4j
 @Singleton
-public class FeedRefreshWorker implements Managed {
+public class FeedRefreshWorker {
 
-	private final FeedRefreshUpdater feedRefreshUpdater;
 	private final FeedRefreshIntervalCalculator refreshIntervalCalculator;
 	private final FeedFetcher fetcher;
-	private final FeedQueues queues;
 	private final CommaFeedConfiguration config;
-	private final FeedRefreshExecutor pool;
+	private final Meter feedFetched;
 
 	@Inject
-	public FeedRefreshWorker(FeedRefreshUpdater feedRefreshUpdater, FeedRefreshIntervalCalculator refreshIntervalCalculator,
-			FeedFetcher fetcher, FeedQueues queues, CommaFeedConfiguration config, MetricRegistry metrics) {
-		this.feedRefreshUpdater = feedRefreshUpdater;
+	public FeedRefreshWorker(FeedRefreshIntervalCalculator refreshIntervalCalculator, FeedFetcher fetcher, CommaFeedConfiguration config,
+			MetricRegistry metrics) {
 		this.refreshIntervalCalculator = refreshIntervalCalculator;
 		this.fetcher = fetcher;
 		this.config = config;
-		this.queues = queues;
-		int threads = config.getApplicationSettings().getBackgroundThreads();
-		pool = new FeedRefreshExecutor("feed-refresh-worker", threads, Math.min(20 * threads, 1000), metrics);
+		this.feedFetched = metrics.meter(MetricRegistry.name(getClass(), "feedFetched"));
+
 	}
 
-	@Override
-	public void start() throws Exception {
-	}
-
-	@Override
-	public void stop() throws Exception {
-		pool.shutdown();
-	}
-
-	public void updateFeed(FeedRefreshContext context) {
-		pool.execute(new FeedTask(context));
-	}
-
-	private void update(FeedRefreshContext context) {
-		Feed feed = context.getFeed();
+	public FeedRefreshWorkerResult update(Feed feed) {
 		try {
 			String url = Optional.ofNullable(feed.getUrlAfterRedirect()).orElse(feed.getUrl());
-			FetchedFeed fetchedFeed = fetcher.fetch(url, false, feed.getLastModifiedHeader(), feed.getEtagHeader(),
+			FeedFetcherResult feedFetcherResult = fetcher.fetch(url, false, feed.getLastModifiedHeader(), feed.getEtagHeader(),
 					feed.getLastPublishedDate(), feed.getLastContentHash());
 			// stops here if NotModifiedException or any other exception is thrown
-			List<FeedEntry> entries = fetchedFeed.getEntries();
+			List<FeedEntry> entries = feedFetcherResult.getEntries();
 
 			Integer maxFeedCapacity = config.getApplicationSettings().getMaxFeedCapacity();
 			if (maxFeedCapacity > 0) {
 				entries = entries.stream().limit(maxFeedCapacity).collect(Collectors.toList());
 			}
 
-			String urlAfterRedirect = fetchedFeed.getUrlAfterRedirect();
+			String urlAfterRedirect = feedFetcherResult.getUrlAfterRedirect();
 			if (StringUtils.equals(url, urlAfterRedirect)) {
 				urlAfterRedirect = null;
 			}
 			feed.setUrlAfterRedirect(urlAfterRedirect);
-			feed.setLink(fetchedFeed.getFeed().getLink());
-			feed.setLastModifiedHeader(fetchedFeed.getFeed().getLastModifiedHeader());
-			feed.setEtagHeader(fetchedFeed.getFeed().getEtagHeader());
-			feed.setLastContentHash(fetchedFeed.getFeed().getLastContentHash());
-			feed.setLastPublishedDate(fetchedFeed.getFeed().getLastPublishedDate());
-			feed.setAverageEntryInterval(fetchedFeed.getFeed().getAverageEntryInterval());
-			feed.setLastEntryDate(fetchedFeed.getFeed().getLastEntryDate());
+			feed.setLink(feedFetcherResult.getFeed().getLink());
+			feed.setLastModifiedHeader(feedFetcherResult.getFeed().getLastModifiedHeader());
+			feed.setEtagHeader(feedFetcherResult.getFeed().getEtagHeader());
+			feed.setLastContentHash(feedFetcherResult.getFeed().getLastContentHash());
+			feed.setLastPublishedDate(feedFetcherResult.getFeed().getLastPublishedDate());
+			feed.setAverageEntryInterval(feedFetcherResult.getFeed().getAverageEntryInterval());
+			feed.setLastEntryDate(feedFetcherResult.getFeed().getLastEntryDate());
 
 			feed.setErrorCount(0);
 			feed.setMessage(null);
-			feed.setDisabledUntil(refreshIntervalCalculator.onFetchSuccess(fetchedFeed));
+			feed.setDisabledUntil(refreshIntervalCalculator.onFetchSuccess(feedFetcherResult.getFeed()));
 
-			handlePubSub(feed, fetchedFeed.getFeed());
-			context.setEntries(entries);
-			feedRefreshUpdater.updateFeed(context);
+			handlePubSub(feed, feedFetcherResult.getFeed());
 
+			return new FeedRefreshWorkerResult(feed, entries);
 		} catch (NotModifiedException e) {
 			log.debug("Feed not modified : {} - {}", feed.getUrl(), e.getMessage());
 
@@ -110,7 +92,7 @@ public class FeedRefreshWorker implements Managed {
 				feed.setEtagHeader(e.getNewEtagHeader());
 			}
 
-			queues.giveBack(feed);
+			return new FeedRefreshWorkerResult(feed, Collections.emptyList());
 		} catch (Exception e) {
 			String message = "Unable to refresh feed " + feed.getUrl() + " : " + e.getMessage();
 			log.debug(e.getClass().getName() + " " + message, e);
@@ -119,7 +101,9 @@ public class FeedRefreshWorker implements Managed {
 			feed.setMessage(message);
 			feed.setDisabledUntil(refreshIntervalCalculator.onFetchError(feed));
 
-			queues.giveBack(feed);
+			return new FeedRefreshWorkerResult(feed, Collections.emptyList());
+		} finally {
+			feedFetched.mark();
 		}
 	}
 
@@ -145,22 +129,10 @@ public class FeedRefreshWorker implements Managed {
 		}
 	}
 
-	private class FeedTask implements Task {
-
-		private final FeedRefreshContext context;
-
-		public FeedTask(FeedRefreshContext context) {
-			this.context = context;
-		}
-
-		@Override
-		public void run() {
-			update(context);
-		}
-
-		@Override
-		public boolean isUrgent() {
-			return context.isUrgent();
-		}
+	@Value
+	public static class FeedRefreshWorkerResult {
+		Feed feed;
+		List<FeedEntry> entries;
 	}
+
 }

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

@@ -28,6 +28,8 @@ import org.jsoup.nodes.Entities.EscapeMode;
 import org.jsoup.safety.Cleaner;
 import org.jsoup.safety.Safelist;
 import org.jsoup.select.Elements;
+import org.netpreserve.urlcanon.Canonicalizer;
+import org.netpreserve.urlcanon.ParsedUrl;
 import org.w3c.css.sac.InputSource;
 import org.w3c.dom.css.CSSStyleDeclaration;
 
@@ -41,7 +43,6 @@ import com.ibm.icu.text.CharsetDetector;
 import com.ibm.icu.text.CharsetMatch;
 import com.steadystate.css.parser.CSSOMParser;
 
-import edu.uci.ics.crawler4j.url.URLCanonicalizer;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -179,7 +180,10 @@ public class FeedUtils {
 		if (url == null) {
 			return null;
 		}
-		String normalized = URLCanonicalizer.getCanonicalURL(url);
+
+		ParsedUrl parsedUrl = ParsedUrl.parseUrl(url);
+		Canonicalizer.AGGRESSIVE.canonicalize(parsedUrl);
+		String normalized = parsedUrl.toString();
 		if (normalized == null) {
 			normalized = url;
 		}

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

@@ -1,23 +0,0 @@
-package com.commafeed.backend.feed;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.commafeed.backend.model.Feed;
-import com.commafeed.backend.model.FeedEntry;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class FetchedFeed {
-
-	private Feed feed = new Feed();
-	private List<FeedEntry> entries = new ArrayList<>();
-
-	private String title;
-	private String urlAfterRedirect;
-	private long fetchDuration;
-
-}

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

@@ -1,11 +1,9 @@
 package com.commafeed.backend.model;
 
 import java.util.Date;
-import java.util.Set;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -123,7 +121,4 @@ public class Feed extends AbstractModel {
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date pushLastPing;
 
-	@OneToMany(mappedBy = "feed")
-	private Set<FeedSubscription> subscriptions;
-
 }

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

@@ -31,7 +31,7 @@ public class UserSettings extends AbstractModel {
 	}
 
 	public enum ViewMode {
-		title, cozy, expanded
+		title, cozy, detailed, expanded
 	}
 
 	@OneToOne(fetch = FetchType.LAZY)

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

@@ -25,7 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @RequiredArgsConstructor(onConstructor = @__({ @Inject }))
 @Singleton
-public class StartupService implements Managed {
+public class DatabaseStartupService implements Managed {
 
 	private final SessionFactory sessionFactory;
 	private final UserDAO userDAO;

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

@@ -7,18 +7,24 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import org.apache.commons.codec.digest.DigestUtils;
+
 import com.commafeed.backend.cache.CacheService;
 import com.commafeed.backend.dao.FeedEntryDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
 import com.commafeed.backend.dao.FeedSubscriptionDAO;
 import com.commafeed.backend.feed.FeedEntryKeyword;
+import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedEntry;
+import com.commafeed.backend.model.FeedEntryContent;
 import com.commafeed.backend.model.FeedEntryStatus;
 import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.User;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @RequiredArgsConstructor(onConstructor = @__({ @Inject }))
 @Singleton
 public class FeedEntryService {
@@ -26,8 +32,45 @@ public class FeedEntryService {
 	private final FeedSubscriptionDAO feedSubscriptionDAO;
 	private final FeedEntryDAO feedEntryDAO;
 	private final FeedEntryStatusDAO feedEntryStatusDAO;
+	private final FeedEntryContentService feedEntryContentService;
+	private final FeedEntryFilteringService feedEntryFilteringService;
 	private final CacheService cache;
 
+	/**
+	 * this is NOT thread-safe
+	 */
+	public boolean addEntry(Feed feed, FeedEntry entry, List<FeedSubscription> subscriptions) {
+
+		Long existing = feedEntryDAO.findExisting(entry.getGuid(), feed);
+		if (existing != null) {
+			return false;
+		}
+
+		FeedEntryContent content = feedEntryContentService.findOrCreate(entry.getContent(), feed.getLink());
+		entry.setGuidHash(DigestUtils.sha1Hex(entry.getGuid()));
+		entry.setContent(content);
+		entry.setInserted(new Date());
+		entry.setFeed(feed);
+		feedEntryDAO.saveOrUpdate(entry);
+
+		// if filter does not match the entry, mark it as read
+		for (FeedSubscription sub : subscriptions) {
+			boolean matches = true;
+			try {
+				matches = feedEntryFilteringService.filterMatchesEntry(sub.getFilter(), entry);
+			} catch (FeedEntryFilteringService.FeedEntryFilterException e) {
+				log.error("could not evaluate filter {}", sub.getFilter(), e);
+			}
+			if (!matches) {
+				FeedEntryStatus status = new FeedEntryStatus(sub.getUser(), sub, entry);
+				status.setRead(true);
+				feedEntryStatusDAO.saveOrUpdate(status);
+			}
+		}
+
+		return true;
+	}
+
 	public void markEntry(User user, Long entryId, boolean read) {
 
 		FeedEntry entry = feedEntryDAO.findById(entryId);

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

@@ -50,6 +50,14 @@ public class FeedService {
 		return feed;
 	}
 
+	public void save(Feed feed) {
+		String normalized = FeedUtils.normalizeURL(feed.getUrl());
+		feed.setNormalizedUrl(normalized);
+		feed.setNormalizedUrlHash(DigestUtils.sha1Hex(normalized));
+		feed.setLastUpdated(new Date());
+		feedDAO.saveOrUpdate(feed);
+	}
+
 	public Favicon fetchFavicon(Feed feed) {
 
 		Favicon icon = null;

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

@@ -14,7 +14,7 @@ import com.commafeed.backend.cache.CacheService;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
 import com.commafeed.backend.dao.FeedSubscriptionDAO;
-import com.commafeed.backend.feed.FeedQueues;
+import com.commafeed.backend.feed.FeedRefreshEngine;
 import com.commafeed.backend.feed.FeedUtils;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
@@ -35,7 +35,7 @@ public class FeedSubscriptionService {
 	private final FeedEntryStatusDAO feedEntryStatusDAO;
 	private final FeedSubscriptionDAO feedSubscriptionDAO;
 	private final FeedService feedService;
-	private final FeedQueues queues;
+	private final FeedRefreshEngine feedRefreshEngine;
 	private final CacheService cache;
 	private final CommaFeedConfiguration config;
 
@@ -76,7 +76,7 @@ public class FeedSubscriptionService {
 		sub.setTitle(FeedUtils.truncate(title, 128));
 		feedSubscriptionDAO.saveOrUpdate(sub);
 
-		queues.add(feed, true);
+		feedRefreshEngine.refreshImmediately(feed);
 		cache.invalidateUserRootCategory(user);
 		return sub.getId();
 	}
@@ -96,7 +96,7 @@ public class FeedSubscriptionService {
 		List<FeedSubscription> subs = feedSubscriptionDAO.findAll(user);
 		for (FeedSubscription sub : subs) {
 			Feed feed = sub.getFeed();
-			queues.add(feed, true);
+			feedRefreshEngine.refreshImmediately(feed);
 		}
 	}
 

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

@@ -1,67 +0,0 @@
-package com.commafeed.backend.service;
-
-import java.util.Date;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.codec.digest.DigestUtils;
-
-import com.commafeed.backend.dao.FeedEntryDAO;
-import com.commafeed.backend.dao.FeedEntryStatusDAO;
-import com.commafeed.backend.model.Feed;
-import com.commafeed.backend.model.FeedEntry;
-import com.commafeed.backend.model.FeedEntryContent;
-import com.commafeed.backend.model.FeedEntryStatus;
-import com.commafeed.backend.model.FeedSubscription;
-import com.commafeed.backend.service.FeedEntryFilteringService.FeedEntryFilterException;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@RequiredArgsConstructor(onConstructor = @__({ @Inject }))
-@Singleton
-public class FeedUpdateService {
-
-	private final FeedEntryDAO feedEntryDAO;
-	private final FeedEntryStatusDAO feedEntryStatusDAO;
-	private final FeedEntryContentService feedEntryContentService;
-	private final FeedEntryFilteringService feedEntryFilteringService;
-
-	/**
-	 * this is NOT thread-safe
-	 */
-	public boolean addEntry(Feed feed, FeedEntry entry, List<FeedSubscription> subscriptions) {
-
-		Long existing = feedEntryDAO.findExisting(entry.getGuid(), feed);
-		if (existing != null) {
-			return false;
-		}
-
-		FeedEntryContent content = feedEntryContentService.findOrCreate(entry.getContent(), feed.getLink());
-		entry.setGuidHash(DigestUtils.sha1Hex(entry.getGuid()));
-		entry.setContent(content);
-		entry.setInserted(new Date());
-		entry.setFeed(feed);
-		feedEntryDAO.saveOrUpdate(entry);
-
-		// if filter does not match the entry, mark it as read
-		for (FeedSubscription sub : subscriptions) {
-			boolean matches = true;
-			try {
-				matches = feedEntryFilteringService.filterMatchesEntry(sub.getFilter(), entry);
-			} catch (FeedEntryFilterException e) {
-				log.error("could not evaluate filter {}", sub.getFilter(), e);
-			}
-			if (!matches) {
-				FeedEntryStatus status = new FeedEntryStatus(sub.getUser(), sub, entry);
-				status.setRead(true);
-				feedEntryStatusDAO.saveOrUpdate(status);
-			}
-		}
-
-		return true;
-	}
-}

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

@@ -17,10 +17,11 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
+import org.hibernate.SessionFactory;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.HttpGetter;
-import com.commafeed.backend.feed.FeedQueues;
+import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.feed.FeedUtils;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.frontend.resource.PubSubHubbubCallbackREST;
@@ -38,7 +39,8 @@ import lombok.extern.slf4j.Slf4j;
 public class PubSubService {
 
 	private final CommaFeedConfiguration config;
-	private final FeedQueues queues;
+	private final FeedService feedService;
+	private final SessionFactory sessionFactory;
 
 	public void subscribe(Feed feed) {
 		String hub = feed.getPushHub();
@@ -73,7 +75,7 @@ public class PubSubService {
 				if (code == 400 && StringUtils.contains(message, pushpressError)) {
 					String[] tokens = message.split(" ");
 					feed.setPushTopic(tokens[tokens.length - 1]);
-					queues.giveBack(feed);
+					UnitOfWork.run(sessionFactory, () -> feedService.save(feed));
 					log.debug("handled pushpress subfeed {} : {}", topic, feed.getPushTopic());
 				} else {
 					throw new Exception(

commafeed-server/src/main/java/com/commafeed/frontend/model/Category.java

@@ -19,6 +19,9 @@ public class Category implements Serializable {
 	@ApiModelProperty(value = "parent category id")
 	private String parentId;
 
+	@ApiModelProperty(value = "parent category name")
+	private String parentName;
+
 	@ApiModelProperty(value = "category id", required = true)
 	private String name;
 

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

@@ -95,7 +95,7 @@ public class CategoryREST {
 	@UnitOfWork
 	@ApiOperation(value = "Get category entries", notes = "Get a list of category entries", response = Entries.class)
 	@Timed
-	public Response getCategoryEntries(@ApiParam(hidden = true) @SecurityCheck User user,
+	public Response getCategoryEntries(@ApiParam(hidden = true) @SecurityCheck(apiKeyAllowed = true) User user,
 			@ApiParam(value = "id of the category, 'all' or 'starred'", required = true) @QueryParam("id") String id,
 			@ApiParam(
 					value = "all entries or only unread ones",
@@ -454,17 +454,13 @@ public class CategoryREST {
 				child.setPosition(c.getPosition());
 				if (c.getParent() != null && c.getParent().getId() != null) {
 					child.setParentId(String.valueOf(c.getParent().getId()));
+					child.setParentName(c.getParent().getName());
 				}
 				child.setExpanded(!c.isCollapsed());
 				category.getChildren().add(child);
 			}
 		}
-		Collections.sort(category.getChildren(), new Comparator<Category>() {
-			@Override
-			public int compare(Category o1, Category o2) {
-				return ObjectUtils.compare(o1.getPosition(), o2.getPosition());
-			}
-		});
+		Collections.sort(category.getChildren(), (o1, o2) -> ObjectUtils.compare(o1.getPosition(), o2.getPosition()));
 
 		for (FeedSubscription subscription : subscriptions) {
 			if (id == null && subscription.getCategory() == null
@@ -474,12 +470,8 @@ public class CategoryREST {
 				category.getFeeds().add(sub);
 			}
 		}
-		Collections.sort(category.getFeeds(), new Comparator<Subscription>() {
-			@Override
-			public int compare(Subscription o1, Subscription o2) {
-				return ObjectUtils.compare(o1.getPosition(), o2.getPosition());
-			}
-		});
+		Collections.sort(category.getFeeds(), (o1, o2) -> ObjectUtils.compare(o1.getPosition(), o2.getPosition()));
+
 		return category;
 	}
 

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

@@ -45,9 +45,9 @@ import com.commafeed.backend.dao.FeedSubscriptionDAO;
 import com.commafeed.backend.favicon.AbstractFaviconFetcher.Favicon;
 import com.commafeed.backend.feed.FeedEntryKeyword;
 import com.commafeed.backend.feed.FeedFetcher;
-import com.commafeed.backend.feed.FeedQueues;
+import com.commafeed.backend.feed.FeedFetcher.FeedFetcherResult;
+import com.commafeed.backend.feed.FeedRefreshEngine;
 import com.commafeed.backend.feed.FeedUtils;
-import com.commafeed.backend.feed.FetchedFeed;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.FeedEntry;
@@ -109,7 +109,7 @@ public class FeedREST {
 	private final FeedEntryService feedEntryService;
 	private final FeedSubscriptionService feedSubscriptionService;
 	private final FeedEntryFilteringService feedEntryFilteringService;
-	private final FeedQueues queues;
+	private final FeedRefreshEngine feedRefreshEngine;
 	private final OPMLImporter opmlImporter;
 	private final OPMLExporter opmlExporter;
 	private final CacheService cache;
@@ -132,7 +132,7 @@ public class FeedREST {
 	@UnitOfWork
 	@ApiOperation(value = "Get feed entries", notes = "Get a list of feed entries", response = Entries.class)
 	@Timed
-	public Response getFeedEntries(@ApiParam(hidden = true) @SecurityCheck User user,
+	public Response getFeedEntries(@ApiParam(hidden = true) @SecurityCheck(apiKeyAllowed = true) User user,
 			@ApiParam(value = "id of the feed", required = true) @QueryParam("id") String id,
 			@ApiParam(
 					value = "all entries or only unread ones",
@@ -244,10 +244,10 @@ public class FeedREST {
 		url = StringUtils.trimToEmpty(url);
 		url = prependHttp(url);
 		try {
-			FetchedFeed feed = feedFetcher.fetch(url, true, null, null, null, null);
+			FeedFetcherResult feedFetcherResult = feedFetcher.fetch(url, true, null, null, null, null);
 			info = new FeedInfo();
-			info.setUrl(feed.getUrlAfterRedirect());
-			info.setTitle(feed.getTitle());
+			info.setUrl(feedFetcherResult.getUrlAfterRedirect());
+			info.setTitle(feedFetcherResult.getTitle());
 
 		} catch (Exception e) {
 			log.debug(e.getMessage(), e);
@@ -303,7 +303,7 @@ public class FeedREST {
 		FeedSubscription sub = feedSubscriptionDAO.findById(user, req.getId());
 		if (sub != null) {
 			Feed feed = sub.getFeed();
-			queues.add(feed, true);
+			feedRefreshEngine.refreshImmediately(feed);
 			return Response.ok().build();
 		}
 		return Response.ok(Status.NOT_FOUND).build();

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

@@ -26,8 +26,8 @@ import com.codahale.metrics.annotation.Timed;
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.feed.FeedParser;
-import com.commafeed.backend.feed.FeedQueues;
-import com.commafeed.backend.feed.FetchedFeed;
+import com.commafeed.backend.feed.FeedParser.FeedParserResult;
+import com.commafeed.backend.feed.FeedRefreshEngine;
 import com.commafeed.backend.model.Feed;
 import com.google.common.base.Preconditions;
 
@@ -46,7 +46,7 @@ public class PubSubHubbubCallbackREST {
 
 	private final FeedDAO feedDAO;
 	private final FeedParser parser;
-	private final FeedQueues queues;
+	private final FeedRefreshEngine feedRefreshEngine;
 	private final CommaFeedConfiguration config;
 	private final MetricRegistry metricRegistry;
 
@@ -100,8 +100,8 @@ public class PubSubHubbubCallbackREST {
 				return Response.status(Status.BAD_REQUEST).entity("empty body received").build();
 			}
 
-			FetchedFeed fetchedFeed = parser.parse(null, bytes);
-			String topic = fetchedFeed.getFeed().getPushTopic();
+			FeedParserResult feedParserResult = parser.parse(null, bytes);
+			String topic = feedParserResult.getFeed().getPushTopic();
 			if (StringUtils.isBlank(topic)) {
 				return Response.status(Status.BAD_REQUEST).entity("empty topic received").build();
 			}
@@ -114,7 +114,7 @@ public class PubSubHubbubCallbackREST {
 
 			for (Feed feed : feeds) {
 				log.debug("pushing content to queue for {}", feed.getUrl());
-				queues.add(feed, false);
+				feedRefreshEngine.refreshImmediately(feed);
 			}
 			metricRegistry.meter(MetricRegistry.name(getClass(), "pushReceived")).mark();
 

commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketSessions.java

@@ -34,10 +34,12 @@ public class WebSocketSessions {
 				.flatMap(e -> e.getValue().stream())
 				.collect(Collectors.toSet());
 
-		log.debug("sending '{}' to {} users via websocket", text, userSessions.size());
-		for (Session userSession : userSessions) {
-			if (userSession.isOpen()) {
-				userSession.getAsyncRemote().sendText(text);
+		if (!userSessions.isEmpty()) {
+			log.debug("sending '{}' to {} users via websocket", text, userSessions.size());
+			for (Session userSession : userSessions) {
+				if (userSession.isOpen()) {
+					userSession.getAsyncRemote().sendText(text);
+				}
 			}
 		}
 	}

commafeed-server/src/test/java/com/commafeed/backend/service/PubSubServiceTest.java

@@ -1,6 +1,7 @@
 package com.commafeed.backend.service;
 
 import org.apache.http.HttpHeaders;
+import org.hibernate.SessionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -15,7 +16,6 @@ import org.mockserver.model.HttpResponse;
 import org.mockserver.model.MediaType;
 
 import com.commafeed.CommaFeedConfiguration;
-import com.commafeed.backend.feed.FeedQueues;
 import com.commafeed.backend.model.Feed;
 
 @ExtendWith(MockServerExtension.class)
@@ -25,7 +25,10 @@ class PubSubServiceTest {
 	private CommaFeedConfiguration config;
 
 	@Mock
-	private FeedQueues queues;
+	private FeedService feedService;
+
+	@Mock(answer = Answers.RETURNS_DEEP_STUBS)
+	private SessionFactory sessionFactory;
 
 	@Mock
 	private Feed feed;
@@ -40,7 +43,7 @@ class PubSubServiceTest {
 		this.client = client;
 		this.client.reset();
 
-		this.underTest = new PubSubService(config, queues);
+		this.underTest = new PubSubService(config, feedService, sessionFactory);
 
 		Integer port = client.getPort();
 		String hubUrl = String.format("http://localhost:%s/hub", port);
@@ -69,7 +72,7 @@ class PubSubServiceTest {
 				.withMethod("POST")
 				.withPath("/hub"));
 		Mockito.verify(feed, Mockito.never()).setPushTopic(Mockito.anyString());
-		Mockito.verifyNoInteractions(queues);
+		Mockito.verifyNoInteractions(feedService);
 	}
 
 	@Test
@@ -83,7 +86,7 @@ class PubSubServiceTest {
 
 		// Assert
 		Mockito.verify(feed).setPushTopic(Mockito.anyString());
-		Mockito.verify(queues).giveBack(feed);
+		Mockito.verify(feedService).save(feed);
 	}
 
 	@Test
@@ -96,7 +99,7 @@ class PubSubServiceTest {
 
 		// Assert
 		Mockito.verify(feed, Mockito.never()).setPushTopic(Mockito.anyString());
-		Mockito.verifyNoInteractions(queues);
+		Mockito.verifyNoInteractions(feedService);
 	}
 
 }

pom.xml

@@ -1,10 +1,11 @@
-<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>
 
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>3.0.0</version>
+	<version>3.1.0</version>
 	<name>CommaFeed</name>
 	<packaging>pom</packaging>
 

release.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Script to create a new release
+# ------------------------------
+
+# exit on error
+set -e
+
+# make sure we're on master
+BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+if [[ "$BRANCH" != "master" ]]; then
+  echo "You're on branch '$BRANCH', you should be on 'master'."
+  exit
+fi
+
+# make sure README.md has been updated
+read -r -p "Has README.md been updated? (Y/n) " CONFIRM
+case "$CONFIRM" in
+n | N) exit ;;
+esac
+
+read -r -p "New version (x.y.z): " VERSION
+
+mvn versions:set -DgenerateBackupPoms=false -DnewVersion="$VERSION"
+git add .
+git commit -am "release $VERSION"
+git tag "$VERSION"
+
+read -r -p "Push master and tag $VERSION? (y/N) " CONFIRM
+case "$CONFIRM" in
+y | Y) git push --atomic origin master "$VERSION" ;;
+esac