docs(changelog): update release notes for version 2.2.4

Based on #2261. For moyu.im/jandan.net, see https://github.com/DIYgod/RSSHub/issues/11528

.devcontainer/devcontainer.json

@@ -0,0 +1,31 @@
+{
+  "name": "Miniflux",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspace",
+  "remoteUser": "vscode",
+  "forwardPorts": [
+    8080
+  ],
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "go.toolsManagement.checkForUpdates": "local",
+        "go.useLanguageServer": true,
+        "go.gopath": "/go"
+      },
+      "extensions": [
+        "ms-azuretools.vscode-docker",
+        "golang.go",
+        "rangav.vscode-thunder-client",
+        "GitHub.codespaces",
+        "GitHub.copilot",
+        "GitHub.copilot-chat"
+      ]
+    }
+  }
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,31 @@
+version: '3.8'
+services:
+  app:
+    image: mcr.microsoft.com/devcontainers/go:1.23
+    volumes:
+      - ..:/workspace:cached
+    command: sleep infinity
+    network_mode: service:db
+    environment:
+      - CREATE_ADMIN=1
+      - ADMIN_USERNAME=admin
+      - ADMIN_PASSWORD=test123
+  db:
+    image: postgres:15
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    hostname: postgres
+    environment:
+      POSTGRES_DB: miniflux2
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_HOST_AUTH_METHOD: trust
+    ports:
+      - 5432:5432
+  apprise:
+    image: caronc/apprise:1.0
+    restart: unless-stopped
+    hostname: apprise
+volumes:
+  postgres-data: null

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,10 @@
+---
+name: Bug report
+about: Create a bug report
+title: ''
+labels: bug, triage needed
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,10 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: wishlist
+assignees: ''
+
+---
+
+- [ ] I have read this document: https://miniflux.app/opinionated.html#feature-request

.github/ISSUE_TEMPLATE/feed-problems.md

@@ -0,0 +1,10 @@
+---
+name: Feed Problems
+about: Problems with a feed or a website
+title: ''
+labels: feed problems, triage needed
+assignees: ''
+
+---
+
+

.github/dependabot.yml

@@ -2,6 +2,15 @@ version: 2
 updates:
   - package-ecosystem: "gomod"
     directory: "/"
+    schedule:
+      interval: "daily"
+    reviewers:
+      - "fguillot"
+    assignees:
+      - "fguillot"
+
+  - package-ecosystem: "docker"
+    directory: "/packaging/docker/alpine"
     schedule:
       interval: "weekly"
     reviewers:
@@ -10,6 +19,33 @@ updates:
       - "fguillot"
 
   - package-ecosystem: "docker"
+    directory: "/packaging/docker/distroless"
+    schedule:
+      interval: "weekly"
+    reviewers:
+      - "fguillot"
+    assignees:
+      - "fguillot"
+
+  - package-ecosystem: "docker"
+    directory: "packaging/debian"
+    schedule:
+      interval: "weekly"
+    reviewers:
+      - "fguillot"
+    assignees:
+      - "fguillot"
+
+  - package-ecosystem: "docker"
+    directory: "packaging/rpm"
+    schedule:
+      interval: "weekly"
+    reviewers:
+      - "fguillot"
+    assignees:
+      - "fguillot"
+
+  - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"

.github/pull_request_template.md

@@ -0,0 +1,7 @@
+Do you follow the guidelines?
+
+- [ ] I have tested my changes
+- [ ] There are no breaking changes
+- [ ] I really tested my changes and there is no regression
+- [ ] Ideally, my commit messages follow the [Conventional Commits specification](https://www.conventionalcommits.org/)
+- [ ] I read this document: https://miniflux.app/faq.html#pull-request

.github/workflows/build_binaries.yml

@@ -0,0 +1,29 @@
+name: Build Binaries
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Golang
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.23.x"
+          check-latest: true
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Compile binaries
+        env:
+          CGO_ENABLED: 0
+        run: make build
+      - name: Upload binaries
+        uses: actions/upload-artifact@v4
+        with:
+          name: binaries
+          path: miniflux-*
+          if-no-files-found: error
+          retention-days: 5

.github/workflows/ci.yml

@@ -1,95 +0,0 @@
-name: CI Workflow
-on:
-  pull_request:
-    branches:
-    - master
-
-jobs:
-
-  linters:
-    name: Linter Check
-    runs-on: ubuntu-latest
-    steps:
-    - name: Set up Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.15
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Checkout
-      uses: actions/checkout@v1
-      with:
-        fetch-depth: 3
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Install linters
-      run: |
-        cd /tmp && go get -u golang.org/x/lint/golint
-        sudo npm install -g jshint
-      env:
-        GO111MODULE: off
-    - name: Run golint
-      run: |
-        export PATH=/home/runner/go/bin:$PATH
-        make lint
-    - name: Run jshint
-      run: jshint ui/static/js/*.js
-
-  unit-tests:
-    name: Unit Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      max-parallel: 4
-      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        go-version: [1.14, 1.15]
-    steps:
-    - name: Set up Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: ${{ matrix.go-version }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Checkout
-      uses: actions/checkout@v1
-      with:
-        fetch-depth: 3
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Run unit tests
-      run: make test
-
-  integration-tests:
-    name: Integration Tests
-    runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:9.5
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: postgres
-        ports:
-        - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-    steps:
-    - name: Set up Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.15
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Checkout
-      uses: actions/checkout@v1
-      with:
-        fetch-depth: 3
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Install Postgres client
-      run: sudo apt-get install -y postgresql-client
-    - name: Run integration tests
-      run: make integration-test
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        PGHOST: 127.0.0.1
-        PGPASSWORD: postgres

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,43 @@
+name: "CodeQL"
+
+permissions: read-all
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '45 22 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go', 'javascript' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - uses: actions/setup-go@v5
+      with:
+        go-version: "1.23.x"
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3

.github/workflows/debian_packages.yml

@@ -0,0 +1,82 @@
+name: Debian Packages
+permissions: read-all
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  pull_request:
+    branches: [ main ]
+jobs:
+  test-packages:
+    if: github.event.pull_request
+    name: Test Packages
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+          fetch-depth: 0
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      id: buildx
+      with:
+          install: true
+    - name: Available Docker Platforms
+      run: echo ${{ steps.buildx.outputs.platforms }}
+    - name: Build Debian Packages
+      run: make debian-packages
+    - name: List generated files
+      run: ls -l *.deb
+  build-packages-manually:
+    if: github.event_name != 'pull_request' && github.event_name != 'push'
+    name: Build Packages Manually
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+          fetch-depth: 0
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      id: buildx
+      with:
+          install: true
+    - name: Available Docker Platforms
+      run: echo ${{ steps.buildx.outputs.platforms }}
+    - name: Build Debian Packages
+      run: make debian-packages
+    - name: Upload package
+      uses: actions/upload-artifact@v4
+      with:
+        name: packages
+        path: "*.deb"
+        if-no-files-found: error
+        retention-days: 3
+  publish-packages:
+    if: github.event_name == 'push'
+    name: Publish Packages
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+          fetch-depth: 0
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      id: buildx
+      with:
+          install: true
+    - name: Available Docker Platforms
+      run: echo ${{ steps.buildx.outputs.platforms }}
+    - name: Build Debian Packages
+      run: make debian-packages
+    - name: List generated files
+      run: ls -l *.deb
+    - name: Upload packages to repository
+      env:
+        FURY_TOKEN: ${{ secrets.FURY_TOKEN }}
+      run: for f in *.deb; do curl -F package=@$f https://$FURY_TOKEN@push.fury.io/miniflux/; done

.github/workflows/docker.yml

@@ -4,54 +4,94 @@ on:
     - cron: '0 1 * * *'
   push:
     tags:
-      - '*.*.*'
+      - '[0-9]+.[0-9]+.[0-9]+'
+  pull_request:
+    branches: [ main ]
 jobs:
   docker-images:
+    name: Docker Images
+    permissions:
+      packages: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Generate Docker tag
-        id: docker_tag
-        run: |
-          DOCKER_IMAGE=miniflux/miniflux
-          DOCKER_VERSION=dev
-          if [ "${{ github.event_name }}" = "schedule" ]; then
-          DOCKER_VERSION=nightly
-          TAGS="${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION}"
-          elif [[ $GITHUB_REF == refs/tags/* ]]; then
-          DOCKER_VERSION=${GITHUB_REF#refs/tags/}
-          TAGS="${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION},${DOCKER_IMAGE}:latest,ghcr.io/${DOCKER_IMAGE}:latest"
-          fi
-          echo ::set-output name=tags::${TAGS}
+      - name: Generate Alpine Docker tags
+        id: docker_alpine_tags
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            docker.io/${{ github.repository_owner }}/miniflux
+            ghcr.io/${{ github.repository_owner }}/miniflux
+            quay.io/${{ github.repository_owner }}/miniflux
+          tags: |
+            type=ref,event=pr
+            type=schedule,pattern=nightly
+            type=semver,pattern={{raw}}
+
+      - name: Generate Distroless Docker tags
+        id: docker_distroless_tags
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            docker.io/${{ github.repository_owner }}/miniflux
+            ghcr.io/${{ github.repository_owner }}/miniflux
+            quay.io/${{ github.repository_owner }}/miniflux
+          tags: |
+            type=ref,event=pr
+            type=schedule,pattern=nightly
+            type=semver,pattern={{raw}}
+          flavor: |
+            suffix=-distroless,onlatest=true
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1 
+        if: ${{ github.event_name != 'pull_request' && vars.PUBLISH_DOCKER_IMAGES == 'true' }}
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1 
+        if: ${{ github.event_name != 'pull_request' && vars.PUBLISH_DOCKER_IMAGES == 'true' }}
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push
-        uses: docker/build-push-action@v2
+      - name: Login to Quay Container Registry
+        if: ${{ github.event_name != 'pull_request' && vars.PUBLISH_DOCKER_IMAGES == 'true' }}
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_TOKEN }}
+
+      - name: Build and Push Alpine images
+        uses: docker/build-push-action@v6
+        if: ${{ vars.PUBLISH_DOCKER_IMAGES == 'true' }}
         with:
           context: .
-          file: ./packaging/docker/Dockerfile
+          file: ./packaging/docker/alpine/Dockerfile
           platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
-          push: true
-          tags: ${{ steps.docker_tag.outputs.tags }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.docker_alpine_tags.outputs.tags }}
+
+      - name: Build and Push Distroless images
+        uses: docker/build-push-action@v6
+        if: ${{ vars.PUBLISH_DOCKER_IMAGES == 'true' }}
+        with:
+          context: .
+          file: ./packaging/docker/distroless/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.docker_distroless_tags.outputs.tags }}

.github/workflows/linters.yml

@@ -0,0 +1,43 @@
+name: Linters
+permissions: read-all
+
+on:
+  pull_request:
+    branches:
+    - main
+  workflow_dispatch:
+
+jobs:
+  jshint:
+    name: Javascript Linter
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install linters
+      run: |
+        sudo npm install -g jshint@2.13.6 eslint@8.57.0
+    - name: Run jshint
+      run: jshint internal/ui/static/js/*.js
+    - name: Run ESLint
+      run: eslint internal/ui/static/js/*.js
+
+  golangci:
+    name: Golang Linters
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.23.x"
+      - run: "go vet ./..."
+      - uses: golangci/golangci-lint-action@v6
+        with:
+          args: >
+            --timeout 10m
+            --exclude-dirs=tests
+            --disable errcheck
+            --enable sqlclosecheck,misspell,gofmt,goimports,whitespace,gocritic
+      - uses: dominikh/staticcheck-action@v1.3.1
+        with:
+          version: "2024.1.1"
+          install-go: false

.github/workflows/rpm_packages.yml

@@ -0,0 +1,55 @@
+name: RPM Packages
+permissions: read-all
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  pull_request:
+    branches: [ main ]
+jobs:
+  test-package:
+    if: github.event.pull_request
+    name: Test Packages
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+          fetch-depth: 0
+    - name: Build RPM Package
+      run: make rpm
+    - name: List generated files
+      run: ls -l *.rpm
+  build-package-manually:
+    if: github.event_name != 'pull_request' && github.event_name != 'push'
+    name: Build Packages Manually
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+          fetch-depth: 0
+    - name: Build RPM Package
+      run: make rpm
+    - name: Upload package
+      uses: actions/upload-artifact@v4
+      with:
+        name: packages
+        path: "*.rpm"
+        if-no-files-found: error
+        retention-days: 3
+  publish-package:
+    if: github.event_name == 'push'
+    name: Publish Packages
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+          fetch-depth: 0
+    - name: Build RPM Package
+      run: make rpm
+    - name: List generated files
+      run: ls -l *.rpm
+    - name: Upload package to repository
+      env:
+        FURY_TOKEN: ${{ secrets.FURY_TOKEN }}
+      run: for f in *.rpm; do curl -F package=@$f https://$FURY_TOKEN@push.fury.io/miniflux/; done

.github/workflows/tests.yml

@@ -0,0 +1,56 @@
+name: Tests
+permissions: read-all
+
+on:
+  pull_request:
+    branches:
+    - main
+  workflow_dispatch:
+
+jobs:
+  unit-tests:
+    name: Unit Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      max-parallel: 4
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        go-version: ["1.23.x"]
+    steps:
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: ${{ matrix.go-version }}
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Run unit tests
+      run: make test
+
+  integration-tests:
+    name: Integration Tests
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:9.5
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        ports:
+        - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    steps:
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: "1.23.x"
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Install Postgres client
+      run: sudo apt update && sudo apt install -y postgresql-client
+    - name: Run integration tests
+      run: make integration-test
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PGHOST: 127.0.0.1
+        PGPASSWORD: postgres

.gitignore

@@ -1,4 +1,7 @@
-miniflux-*
-miniflux
-*.rpm
+./*.sha256
+./miniflux
+.idea
+.vscode
 *.deb
+*.rpm
+miniflux-*

Makefile

@@ -1,17 +1,18 @@
-APP          := miniflux
-DOCKER_IMAGE := miniflux/miniflux
-VERSION      := $(shell git describe --tags --abbrev=0)
-COMMIT       := $(shell git rev-parse --short HEAD)
-BUILD_DATE   := `date +%FT%T%z`
-LD_FLAGS     := "-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.Commit=$(COMMIT)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'"
-PKG_LIST     := $(shell go list ./... | grep -v /vendor/)
-DB_URL       := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable
-DEB_IMG_ARCH := amd64
+APP             := miniflux
+DOCKER_IMAGE    := miniflux/miniflux
+VERSION         := $(shell git describe --tags --abbrev=0 2>/dev/null)
+COMMIT          := $(shell git rev-parse --short HEAD 2>/dev/null)
+BUILD_DATE      := `date +%FT%T%z`
+LD_FLAGS        := "-s -w -X 'miniflux.app/v2/internal/version.Version=$(VERSION)' -X 'miniflux.app/v2/internal/version.Commit=$(COMMIT)' -X 'miniflux.app/v2/internal/version.BuildDate=$(BUILD_DATE)'"
+PKG_LIST        := $(shell go list ./... | grep -v /vendor/)
+DB_URL          := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable
+DOCKER_PLATFORM := amd64
 
 export PGPASSWORD := postgres
 
-.PHONY: generate \
+.PHONY: \
 	miniflux \
+	miniflux-no-pie \
 	linux-amd64 \
 	linux-arm64 \
 	linux-armv7 \
@@ -19,6 +20,7 @@ export PGPASSWORD := postgres
 	linux-armv5 \
 	linux-x86 \
 	darwin-amd64 \
+	darwin-arm64 \
 	freebsd-amd64 \
 	freebsd-x86 \
 	openbsd-amd64 \
@@ -35,86 +37,112 @@ export PGPASSWORD := postgres
 	integration-test \
 	clean-integration-test \
 	docker-image \
+	docker-image-distroless \
 	docker-images \
 	rpm \
 	debian \
 	debian-packages
 
-generate:
-	@ go generate
+miniflux:
+	@ go build -buildmode=pie -ldflags=$(LD_FLAGS) -o $(APP) main.go
 
-miniflux: generate
+miniflux-no-pie:
 	@ go build -ldflags=$(LD_FLAGS) -o $(APP) main.go
 
-linux-amd64: generate
-	@ GOOS=linux GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-linux-amd64 main.go
+linux-amd64:
+	@ CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
-linux-arm64: generate
-	@ GOOS=linux GOARCH=arm64 go build -ldflags=$(LD_FLAGS) -o $(APP)-linux-arm64 main.go
+linux-arm64:
+	@ CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
-linux-armv7: generate
-	@ GOOS=linux GOARCH=arm GOARM=7 go build -ldflags=$(LD_FLAGS) -o $(APP)-linux-armv7 main.go
+linux-armv7:
+	@ CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
-linux-armv6: generate
-	@ GOOS=linux GOARCH=arm GOARM=6 go build -ldflags=$(LD_FLAGS) -o $(APP)-linux-armv6 main.go
+linux-armv6:
+	@ CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
-linux-armv5: generate
-	@ GOOS=linux GOARCH=arm GOARM=5 go build -ldflags=$(LD_FLAGS) -o $(APP)-linux-armv5 main.go
+linux-armv5:
+	@ CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=5 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
-darwin-amd64: generate
-	@ GOOS=darwin GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-darwin-amd64 main.go
+darwin-amd64:
+	@ GOOS=darwin GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
-freebsd-amd64: generate
-	@ GOOS=freebsd GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-freebsd-amd64 main.go
+darwin-arm64:
+	@ GOOS=darwin GOARCH=arm64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
-openbsd-amd64: generate
-	@ GOOS=openbsd GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-openbsd-amd64 main.go
+freebsd-amd64:
+	@ CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
-windows-amd64: generate
-	@ GOOS=windows GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-windows-amd64 main.go
+openbsd-amd64:
+	@ GOOS=openbsd GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
-build: linux-amd64 linux-arm64 linux-armv7 linux-armv6 linux-armv5 darwin-amd64 freebsd-amd64 openbsd-amd64 windows-amd64
+windows-amd64:
+	@ GOOS=windows GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@.exe main.go
+	@ sha256sum $(APP)-$@.exe > $(APP)-$@.exe.sha256
+
+build: linux-amd64 linux-arm64 linux-armv7 linux-armv6 linux-armv5 darwin-amd64 darwin-arm64 freebsd-amd64 openbsd-amd64 windows-amd64
 
 # NOTE: unsupported targets
-netbsd-amd64: generate
-	@ GOOS=netbsd GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-netbsd-amd64 main.go
+netbsd-amd64:
+	@ CGO_ENABLED=0 GOOS=netbsd GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
 
-linux-x86: generate
-	@ GOOS=linux GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-linux-x86 main.go
+linux-x86:
+	@ CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
 
-freebsd-x86: generate
-	@ GOOS=freebsd GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-freebsd-x86 main.go
+freebsd-x86:
+	@ CGO_ENABLED=0 GOOS=freebsd GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
 
-netbsd-x86: generate
-	@ GOOS=netbsd GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-netbsd-x86 main.go
+netbsd-x86:
+	@ CGO_ENABLED=0 GOOS=netbsd GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
 
-openbsd-x86: generate
-	@ GOOS=openbsd GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-freebsd-x86 main.go
+openbsd-x86:
+	@ GOOS=openbsd GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
 
-windows-x86: generate
-	@ GOOS=windows GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-windows-x86 main.go
+windows-x86:
+	@ GOOS=windows GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@.exe main.go
 
-run: generate
-	@ LOG_DATE_TIME=1 go run main.go -debug
+run:
+	@ LOG_DATE_TIME=1 LOG_LEVEL=debug RUN_MIGRATIONS=1 CREATE_ADMIN=1 ADMIN_USERNAME=admin ADMIN_PASSWORD=test123 go run main.go
 
 clean:
-	@ rm -f $(APP)-* $(APP) $(APP)*.rpm $(APP)*.deb
+	@ rm -f $(APP)-* $(APP) $(APP)*.rpm $(APP)*.deb $(APP)*.exe $(APP)*.sha256
 
 test:
 	go test -cover -race -count=1 ./...
 
 lint:
-	golint -set_exit_status ${PKG_LIST}
+	go vet ./...
+	staticcheck ./...
+	golangci-lint run --disable errcheck --enable sqlclosecheck --enable misspell --enable gofmt --enable goimports --enable whitespace
 
 integration-test:
 	psql -U postgres -c 'drop database if exists miniflux_test;'
 	psql -U postgres -c 'create database miniflux_test;'
-	DATABASE_URL=$(DB_URL) go run main.go -migrate
-	DATABASE_URL=$(DB_URL) ADMIN_USERNAME=admin ADMIN_PASSWORD=test123 go run main.go -create-admin
 	go build -o miniflux-test main.go
-	DATABASE_URL=$(DB_URL) ./miniflux-test -debug >/tmp/miniflux.log 2>&1 & echo "$$!" > "/tmp/miniflux.pid"
-	while ! echo exit | nc localhost 8080; do sleep 1; done >/dev/null
-	go test -v -tags=integration -count=1 miniflux.app/tests
+
+	DATABASE_URL=$(DB_URL) \
+	ADMIN_USERNAME=admin \
+	ADMIN_PASSWORD=test123 \
+	CREATE_ADMIN=1 \
+	RUN_MIGRATIONS=1 \
+	DEBUG=1 \
+	./miniflux-test >/tmp/miniflux.log 2>&1 & echo "$$!" > "/tmp/miniflux.pid"
+
+	while ! nc -z localhost 8080; do sleep 1; done
+
+	TEST_MINIFLUX_BASE_URL=http://127.0.0.1:8080 \
+	TEST_MINIFLUX_ADMIN_USERNAME=admin \
+	TEST_MINIFLUX_ADMIN_PASSWORD=test123 \
+	go test -v -count=1 ./internal/api
 
 clean-integration-test:
 	@ kill -9 `cat /tmp/miniflux.pid`
@@ -123,12 +151,15 @@ clean-integration-test:
 	@ psql -U postgres -c 'drop database if exists miniflux_test;'
 
 docker-image:
-	docker build -t $(DOCKER_IMAGE):$(VERSION) -f packaging/docker/Dockerfile .
+	docker build --pull -t $(DOCKER_IMAGE):$(VERSION) -f packaging/docker/alpine/Dockerfile .
+
+docker-image-distroless:
+	docker build -t $(DOCKER_IMAGE):$(VERSION) -f packaging/docker/distroless/Dockerfile .
 
 docker-images:
 	docker buildx build \
 		--platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 \
-		--file packaging/docker/Dockerfile \
+		--file packaging/docker/alpine/Dockerfile \
 		--tag $(DOCKER_IMAGE):$(VERSION) \
 		--push .
 
@@ -142,15 +173,15 @@ rpm: clean
 		rpmbuild -bb --define "_miniflux_version $(VERSION)" /root/rpmbuild/SPECS/miniflux.spec
 
 debian:
-	@ docker build \
-		--build-arg BASE_IMAGE_ARCH=$(DEB_IMG_ARCH) \
-		-t $(DEB_IMG_ARCH)/miniflux-deb-builder \
+	@ docker buildx build --load \
+		--platform linux/$(DOCKER_PLATFORM) \
+		-t miniflux-deb-builder \
 		-f packaging/debian/Dockerfile \
 		.
-	@ docker run --rm \
-		-v ${PWD}:/pkg $(DEB_IMG_ARCH)/miniflux-deb-builder
+	@ docker run --rm --platform linux/$(DOCKER_PLATFORM) \
+		-v ${PWD}:/pkg miniflux-deb-builder
 
 debian-packages: clean
-	$(MAKE) debian DEB_IMG_ARCH=amd64
-	$(MAKE) debian DEB_IMG_ARCH=arm64v8
-	$(MAKE) debian DEB_IMG_ARCH=arm32v7
+	$(MAKE) debian DOCKER_PLATFORM=amd64
+	$(MAKE) debian DOCKER_PLATFORM=arm64
+	$(MAKE) debian DOCKER_PLATFORM=arm/v7

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+Only the latest stable version is supported.
+
+## Reporting a Vulnerability
+
+Preferably, [report the vulnerability privately using GitHub](https://github.com/miniflux/v2/security/advisories/new) ([documentation](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability)).
+
+If you do not want to use GitHub, send an email to `security AT miniflux DOT net` with all the steps to reproduce the problem.

api/entry.go

@@ -1,200 +0,0 @@
-// Copyright 2017 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package api // import "miniflux.app/api"
-
-import (
-	json_parser "encoding/json"
-	"errors"
-	"net/http"
-	"time"
-
-	"miniflux.app/http/request"
-	"miniflux.app/http/response/json"
-	"miniflux.app/model"
-	"miniflux.app/storage"
-	"miniflux.app/validator"
-)
-
-func (h *handler) getFeedEntry(w http.ResponseWriter, r *http.Request) {
-	feedID := request.RouteInt64Param(r, "feedID")
-	entryID := request.RouteInt64Param(r, "entryID")
-
-	builder := h.store.NewEntryQueryBuilder(request.UserID(r))
-	builder.WithFeedID(feedID)
-	builder.WithEntryID(entryID)
-
-	entry, err := builder.GetEntry()
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	if entry == nil {
-		json.NotFound(w, r)
-		return
-	}
-
-	json.OK(w, r, entry)
-}
-
-func (h *handler) getEntry(w http.ResponseWriter, r *http.Request) {
-	entryID := request.RouteInt64Param(r, "entryID")
-	builder := h.store.NewEntryQueryBuilder(request.UserID(r))
-	builder.WithEntryID(entryID)
-
-	entry, err := builder.GetEntry()
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	if entry == nil {
-		json.NotFound(w, r)
-		return
-	}
-
-	json.OK(w, r, entry)
-}
-
-func (h *handler) getFeedEntries(w http.ResponseWriter, r *http.Request) {
-	feedID := request.RouteInt64Param(r, "feedID")
-	h.findEntries(w, r, feedID)
-}
-
-func (h *handler) getEntries(w http.ResponseWriter, r *http.Request) {
-	h.findEntries(w, r, 0)
-}
-
-func (h *handler) findEntries(w http.ResponseWriter, r *http.Request, feedID int64) {
-	statuses := request.QueryStringParamList(r, "status")
-	for _, status := range statuses {
-		if err := validator.ValidateEntryStatus(status); err != nil {
-			json.BadRequest(w, r, err)
-			return
-		}
-	}
-
-	order := request.QueryStringParam(r, "order", model.DefaultSortingOrder)
-	if err := validator.ValidateEntryOrder(order); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	direction := request.QueryStringParam(r, "direction", model.DefaultSortingDirection)
-	if err := validator.ValidateDirection(direction); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	limit := request.QueryIntParam(r, "limit", 100)
-	offset := request.QueryIntParam(r, "offset", 0)
-	if err := validator.ValidateRange(offset, limit); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	userID := request.UserID(r)
-	categoryID := request.QueryInt64Param(r, "category_id", 0)
-	if categoryID > 0 && !h.store.CategoryIDExists(userID, categoryID) {
-		json.BadRequest(w, r, errors.New("Invalid category ID"))
-		return
-	}
-
-	feedID = request.QueryInt64Param(r, "feed_id", feedID)
-	if feedID > 0 && !h.store.FeedExists(userID, feedID) {
-		json.BadRequest(w, r, errors.New("Invalid feed ID"))
-		return
-	}
-
-	builder := h.store.NewEntryQueryBuilder(userID)
-	builder.WithFeedID(feedID)
-	builder.WithCategoryID(categoryID)
-	builder.WithStatuses(statuses)
-	builder.WithOrder(order)
-	builder.WithDirection(direction)
-	builder.WithOffset(offset)
-	builder.WithLimit(limit)
-	configureFilters(builder, r)
-
-	entries, err := builder.GetEntries()
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	count, err := builder.CountEntries()
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json.OK(w, r, &entriesResponse{Total: count, Entries: entries})
-}
-
-func (h *handler) setEntryStatus(w http.ResponseWriter, r *http.Request) {
-	var entriesStatusUpdateRequest model.EntriesStatusUpdateRequest
-	if err := json_parser.NewDecoder(r.Body).Decode(&entriesStatusUpdateRequest); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	if err := validator.ValidateEntriesStatusUpdateRequest(&entriesStatusUpdateRequest); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	if err := h.store.SetEntriesStatus(request.UserID(r), entriesStatusUpdateRequest.EntryIDs, entriesStatusUpdateRequest.Status); err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json.NoContent(w, r)
-}
-
-func (h *handler) toggleBookmark(w http.ResponseWriter, r *http.Request) {
-	entryID := request.RouteInt64Param(r, "entryID")
-	if err := h.store.ToggleBookmark(request.UserID(r), entryID); err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json.NoContent(w, r)
-}
-
-func configureFilters(builder *storage.EntryQueryBuilder, r *http.Request) {
-	beforeEntryID := request.QueryInt64Param(r, "before_entry_id", 0)
-	if beforeEntryID > 0 {
-		builder.BeforeEntryID(beforeEntryID)
-	}
-
-	afterEntryID := request.QueryInt64Param(r, "after_entry_id", 0)
-	if afterEntryID > 0 {
-		builder.AfterEntryID(afterEntryID)
-	}
-
-	beforeTimestamp := request.QueryInt64Param(r, "before", 0)
-	if beforeTimestamp > 0 {
-		builder.BeforeDate(time.Unix(beforeTimestamp, 0))
-	}
-
-	afterTimestamp := request.QueryInt64Param(r, "after", 0)
-	if afterTimestamp > 0 {
-		builder.AfterDate(time.Unix(afterTimestamp, 0))
-	}
-
-	categoryID := request.QueryInt64Param(r, "category_id", 0)
-	if categoryID > 0 {
-		builder.WithCategoryID(categoryID)
-	}
-
-	if request.HasQueryParam(r, "starred") {
-		builder.WithStarred()
-	}
-
-	searchQuery := request.QueryStringParam(r, "search", "")
-	if searchQuery != "" {
-		builder.WithSearchQuery(searchQuery)
-	}
-}

api/icon.go

@@ -1,38 +0,0 @@
-// Copyright 2017 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package api // import "miniflux.app/api"
-
-import (
-	"net/http"
-
-	"miniflux.app/http/request"
-	"miniflux.app/http/response/json"
-)
-
-func (h *handler) feedIcon(w http.ResponseWriter, r *http.Request) {
-	feedID := request.RouteInt64Param(r, "feedID")
-
-	if !h.store.HasIcon(feedID) {
-		json.NotFound(w, r)
-		return
-	}
-
-	icon, err := h.store.IconByFeedID(request.UserID(r), feedID)
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	if icon == nil {
-		json.NotFound(w, r)
-		return
-	}
-
-	json.OK(w, r, &feedIconResponse{
-		ID:       icon.ID,
-		MimeType: icon.MimeType,
-		Data:     icon.DataURL(),
-	})
-}

api/payload.go

@@ -1,24 +0,0 @@
-// Copyright 2017 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package api // import "miniflux.app/api"
-
-import (
-	"miniflux.app/model"
-)
-
-type feedIconResponse struct {
-	ID       int64  `json:"id"`
-	MimeType string `json:"mime_type"`
-	Data     string `json:"data"`
-}
-
-type entriesResponse struct {
-	Total   int           `json:"total"`
-	Entries model.Entries `json:"entries"`
-}
-
-type feedCreationResponse struct {
-	FeedID int64 `json:"feed_id"`
-}

api/subscription.go

@@ -1,47 +0,0 @@
-// Copyright 2017 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package api // import "miniflux.app/api"
-
-import (
-	json_parser "encoding/json"
-	"net/http"
-
-	"miniflux.app/http/response/json"
-	"miniflux.app/model"
-	"miniflux.app/reader/subscription"
-	"miniflux.app/validator"
-)
-
-func (h *handler) discoverSubscriptions(w http.ResponseWriter, r *http.Request) {
-	var subscriptionDiscoveryRequest model.SubscriptionDiscoveryRequest
-	if err := json_parser.NewDecoder(r.Body).Decode(&subscriptionDiscoveryRequest); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	if validationErr := validator.ValidateSubscriptionDiscovery(&subscriptionDiscoveryRequest); validationErr != nil {
-		json.BadRequest(w, r, validationErr.Error())
-		return
-	}
-
-	subscriptions, finderErr := subscription.FindSubscriptions(
-		subscriptionDiscoveryRequest.URL,
-		subscriptionDiscoveryRequest.UserAgent,
-		subscriptionDiscoveryRequest.Username,
-		subscriptionDiscoveryRequest.Password,
-		subscriptionDiscoveryRequest.FetchViaProxy,
-	)
-	if finderErr != nil {
-		json.ServerError(w, r, finderErr)
-		return
-	}
-
-	if subscriptions == nil {
-		json.NotFound(w, r)
-		return
-	}
-
-	json.OK(w, r, subscriptions)
-}

cli/ask_credentials.go

@@ -1,37 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package cli // import "miniflux.app/cli"
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-	"strings"
-
-	"golang.org/x/crypto/ssh/terminal"
-)
-
-func askCredentials() (string, string) {
-	fd := int(os.Stdin.Fd())
-
-	if !terminal.IsTerminal(fd) {
-		fmt.Fprintf(os.Stderr, "This is not a terminal, exiting.\n")
-		os.Exit(1)
-	}
-
-	fmt.Print("Enter Username: ")
-
-	reader := bufio.NewReader(os.Stdin)
-	username, _ := reader.ReadString('\n')
-
-	fmt.Print("Enter Password: ")
-
-	state, _ := terminal.GetState(fd)
-	defer terminal.Restore(fd, state)
-	bytePassword, _ := terminal.ReadPassword(fd)
-
-	fmt.Printf("\n")
-	return strings.TrimSpace(username), strings.TrimSpace(string(bytePassword))
-}

cli/cli.go

@@ -1,157 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package cli // import "miniflux.app/cli"
-
-import (
-	"flag"
-	"fmt"
-
-	"miniflux.app/config"
-	"miniflux.app/database"
-	"miniflux.app/logger"
-	"miniflux.app/storage"
-	"miniflux.app/version"
-)
-
-const (
-	flagInfoHelp            = "Show application information"
-	flagVersionHelp         = "Show application version"
-	flagMigrateHelp         = "Run SQL migrations"
-	flagFlushSessionsHelp   = "Flush all sessions (disconnect users)"
-	flagCreateAdminHelp     = "Create admin user"
-	flagResetPasswordHelp   = "Reset user password"
-	flagResetFeedErrorsHelp = "Clear all feed errors for all users"
-	flagDebugModeHelp       = "Show debug logs"
-	flagConfigFileHelp      = "Load configuration file"
-	flagConfigDumpHelp      = "Print parsed configuration values"
-)
-
-// Parse parses command line arguments.
-func Parse() {
-	var (
-		err                 error
-		flagInfo            bool
-		flagVersion         bool
-		flagMigrate         bool
-		flagFlushSessions   bool
-		flagCreateAdmin     bool
-		flagResetPassword   bool
-		flagResetFeedErrors bool
-		flagDebugMode       bool
-		flagConfigFile      string
-		flagConfigDump      bool
-	)
-
-	flag.BoolVar(&flagInfo, "info", false, flagInfoHelp)
-	flag.BoolVar(&flagInfo, "i", false, flagInfoHelp)
-	flag.BoolVar(&flagVersion, "version", false, flagVersionHelp)
-	flag.BoolVar(&flagVersion, "v", false, flagVersionHelp)
-	flag.BoolVar(&flagMigrate, "migrate", false, flagMigrateHelp)
-	flag.BoolVar(&flagFlushSessions, "flush-sessions", false, flagFlushSessionsHelp)
-	flag.BoolVar(&flagCreateAdmin, "create-admin", false, flagCreateAdminHelp)
-	flag.BoolVar(&flagResetPassword, "reset-password", false, flagResetPasswordHelp)
-	flag.BoolVar(&flagResetFeedErrors, "reset-feed-errors", false, flagResetFeedErrorsHelp)
-	flag.BoolVar(&flagDebugMode, "debug", false, flagDebugModeHelp)
-	flag.StringVar(&flagConfigFile, "config-file", "", flagConfigFileHelp)
-	flag.StringVar(&flagConfigFile, "c", "", flagConfigFileHelp)
-	flag.BoolVar(&flagConfigDump, "config-dump", false, flagConfigDumpHelp)
-	flag.Parse()
-
-	cfg := config.NewParser()
-
-	if flagConfigFile != "" {
-		config.Opts, err = cfg.ParseFile(flagConfigFile)
-		if err != nil {
-			logger.Fatal("%v", err)
-		}
-	}
-
-	config.Opts, err = cfg.ParseEnvironmentVariables()
-	if err != nil {
-		logger.Fatal("%v", err)
-	}
-
-	if flagConfigDump {
-		fmt.Print(config.Opts)
-		return
-	}
-
-	if config.Opts.LogDateTime() {
-		logger.EnableDateTime()
-	}
-
-	if flagDebugMode || config.Opts.HasDebugMode() {
-		logger.EnableDebug()
-	}
-
-	if flagInfo {
-		info()
-		return
-	}
-
-	if flagVersion {
-		fmt.Println(version.Version)
-		return
-	}
-
-	if config.Opts.IsDefaultDatabaseURL() {
-		logger.Info("The default value for DATABASE_URL is used")
-	}
-
-	db, err := database.NewConnectionPool(
-		config.Opts.DatabaseURL(),
-		config.Opts.DatabaseMinConns(),
-		config.Opts.DatabaseMaxConns(),
-	)
-	if err != nil {
-		logger.Fatal("Unable to connect to the database: %v", err)
-	}
-	defer db.Close()
-
-	if flagMigrate {
-		database.Migrate(db)
-		return
-	}
-
-	store := storage.NewStorage(db)
-
-	if flagResetFeedErrors {
-		store.ResetFeedErrors()
-		return
-	}
-
-	if flagFlushSessions {
-		flushSessions(store)
-		return
-	}
-
-	if flagCreateAdmin {
-		createAdmin(store)
-		return
-	}
-
-	if flagResetPassword {
-		resetPassword(store)
-		return
-	}
-
-	// Run migrations and start the deamon.
-	if config.Opts.RunMigrations() {
-		if err := database.Migrate(db); err != nil {
-			logger.Fatal(`%v`, err)
-		}
-	}
-
-	if err := database.IsSchemaUpToDate(db); err != nil {
-		logger.Fatal(`You must run the SQL migrations, %v`, err)
-	}
-
-	// Create admin user and start the deamon.
-	if config.Opts.CreateAdmin() {
-		createAdmin(store)
-	}
-
-	startDaemon(store)
-}

cli/create_admin.go

@@ -1,43 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package cli // import "miniflux.app/cli"
-
-import (
-	"fmt"
-	"os"
-
-	"miniflux.app/config"
-	"miniflux.app/logger"
-	"miniflux.app/model"
-	"miniflux.app/storage"
-	"miniflux.app/validator"
-)
-
-func createAdmin(store *storage.Storage) {
-	userCreationRequest := &model.UserCreationRequest{
-		Username: config.Opts.AdminUsername(),
-		Password: config.Opts.AdminPassword(),
-		IsAdmin:  true,
-	}
-
-	if userCreationRequest.Username == "" || userCreationRequest.Password == "" {
-		userCreationRequest.Username, userCreationRequest.Password = askCredentials()
-	}
-
-	if store.UserExists(userCreationRequest.Username) {
-		logger.Info(`User %q already exists, skipping creation`, userCreationRequest.Username)
-		return
-	}
-
-	if validationErr := validator.ValidateUserCreationWithPassword(store, userCreationRequest); validationErr != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", validationErr)
-		os.Exit(1)
-	}
-
-	if _, err := store.CreateUser(userCreationRequest); err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-		os.Exit(1)
-	}
-}

cli/daemon.go

@@ -1,57 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package cli // import "miniflux.app/cli"
-
-import (
-	"context"
-	"net/http"
-	"os"
-	"os/signal"
-	"syscall"
-	"time"
-
-	"miniflux.app/config"
-	"miniflux.app/logger"
-	"miniflux.app/metric"
-	"miniflux.app/service/httpd"
-	"miniflux.app/service/scheduler"
-	"miniflux.app/storage"
-	"miniflux.app/worker"
-)
-
-func startDaemon(store *storage.Storage) {
-	logger.Info("Starting Miniflux...")
-
-	stop := make(chan os.Signal, 1)
-	signal.Notify(stop, os.Interrupt)
-	signal.Notify(stop, syscall.SIGTERM)
-
-	pool := worker.NewPool(store, config.Opts.WorkerPoolSize())
-
-	if config.Opts.HasSchedulerService() && !config.Opts.HasMaintenanceMode() {
-		scheduler.Serve(store, pool)
-	}
-
-	var httpServer *http.Server
-	if config.Opts.HasHTTPService() {
-		httpServer = httpd.Serve(store, pool)
-	}
-
-	if config.Opts.HasMetricsCollector() {
-		collector := metric.NewCollector(store, config.Opts.MetricsRefreshInterval())
-		go collector.GatherStorageMetrics()
-	}
-
-	<-stop
-	logger.Info("Shutting down the process...")
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	if httpServer != nil {
-		httpServer.Shutdown(ctx)
-	}
-
-	logger.Info("Process gracefully stopped")
-}

cli/doc.go

@@ -1,10 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-/*
-
-Package cli implements command line arguments for Miniflux application.
-
-*/
-package cli // import "miniflux.app/cli"

cli/flush_sessions.go

@@ -1,20 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package cli // import "miniflux.app/cli"
-
-import (
-	"fmt"
-	"os"
-
-	"miniflux.app/storage"
-)
-
-func flushSessions(store *storage.Storage) {
-	fmt.Println("Flushing all sessions (disconnect users)")
-	if err := store.FlushAllSessions(); err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-		os.Exit(1)
-	}
-}

cli/reset_password.go

@@ -1,43 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package cli // import "miniflux.app/cli"
-
-import (
-	"fmt"
-	"os"
-
-	"miniflux.app/model"
-	"miniflux.app/storage"
-	"miniflux.app/validator"
-)
-
-func resetPassword(store *storage.Storage) {
-	username, password := askCredentials()
-	user, err := store.UserByUsername(username)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-		os.Exit(1)
-	}
-
-	if user == nil {
-		fmt.Fprintf(os.Stderr, "User not found!\n")
-		os.Exit(1)
-	}
-
-	userModificationRequest := &model.UserModificationRequest{
-		Password: &password,
-	}
-	if validationErr := validator.ValidateUserModification(store, user.ID, userModificationRequest); validationErr != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", validationErr)
-		os.Exit(1)
-	}
-
-	if err := store.UpdateUser(user); err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-		os.Exit(1)
-	}
-
-	fmt.Println("Password changed!")
-}

client/README.md

@@ -1,7 +1,7 @@
 Miniflux API Client
 ===================
 
-[![PkgGoDev](https://pkg.go.dev/badge/miniflux.app/client)](https://pkg.go.dev/miniflux.app/client)
+[![PkgGoDev](https://pkg.go.dev/badge/miniflux.app/v2/client)](https://pkg.go.dev/miniflux.app/v2/client)
 
 Client library for Miniflux REST API.
 
@@ -9,7 +9,7 @@ Installation
 ------------
 
 ```bash
-go get -u miniflux.app/client
+go get -u miniflux.app/v2/client
 ```
 
 Example
@@ -20,9 +20,9 @@ package main
 
 import (
 	"fmt"
-    "io/ioutil"
+	"os"
 
-	miniflux "miniflux.app/client"
+	miniflux "miniflux.app/v2/client"
 )
 
 func main() {
@@ -47,7 +47,7 @@ func main() {
         return
     }
 
-    err = ioutil.WriteFile("opml.xml", opml, 0644)
+    err = os.WriteFile("opml.xml", opml, 0644)
     if err != nil {
         fmt.Println(err)
         return

client/client.go

@@ -1,16 +1,15 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
 
-package client // import "miniflux.app/client"
+package client // import "miniflux.app/v2/client"
 
 import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/url"
 	"strconv"
+	"strings"
 )
 
 // Client holds API procedure calls.
@@ -19,11 +18,60 @@ type Client struct {
 }
 
 // New returns a new Miniflux client.
+// Deprecated: use NewClient instead.
 func New(endpoint string, credentials ...string) *Client {
-	if len(credentials) == 2 {
+	return NewClient(endpoint, credentials...)
+}
+
+// NewClient returns a new Miniflux client.
+func NewClient(endpoint string, credentials ...string) *Client {
+	// Trim trailing slashes and /v1 from the endpoint.
+	endpoint = strings.TrimSuffix(endpoint, "/")
+	endpoint = strings.TrimSuffix(endpoint, "/v1")
+	switch len(credentials) {
+	case 2:
 		return &Client{request: &request{endpoint: endpoint, username: credentials[0], password: credentials[1]}}
+	case 1:
+		return &Client{request: &request{endpoint: endpoint, apiKey: credentials[0]}}
+	default:
+		return &Client{request: &request{endpoint: endpoint}}
 	}
-	return &Client{request: &request{endpoint: endpoint, apiKey: credentials[0]}}
+}
+
+// Healthcheck checks if the application is up and running.
+func (c *Client) Healthcheck() error {
+	body, err := c.request.Get("/healthcheck")
+	if err != nil {
+		return fmt.Errorf("miniflux: unable to perform healthcheck: %w", err)
+	}
+	defer body.Close()
+
+	responseBodyContent, err := io.ReadAll(body)
+	if err != nil {
+		return fmt.Errorf("miniflux: unable to read healthcheck response: %w", err)
+	}
+
+	if string(responseBodyContent) != "OK" {
+		return fmt.Errorf("miniflux: invalid healthcheck response: %q", responseBodyContent)
+	}
+
+	return nil
+}
+
+// Version returns the version of the Miniflux instance.
+func (c *Client) Version() (*VersionResponse, error) {
+	body, err := c.request.Get("/v1/version")
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var versionResponse *VersionResponse
+	if err := json.NewDecoder(body).Decode(&versionResponse); err != nil {
+		return nil, fmt.Errorf("miniflux: json error (%v)", err)
+	}
+
+	return versionResponse, nil
 }
 
 // Me returns the logged user information.
@@ -35,8 +83,7 @@ func (c *Client) Me() (*User, error) {
 	defer body.Close()
 
 	var user *User
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&user); err != nil {
+	if err := json.NewDecoder(body).Decode(&user); err != nil {
 		return nil, fmt.Errorf("miniflux: json error (%v)", err)
 	}
 
@@ -52,8 +99,7 @@ func (c *Client) Users() (Users, error) {
 	defer body.Close()
 
 	var users Users
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&users); err != nil {
+	if err := json.NewDecoder(body).Decode(&users); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -69,8 +115,7 @@ func (c *Client) UserByID(userID int64) (*User, error) {
 	defer body.Close()
 
 	var user User
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&user); err != nil {
+	if err := json.NewDecoder(body).Decode(&user); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -86,8 +131,7 @@ func (c *Client) UserByUsername(username string) (*User, error) {
 	defer body.Close()
 
 	var user User
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&user); err != nil {
+	if err := json.NewDecoder(body).Decode(&user); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -107,8 +151,7 @@ func (c *Client) CreateUser(username, password string, isAdmin bool) (*User, err
 	defer body.Close()
 
 	var user *User
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&user); err != nil {
+	if err := json.NewDecoder(body).Decode(&user); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -124,8 +167,7 @@ func (c *Client) UpdateUser(userID int64, userChanges *UserModificationRequest)
 	defer body.Close()
 
 	var u *User
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&u); err != nil {
+	if err := json.NewDecoder(body).Decode(&u); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -143,6 +185,25 @@ func (c *Client) MarkAllAsRead(userID int64) error {
 	return err
 }
 
+// IntegrationsStatus fetches the integrations status for the logged user.
+func (c *Client) IntegrationsStatus() (bool, error) {
+	body, err := c.request.Get("/v1/integrations/status")
+	if err != nil {
+		return false, err
+	}
+	defer body.Close()
+
+	var response struct {
+		HasIntegrations bool `json:"has_integrations"`
+	}
+
+	if err := json.NewDecoder(body).Decode(&response); err != nil {
+		return false, fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return response.HasIntegrations, nil
+}
+
 // Discover try to find subscriptions from a website.
 func (c *Client) Discover(url string) (Subscriptions, error) {
 	body, err := c.request.Post("/v1/discover", map[string]string{"url": url})
@@ -152,8 +213,7 @@ func (c *Client) Discover(url string) (Subscriptions, error) {
 	defer body.Close()
 
 	var subscriptions Subscriptions
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&subscriptions); err != nil {
+	if err := json.NewDecoder(body).Decode(&subscriptions); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -169,8 +229,7 @@ func (c *Client) Categories() (Categories, error) {
 	defer body.Close()
 
 	var categories Categories
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&categories); err != nil {
+	if err := json.NewDecoder(body).Decode(&categories); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -182,15 +241,13 @@ func (c *Client) CreateCategory(title string) (*Category, error) {
 	body, err := c.request.Post("/v1/categories", map[string]interface{}{
 		"title": title,
 	})
-
 	if err != nil {
 		return nil, err
 	}
 	defer body.Close()
 
 	var category *Category
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&category); err != nil {
+	if err := json.NewDecoder(body).Decode(&category); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -202,15 +259,13 @@ func (c *Client) UpdateCategory(categoryID int64, title string) (*Category, erro
 	body, err := c.request.Put(fmt.Sprintf("/v1/categories/%d", categoryID), map[string]interface{}{
 		"title": title,
 	})
-
 	if err != nil {
 		return nil, err
 	}
 	defer body.Close()
 
 	var category *Category
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&category); err != nil {
+	if err := json.NewDecoder(body).Decode(&category); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -223,11 +278,33 @@ func (c *Client) MarkCategoryAsRead(categoryID int64) error {
 	return err
 }
 
+// CategoryFeeds gets feeds of a category.
+func (c *Client) CategoryFeeds(categoryID int64) (Feeds, error) {
+	body, err := c.request.Get(fmt.Sprintf("/v1/categories/%d/feeds", categoryID))
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var feeds Feeds
+	if err := json.NewDecoder(body).Decode(&feeds); err != nil {
+		return nil, fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return feeds, nil
+}
+
 // DeleteCategory removes a category.
 func (c *Client) DeleteCategory(categoryID int64) error {
 	return c.request.Delete(fmt.Sprintf("/v1/categories/%d", categoryID))
 }
 
+// RefreshCategory refreshes a category.
+func (c *Client) RefreshCategory(categoryID int64) error {
+	_, err := c.request.Put(fmt.Sprintf("/v1/categories/%d/refresh", categoryID), nil)
+	return err
+}
+
 // Feeds gets all feeds.
 func (c *Client) Feeds() (Feeds, error) {
 	body, err := c.request.Get("/v1/feeds")
@@ -237,8 +314,7 @@ func (c *Client) Feeds() (Feeds, error) {
 	defer body.Close()
 
 	var feeds Feeds
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&feeds); err != nil {
+	if err := json.NewDecoder(body).Decode(&feeds); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -253,7 +329,7 @@ func (c *Client) Export() ([]byte, error) {
 	}
 	defer body.Close()
 
-	opml, err := ioutil.ReadAll(body)
+	opml, err := io.ReadAll(body)
 	if err != nil {
 		return nil, err
 	}
@@ -276,8 +352,7 @@ func (c *Client) Feed(feedID int64) (*Feed, error) {
 	defer body.Close()
 
 	var feed *Feed
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&feed); err != nil {
+	if err := json.NewDecoder(body).Decode(&feed); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -297,8 +372,7 @@ func (c *Client) CreateFeed(feedCreationRequest *FeedCreationRequest) (int64, er
 	}
 
 	var r result
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&r); err != nil {
+	if err := json.NewDecoder(body).Decode(&r); err != nil {
 		return 0, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -329,7 +403,7 @@ func (c *Client) MarkFeedAsRead(feedID int64) error {
 
 // RefreshAllFeeds refreshes all feeds.
 func (c *Client) RefreshAllFeeds() error {
-	_, err := c.request.Put(fmt.Sprintf("/v1/feeds/refresh"), nil)
+	_, err := c.request.Put("/v1/feeds/refresh", nil)
 	return err
 }
 
@@ -353,8 +427,7 @@ func (c *Client) FeedIcon(feedID int64) (*FeedIcon, error) {
 	defer body.Close()
 
 	var feedIcon *FeedIcon
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&feedIcon); err != nil {
+	if err := json.NewDecoder(body).Decode(&feedIcon); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -370,8 +443,23 @@ func (c *Client) FeedEntry(feedID, entryID int64) (*Entry, error) {
 	defer body.Close()
 
 	var entry *Entry
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&entry); err != nil {
+	if err := json.NewDecoder(body).Decode(&entry); err != nil {
+		return nil, fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return entry, nil
+}
+
+// CategoryEntry gets a single category entry.
+func (c *Client) CategoryEntry(categoryID, entryID int64) (*Entry, error) {
+	body, err := c.request.Get(fmt.Sprintf("/v1/categories/%d/entries/%d", categoryID, entryID))
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var entry *Entry
+	if err := json.NewDecoder(body).Decode(&entry); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -387,8 +475,7 @@ func (c *Client) Entry(entryID int64) (*Entry, error) {
 	defer body.Close()
 
 	var entry *Entry
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&entry); err != nil {
+	if err := json.NewDecoder(body).Decode(&entry); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -406,8 +493,7 @@ func (c *Client) Entries(filter *Filter) (*EntryResultSet, error) {
 	defer body.Close()
 
 	var result EntryResultSet
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&result); err != nil {
+	if err := json.NewDecoder(body).Decode(&result); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -425,8 +511,25 @@ func (c *Client) FeedEntries(feedID int64, filter *Filter) (*EntryResultSet, err
 	defer body.Close()
 
 	var result EntryResultSet
-	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&result); err != nil {
+	if err := json.NewDecoder(body).Decode(&result); err != nil {
+		return nil, fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return &result, nil
+}
+
+// CategoryEntries fetch entries of a category.
+func (c *Client) CategoryEntries(categoryID int64, filter *Filter) (*EntryResultSet, error) {
+	path := buildFilterQueryString(fmt.Sprintf("/v1/categories/%d/entries", categoryID), filter)
+
+	body, err := c.request.Get(path)
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var result EntryResultSet
+	if err := json.NewDecoder(body).Decode(&result); err != nil {
 		return nil, fmt.Errorf("miniflux: response error (%v)", err)
 	}
 
@@ -444,12 +547,113 @@ func (c *Client) UpdateEntries(entryIDs []int64, status string) error {
 	return err
 }
 
+// UpdateEntry updates an entry.
+func (c *Client) UpdateEntry(entryID int64, entryChanges *EntryModificationRequest) (*Entry, error) {
+	body, err := c.request.Put(fmt.Sprintf("/v1/entries/%d", entryID), entryChanges)
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var entry *Entry
+	if err := json.NewDecoder(body).Decode(&entry); err != nil {
+		return nil, fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return entry, nil
+}
+
 // ToggleBookmark toggles entry bookmark value.
 func (c *Client) ToggleBookmark(entryID int64) error {
 	_, err := c.request.Put(fmt.Sprintf("/v1/entries/%d/bookmark", entryID), nil)
 	return err
 }
 
+// SaveEntry sends an entry to a third-party service.
+func (c *Client) SaveEntry(entryID int64) error {
+	_, err := c.request.Post(fmt.Sprintf("/v1/entries/%d/save", entryID), nil)
+	return err
+}
+
+// FetchEntryOriginalContent fetches the original content of an entry using the scraper.
+func (c *Client) FetchEntryOriginalContent(entryID int64) (string, error) {
+	body, err := c.request.Get(fmt.Sprintf("/v1/entries/%d/fetch-content", entryID))
+	if err != nil {
+		return "", err
+	}
+	defer body.Close()
+
+	var response struct {
+		Content string `json:"content"`
+	}
+
+	if err := json.NewDecoder(body).Decode(&response); err != nil {
+		return "", fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return response.Content, nil
+}
+
+// FetchCounters fetches feed counters.
+func (c *Client) FetchCounters() (*FeedCounters, error) {
+	body, err := c.request.Get("/v1/feeds/counters")
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var result FeedCounters
+	if err := json.NewDecoder(body).Decode(&result); err != nil {
+		return nil, fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return &result, nil
+}
+
+// FlushHistory changes all entries with the status "read" to "removed".
+func (c *Client) FlushHistory() error {
+	_, err := c.request.Put("/v1/flush-history", nil)
+	return err
+}
+
+// Icon fetches a feed icon.
+func (c *Client) Icon(iconID int64) (*FeedIcon, error) {
+	body, err := c.request.Get(fmt.Sprintf("/v1/icons/%d", iconID))
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var feedIcon *FeedIcon
+	if err := json.NewDecoder(body).Decode(&feedIcon); err != nil {
+		return nil, fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return feedIcon, nil
+}
+
+// Enclosure fetches a specific enclosure.
+func (c *Client) Enclosure(enclosureID int64) (*Enclosure, error) {
+	body, err := c.request.Get(fmt.Sprintf("/v1/enclosures/%d", enclosureID))
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var enclosure *Enclosure
+	if err := json.NewDecoder(body).Decode(&enclosure); err != nil {
+		return nil, fmt.Errorf("miniflux: response error(%v)", err)
+	}
+
+	return enclosure, nil
+}
+
+// UpdateEnclosure updates an enclosure.
+func (c *Client) UpdateEnclosure(enclosureID int64, enclosureUpdate *EnclosureUpdateRequest) error {
+	_, err := c.request.Put(fmt.Sprintf("/v1/enclosures/%d", enclosureID), enclosureUpdate)
+	return err
+}
+
 func buildFilterQueryString(path string, filter *Filter) string {
 	if filter != nil {
 		values := url.Values{}
@@ -478,20 +682,36 @@ func buildFilterQueryString(path string, filter *Filter) string {
 			values.Set("after", strconv.FormatInt(filter.After, 10))
 		}
 
-		if filter.AfterEntryID > 0 {
-			values.Set("after_entry_id", strconv.FormatInt(filter.AfterEntryID, 10))
-		}
-
 		if filter.Before > 0 {
 			values.Set("before", strconv.FormatInt(filter.Before, 10))
 		}
 
+		if filter.PublishedAfter > 0 {
+			values.Set("published_after", strconv.FormatInt(filter.PublishedAfter, 10))
+		}
+
+		if filter.PublishedBefore > 0 {
+			values.Set("published_before", strconv.FormatInt(filter.PublishedBefore, 10))
+		}
+
+		if filter.ChangedAfter > 0 {
+			values.Set("changed_after", strconv.FormatInt(filter.ChangedAfter, 10))
+		}
+
+		if filter.ChangedBefore > 0 {
+			values.Set("changed_before", strconv.FormatInt(filter.ChangedBefore, 10))
+		}
+
+		if filter.AfterEntryID > 0 {
+			values.Set("after_entry_id", strconv.FormatInt(filter.AfterEntryID, 10))
+		}
+
 		if filter.BeforeEntryID > 0 {
 			values.Set("before_entry_id", strconv.FormatInt(filter.BeforeEntryID, 10))
 		}
 
-		if filter.Starred {
-			values.Set("starred", "1")
+		if filter.Starred != "" {
+			values.Set("starred", filter.Starred)
 		}
 
 		if filter.Search != "" {
@@ -506,6 +726,10 @@ func buildFilterQueryString(path string, filter *Filter) string {
 			values.Set("feed_id", strconv.FormatInt(filter.FeedID, 10))
 		}
 
+		if filter.GloballyVisible {
+			values.Set("globally_visible", "true")
+		}
+
 		for _, status := range filter.Statuses {
 			values.Add("status", status)
 		}

client/core.go

@@ -1,231 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package client // import "miniflux.app/client"
-
-import (
-	"fmt"
-	"time"
-)
-
-// Entry statuses.
-const (
-	EntryStatusUnread  = "unread"
-	EntryStatusRead    = "read"
-	EntryStatusRemoved = "removed"
-)
-
-// User represents a user in the system.
-type User struct {
-	ID                int64      `json:"id"`
-	Username          string     `json:"username"`
-	Password          string     `json:"password,omitempty"`
-	IsAdmin           bool       `json:"is_admin"`
-	Theme             string     `json:"theme"`
-	Language          string     `json:"language"`
-	Timezone          string     `json:"timezone"`
-	EntryDirection    string     `json:"entry_sorting_direction"`
-	Stylesheet        string     `json:"stylesheet"`
-	GoogleID          string     `json:"google_id"`
-	OpenIDConnectID   string     `json:"openid_connect_id"`
-	EntriesPerPage    int        `json:"entries_per_page"`
-	KeyboardShortcuts bool       `json:"keyboard_shortcuts"`
-	ShowReadingTime   bool       `json:"show_reading_time"`
-	EntrySwipe        bool       `json:"entry_swipe"`
-	LastLoginAt       *time.Time `json:"last_login_at"`
-}
-
-func (u User) String() string {
-	return fmt.Sprintf("#%d - %s (admin=%v)", u.ID, u.Username, u.IsAdmin)
-}
-
-// UserCreationRequest represents the request to create a user.
-type UserCreationRequest struct {
-	Username        string `json:"username"`
-	Password        string `json:"password"`
-	IsAdmin         bool   `json:"is_admin"`
-	GoogleID        string `json:"google_id"`
-	OpenIDConnectID string `json:"openid_connect_id"`
-}
-
-// UserModificationRequest represents the request to update a user.
-type UserModificationRequest struct {
-	Username          *string `json:"username"`
-	Password          *string `json:"password"`
-	IsAdmin           *bool   `json:"is_admin"`
-	Theme             *string `json:"theme"`
-	Language          *string `json:"language"`
-	Timezone          *string `json:"timezone"`
-	EntryDirection    *string `json:"entry_sorting_direction"`
-	Stylesheet        *string `json:"stylesheet"`
-	GoogleID          *string `json:"google_id"`
-	OpenIDConnectID   *string `json:"openid_connect_id"`
-	EntriesPerPage    *int    `json:"entries_per_page"`
-	KeyboardShortcuts *bool   `json:"keyboard_shortcuts"`
-	ShowReadingTime   *bool   `json:"show_reading_time"`
-	EntrySwipe        *bool   `json:"entry_swipe"`
-}
-
-// Users represents a list of users.
-type Users []User
-
-// Category represents a feed category.
-type Category struct {
-	ID     int64  `json:"id,omitempty"`
-	Title  string `json:"title,omitempty"`
-	UserID int64  `json:"user_id,omitempty"`
-}
-
-func (c Category) String() string {
-	return fmt.Sprintf("#%d %s", c.ID, c.Title)
-}
-
-// Categories represents a list of categories.
-type Categories []*Category
-
-// Subscription represents a feed subscription.
-type Subscription struct {
-	Title string `json:"title"`
-	URL   string `json:"url"`
-	Type  string `json:"type"`
-}
-
-func (s Subscription) String() string {
-	return fmt.Sprintf(`Title="%s", URL="%s", Type="%s"`, s.Title, s.URL, s.Type)
-}
-
-// Subscriptions represents a list of subscriptions.
-type Subscriptions []*Subscription
-
-// Feed represents a Miniflux feed.
-type Feed struct {
-	ID                 int64     `json:"id"`
-	UserID             int64     `json:"user_id"`
-	FeedURL            string    `json:"feed_url"`
-	SiteURL            string    `json:"site_url"`
-	Title              string    `json:"title"`
-	CheckedAt          time.Time `json:"checked_at,omitempty"`
-	EtagHeader         string    `json:"etag_header,omitempty"`
-	LastModifiedHeader string    `json:"last_modified_header,omitempty"`
-	ParsingErrorMsg    string    `json:"parsing_error_message,omitempty"`
-	ParsingErrorCount  int       `json:"parsing_error_count,omitempty"`
-	Disabled           bool      `json:"disabled"`
-	IgnoreHTTPCache    bool      `json:"ignore_http_cache"`
-	FetchViaProxy      bool      `json:"fetch_via_proxy"`
-	ScraperRules       string    `json:"scraper_rules"`
-	RewriteRules       string    `json:"rewrite_rules"`
-	BlocklistRules     string    `json:"blocklist_rules"`
-	KeeplistRules      string    `json:"keeplist_rules"`
-	Crawler            bool      `json:"crawler"`
-	UserAgent          string    `json:"user_agent"`
-	Username           string    `json:"username"`
-	Password           string    `json:"password"`
-	Category           *Category `json:"category,omitempty"`
-}
-
-// FeedCreationRequest represents the request to create a feed.
-type FeedCreationRequest struct {
-	FeedURL         string `json:"feed_url"`
-	CategoryID      int64  `json:"category_id"`
-	UserAgent       string `json:"user_agent"`
-	Username        string `json:"username"`
-	Password        string `json:"password"`
-	Crawler         bool   `json:"crawler"`
-	Disabled        bool   `json:"disabled"`
-	IgnoreHTTPCache bool   `json:"ignore_http_cache"`
-	FetchViaProxy   bool   `json:"fetch_via_proxy"`
-	ScraperRules    string `json:"scraper_rules"`
-	RewriteRules    string `json:"rewrite_rules"`
-	BlocklistRules  string `json:"blocklist_rules"`
-	KeeplistRules   string `json:"keeplist_rules"`
-}
-
-// FeedModificationRequest represents the request to update a feed.
-type FeedModificationRequest struct {
-	FeedURL         *string `json:"feed_url"`
-	SiteURL         *string `json:"site_url"`
-	Title           *string `json:"title"`
-	ScraperRules    *string `json:"scraper_rules"`
-	RewriteRules    *string `json:"rewrite_rules"`
-	BlocklistRules  *string `json:"blocklist_rules"`
-	KeeplistRules   *string `json:"keeplist_rules"`
-	Crawler         *bool   `json:"crawler"`
-	UserAgent       *string `json:"user_agent"`
-	Username        *string `json:"username"`
-	Password        *string `json:"password"`
-	CategoryID      *int64  `json:"category_id"`
-	Disabled        *bool   `json:"disabled"`
-	IgnoreHTTPCache *bool   `json:"ignore_http_cache"`
-	FetchViaProxy   *bool   `json:"fetch_via_proxy"`
-}
-
-// FeedIcon represents the feed icon.
-type FeedIcon struct {
-	ID       int64  `json:"id"`
-	MimeType string `json:"mime_type"`
-	Data     string `json:"data"`
-}
-
-// Feeds represents a list of feeds.
-type Feeds []*Feed
-
-// Entry represents a subscription item in the system.
-type Entry struct {
-	ID          int64      `json:"id"`
-	UserID      int64      `json:"user_id"`
-	FeedID      int64      `json:"feed_id"`
-	Status      string     `json:"status"`
-	Hash        string     `json:"hash"`
-	Title       string     `json:"title"`
-	URL         string     `json:"url"`
-	Date        time.Time  `json:"published_at"`
-	CreatedAt   time.Time  `json:"created_at"`
-	Content     string     `json:"content"`
-	Author      string     `json:"author"`
-	ShareCode   string     `json:"share_code"`
-	Starred     bool       `json:"starred"`
-	ReadingTime int        `json:"reading_time"`
-	Enclosures  Enclosures `json:"enclosures,omitempty"`
-	Feed        *Feed      `json:"feed,omitempty"`
-}
-
-// Entries represents a list of entries.
-type Entries []*Entry
-
-// Enclosure represents an attachment.
-type Enclosure struct {
-	ID       int64  `json:"id"`
-	UserID   int64  `json:"user_id"`
-	EntryID  int64  `json:"entry_id"`
-	URL      string `json:"url"`
-	MimeType string `json:"mime_type"`
-	Size     int    `json:"size"`
-}
-
-// Enclosures represents a list of attachments.
-type Enclosures []*Enclosure
-
-// Filter is used to filter entries.
-type Filter struct {
-	Status        string
-	Offset        int
-	Limit         int
-	Order         string
-	Direction     string
-	Starred       bool
-	Before        int64
-	After         int64
-	BeforeEntryID int64
-	AfterEntryID  int64
-	Search        string
-	CategoryID    int64
-	FeedID        int64
-	Statuses      []string
-}
-
-// EntryResultSet represents the response when fetching entries.
-type EntryResultSet struct {
-	Total   int     `json:"total"`
-	Entries Entries `json:"entries"`
-}

client/doc.go

@@ -1,20 +1,18 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
 
 /*
-
 Package client implements a client library for the Miniflux REST API.
 
-Examples
+# Examples
 
 This code snippet fetch the list of users:
 
 	import (
-		miniflux "miniflux.app/client"
+		miniflux "miniflux.app/v2/client"
 	)
 
-	client := miniflux.New("https://api.example.org", "admin", "secret")
+	client := miniflux.NewClient("https://api.example.org", "admin", "secret")
 	users, err := client.Users()
 	if err != nil {
 		fmt.Println(err)
@@ -30,6 +28,5 @@ This one discover subscriptions on a website:
 		return
 	}
 	fmt.Println(subscriptions)
-
 */
-package client // import "miniflux.app/client"
+package client // import "miniflux.app/v2/client"

client/model.go

@@ -0,0 +1,312 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package client // import "miniflux.app/v2/client"
+
+import (
+	"fmt"
+	"time"
+)
+
+// Entry statuses.
+const (
+	EntryStatusUnread  = "unread"
+	EntryStatusRead    = "read"
+	EntryStatusRemoved = "removed"
+)
+
+// User represents a user in the system.
+type User struct {
+	ID                     int64      `json:"id"`
+	Username               string     `json:"username"`
+	Password               string     `json:"password,omitempty"`
+	IsAdmin                bool       `json:"is_admin"`
+	Theme                  string     `json:"theme"`
+	Language               string     `json:"language"`
+	Timezone               string     `json:"timezone"`
+	EntryDirection         string     `json:"entry_sorting_direction"`
+	EntryOrder             string     `json:"entry_sorting_order"`
+	Stylesheet             string     `json:"stylesheet"`
+	CustomJS               string     `json:"custom_js"`
+	GoogleID               string     `json:"google_id"`
+	OpenIDConnectID        string     `json:"openid_connect_id"`
+	EntriesPerPage         int        `json:"entries_per_page"`
+	KeyboardShortcuts      bool       `json:"keyboard_shortcuts"`
+	ShowReadingTime        bool       `json:"show_reading_time"`
+	EntrySwipe             bool       `json:"entry_swipe"`
+	GestureNav             string     `json:"gesture_nav"`
+	LastLoginAt            *time.Time `json:"last_login_at"`
+	DisplayMode            string     `json:"display_mode"`
+	DefaultReadingSpeed    int        `json:"default_reading_speed"`
+	CJKReadingSpeed        int        `json:"cjk_reading_speed"`
+	DefaultHomePage        string     `json:"default_home_page"`
+	CategoriesSortingOrder string     `json:"categories_sorting_order"`
+	MarkReadOnView         bool       `json:"mark_read_on_view"`
+	MediaPlaybackRate      float64    `json:"media_playback_rate"`
+	BlockFilterEntryRules  string     `json:"block_filter_entry_rules"`
+	KeepFilterEntryRules   string     `json:"keep_filter_entry_rules"`
+	ExternalFontHosts      string     `json:"external_font_hosts"`
+}
+
+func (u User) String() string {
+	return fmt.Sprintf("#%d - %s (admin=%v)", u.ID, u.Username, u.IsAdmin)
+}
+
+// UserCreationRequest represents the request to create a user.
+type UserCreationRequest struct {
+	Username        string `json:"username"`
+	Password        string `json:"password"`
+	IsAdmin         bool   `json:"is_admin"`
+	GoogleID        string `json:"google_id"`
+	OpenIDConnectID string `json:"openid_connect_id"`
+}
+
+// UserModificationRequest represents the request to update a user.
+type UserModificationRequest struct {
+	Username               *string  `json:"username"`
+	Password               *string  `json:"password"`
+	IsAdmin                *bool    `json:"is_admin"`
+	Theme                  *string  `json:"theme"`
+	Language               *string  `json:"language"`
+	Timezone               *string  `json:"timezone"`
+	EntryDirection         *string  `json:"entry_sorting_direction"`
+	EntryOrder             *string  `json:"entry_sorting_order"`
+	Stylesheet             *string  `json:"stylesheet"`
+	CustomJS               *string  `json:"custom_js"`
+	GoogleID               *string  `json:"google_id"`
+	OpenIDConnectID        *string  `json:"openid_connect_id"`
+	EntriesPerPage         *int     `json:"entries_per_page"`
+	KeyboardShortcuts      *bool    `json:"keyboard_shortcuts"`
+	ShowReadingTime        *bool    `json:"show_reading_time"`
+	EntrySwipe             *bool    `json:"entry_swipe"`
+	GestureNav             *string  `json:"gesture_nav"`
+	DisplayMode            *string  `json:"display_mode"`
+	DefaultReadingSpeed    *int     `json:"default_reading_speed"`
+	CJKReadingSpeed        *int     `json:"cjk_reading_speed"`
+	DefaultHomePage        *string  `json:"default_home_page"`
+	CategoriesSortingOrder *string  `json:"categories_sorting_order"`
+	MarkReadOnView         *bool    `json:"mark_read_on_view"`
+	MediaPlaybackRate      *float64 `json:"media_playback_rate"`
+	BlockFilterEntryRules  *string  `json:"block_filter_entry_rules"`
+	KeepFilterEntryRules   *string  `json:"keep_filter_entry_rules"`
+	ExternalFontHosts      *string  `json:"external_font_hosts"`
+}
+
+// Users represents a list of users.
+type Users []User
+
+// Category represents a feed category.
+type Category struct {
+	ID     int64  `json:"id,omitempty"`
+	Title  string `json:"title,omitempty"`
+	UserID int64  `json:"user_id,omitempty"`
+}
+
+func (c Category) String() string {
+	return fmt.Sprintf("#%d %s", c.ID, c.Title)
+}
+
+// Categories represents a list of categories.
+type Categories []*Category
+
+// Subscription represents a feed subscription.
+type Subscription struct {
+	Title string `json:"title"`
+	URL   string `json:"url"`
+	Type  string `json:"type"`
+}
+
+func (s Subscription) String() string {
+	return fmt.Sprintf(`Title=%q, URL=%q, Type=%q`, s.Title, s.URL, s.Type)
+}
+
+// Subscriptions represents a list of subscriptions.
+type Subscriptions []*Subscription
+
+// Feed represents a Miniflux feed.
+type Feed struct {
+	ID                          int64     `json:"id"`
+	UserID                      int64     `json:"user_id"`
+	FeedURL                     string    `json:"feed_url"`
+	SiteURL                     string    `json:"site_url"`
+	Title                       string    `json:"title"`
+	CheckedAt                   time.Time `json:"checked_at,omitempty"`
+	EtagHeader                  string    `json:"etag_header,omitempty"`
+	LastModifiedHeader          string    `json:"last_modified_header,omitempty"`
+	ParsingErrorMsg             string    `json:"parsing_error_message,omitempty"`
+	ParsingErrorCount           int       `json:"parsing_error_count,omitempty"`
+	Disabled                    bool      `json:"disabled"`
+	IgnoreHTTPCache             bool      `json:"ignore_http_cache"`
+	AllowSelfSignedCertificates bool      `json:"allow_self_signed_certificates"`
+	FetchViaProxy               bool      `json:"fetch_via_proxy"`
+	ScraperRules                string    `json:"scraper_rules"`
+	RewriteRules                string    `json:"rewrite_rules"`
+	BlocklistRules              string    `json:"blocklist_rules"`
+	KeeplistRules               string    `json:"keeplist_rules"`
+	Crawler                     bool      `json:"crawler"`
+	UserAgent                   string    `json:"user_agent"`
+	Cookie                      string    `json:"cookie"`
+	Username                    string    `json:"username"`
+	Password                    string    `json:"password"`
+	Category                    *Category `json:"category,omitempty"`
+	HideGlobally                bool      `json:"hide_globally"`
+	DisableHTTP2                bool      `json:"disable_http2"`
+}
+
+// FeedCreationRequest represents the request to create a feed.
+type FeedCreationRequest struct {
+	FeedURL                     string `json:"feed_url"`
+	CategoryID                  int64  `json:"category_id"`
+	UserAgent                   string `json:"user_agent"`
+	Cookie                      string `json:"cookie"`
+	Username                    string `json:"username"`
+	Password                    string `json:"password"`
+	Crawler                     bool   `json:"crawler"`
+	Disabled                    bool   `json:"disabled"`
+	IgnoreHTTPCache             bool   `json:"ignore_http_cache"`
+	AllowSelfSignedCertificates bool   `json:"allow_self_signed_certificates"`
+	FetchViaProxy               bool   `json:"fetch_via_proxy"`
+	ScraperRules                string `json:"scraper_rules"`
+	RewriteRules                string `json:"rewrite_rules"`
+	BlocklistRules              string `json:"blocklist_rules"`
+	KeeplistRules               string `json:"keeplist_rules"`
+	HideGlobally                bool   `json:"hide_globally"`
+	DisableHTTP2                bool   `json:"disable_http2"`
+}
+
+// FeedModificationRequest represents the request to update a feed.
+type FeedModificationRequest struct {
+	FeedURL                     *string `json:"feed_url"`
+	SiteURL                     *string `json:"site_url"`
+	Title                       *string `json:"title"`
+	ScraperRules                *string `json:"scraper_rules"`
+	RewriteRules                *string `json:"rewrite_rules"`
+	BlocklistRules              *string `json:"blocklist_rules"`
+	KeeplistRules               *string `json:"keeplist_rules"`
+	Crawler                     *bool   `json:"crawler"`
+	UserAgent                   *string `json:"user_agent"`
+	Cookie                      *string `json:"cookie"`
+	Username                    *string `json:"username"`
+	Password                    *string `json:"password"`
+	CategoryID                  *int64  `json:"category_id"`
+	Disabled                    *bool   `json:"disabled"`
+	IgnoreHTTPCache             *bool   `json:"ignore_http_cache"`
+	AllowSelfSignedCertificates *bool   `json:"allow_self_signed_certificates"`
+	FetchViaProxy               *bool   `json:"fetch_via_proxy"`
+	HideGlobally                *bool   `json:"hide_globally"`
+	DisableHTTP2                *bool   `json:"disable_http2"`
+}
+
+// FeedIcon represents the feed icon.
+type FeedIcon struct {
+	ID       int64  `json:"id"`
+	MimeType string `json:"mime_type"`
+	Data     string `json:"data"`
+}
+
+type FeedCounters struct {
+	ReadCounters   map[int64]int `json:"reads"`
+	UnreadCounters map[int64]int `json:"unreads"`
+}
+
+// Feeds represents a list of feeds.
+type Feeds []*Feed
+
+// Entry represents a subscription item in the system.
+type Entry struct {
+	ID          int64      `json:"id"`
+	Date        time.Time  `json:"published_at"`
+	ChangedAt   time.Time  `json:"changed_at"`
+	CreatedAt   time.Time  `json:"created_at"`
+	Feed        *Feed      `json:"feed,omitempty"`
+	Hash        string     `json:"hash"`
+	URL         string     `json:"url"`
+	CommentsURL string     `json:"comments_url"`
+	Title       string     `json:"title"`
+	Status      string     `json:"status"`
+	Content     string     `json:"content"`
+	Author      string     `json:"author"`
+	ShareCode   string     `json:"share_code"`
+	Enclosures  Enclosures `json:"enclosures,omitempty"`
+	Tags        []string   `json:"tags"`
+	ReadingTime int        `json:"reading_time"`
+	UserID      int64      `json:"user_id"`
+	FeedID      int64      `json:"feed_id"`
+	Starred     bool       `json:"starred"`
+}
+
+// EntryModificationRequest represents a request to modify an entry.
+type EntryModificationRequest struct {
+	Title   *string `json:"title"`
+	Content *string `json:"content"`
+}
+
+// Entries represents a list of entries.
+type Entries []*Entry
+
+// Enclosure represents an attachment.
+type Enclosure struct {
+	ID               int64  `json:"id"`
+	UserID           int64  `json:"user_id"`
+	EntryID          int64  `json:"entry_id"`
+	URL              string `json:"url"`
+	MimeType         string `json:"mime_type"`
+	Size             int    `json:"size"`
+	MediaProgression int64  `json:"media_progression"`
+}
+
+type EnclosureUpdateRequest struct {
+	MediaProgression int64 `json:"media_progression"`
+}
+
+// Enclosures represents a list of attachments.
+type Enclosures []*Enclosure
+
+const (
+	FilterNotStarred  = "0"
+	FilterOnlyStarred = "1"
+)
+
+// Filter is used to filter entries.
+type Filter struct {
+	Status          string
+	Offset          int
+	Limit           int
+	Order           string
+	Direction       string
+	Starred         string
+	Before          int64
+	After           int64
+	PublishedBefore int64
+	PublishedAfter  int64
+	ChangedBefore   int64
+	ChangedAfter    int64
+	BeforeEntryID   int64
+	AfterEntryID    int64
+	Search          string
+	CategoryID      int64
+	FeedID          int64
+	Statuses        []string
+	GloballyVisible bool
+}
+
+// EntryResultSet represents the response when fetching entries.
+type EntryResultSet struct {
+	Total   int     `json:"total"`
+	Entries Entries `json:"entries"`
+}
+
+// VersionResponse represents the version and the build information of the Miniflux instance.
+type VersionResponse struct {
+	Version   string `json:"version"`
+	Commit    string `json:"commit"`
+	BuildDate string `json:"build_date"`
+	GoVersion string `json:"go_version"`
+	Compiler  string `json:"compiler"`
+	Arch      string `json:"arch"`
+	OS        string `json:"os"`
+}
+
+func SetOptionalField[T any](value T) *T {
+	return &value
+}

client/request.go

@@ -1,8 +1,7 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
 
-package client // import "miniflux.app/client"
+package client // import "miniflux.app/v2/client"
 
 import (
 	"bytes"
@@ -10,7 +9,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
@@ -28,6 +26,8 @@ var (
 	ErrForbidden     = errors.New("miniflux: access forbidden")
 	ErrServerError   = errors.New("miniflux: internal server error")
 	ErrNotFound      = errors.New("miniflux: resource not found")
+	ErrBadRequest    = errors.New("miniflux: bad request")
+	ErrEmptyEndpoint = errors.New("miniflux: empty endpoint provided")
 )
 
 type errorResponse struct {
@@ -63,6 +63,9 @@ func (r *request) Delete(path string) error {
 }
 
 func (r *request) execute(method, path string, data interface{}) (io.ReadCloser, error) {
+	if r.endpoint == "" {
+		return nil, ErrEmptyEndpoint
+	}
 	if r.endpoint[len(r.endpoint)-1:] == "/" {
 		r.endpoint = r.endpoint[:len(r.endpoint)-1]
 	}
@@ -83,11 +86,11 @@ func (r *request) execute(method, path string, data interface{}) (io.ReadCloser,
 	}
 
 	if data != nil {
-		switch data.(type) {
+		switch data := data.(type) {
 		case io.ReadCloser:
-			request.Body = data.(io.ReadCloser)
+			request.Body = data
 		default:
-			request.Body = ioutil.NopCloser(bytes.NewBuffer(r.toJSON(data)))
+			request.Body = io.NopCloser(bytes.NewBuffer(r.toJSON(data)))
 		}
 	}
 
@@ -105,8 +108,15 @@ func (r *request) execute(method, path string, data interface{}) (io.ReadCloser,
 		response.Body.Close()
 		return nil, ErrForbidden
 	case http.StatusInternalServerError:
-		response.Body.Close()
-		return nil, ErrServerError
+		defer response.Body.Close()
+
+		var resp errorResponse
+		decoder := json.NewDecoder(response.Body)
+		// If we failed to decode, just return a generic ErrServerError
+		if err := decoder.Decode(&resp); err != nil {
+			return nil, ErrServerError
+		}
+		return nil, errors.New("miniflux: internal server error: " + resp.ErrorMessage)
 	case http.StatusNotFound:
 		response.Body.Close()
 		return nil, ErrNotFound
@@ -119,10 +129,10 @@ func (r *request) execute(method, path string, data interface{}) (io.ReadCloser,
 		var resp errorResponse
 		decoder := json.NewDecoder(response.Body)
 		if err := decoder.Decode(&resp); err != nil {
-			return nil, fmt.Errorf("miniflux: bad request error (%v)", err)
+			return nil, fmt.Errorf("%w (%v)", ErrBadRequest, err)
 		}
 
-		return nil, fmt.Errorf("miniflux: bad request (%s)", resp.ErrorMessage)
+		return nil, fmt.Errorf("%w (%s)", ErrBadRequest, resp.ErrorMessage)
 	}
 
 	if response.StatusCode > 400 {

config/config.go

@@ -1,8 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package config // import "miniflux.app/config"
-
-// Opts holds parsed configuration options.
-var Opts *Options

config/doc.go

@@ -1,10 +0,0 @@
-// Copyright 2019 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-/*
-
-Package config handles configuration management for the application.
-
-*/
-package config // import "miniflux.app/config"

config/options.go

@@ -1,498 +0,0 @@
-// Copyright 2019 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package config // import "miniflux.app/config"
-
-import (
-	"fmt"
-	"strings"
-
-	"miniflux.app/version"
-)
-
-const (
-	defaultHTTPS                              = false
-	defaultLogDateTime                        = false
-	defaultHSTS                               = true
-	defaultHTTPService                        = true
-	defaultSchedulerService                   = true
-	defaultDebug                              = false
-	defaultTiming                             = false
-	defaultBaseURL                            = "http://localhost"
-	defaultRootURL                            = "http://localhost"
-	defaultBasePath                           = ""
-	defaultWorkerPoolSize                     = 5
-	defaultPollingFrequency                   = 60
-	defaultBatchSize                          = 10
-	defaultPollingScheduler                   = "round_robin"
-	defaultSchedulerEntryFrequencyMinInterval = 5
-	defaultSchedulerEntryFrequencyMaxInterval = 24 * 60
-	defaultRunMigrations                      = false
-	defaultDatabaseURL                        = "user=postgres password=postgres dbname=miniflux2 sslmode=disable"
-	defaultDatabaseMaxConns                   = 20
-	defaultDatabaseMinConns                   = 1
-	defaultListenAddr                         = "127.0.0.1:8080"
-	defaultCertFile                           = ""
-	defaultKeyFile                            = ""
-	defaultCertDomain                         = ""
-	defaultCertCache                          = "/tmp/cert_cache"
-	defaultCleanupFrequencyHours              = 24
-	defaultCleanupArchiveReadDays             = 60
-	defaultCleanupArchiveUnreadDays           = 180
-	defaultCleanupRemoveSessionsDays          = 30
-	defaultProxyImages                        = "http-only"
-	defaultCreateAdmin                        = false
-	defaultAdminUsername                      = ""
-	defaultAdminPassword                      = ""
-	defaultOAuth2UserCreation                 = false
-	defaultOAuth2ClientID                     = ""
-	defaultOAuth2ClientSecret                 = ""
-	defaultOAuth2RedirectURL                  = ""
-	defaultOAuth2OidcDiscoveryEndpoint        = ""
-	defaultOAuth2Provider                     = ""
-	defaultPocketConsumerKey                  = ""
-	defaultHTTPClientTimeout                  = 20
-	defaultHTTPClientMaxBodySize              = 15
-	defaultHTTPClientProxy                    = ""
-	defaultAuthProxyHeader                    = ""
-	defaultAuthProxyUserCreation              = false
-	defaultMaintenanceMode                    = false
-	defaultMaintenanceMessage                 = "Miniflux is currently under maintenance"
-	defaultMetricsCollector                   = false
-	defaultMetricsRefreshInterval             = 60
-	defaultMetricsAllowedNetworks             = "127.0.0.1/8"
-)
-
-var defaultHTTPClientUserAgent = "Mozilla/5.0 (compatible; Miniflux/" + version.Version + "; +https://miniflux.app)"
-
-// Options contains configuration options.
-type Options struct {
-	HTTPS                              bool
-	logDateTime                        bool
-	hsts                               bool
-	httpService                        bool
-	schedulerService                   bool
-	debug                              bool
-	serverTimingHeader                 bool
-	baseURL                            string
-	rootURL                            string
-	basePath                           string
-	databaseURL                        string
-	databaseMaxConns                   int
-	databaseMinConns                   int
-	runMigrations                      bool
-	listenAddr                         string
-	certFile                           string
-	certDomain                         string
-	certCache                          string
-	certKeyFile                        string
-	cleanupFrequencyHours              int
-	cleanupArchiveReadDays             int
-	cleanupArchiveUnreadDays           int
-	cleanupRemoveSessionsDays          int
-	pollingFrequency                   int
-	batchSize                          int
-	pollingScheduler                   string
-	schedulerEntryFrequencyMinInterval int
-	schedulerEntryFrequencyMaxInterval int
-	workerPoolSize                     int
-	createAdmin                        bool
-	adminUsername                      string
-	adminPassword                      string
-	proxyImages                        string
-	oauth2UserCreationAllowed          bool
-	oauth2ClientID                     string
-	oauth2ClientSecret                 string
-	oauth2RedirectURL                  string
-	oauth2OidcDiscoveryEndpoint        string
-	oauth2Provider                     string
-	pocketConsumerKey                  string
-	httpClientTimeout                  int
-	httpClientMaxBodySize              int64
-	httpClientProxy                    string
-	httpClientUserAgent                string
-	authProxyHeader                    string
-	authProxyUserCreation              bool
-	maintenanceMode                    bool
-	maintenanceMessage                 string
-	metricsCollector                   bool
-	metricsRefreshInterval             int
-	metricsAllowedNetworks             []string
-}
-
-// NewOptions returns Options with default values.
-func NewOptions() *Options {
-	return &Options{
-		HTTPS:                              defaultHTTPS,
-		logDateTime:                        defaultLogDateTime,
-		hsts:                               defaultHSTS,
-		httpService:                        defaultHTTPService,
-		schedulerService:                   defaultSchedulerService,
-		debug:                              defaultDebug,
-		serverTimingHeader:                 defaultTiming,
-		baseURL:                            defaultBaseURL,
-		rootURL:                            defaultRootURL,
-		basePath:                           defaultBasePath,
-		databaseURL:                        defaultDatabaseURL,
-		databaseMaxConns:                   defaultDatabaseMaxConns,
-		databaseMinConns:                   defaultDatabaseMinConns,
-		runMigrations:                      defaultRunMigrations,
-		listenAddr:                         defaultListenAddr,
-		certFile:                           defaultCertFile,
-		certDomain:                         defaultCertDomain,
-		certCache:                          defaultCertCache,
-		certKeyFile:                        defaultKeyFile,
-		cleanupFrequencyHours:              defaultCleanupFrequencyHours,
-		cleanupArchiveReadDays:             defaultCleanupArchiveReadDays,
-		cleanupArchiveUnreadDays:           defaultCleanupArchiveUnreadDays,
-		cleanupRemoveSessionsDays:          defaultCleanupRemoveSessionsDays,
-		pollingFrequency:                   defaultPollingFrequency,
-		batchSize:                          defaultBatchSize,
-		pollingScheduler:                   defaultPollingScheduler,
-		schedulerEntryFrequencyMinInterval: defaultSchedulerEntryFrequencyMinInterval,
-		schedulerEntryFrequencyMaxInterval: defaultSchedulerEntryFrequencyMaxInterval,
-		workerPoolSize:                     defaultWorkerPoolSize,
-		createAdmin:                        defaultCreateAdmin,
-		proxyImages:                        defaultProxyImages,
-		oauth2UserCreationAllowed:          defaultOAuth2UserCreation,
-		oauth2ClientID:                     defaultOAuth2ClientID,
-		oauth2ClientSecret:                 defaultOAuth2ClientSecret,
-		oauth2RedirectURL:                  defaultOAuth2RedirectURL,
-		oauth2OidcDiscoveryEndpoint:        defaultOAuth2OidcDiscoveryEndpoint,
-		oauth2Provider:                     defaultOAuth2Provider,
-		pocketConsumerKey:                  defaultPocketConsumerKey,
-		httpClientTimeout:                  defaultHTTPClientTimeout,
-		httpClientMaxBodySize:              defaultHTTPClientMaxBodySize * 1024 * 1024,
-		httpClientProxy:                    defaultHTTPClientProxy,
-		httpClientUserAgent:                defaultHTTPClientUserAgent,
-		authProxyHeader:                    defaultAuthProxyHeader,
-		authProxyUserCreation:              defaultAuthProxyUserCreation,
-		maintenanceMode:                    defaultMaintenanceMode,
-		maintenanceMessage:                 defaultMaintenanceMessage,
-		metricsCollector:                   defaultMetricsCollector,
-		metricsRefreshInterval:             defaultMetricsRefreshInterval,
-		metricsAllowedNetworks:             []string{defaultMetricsAllowedNetworks},
-	}
-}
-
-// LogDateTime returns true if the date/time should be displayed in log messages.
-func (o *Options) LogDateTime() bool {
-	return o.logDateTime
-}
-
-// HasMaintenanceMode returns true if maintenance mode is enabled.
-func (o *Options) HasMaintenanceMode() bool {
-	return o.maintenanceMode
-}
-
-// MaintenanceMessage returns maintenance message.
-func (o *Options) MaintenanceMessage() string {
-	return o.maintenanceMessage
-}
-
-// HasDebugMode returns true if debug mode is enabled.
-func (o *Options) HasDebugMode() bool {
-	return o.debug
-}
-
-// HasServerTimingHeader returns true if server-timing headers enabled.
-func (o *Options) HasServerTimingHeader() bool {
-	return o.serverTimingHeader
-}
-
-// BaseURL returns the application base URL with path.
-func (o *Options) BaseURL() string {
-	return o.baseURL
-}
-
-// RootURL returns the base URL without path.
-func (o *Options) RootURL() string {
-	return o.rootURL
-}
-
-// BasePath returns the application base path according to the base URL.
-func (o *Options) BasePath() string {
-	return o.basePath
-}
-
-// IsDefaultDatabaseURL returns true if the default database URL is used.
-func (o *Options) IsDefaultDatabaseURL() bool {
-	return o.databaseURL == defaultDatabaseURL
-}
-
-// DatabaseURL returns the database URL.
-func (o *Options) DatabaseURL() string {
-	return o.databaseURL
-}
-
-// DatabaseMaxConns returns the maximum number of database connections.
-func (o *Options) DatabaseMaxConns() int {
-	return o.databaseMaxConns
-}
-
-// DatabaseMinConns returns the minimum number of database connections.
-func (o *Options) DatabaseMinConns() int {
-	return o.databaseMinConns
-}
-
-// ListenAddr returns the listen address for the HTTP server.
-func (o *Options) ListenAddr() string {
-	return o.listenAddr
-}
-
-// CertFile returns the SSL certificate filename if any.
-func (o *Options) CertFile() string {
-	return o.certFile
-}
-
-// CertKeyFile returns the private key filename for custom SSL certificate.
-func (o *Options) CertKeyFile() string {
-	return o.certKeyFile
-}
-
-// CertDomain returns the domain to use for Let's Encrypt certificate.
-func (o *Options) CertDomain() string {
-	return o.certDomain
-}
-
-// CertCache returns the directory to use for Let's Encrypt session cache.
-func (o *Options) CertCache() string {
-	return o.certCache
-}
-
-// CleanupFrequencyHours returns the interval in hours for cleanup jobs.
-func (o *Options) CleanupFrequencyHours() int {
-	return o.cleanupFrequencyHours
-}
-
-// CleanupArchiveReadDays returns the number of days after which marking read items as removed.
-func (o *Options) CleanupArchiveReadDays() int {
-	return o.cleanupArchiveReadDays
-}
-
-// CleanupArchiveUnreadDays returns the number of days after which marking unread items as removed.
-func (o *Options) CleanupArchiveUnreadDays() int {
-	return o.cleanupArchiveUnreadDays
-}
-
-// CleanupRemoveSessionsDays returns the number of days after which to remove sessions.
-func (o *Options) CleanupRemoveSessionsDays() int {
-	return o.cleanupRemoveSessionsDays
-}
-
-// WorkerPoolSize returns the number of background worker.
-func (o *Options) WorkerPoolSize() int {
-	return o.workerPoolSize
-}
-
-// PollingFrequency returns the interval to refresh feeds in the background.
-func (o *Options) PollingFrequency() int {
-	return o.pollingFrequency
-}
-
-// BatchSize returns the number of feeds to send for background processing.
-func (o *Options) BatchSize() int {
-	return o.batchSize
-}
-
-// PollingScheduler returns the scheduler used for polling feeds.
-func (o *Options) PollingScheduler() string {
-	return o.pollingScheduler
-}
-
-// SchedulerEntryFrequencyMaxInterval returns the maximum interval in minutes for the entry frequency scheduler.
-func (o *Options) SchedulerEntryFrequencyMaxInterval() int {
-	return o.schedulerEntryFrequencyMaxInterval
-}
-
-// SchedulerEntryFrequencyMinInterval returns the minimum interval in minutes for the entry frequency scheduler.
-func (o *Options) SchedulerEntryFrequencyMinInterval() int {
-	return o.schedulerEntryFrequencyMinInterval
-}
-
-// IsOAuth2UserCreationAllowed returns true if user creation is allowed for OAuth2 users.
-func (o *Options) IsOAuth2UserCreationAllowed() bool {
-	return o.oauth2UserCreationAllowed
-}
-
-// OAuth2ClientID returns the OAuth2 Client ID.
-func (o *Options) OAuth2ClientID() string {
-	return o.oauth2ClientID
-}
-
-// OAuth2ClientSecret returns the OAuth2 client secret.
-func (o *Options) OAuth2ClientSecret() string {
-	return o.oauth2ClientSecret
-}
-
-// OAuth2RedirectURL returns the OAuth2 redirect URL.
-func (o *Options) OAuth2RedirectURL() string {
-	return o.oauth2RedirectURL
-}
-
-// OAuth2OidcDiscoveryEndpoint returns the OAuth2 OIDC discovery endpoint.
-func (o *Options) OAuth2OidcDiscoveryEndpoint() string {
-	return o.oauth2OidcDiscoveryEndpoint
-}
-
-// OAuth2Provider returns the name of the OAuth2 provider configured.
-func (o *Options) OAuth2Provider() string {
-	return o.oauth2Provider
-}
-
-// HasHSTS returns true if HTTP Strict Transport Security is enabled.
-func (o *Options) HasHSTS() bool {
-	return o.hsts
-}
-
-// RunMigrations returns true if the environment variable RUN_MIGRATIONS is not empty.
-func (o *Options) RunMigrations() bool {
-	return o.runMigrations
-}
-
-// CreateAdmin returns true if the environment variable CREATE_ADMIN is not empty.
-func (o *Options) CreateAdmin() bool {
-	return o.createAdmin
-}
-
-// AdminUsername returns the admin username if defined.
-func (o *Options) AdminUsername() string {
-	return o.adminUsername
-}
-
-// AdminPassword returns the admin password if defined.
-func (o *Options) AdminPassword() string {
-	return o.adminPassword
-}
-
-// ProxyImages returns "none" to never proxy, "http-only" to proxy non-HTTPS, "all" to always proxy.
-func (o *Options) ProxyImages() string {
-	return o.proxyImages
-}
-
-// HasHTTPService returns true if the HTTP service is enabled.
-func (o *Options) HasHTTPService() bool {
-	return o.httpService
-}
-
-// HasSchedulerService returns true if the scheduler service is enabled.
-func (o *Options) HasSchedulerService() bool {
-	return o.schedulerService
-}
-
-// PocketConsumerKey returns the Pocket Consumer Key if configured.
-func (o *Options) PocketConsumerKey(defaultValue string) string {
-	if o.pocketConsumerKey != "" {
-		return o.pocketConsumerKey
-	}
-	return defaultValue
-}
-
-// HTTPClientTimeout returns the time limit in seconds before the HTTP client cancel the request.
-func (o *Options) HTTPClientTimeout() int {
-	return o.httpClientTimeout
-}
-
-// HTTPClientMaxBodySize returns the number of bytes allowed for the HTTP client to transfer.
-func (o *Options) HTTPClientMaxBodySize() int64 {
-	return o.httpClientMaxBodySize
-}
-
-// HTTPClientProxy returns the proxy URL for HTTP client.
-func (o *Options) HTTPClientProxy() string {
-	return o.httpClientProxy
-}
-
-// HasHTTPClientProxyConfigured returns true if the HTTP proxy is configured.
-func (o *Options) HasHTTPClientProxyConfigured() bool {
-	return o.httpClientProxy != ""
-}
-
-// AuthProxyHeader returns an HTTP header name that contains username for
-// authentication using auth proxy.
-func (o *Options) AuthProxyHeader() string {
-	return o.authProxyHeader
-}
-
-// IsAuthProxyUserCreationAllowed returns true if user creation is allowed for
-// users authenticated using auth proxy.
-func (o *Options) IsAuthProxyUserCreationAllowed() bool {
-	return o.authProxyUserCreation
-}
-
-// HasMetricsCollector returns true if metrics collection is enabled.
-func (o *Options) HasMetricsCollector() bool {
-	return o.metricsCollector
-}
-
-// MetricsRefreshInterval returns the refresh interval in seconds.
-func (o *Options) MetricsRefreshInterval() int {
-	return o.metricsRefreshInterval
-}
-
-// MetricsAllowedNetworks returns the list of networks allowed to connect to the metrics endpoint.
-func (o *Options) MetricsAllowedNetworks() []string {
-	return o.metricsAllowedNetworks
-}
-
-// HTTPClientUserAgent returns the global User-Agent header for miniflux.
-func (o *Options) HTTPClientUserAgent() string {
-	return o.httpClientUserAgent
-}
-
-func (o *Options) String() string {
-	var builder strings.Builder
-	builder.WriteString(fmt.Sprintf("LOG_DATE_TIME: %v\n", o.logDateTime))
-	builder.WriteString(fmt.Sprintf("DEBUG: %v\n", o.debug))
-	builder.WriteString(fmt.Sprintf("SERVER_TIMING_HEADER: %v\n", o.serverTimingHeader))
-	builder.WriteString(fmt.Sprintf("HTTP_SERVICE: %v\n", o.httpService))
-	builder.WriteString(fmt.Sprintf("SCHEDULER_SERVICE: %v\n", o.schedulerService))
-	builder.WriteString(fmt.Sprintf("HTTPS: %v\n", o.HTTPS))
-	builder.WriteString(fmt.Sprintf("HSTS: %v\n", o.hsts))
-	builder.WriteString(fmt.Sprintf("BASE_URL: %v\n", o.baseURL))
-	builder.WriteString(fmt.Sprintf("ROOT_URL: %v\n", o.rootURL))
-	builder.WriteString(fmt.Sprintf("BASE_PATH: %v\n", o.basePath))
-	builder.WriteString(fmt.Sprintf("LISTEN_ADDR: %v\n", o.listenAddr))
-	builder.WriteString(fmt.Sprintf("DATABASE_URL: %v\n", o.databaseURL))
-	builder.WriteString(fmt.Sprintf("DATABASE_MAX_CONNS: %v\n", o.databaseMaxConns))
-	builder.WriteString(fmt.Sprintf("DATABASE_MIN_CONNS: %v\n", o.databaseMinConns))
-	builder.WriteString(fmt.Sprintf("RUN_MIGRATIONS: %v\n", o.runMigrations))
-	builder.WriteString(fmt.Sprintf("CERT_FILE: %v\n", o.certFile))
-	builder.WriteString(fmt.Sprintf("KEY_FILE: %v\n", o.certKeyFile))
-	builder.WriteString(fmt.Sprintf("CERT_DOMAIN: %v\n", o.certDomain))
-	builder.WriteString(fmt.Sprintf("CERT_CACHE: %v\n", o.certCache))
-	builder.WriteString(fmt.Sprintf("CLEANUP_FREQUENCY_HOURS: %v\n", o.cleanupFrequencyHours))
-	builder.WriteString(fmt.Sprintf("CLEANUP_ARCHIVE_READ_DAYS: %v\n", o.cleanupArchiveReadDays))
-	builder.WriteString(fmt.Sprintf("CLEANUP_ARCHIVE_UNREAD_DAYS: %v\n", o.cleanupArchiveUnreadDays))
-	builder.WriteString(fmt.Sprintf("CLEANUP_REMOVE_SESSIONS_DAYS: %v\n", o.cleanupRemoveSessionsDays))
-	builder.WriteString(fmt.Sprintf("WORKER_POOL_SIZE: %v\n", o.workerPoolSize))
-	builder.WriteString(fmt.Sprintf("POLLING_FREQUENCY: %v\n", o.pollingFrequency))
-	builder.WriteString(fmt.Sprintf("BATCH_SIZE: %v\n", o.batchSize))
-	builder.WriteString(fmt.Sprintf("POLLING_SCHEDULER: %v\n", o.pollingScheduler))
-	builder.WriteString(fmt.Sprintf("SCHEDULER_ENTRY_FREQUENCY_MAX_INTERVAL: %v\n", o.schedulerEntryFrequencyMaxInterval))
-	builder.WriteString(fmt.Sprintf("SCHEDULER_ENTRY_FREQUENCY_MIN_INTERVAL: %v\n", o.schedulerEntryFrequencyMinInterval))
-	builder.WriteString(fmt.Sprintf("PROXY_IMAGES: %v\n", o.proxyImages))
-	builder.WriteString(fmt.Sprintf("CREATE_ADMIN: %v\n", o.createAdmin))
-	builder.WriteString(fmt.Sprintf("ADMIN_USERNAME: %v\n", o.adminUsername))
-	builder.WriteString(fmt.Sprintf("ADMIN_PASSWORD: %v\n", o.adminPassword))
-	builder.WriteString(fmt.Sprintf("POCKET_CONSUMER_KEY: %v\n", o.pocketConsumerKey))
-	builder.WriteString(fmt.Sprintf("OAUTH2_USER_CREATION: %v\n", o.oauth2UserCreationAllowed))
-	builder.WriteString(fmt.Sprintf("OAUTH2_CLIENT_ID: %v\n", o.oauth2ClientID))
-	builder.WriteString(fmt.Sprintf("OAUTH2_CLIENT_SECRET: %v\n", o.oauth2ClientSecret))
-	builder.WriteString(fmt.Sprintf("OAUTH2_REDIRECT_URL: %v\n", o.oauth2RedirectURL))
-	builder.WriteString(fmt.Sprintf("OAUTH2_OIDC_DISCOVERY_ENDPOINT: %v\n", o.oauth2OidcDiscoveryEndpoint))
-	builder.WriteString(fmt.Sprintf("OAUTH2_PROVIDER: %v\n", o.oauth2Provider))
-	builder.WriteString(fmt.Sprintf("HTTP_CLIENT_TIMEOUT: %v\n", o.httpClientTimeout))
-	builder.WriteString(fmt.Sprintf("HTTP_CLIENT_MAX_BODY_SIZE: %v\n", o.httpClientMaxBodySize))
-	builder.WriteString(fmt.Sprintf("HTTP_CLIENT_PROXY: %v\n", o.httpClientProxy))
-	builder.WriteString(fmt.Sprintf("HTTP_CLIENT_USER_AGENT: %v\n", o.httpClientUserAgent))
-	builder.WriteString(fmt.Sprintf("AUTH_PROXY_HEADER: %v\n", o.authProxyHeader))
-	builder.WriteString(fmt.Sprintf("AUTH_PROXY_USER_CREATION: %v\n", o.authProxyUserCreation))
-	builder.WriteString(fmt.Sprintf("MAINTENANCE_MODE: %v\n", o.maintenanceMode))
-	builder.WriteString(fmt.Sprintf("MAINTENANCE_MESSAGE: %v\n", o.maintenanceMessage))
-	builder.WriteString(fmt.Sprintf("METRICS_COLLECTOR: %v\n", o.metricsCollector))
-	builder.WriteString(fmt.Sprintf("METRICS_REFRESH_INTERVAL: %v\n", o.metricsRefreshInterval))
-	builder.WriteString(fmt.Sprintf("METRICS_ALLOWED_NETWORKS: %v\n", o.metricsAllowedNetworks))
-	return builder.String()
-}

contrib/bruno/README.md

@@ -0,0 +1,6 @@
+This folder contains Miniflux API collection for [Bruno](https://www.usebruno.com).
+
+Bruno is a lightweight alternative to Postman/Insomnia.
+
+- https://www.usebruno.com
+- https://github.com/usebruno/bruno

contrib/bruno/miniflux/Bookmark an entry.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Bookmark an entry
+  type: http
+  seq: 37
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/entries/{{entryID}}/bookmark
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}
+
+vars:pre-request {
+  entryID: 1698
+}

contrib/bruno/miniflux/Create a feed.bru

@@ -0,0 +1,22 @@
+meta {
+  name: Create a feed
+  type: http
+  seq: 19
+}
+
+post {
+  url: {{minifluxBaseURL}}/v1/feeds
+  body: json
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}

contrib/bruno/miniflux/Create a new category.bru

@@ -0,0 +1,22 @@
+meta {
+  name: Create a new category
+  type: http
+  seq: 10
+}
+
+post {
+  url: {{minifluxBaseURL}}/v1/categories
+  body: json
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "title": "Test"
+  }
+}

contrib/bruno/miniflux/Create a new user.bru

@@ -0,0 +1,23 @@
+meta {
+  name: Create a new user
+  type: http
+  seq: 5
+}
+
+post {
+  url: {{minifluxBaseURL}}/v1/users
+  body: json
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "username": "foobar",
+    "password": "secret123"
+  }
+}

contrib/bruno/miniflux/Delete a category.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Delete a category
+  type: http
+  seq: 12
+}
+
+delete {
+  url: {{minifluxBaseURL}}/v1/categories/{{categoryID}}
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "title": "Test Update"
+  }
+}
+
+vars:pre-request {
+  categoryID: 1
+}

contrib/bruno/miniflux/Delete a feed.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Delete a feed
+  type: http
+  seq: 26
+}
+
+delete {
+  url: {{minifluxBaseURL}}/v1/feeds/{{feedID}}
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "user_agent": "My user agent"
+  }
+}
+
+vars:pre-request {
+  feedID: 18
+}

contrib/bruno/miniflux/Delete a user.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Delete a user
+  type: http
+  seq: 7
+}
+
+delete {
+  url: {{minifluxBaseURL}}/v1/users/{{userID}}
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "language": "fr_FR"
+  }
+}
+
+vars:pre-request {
+  userID: 2
+}

contrib/bruno/miniflux/Discover feeds.bru

@@ -0,0 +1,22 @@
+meta {
+  name: Discover feeds
+  type: http
+  seq: 18
+}
+
+post {
+  url: {{minifluxBaseURL}}/v1/discover
+  body: json
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "url": "https://miniflux.app"
+  }
+}

contrib/bruno/miniflux/Fetch entry website content.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Fetch entry website content
+  type: http
+  seq: 39
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/entries/{{entryID}}/fetch-content
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}
+
+vars:pre-request {
+  entryID: 1698
+}

contrib/bruno/miniflux/Flush history.bru

@@ -0,0 +1,22 @@
+meta {
+  name: Flush history
+  type: http
+  seq: 40
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/flush-history
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "url": "https://miniflux.app"
+  }
+}

contrib/bruno/miniflux/Get a single entry.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Get a single entry
+  type: http
+  seq: 36
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/entries/{{entryID}}
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}
+
+vars:pre-request {
+  entryID: 1698
+}

contrib/bruno/miniflux/Get a single feed entry.bru

@@ -0,0 +1,27 @@
+meta {
+  name: Get a single feed entry
+  type: http
+  seq: 33
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/feeds/{{feedID}}/entries/{{entryID}}
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}
+
+vars:pre-request {
+  feedID: 19
+  entryID: 1698
+}

contrib/bruno/miniflux/Get a single feed.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Get a single feed
+  type: http
+  seq: 24
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/feeds/{{feedID}}
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}
+
+vars:pre-request {
+  feedID: 18
+}

contrib/bruno/miniflux/Get a single user by ID.bru

@@ -0,0 +1,20 @@
+meta {
+  name: Get a single user by ID
+  type: http
+  seq: 3
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/users/{{userID}}
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+vars:pre-request {
+  userID: 1
+}

contrib/bruno/miniflux/Get a single user by username.bru

@@ -0,0 +1,20 @@
+meta {
+  name: Get a single user by username
+  type: http
+  seq: 4
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/users/{{username}}
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+vars:pre-request {
+  username: admin
+}

contrib/bruno/miniflux/Get all categories.bru

@@ -0,0 +1,16 @@
+meta {
+  name: Get all categories
+  type: http
+  seq: 9
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/categories
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}

contrib/bruno/miniflux/Get all entries.bru

@@ -0,0 +1,22 @@
+meta {
+  name: Get all entries
+  type: http
+  seq: 34
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/entries
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}

contrib/bruno/miniflux/Get all feeds.bru

@@ -0,0 +1,22 @@
+meta {
+  name: Get all feeds
+  type: http
+  seq: 20
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/feeds
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}

contrib/bruno/miniflux/Get all users.bru

@@ -0,0 +1,16 @@
+meta {
+  name: Get all users
+  type: http
+  seq: 2
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/users
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}

contrib/bruno/miniflux/Get category entries.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Get category entries
+  type: http
+  seq: 16
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/categories/{{categoryID}}/entries
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "title": "Test Update"
+  }
+}
+
+vars:pre-request {
+  categoryID: 2
+}

contrib/bruno/miniflux/Get category entry.bru

@@ -0,0 +1,27 @@
+meta {
+  name: Get category entry
+  type: http
+  seq: 17
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/categories/{{categoryID}}/entries/{{entryID}}
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "title": "Test Update"
+  }
+}
+
+vars:pre-request {
+  categoryID: 2
+  entryID: 1
+}

contrib/bruno/miniflux/Get category feeds.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Get category feeds
+  type: http
+  seq: 14
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/categories/{{categoryID}}/feeds
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "title": "Test Update"
+  }
+}
+
+vars:pre-request {
+  categoryID: 2
+}

contrib/bruno/miniflux/Get current user.bru

@@ -0,0 +1,16 @@
+meta {
+  name: Get current user
+  type: http
+  seq: 1
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/me
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}

contrib/bruno/miniflux/Get feed counters.bru

@@ -0,0 +1,22 @@
+meta {
+  name: Get feed counters
+  type: http
+  seq: 21
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/feeds/counters
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}

contrib/bruno/miniflux/Get feed entries.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Get feed entries
+  type: http
+  seq: 32
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/feeds/{{feedID}}/entries
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}
+
+vars:pre-request {
+  feedID: 19
+}

contrib/bruno/miniflux/Get feed icon by feed ID.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Get feed icon by feed ID
+  type: http
+  seq: 27
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/feeds/{{feedID}}/icon
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "user_agent": "My user agent"
+  }
+}
+
+vars:pre-request {
+  feedID: 19
+}

contrib/bruno/miniflux/Get feed icon by icon ID.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Get feed icon by icon ID
+  type: http
+  seq: 28
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/icons/{{iconID}}
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "user_agent": "My user agent"
+  }
+}
+
+vars:pre-request {
+  iconID: 11
+}

contrib/bruno/miniflux/Get version and build information.bru

@@ -0,0 +1,16 @@
+meta {
+  name: Get version and build information
+  type: http
+  seq: 42
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/version
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}

contrib/bruno/miniflux/Mark all category entries as read.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Mark all category entries as read
+  type: http
+  seq: 13
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/categories/{{categoryID}}/mark-all-as-read
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "title": "Test Update"
+  }
+}
+
+vars:pre-request {
+  categoryID: 2
+}

contrib/bruno/miniflux/Mark all user entries as read.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Mark all user entries as read
+  type: http
+  seq: 8
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/users/{{userID}}/mark-all-as-read
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "title": "Test Update"
+  }
+}
+
+vars:pre-request {
+  userID: 1
+}

contrib/bruno/miniflux/Mark feed as read.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Mark feed as read
+  type: http
+  seq: 29
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/feeds/{{feedID}}/mark-all-as-read
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "user_agent": "My user agent"
+  }
+}
+
+vars:pre-request {
+  feedID: 19
+}

contrib/bruno/miniflux/OPML Export.bru

@@ -0,0 +1,26 @@
+meta {
+  name: OPML Export
+  type: http
+  seq: 30
+}
+
+get {
+  url: {{minifluxBaseURL}}/v1/export
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "user_agent": "My user agent"
+  }
+}
+
+vars:pre-request {
+  feedID: 19
+}

contrib/bruno/miniflux/OPML Import.bru

@@ -0,0 +1,40 @@
+meta {
+  name: OPML Import
+  type: http
+  seq: 31
+}
+
+post {
+  url: {{minifluxBaseURL}}/v1/import
+  body: xml
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "user_agent": "My user agent"
+  }
+}
+
+body:xml {
+  <?xml version="1.0" encoding="UTF-8"?>
+  <opml version="2.0">
+      <head>
+          <title>Miniflux</title>
+      </head>
+      <body>
+          <outline text="My category">
+              <outline title="Miniflux" text="Miniflux" xmlUrl="https://miniflux.app/feed.xml" htmlUrl="https://miniflux.app"></outline>
+          </outline>
+      </body>
+  </opml>
+}
+
+vars:pre-request {
+  feedID: 19
+}

contrib/bruno/miniflux/Refresh a single feed.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Refresh a single feed
+  type: http
+  seq: 23
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/feeds/{{feedID}}/refresh
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}
+
+vars:pre-request {
+  feedID: 18
+}

contrib/bruno/miniflux/Refresh all feeds.bru

@@ -0,0 +1,22 @@
+meta {
+  name: Refresh all feeds
+  type: http
+  seq: 22
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/feeds/refresh
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}

contrib/bruno/miniflux/Refresh category feeds.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Refresh category feeds
+  type: http
+  seq: 15
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/categories/{{categoryID}}/refresh
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "title": "Test Update"
+  }
+}
+
+vars:pre-request {
+  categoryID: 2
+}

contrib/bruno/miniflux/Save an entry.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Save an entry
+  type: http
+  seq: 38
+}
+
+post {
+  url: {{minifluxBaseURL}}/v1/entries/{{entryID}}/save
+  body: none
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "feed_url": "https://miniflux.app/feed.xml"
+  }
+}
+
+vars:pre-request {
+  entryID: 1698
+}

contrib/bruno/miniflux/Update a category.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Update a category
+  type: http
+  seq: 11
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/categories/{{categoryID}}
+  body: json
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "title": "Test Update"
+  }
+}
+
+vars:pre-request {
+  categoryID: 1
+}

contrib/bruno/miniflux/Update a feed.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Update a feed
+  type: http
+  seq: 25
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/feeds/{{feedID}}
+  body: json
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "user_agent": "My user agent"
+  }
+}
+
+vars:pre-request {
+  feedID: 18
+}

contrib/bruno/miniflux/Update a user.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Update a user
+  type: http
+  seq: 6
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/users/{{userID}}
+  body: json
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "language": "fr_FR"
+  }
+}
+
+vars:pre-request {
+  userID: 1
+}

contrib/bruno/miniflux/Update entries status.bru

@@ -0,0 +1,23 @@
+meta {
+  name: Update entries status
+  type: http
+  seq: 35
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/entries
+  body: json
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "entry_ids": [1698, 1699],
+    "status": "read"
+  }
+}

contrib/bruno/miniflux/Update entry.bru

@@ -0,0 +1,27 @@
+meta {
+  name: Update entry
+  type: http
+  seq: 41
+}
+
+put {
+  url: {{minifluxBaseURL}}/v1/entries/{{entryID}}
+  body: json
+  auth: basic
+}
+
+auth:basic {
+  username: {{minifluxUsername}}
+  password: {{minifluxPassword}}
+}
+
+body:json {
+  {
+    "title": "New title",
+    "content": "Some text"
+  }
+}
+
+vars:pre-request {
+  entryID: 1789
+}

contrib/bruno/miniflux/bruno.json

@@ -0,0 +1,5 @@
+{
+  "version": "1",
+  "name": "Miniflux",
+  "type": "collection"
+}

contrib/bruno/miniflux/environments/Local.bru

@@ -0,0 +1,7 @@
+vars {
+  minifluxBaseURL: http://127.0.0.1:8080
+  minifluxUsername: admin
+}
+vars:secret [
+  minifluxPassword
+]

contrib/docker-compose/README.md

@@ -8,6 +8,5 @@ Here are few Docker Compose examples:
 - `traefik.yml`: Use Traefik as reverse-proxy with automatic HTTPS
 
 ```bash
-docker-compose -f basic.yml up -d db
-docker-compose -f basic.yml up
+docker compose -f basic.yml up -d
 ```

contrib/docker-compose/basic.yml

@@ -1,25 +1,35 @@
-version: '3.3'
 services:
   miniflux:
-    image: miniflux/miniflux:latest
+    image: ${MINIFLUX_IMAGE:-miniflux/miniflux:latest}
     container_name: miniflux
+    restart: always
     ports:
       - "80:8080"
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     environment:
       - DATABASE_URL=postgres://miniflux:secret@db/miniflux?sslmode=disable
       - RUN_MIGRATIONS=1
       - CREATE_ADMIN=1
       - ADMIN_USERNAME=admin
       - ADMIN_PASSWORD=test123
+      - DEBUG=1
+    # Optional health check:
+    # healthcheck:
+    #  test: ["CMD", "/usr/bin/miniflux", "-healthcheck", "auto"]
   db:
-    image: postgres:latest
+    image: postgres:15
     container_name: postgres
     environment:
       - POSTGRES_USER=miniflux
       - POSTGRES_PASSWORD=secret
+      - POSTGRES_DB=miniflux
     volumes:
       - miniflux-db:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "miniflux"]
+      interval: 10s
+      start_period: 30s
 volumes:
-  miniflux-db:
+  miniflux-db:

contrib/docker-compose/caddy.yml

@@ -1,4 +1,3 @@
-version: '3.3'
 services:
   caddy:
     image: caddy:2
@@ -13,10 +12,11 @@ services:
       - caddy_data:/data
       - caddy_config:/config
   miniflux:
-    image: miniflux/miniflux:latest
+    image: ${MINIFLUX_IMAGE:-miniflux/miniflux:latest}
     container_name: miniflux
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     environment:
       - DATABASE_URL=postgres://miniflux:secret@db/miniflux?sslmode=disable
       - RUN_MIGRATIONS=1
@@ -25,13 +25,17 @@ services:
       - ADMIN_PASSWORD=test123
       - BASE_URL=https://miniflux.example.org
   db:
-    image: postgres:latest
+    image: postgres:15
     container_name: postgres
     environment:
       - POSTGRES_USER=miniflux
       - POSTGRES_PASSWORD=secret
     volumes:
       - miniflux-db:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "miniflux"]
+      interval: 10s
+      start_period: 30s
 volumes:
   miniflux-db:
   caddy_data:

contrib/docker-compose/traefik.yml

@@ -1,4 +1,3 @@
-version: '3.3'
 services:
   traefik:
     image: "traefik:v2.3"
@@ -18,10 +17,11 @@ services:
       - "./letsencrypt:/letsencrypt"
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
   miniflux:
-    image: miniflux/miniflux:latest
+    image: ${MINIFLUX_IMAGE:-miniflux/miniflux:latest}
     container_name: miniflux
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     expose:
       - "8080"
     environment:
@@ -37,12 +37,16 @@ services:
       - "traefik.http.routers.miniflux.entrypoints=websecure"
       - "traefik.http.routers.miniflux.tls.certresolver=myresolver"
   db:
-    image: postgres:latest
+    image: postgres:15
     container_name: postgres
     environment:
       - POSTGRES_USER=miniflux
       - POSTGRES_PASSWORD=secret
     volumes:
       - miniflux-db:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "miniflux"]
+      interval: 10s
+      start_period: 30s
 volumes:
   miniflux-db:

contrib/sysvinit/README.md

@@ -0,0 +1,7 @@
+
+System-V init for e.g. http://devuan.org
+
+Assumes an executable `/usr/local/bin/miniflux`.
+
+Configure in `etc/default/miniflux`
+

contrib/sysvinit/etc/default/miniflux

@@ -0,0 +1,6 @@
+# sourced by /etc/init.d/miniflux
+# see cluster port in pg_lsclusters and ls -Al /var/run/postgresql/
+export DATABASE_URL='host=/var/run/postgresql/ port=5433 user=miniflux password=<my secrect db password> dbname=miniflux sslmode=disable'
+export LISTEN_ADDR='127.0.0.1:8081'
+export BASE_URL='https://<my miniflux domain> and path/'
+

contrib/sysvinit/etc/init.d/miniflux

@@ -0,0 +1,127 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides:          miniflux
+# Required-Start:    $syslog $network
+# Required-Stop:     $syslog
+# Should-Start:      postgresql
+# Should-Stop:       postgresql
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: A rss reader
+# Description:       A RSS reader
+### END INIT INFO
+
+# Author: Danny Boisvert
+
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Miniflux"
+NAME=miniflux
+SERVICEVERBOSE=yes
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+WORKINGDIR=/usr/local/bin
+DAEMON=$WORKINGDIR/$NAME
+DAEMON_ARGS=""
+USER=nobody
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+  # Return
+  #   0 if daemon has been started
+  #   1 if daemon was already running
+  #   2 if daemon could not be started
+  sh -c "USER=$USER start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\
+      --test --chdir $WORKINGDIR --chuid $USER \\
+      --exec $DAEMON -- $DAEMON_ARGS > /dev/null \\
+      || return 1"
+  sh -c "USER=$USER start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\
+      --background --chdir $WORKINGDIR --chuid $USER \\
+      --exec $DAEMON -- $DAEMON_ARGS \\
+      || return 2"
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+  # Return
+  #   0 if daemon has been stopped
+  #   1 if daemon was already stopped
+  #   2 if daemon could not be stopped
+  #   other if a failure occurred
+  start-stop-daemon --stop --quiet --retry=TERM/1/KILL/5 --pidfile $PIDFILE --name $NAME
+  RETVAL="$?"
+  [ "$RETVAL" = 2 ] && return 2
+  start-stop-daemon --stop --quiet --oknodo --retry=0/1/KILL/5 --exec $DAEMON
+  [ "$?" = 2 ] && return 2
+  # Many daemons don't delete their pidfiles when they exit.
+  rm -f $PIDFILE
+  return "$RETVAL"
+}
+
+
+case "$1" in
+  start)
+  [ "$SERVICEVERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+  do_start
+  case "$?" in
+    0|1) [ "$SERVICEVERBOSE" != no ] && log_end_msg 0 ;;
+    2) [ "$SERVICEVERBOSE" != no ] && log_end_msg 1 ;;
+  esac
+  ;;
+  stop)
+  [ "$SERVICEVERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+  do_stop
+  case "$?" in
+    0|1) [ "$SERVICEVERBOSE" != no ] && log_end_msg 0 ;;
+    2) [ "$SERVICEVERBOSE" != no ] && log_end_msg 1 ;;
+  esac
+  ;;
+  status)
+  status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+  ;;
+  restart|force-reload)
+  log_daemon_msg "Restarting $DESC" "$NAME"
+  do_stop
+  case "$?" in
+    0|1)
+    do_start
+    case "$?" in
+      0) log_end_msg 0 ;;
+      1) log_end_msg 1 ;; # Old process is still running
+      *) log_end_msg 1 ;; # Failed to start
+    esac
+    ;;
+    *)
+    # Failed to stop
+    log_end_msg 1
+    ;;
+    esac
+  ;;
+  *)
+    echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+    exit 3
+    ;;
+esac

contrib/thunder_client/README.md

@@ -0,0 +1,6 @@
+Miniflux API Collection for Thunder Client VS Code Extension
+============================================================
+
+Official website: https://www.thunderclient.com
+
+This folder contains the API endpoints collection for Miniflux. You can import it locally to interact with the Miniflux API.

contrib/thunder_client/collection.json

@@ -0,0 +1,769 @@
+{
+    "client": "Thunder Client",
+    "collectionName": "Miniflux v2",
+    "dateExported": "2023-07-31T01:53:38.743Z",
+    "version": "1.1",
+    "folders": [],
+    "requests": [
+        {
+            "_id": "d23fb9ba-c0c1-46ff-93f4-c5ed24ecd56e",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Discover Subscriptions",
+            "url": "/v1/discover",
+            "method": "POST",
+            "sortNum": 20000,
+            "created": "2023-07-31T01:20:12.275Z",
+            "modified": "2023-07-31T01:29:39.751Z",
+            "headers": [],
+            "params": [],
+            "body": {
+                "type": "json",
+                "raw": "\n{\n    \"url\": \"https://miniflux.app/\"\n}",
+                "form": []
+            },
+            "tests": []
+        },
+        {
+            "_id": "29cfc679-31d4-4d8c-b843-ab92a74dfa85",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Feeds",
+            "url": "/v1/feeds",
+            "method": "GET",
+            "sortNum": 50000,
+            "created": "2023-07-31T01:20:12.276Z",
+            "modified": "2023-07-31T01:20:12.276Z",
+            "headers": [],
+            "params": [],
+            "tests": []
+        },
+        {
+            "_id": "52a88df8-41c7-47c2-a635-8c93d7d29f40",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Category Feeds",
+            "url": "/v1/categories/1/feeds",
+            "method": "GET",
+            "sortNum": 60000,
+            "created": "2023-07-31T01:20:12.277Z",
+            "modified": "2023-07-31T01:20:12.277Z",
+            "headers": [],
+            "params": [],
+            "tests": []
+        },
+        {
+            "_id": "a5c2cb48-a4cf-4edc-a0e0-927d9f711843",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Feed",
+            "url": "/v1/feeds/{feedID}",
+            "method": "GET",
+            "sortNum": 70000,
+            "created": "2023-07-31T01:20:12.279Z",
+            "modified": "2023-07-31T01:31:11.478Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "feedID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "fb55b058-c2ba-4785-be92-a98f0596e86e",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Feed Icon ",
+            "url": "/v1/feeds/{feedID}/icon",
+            "method": "GET",
+            "sortNum": 80000,
+            "created": "2023-07-31T01:20:12.280Z",
+            "modified": "2023-07-31T01:31:18.174Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "feedID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "c0ec9a45-263e-4627-a13b-b5df901a6456",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Create Feed ",
+            "url": "/v1/feeds",
+            "method": "POST",
+            "sortNum": 90000,
+            "created": "2023-07-31T01:20:12.281Z",
+            "modified": "2023-07-31T01:31:31.415Z",
+            "headers": [],
+            "params": [],
+            "body": {
+                "type": "json",
+                "raw": "{\n    \"feed_url\": \"https://miniflux.app/feed.xml\",\n    \"category_id\": 1\n}",
+                "form": []
+            },
+            "tests": []
+        },
+        {
+            "_id": "f4c078a2-c031-4753-a7a4-4987439a61d0",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Update Feed",
+            "url": "/v1/feeds/{feedID}",
+            "method": "PUT",
+            "sortNum": 100000,
+            "created": "2023-07-31T01:20:12.282Z",
+            "modified": "2023-07-31T01:31:48.115Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "feedID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "body": {
+                "type": "json",
+                "raw": "{\n    \"title\": \"Updated - New Feed Title\",\n    \"category_id\": 1\n}",
+                "form": []
+            },
+            "tests": []
+        },
+        {
+            "_id": "1e47aeab-09ce-439b-907f-f9347b98b160",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Refresh Feed",
+            "url": "/v1/feeds/{feedID}/refresh",
+            "method": "PUT",
+            "sortNum": 110000,
+            "created": "2023-07-31T01:20:12.283Z",
+            "modified": "2023-07-31T01:31:58.778Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "feedID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "4f643fa6-042d-4e95-8194-4cb0af7102bf",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Refresh All Feeds",
+            "url": "/v1/feeds/refresh",
+            "method": "PUT",
+            "sortNum": 115000,
+            "created": "2023-07-31T01:20:12.312Z",
+            "modified": "2023-07-31T01:20:12.312Z",
+            "headers": [],
+            "params": [],
+            "tests": []
+        },
+        {
+            "_id": "d829f651-e9b9-41f9-aa9e-bd830d5e6389",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Remove Feed",
+            "url": "/v1/feeds/{feedID}",
+            "method": "DELETE",
+            "sortNum": 120000,
+            "created": "2023-07-31T01:20:12.284Z",
+            "modified": "2023-07-31T01:32:16.723Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "feedID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "deafbf1a-d9e0-420f-a749-1bdde56772cb",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Feed Entries",
+            "url": "/v1/feeds/{feedID}/entries",
+            "method": "GET",
+            "sortNum": 130000,
+            "created": "2023-07-31T01:20:12.285Z",
+            "modified": "2023-07-31T01:32:52.812Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "feedID",
+                    "value": "2",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "0052e903-75fc-48ec-8fd5-6e8784ed401a",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Entry",
+            "url": "/v1/entries/{entryID}",
+            "method": "GET",
+            "sortNum": 140000,
+            "created": "2023-07-31T01:20:12.286Z",
+            "modified": "2023-07-31T01:33:30.417Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "entryID",
+                    "value": "19",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "1a055ace-2629-4298-9ea0-1bd17d59a4d6",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Fetch original article",
+            "url": "/v1/entries/{entryID}/fetch-content",
+            "method": "GET",
+            "sortNum": 150000,
+            "created": "2023-07-31T01:20:12.287Z",
+            "modified": "2023-07-31T01:33:41.014Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "entryID",
+                    "value": "19",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "f272d1e6-ebbb-4c58-a159-4412ad657136",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Category Entries",
+            "url": "/v1/categories/{categoryID}/entries",
+            "method": "GET",
+            "sortNum": 160000,
+            "created": "2023-07-31T01:20:12.288Z",
+            "modified": "2023-07-31T01:20:12.288Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "categoryID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "856ed091-318a-4a76-b7ce-6475106dd6b5",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Mark All Feed Entries as Read",
+            "url": "/v1/feeds/{feedID}/mark-all-as-read",
+            "method": "PUT",
+            "sortNum": 180000,
+            "created": "2023-07-31T01:20:12.290Z",
+            "modified": "2023-07-31T01:46:57.443Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "feedID",
+                    "value": "2",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "67749962-d646-45d5-8b78-a8eeaa7cb971",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Entries",
+            "url": "/v1/entries",
+            "method": "GET",
+            "sortNum": 190000,
+            "created": "2023-07-31T01:20:12.291Z",
+            "modified": "2023-07-31T01:20:12.291Z",
+            "headers": [],
+            "params": [],
+            "tests": []
+        },
+        {
+            "_id": "b55ae165-2abe-41f0-8b8a-14d826238d20",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Change Entries Status",
+            "url": "/v1/entries",
+            "method": "PUT",
+            "sortNum": 200000,
+            "created": "2023-07-31T01:20:12.292Z",
+            "modified": "2023-07-31T01:46:46.133Z",
+            "headers": [],
+            "params": [],
+            "body": {
+                "type": "json",
+                "raw": "{\n    \"entry_ids\": [19, 20],\n    \"status\": \"read\"\n}",
+                "form": []
+            },
+            "tests": []
+        },
+        {
+            "_id": "710dfc55-fc4e-48ab-989e-3ed78019d6c3",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Toggle Entry Bookmark",
+            "url": "/v1/entries/{entryID}/bookmark",
+            "method": "PUT",
+            "sortNum": 210000,
+            "created": "2023-07-31T01:20:12.293Z",
+            "modified": "2023-07-31T01:45:51.933Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "entryID",
+                    "value": "19",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "19edbe55-0a0a-4102-bde0-73ed6d8515f6",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Save Entry to Third-Party Service",
+            "url": "/v1/entries/{entryID}/save",
+            "method": "POST",
+            "sortNum": 215000,
+            "created": "2023-07-31T01:20:12.313Z",
+            "modified": "2023-07-31T01:20:12.313Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "entryID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "13d2cf52-aa08-4f7f-a83d-ffcb1e1190cd",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Categories",
+            "url": "/v1/categories",
+            "method": "GET",
+            "sortNum": 220000,
+            "created": "2023-07-31T01:20:12.294Z",
+            "modified": "2023-07-31T01:20:12.294Z",
+            "headers": [],
+            "params": [],
+            "tests": []
+        },
+        {
+            "_id": "1547dabe-2bcb-4e06-acaa-fb393d1027e2",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Create Category ",
+            "url": "/v1/categories",
+            "method": "POST",
+            "sortNum": 230000,
+            "created": "2023-07-31T01:20:12.295Z",
+            "modified": "2023-07-31T01:20:12.295Z",
+            "headers": [],
+            "params": [],
+            "body": {
+                "type": "json",
+                "raw": "{\n    \"title\": \"My category\"\n}",
+                "form": []
+            },
+            "tests": []
+        },
+        {
+            "_id": "e8dac503-19dc-434d-832f-eac4364785d8",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Update Category",
+            "url": "/v1/categories/{categoryID}",
+            "method": "PUT",
+            "sortNum": 232500,
+            "created": "2023-07-31T01:20:12.296Z",
+            "modified": "2023-07-31T01:42:55.831Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "categoryID",
+                    "value": "3",
+                    "isPath": true
+                }
+            ],
+            "body": {
+                "type": "json",
+                "raw": "\n{\n    \"title\": \"My new title\"\n}",
+                "form": []
+            },
+            "tests": []
+        },
+        {
+            "_id": "86d74247-7f12-4a6e-91b3-fad9e7b6b1fb",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Delete Category",
+            "url": "/v1/categories/{categoryID}",
+            "method": "DELETE",
+            "sortNum": 235000,
+            "created": "2023-07-31T01:20:12.298Z",
+            "modified": "2023-07-31T01:44:21.486Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "categoryID",
+                    "value": "3",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "668dde80-ed03-4fa6-ad2a-9cacd0ec31eb",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Mark Category Entries as Read",
+            "url": "/v1/categories/{categoryID}/mark-all-as-read",
+            "method": "PUT",
+            "sortNum": 237500,
+            "created": "2023-07-31T01:20:12.299Z",
+            "modified": "2023-07-31T01:43:50.637Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "categoryID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "39ada469-765e-4584-ab00-9d263bd526a1",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Category Feeds",
+            "url": "/v1/categories/{categoryID}/feeds",
+            "method": "GET",
+            "sortNum": 243750,
+            "created": "2023-07-31T01:50:23.959Z",
+            "modified": "2023-07-31T01:50:51.443Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "categoryID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "ec389c41-185f-4b57-a373-c6ff952b4282",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Refresh Category Feeds",
+            "url": "/v1/categories/{categoryID}/refresh",
+            "method": "PUT",
+            "sortNum": 250000,
+            "created": "2023-07-31T01:20:12.297Z",
+            "modified": "2023-07-31T01:43:23.102Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "categoryID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "bc4a7578-c95e-4436-bbfa-61ccc4a8fc71",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Category Entries",
+            "url": "/v1/categories/{categoryID}/entries",
+            "method": "GET",
+            "sortNum": 257500,
+            "created": "2023-07-31T01:51:15.403Z",
+            "modified": "2023-07-31T01:51:35.106Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "categoryID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "fa935fb3-3ed6-4ee3-b995-6c054766d109",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Category Entry",
+            "url": "/v1/categories/{categoryID}/entries/{entryID}",
+            "method": "GET",
+            "sortNum": 258750,
+            "created": "2023-07-31T01:51:46.699Z",
+            "modified": "2023-07-31T01:52:12.155Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "categoryID",
+                    "value": "1",
+                    "isPath": true
+                },
+                {
+                    "name": "entryID",
+                    "value": "19",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "cb6968e9-8d13-4410-9ad5-85847b73d7eb",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "OPML Export",
+            "url": "/v1/export",
+            "method": "GET",
+            "sortNum": 280000,
+            "created": "2023-07-31T01:20:12.300Z",
+            "modified": "2023-07-31T01:20:12.300Z",
+            "headers": [],
+            "params": [],
+            "tests": []
+        },
+        {
+            "_id": "169a64e1-08dd-4760-b405-a748a5286b38",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "OPML Import",
+            "url": "/v1/import",
+            "method": "POST",
+            "sortNum": 290000,
+            "created": "2023-07-31T01:20:12.301Z",
+            "modified": "2023-07-31T01:41:31.218Z",
+            "headers": [],
+            "params": [],
+            "body": {
+                "type": "xml",
+                "raw": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<opml version=\"2.0\">\n    <head>\n        <title>Miniflux</title>\n        <dateCreated>Sun, 30 Jul 2023 18:41:08 PDT</dateCreated>\n    </head>\n    <body>\n        <outline text=\"All\">\n            <outline title=\"Miniflux\" text=\"Miniflux\" xmlUrl=\"https://miniflux.app/feed.xml\" htmlUrl=\"https://miniflux.app\"></outline>\n        </outline>\n    </body>\n</opml>",
+                "form": []
+            },
+            "tests": []
+        },
+        {
+            "_id": "bfb7264a-7b46-49fe-b451-fb6d9b03f0b2",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Create User",
+            "url": "/v1/users",
+            "method": "POST",
+            "sortNum": 300000,
+            "created": "2023-07-31T01:20:12.302Z",
+            "modified": "2023-07-31T01:20:12.302Z",
+            "headers": [],
+            "params": [],
+            "body": {
+                "type": "json",
+                "raw": "{\n    \"username\": \"bob\",\n    \"password\": \"test123\",\n    \"is_admin\": false\n}",
+                "form": []
+            },
+            "tests": []
+        },
+        {
+            "_id": "93c1dcc2-bf09-4e8e-86ba-0c042147a48f",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Update User",
+            "url": "/v1/users/{userID}",
+            "method": "PUT",
+            "sortNum": 310000,
+            "created": "2023-07-31T01:20:12.303Z",
+            "modified": "2023-07-31T01:40:09.576Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "userID",
+                    "value": "2",
+                    "isPath": true
+                }
+            ],
+            "body": {
+                "type": "json",
+                "raw": "{\n    \"username\": \"joe\"\n}",
+                "form": []
+            },
+            "tests": []
+        },
+        {
+            "_id": "19cf34c1-eb0a-4442-a682-2e94c4f5e594",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Current User",
+            "url": "/v1/me",
+            "method": "GET",
+            "sortNum": 320000,
+            "created": "2023-07-31T01:20:12.304Z",
+            "modified": "2023-07-31T01:20:12.304Z",
+            "headers": [],
+            "params": [],
+            "tests": []
+        },
+        {
+            "_id": "4a700f7c-8762-4cab-aab1-2d8066884d69",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get User by ID",
+            "url": "/v1/users/{userID}",
+            "method": "GET",
+            "sortNum": 330000,
+            "created": "2023-07-31T01:20:12.305Z",
+            "modified": "2023-07-31T01:39:38.472Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "userID",
+                    "value": "1",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "66cb0985-5ed4-4b1e-9029-8605b7f5f74e",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get User by username",
+            "url": "/v1/users/{username}",
+            "method": "GET",
+            "sortNum": 335000,
+            "created": "2023-07-31T01:47:53.649Z",
+            "modified": "2023-07-31T01:48:10.655Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "username",
+                    "value": "admin",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "3d4b227a-83a2-4d87-a0ed-ce9d5497aea6",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Get Users",
+            "url": "/v1/users",
+            "method": "GET",
+            "sortNum": 340000,
+            "created": "2023-07-31T01:20:12.306Z",
+            "modified": "2023-07-31T01:20:12.306Z",
+            "headers": [],
+            "params": [],
+            "tests": []
+        },
+        {
+            "_id": "90138dea-799a-4b44-ad68-fce6ec5898a6",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Delete User",
+            "url": "/v1/users/{userID}",
+            "method": "DELETE",
+            "sortNum": 350000,
+            "created": "2023-07-31T01:20:12.307Z",
+            "modified": "2023-07-31T01:40:38.124Z",
+            "headers": [],
+            "params": [
+                {
+                    "name": "userID",
+                    "value": "2",
+                    "isPath": true
+                }
+            ],
+            "tests": []
+        },
+        {
+            "_id": "4b3bf7ca-bc55-423b-a3ee-6279c10a0d85",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Fetch Read/Unread Counters",
+            "url": "/v1/feeds/counters",
+            "method": "GET",
+            "sortNum": 370000,
+            "created": "2023-07-31T01:20:12.309Z",
+            "modified": "2023-07-31T01:20:12.309Z",
+            "headers": [],
+            "params": [],
+            "tests": []
+        },
+        {
+            "_id": "7721682f-31e3-4d71-8df9-02e30e4729d7",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Healthcheck",
+            "url": "/healthcheck",
+            "method": "GET",
+            "sortNum": 380000,
+            "created": "2023-07-31T01:20:12.310Z",
+            "modified": "2023-07-31T01:20:12.310Z",
+            "headers": [],
+            "params": [],
+            "tests": []
+        },
+        {
+            "_id": "64410254-b17a-43e4-984d-10b9b13c5818",
+            "colId": "fc35618a-f39f-40a0-a443-d4ae568baa8e",
+            "containerId": "",
+            "name": "Version",
+            "url": "/version",
+            "method": "GET",
+            "sortNum": 390000,
+            "created": "2023-07-31T01:20:12.311Z",
+            "modified": "2023-07-31T01:20:12.311Z",
+            "headers": [],
+            "params": [],
+            "tests": []
+        }
+    ],
+    "settings": {
+        "auth": {
+            "type": "basic",
+            "basic": {
+                "username": "admin",
+                "password": "test123"
+            }
+        },
+        "options": {
+            "baseUrl": "http://localhost:8080"
+        }
+    }
+}

crypto/crypto.go

@@ -1,44 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package crypto // import "miniflux.app/crypto"
-
-import (
-	"crypto/rand"
-	"crypto/sha256"
-	"encoding/base64"
-	"encoding/hex"
-	"fmt"
-)
-
-// HashFromBytes returns a SHA-256 checksum of the input.
-func HashFromBytes(value []byte) string {
-	sum := sha256.Sum256(value)
-	return fmt.Sprintf("%x", sum)
-}
-
-// Hash returns a SHA-256 checksum of a string.
-func Hash(value string) string {
-	return HashFromBytes([]byte(value))
-}
-
-// GenerateRandomBytes returns random bytes.
-func GenerateRandomBytes(size int) []byte {
-	b := make([]byte, size)
-	if _, err := rand.Read(b); err != nil {
-		panic(err)
-	}
-
-	return b
-}
-
-// GenerateRandomString returns a random string.
-func GenerateRandomString(size int) string {
-	return base64.URLEncoding.EncodeToString(GenerateRandomBytes(size))
-}
-
-// GenerateRandomStringHex returns a random hexadecimal string.
-func GenerateRandomStringHex(size int) string {
-	return hex.EncodeToString(GenerateRandomBytes(size))
-}

crypto/doc.go

@@ -1,10 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-/*
-
-Package crypto implements helpers related to cryptography.
-
-*/
-package crypto // import "miniflux.app/crypto"

database/migrations.go

@@ -1,499 +0,0 @@
-// Copyright 2020 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package database // import "miniflux.app/database"
-
-import (
-	"database/sql"
-)
-
-var schemaVersion = len(migrations)
-
-var migrations = []func(tx *sql.Tx) error{
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			CREATE TABLE schema_version (
-				version text not null
-			);
-			
-			CREATE TABLE users (
-				id serial not null,
-				username text not null unique,
-				password text,
-				is_admin bool default 'f',
-				language text default 'en_US',
-				timezone text default 'UTC',
-				theme text default 'default',
-				last_login_at timestamp with time zone,
-				primary key (id)
-			);
-			
-			CREATE TABLE sessions (
-				id serial not null,
-				user_id int not null,
-				token text not null unique,
-				created_at timestamp with time zone default now(),
-				user_agent text,
-				ip text,
-				primary key (id),
-				unique (user_id, token),
-				foreign key (user_id) references users(id) on delete cascade
-			);
-			
-			CREATE TABLE categories (
-				id serial not null,
-				user_id int not null,
-				title text not null,
-				primary key (id),
-				unique (user_id, title),
-				foreign key (user_id) references users(id) on delete cascade
-			);
-			
-			CREATE TABLE feeds (
-				id bigserial not null,
-				user_id int not null,
-				category_id int not null,
-				title text not null,
-				feed_url text not null,
-				site_url text not null,
-				checked_at timestamp with time zone default now(),
-				etag_header text default '',
-				last_modified_header text default '',
-				parsing_error_msg text default '',
-				parsing_error_count int default 0,
-				primary key (id),
-				unique (user_id, feed_url),
-				foreign key (user_id) references users(id) on delete cascade,
-				foreign key (category_id) references categories(id) on delete cascade
-			);
-			
-			CREATE TYPE entry_status as enum('unread', 'read', 'removed');
-			
-			CREATE TABLE entries (
-				id bigserial not null,
-				user_id int not null,
-				feed_id bigint not null,
-				hash text not null,
-				published_at timestamp with time zone not null,
-				title text not null,
-				url text not null,
-				author text,
-				content text,
-				status entry_status default 'unread',
-				primary key (id),
-				unique (feed_id, hash),
-				foreign key (user_id) references users(id) on delete cascade,
-				foreign key (feed_id) references feeds(id) on delete cascade
-			);
-			
-			CREATE INDEX entries_feed_idx on entries using btree(feed_id);
-			
-			CREATE TABLE enclosures (
-				id bigserial not null,
-				user_id int not null,
-				entry_id bigint not null,
-				url text not null,
-				size int default 0,
-				mime_type text default '',
-				primary key (id),
-				foreign key (user_id) references users(id) on delete cascade,
-				foreign key (entry_id) references entries(id) on delete cascade
-			);
-			
-			CREATE TABLE icons (
-				id bigserial not null,
-				hash text not null unique,
-				mime_type text not null,
-				content bytea not null,
-				primary key (id)
-			);
-			
-			CREATE TABLE feed_icons (
-				feed_id bigint not null,
-				icon_id bigint not null,
-				primary key(feed_id, icon_id),
-				foreign key (feed_id) references feeds(id) on delete cascade,
-				foreign key (icon_id) references icons(id) on delete cascade
-			);		
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			CREATE EXTENSION IF NOT EXISTS hstore;
-			ALTER TABLE users ADD COLUMN extra hstore;
-			CREATE INDEX users_extra_idx ON users using gin(extra);
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			CREATE TABLE tokens (
-				id text not null,
-				value text not null,
-				created_at timestamp with time zone not null default now(),
-				primary key(id, value)
-			);
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			CREATE TYPE entry_sorting_direction AS enum('asc', 'desc');
-			ALTER TABLE users ADD COLUMN entry_direction entry_sorting_direction default 'asc';
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			CREATE TABLE integrations (
-				user_id int not null,
-				pinboard_enabled bool default 'f',
-				pinboard_token text default '',
-				pinboard_tags text default 'miniflux',
-				pinboard_mark_as_unread bool default 'f',
-				instapaper_enabled bool default 'f',
-				instapaper_username text default '',
-				instapaper_password text default '',
-				fever_enabled bool default 'f',
-				fever_username text default '',
-				fever_password text default '',
-				fever_token text default '',
-				primary key(user_id)
-			);
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE feeds ADD COLUMN scraper_rules text default ''`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE feeds ADD COLUMN rewrite_rules text default ''`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE feeds ADD COLUMN crawler boolean default 'f'`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE sessions rename to user_sessions`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			DROP TABLE tokens;
-
-			CREATE TABLE sessions (
-				id text not null,
-				data jsonb not null,
-				created_at timestamp with time zone not null default now(),
-				primary key(id)
-			);
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE integrations ADD COLUMN wallabag_enabled bool default 'f';
-			ALTER TABLE integrations ADD COLUMN wallabag_url text default '';
-			ALTER TABLE integrations ADD COLUMN wallabag_client_id text default '';
-			ALTER TABLE integrations ADD COLUMN wallabag_client_secret text default '';
-			ALTER TABLE integrations ADD COLUMN wallabag_username text default '';
-			ALTER TABLE integrations ADD COLUMN wallabag_password text default '';
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE entries ADD COLUMN starred bool default 'f'`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			CREATE INDEX entries_user_status_idx ON entries(user_id, status);
-			CREATE INDEX feeds_user_category_idx ON feeds(user_id, category_id);
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE integrations ADD COLUMN nunux_keeper_enabled bool default 'f';
-			ALTER TABLE integrations ADD COLUMN nunux_keeper_url text default '';
-			ALTER TABLE integrations ADD COLUMN nunux_keeper_api_key text default '';
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE enclosures ALTER COLUMN size SET DATA TYPE bigint`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE entries ADD COLUMN comments_url text default ''`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE integrations ADD COLUMN pocket_enabled bool default 'f';
-			ALTER TABLE integrations ADD COLUMN pocket_access_token text default '';
-			ALTER TABLE integrations ADD COLUMN pocket_consumer_key text default '';
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE user_sessions ALTER COLUMN ip SET DATA TYPE inet using ip::inet;
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE feeds ADD COLUMN username text default '';
-			ALTER TABLE feeds ADD COLUMN password text default '';
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE entries ADD COLUMN document_vectors tsvector;
-			UPDATE entries SET document_vectors = to_tsvector(substring(title || ' ' || coalesce(content, '') for 1000000));
-			CREATE INDEX document_vectors_idx ON entries USING gin(document_vectors);
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE feeds ADD COLUMN user_agent text default ''`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			UPDATE
-				entries
-			SET
-				document_vectors = setweight(to_tsvector(substring(coalesce(title, '') for 1000000)), 'A') || setweight(to_tsvector(substring(coalesce(content, '') for 1000000)), 'B')
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE users ADD COLUMN keyboard_shortcuts boolean default 't'`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE feeds ADD COLUMN disabled boolean default 'f';`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE users ALTER COLUMN theme SET DEFAULT 'light_serif';
-			UPDATE users SET theme='light_serif' WHERE theme='default';
-			UPDATE users SET theme='light_sans_serif' WHERE theme='sansserif';
-			UPDATE users SET theme='dark_serif' WHERE theme='black';
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE entries ADD COLUMN changed_at timestamp with time zone;
-			UPDATE entries SET changed_at = published_at;
-			ALTER TABLE entries ALTER COLUMN changed_at SET not null;
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			CREATE TABLE api_keys (
-				id serial not null,
-				user_id int not null references users(id) on delete cascade,
-				token text not null unique,
-				description text not null,
-				last_used_at timestamp with time zone,
-				created_at timestamp with time zone default now(),
-				primary key(id),
-				unique (user_id, description)
-			);
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE entries ADD COLUMN share_code text not null default '';
-			CREATE UNIQUE INDEX entries_share_code_idx ON entries USING btree(share_code) WHERE share_code <> '';
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `CREATE INDEX enclosures_user_entry_url_idx ON enclosures(user_id, entry_id, md5(url))`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE feeds ADD COLUMN next_check_at timestamp with time zone default now();
-			CREATE INDEX entries_user_feed_idx ON entries (user_id, feed_id);
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE feeds ADD COLUMN ignore_http_cache bool default false`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE users ADD COLUMN entries_per_page int default 100`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE users ADD COLUMN show_reading_time boolean default 't'`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `CREATE INDEX entries_id_user_status_idx ON entries USING btree (id, user_id, status)`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE feeds ADD COLUMN fetch_via_proxy bool default false`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `CREATE INDEX entries_feed_id_status_hash_idx ON entries USING btree (feed_id, status, hash)`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `CREATE INDEX entries_user_id_status_starred_idx ON entries (user_id, status, starred)`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE users ADD COLUMN entry_swipe boolean default 't'`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE integrations DROP COLUMN fever_password`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE feeds 
-				ADD COLUMN blocklist_rules text not null default '',
-				ADD COLUMN keeplist_rules text not null default ''
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `ALTER TABLE entries ADD COLUMN reading_time int not null default 0`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		sql := `
-			ALTER TABLE entries ADD COLUMN created_at timestamp with time zone not null default now();
-			UPDATE entries SET created_at = published_at;
-		`
-		_, err = tx.Exec(sql)
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		_, err = tx.Exec(`
-			ALTER TABLE users
-				ADD column stylesheet text not null default '',
-				ADD column google_id text not null default '',
-				ADD column openid_connect_id text not null default ''
-		`)
-		if err != nil {
-			return err
-		}
-
-		_, err = tx.Exec(`
-			DECLARE my_cursor CURSOR FOR
-			SELECT
-				id,
-				COALESCE(extra->'custom_css', '') as custom_css,
-				COALESCE(extra->'google_id', '') as google_id,
-				COALESCE(extra->'oidc_id', '') as oidc_id
-			FROM users
-			FOR UPDATE
-		`)
-		if err != nil {
-			return err
-		}
-		defer tx.Exec("CLOSE my_cursor")
-
-		for {
-			var (
-				userID           int64
-				customStylesheet string
-				googleID         string
-				oidcID           string
-			)
-
-			if err := tx.QueryRow(`FETCH NEXT FROM my_cursor`).Scan(&userID, &customStylesheet, &googleID, &oidcID); err != nil {
-				if err == sql.ErrNoRows {
-					break
-				}
-				return err
-			}
-
-			_, err := tx.Exec(
-				`UPDATE
-					users
-				SET
-					stylesheet=$2,
-					google_id=$3,
-					openid_connect_id=$4
-				WHERE
-					id=$1
-				`,
-				userID, customStylesheet, googleID, oidcID)
-			if err != nil {
-				return err
-			}
-		}
-
-		return err
-	},
-	func(tx *sql.Tx) (err error) {
-		_, err = tx.Exec(`
-			ALTER TABLE users DROP COLUMN extra;
-			CREATE UNIQUE INDEX users_google_id_idx ON users(google_id) WHERE google_id <> '';
-			CREATE UNIQUE INDEX users_openid_connect_id_idx ON users(openid_connect_id) WHERE openid_connect_id <> '';
-		`)
-		return err
-	},
-}

doc.go

@@ -1,10 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-/*
-
-Miniflux is a feed reader application.
-
-*/
-package main // import "miniflux.app"

errors/doc.go

@@ -1,10 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-/*
-
-Package errors handles localized errors.
-
-*/
-package errors // import "miniflux.app/errors"