docs(man): improve miniflux.1 consistency and fix typos

The `output` parameter seems to be optional and Miniflux will always
returns a JSON response. This change makes Miniflux more consistent with
other open source RSS readers.

.devcontainer/devcontainer.json

@@ -0,0 +1,33 @@
+{
+  "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": {
+      "moby": false
+    }
+  },
+  "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,30 @@
+services:
+  app:
+    image: mcr.microsoft.com/devcontainers/go:1-trixie # https://www.debian.org/releases/trixie/index.en.html
+    volumes:
+      - ..:/workspace:cached
+    command: sleep infinity
+    network_mode: service:db
+    environment:
+      - CREATE_ADMIN=1
+      - ADMIN_USERNAME=admin
+      - ADMIN_PASSWORD=test123
+  db:
+    image: postgres:latest
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql
+    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.yml

@@ -0,0 +1,105 @@
+name: "Bug Report"
+description: "Report a bug or unexpected behavior"
+title: "[Bug]: "
+type: "Bug"
+labels: ["triage needed"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting a bug! Please provide detailed information to help us reproduce and fix the issue.
+
+  - type: input
+    id: summary
+    attributes:
+      label: "Bug Summary"
+      description: "Briefly describe the bug."
+      placeholder: "e.g., Error when saving a new entry"
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: "Description"
+      description: "A clear and concise description of the bug."
+      placeholder: "e.g., When I click 'Save', I get a 500 error."
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps_to_reproduce
+    attributes:
+      label: "Steps to Reproduce"
+      description: "Steps to reproduce the behavior."
+      placeholder: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Scroll down to '...'
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected_behavior
+    attributes:
+      label: "Expected Behavior"
+      description: "What should happen instead?"
+      placeholder: "e.g., The form should be saved successfully."
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual_behavior
+    attributes:
+      label: "Actual Behavior"
+      description: "What actually happens?"
+      placeholder: "e.g., A 500 error is returned with no useful error message."
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: "Version"
+      description: "Which version of Miniflux are you using?"
+      placeholder: "e.g., 2.2.6"
+    validations:
+      required: true
+
+  - type: input
+    id: browser
+    attributes:
+      label: "Browser"
+      description: "If applicable, which browser are you using? Please provide the version."
+      placeholder: "e.g., Chrome, Firefox, Safari"
+    validations:
+      required: false
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: "Relevant Logs or Error Output"
+      description: "Paste any relevant logs or error messages (if applicable)."
+      render: shell
+      placeholder: "e.g., Stack trace, log files, browser console logs, or console output"
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: "Additional Context"
+      description: "Add any other context about the problem here."
+      placeholder: "e.g., Screenshots, video recordings, or related issues"
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: agreement
+    attributes:
+      label: "Checklist"
+      description: "Please confirm the following:"
+      options:
+        - label: "I have searched existing issues to ensure this bug hasn't been reported before."
+          required: true

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/documentation.yml

@@ -0,0 +1,81 @@
+name: "Documentation Issue"
+description: "Report issues or suggest improvements for the documentation"
+title: "[Docs]: "
+type: "Documentation"
+labels: ["triage needed"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for helping improve the Miniflux documentation! Clear and accurate documentation helps everyone.
+
+  - type: dropdown
+    id: issue_type
+    attributes:
+      label: "Documentation Issue Type"
+      description: "What kind of documentation issue are you reporting?"
+      options:
+        - "Missing Information"
+        - "Incorrect Information"
+        - "Outdated Information"
+        - "Unclear Explanation"
+        - "Formatting/Structural Issue"
+        - "Typo/Grammar Error"
+        - "Documentation Request"
+        - "Other"
+    validations:
+      required: true
+
+  - type: input
+    id: summary
+    attributes:
+      label: "Summary"
+      description: "Briefly describe the documentation issue."
+      placeholder: "e.g., The API authentication section is outdated"
+    validations:
+      required: true
+
+  - type: input
+    id: location
+    attributes:
+      label: "Location"
+      description: "Where is the documentation you're referring to? Provide URLs, file paths, or section names."
+      placeholder: "e.g., README.md, docs/api.md, Installation section of the website"
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: "Detailed Description"
+      description: "Provide a detailed description of the issue or improvement."
+      placeholder: "e.g., The API authentication section doesn't mention the new token-based authentication method introduced in version 2.0.5."
+    validations:
+      required: true
+
+  - type: textarea
+    id: current_content
+    attributes:
+      label: "Current Content (if applicable)"
+      description: "What does the current documentation say?"
+      placeholder: "Paste the current documentation text here."
+    validations:
+      required: false
+
+  - type: textarea
+    id: suggested_content
+    attributes:
+      label: "Suggested Changes"
+      description: "If you have specific suggestions for how to improve the documentation, please provide them here."
+      placeholder: "e.g., Add a new section about token-based authentication with these details..."
+    validations:
+      required: false
+
+  - type: input
+    id: version
+    attributes:
+      label: "Version"
+      description: "Which version of Miniflux does this documentation issue relate to?"
+      placeholder: "e.g., 2.2.6, or 'all versions'"
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,67 @@
+name: "Feature Request"
+description: "Suggest an idea or improvement for the project"
+title: "[Feature]: "
+type: "Feature"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to suggest a feature! Please provide detailed information to help us understand and evaluate your idea.
+
+  - type: input
+    id: summary
+    attributes:
+      label: "Feature Summary"
+      description: "Briefly describe the feature or enhancement."
+      placeholder: "e.g., Add dark mode support"
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: "What problem does this feature solve?"
+      description: "Explain the problem or limitation this feature would address."
+      placeholder: "e.g., It's difficult to use the app in low-light environments."
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: "Proposed Solution"
+      description: "Describe how you think this feature should work."
+      placeholder: "e.g., Add a toggle in settings to switch between light and dark mode."
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: "Alternatives Considered"
+      description: "Have you considered other solutions or workarounds?"
+      placeholder: "e.g., Using browser extensions to force dark mode."
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: "Additional Context"
+      description: "Add any other context, screenshots, or examples to explain your request."
+      placeholder: "e.g., A screenshot of a similar feature in another project."
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: agreement
+    attributes:
+      label: "Checklist"
+      description: "Please confirm the following:"
+      options:
+        - label: "I have searched existing issues to ensure this feature hasn't been requested before."
+          required: true
+        - label: "I understand that feature requests are not guaranteed to be implemented."
+          required: true
+        - label: "I agree to follow the project's contribution guidelines."
+          required: true

.github/ISSUE_TEMPLATE/feed_issue.yml

@@ -0,0 +1,84 @@
+name: "Feed/Website Issue"
+description: "Report problems with a specific feed or website"
+title: "[Feed Issue]: "
+type: "Feed Issue"
+labels: ["triage needed"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting an issue with a feed or website! Please provide detailed information to help us diagnose and resolve the problem.
+
+  - type: input
+    id: feed_url
+    attributes:
+      label: "Feed URL"
+      description: "Provide the URL of the feed that is not working correctly."
+      placeholder: "e.g., https://example.com/feed.xml"
+    validations:
+      required: true
+
+  - type: input
+    id: website_url
+    attributes:
+      label: "Website URL"
+      description: "Provide the URL of the website."
+      placeholder: "e.g., https://example.com"
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem_description
+    attributes:
+      label: "Problem Description"
+      description: "Describe the issue you are experiencing with this feed."
+      placeholder: |
+        e.g.,
+        - The feed URL returns a 403 error.
+        - The content is malformed.
+        - Images are not loading in the web ui.
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected_behavior
+    attributes:
+      label: "Expected Behavior"
+      description: "Describe what you expect to happen."
+      placeholder: "e.g., The feed should show the images correctly."
+    validations:
+      required: true
+
+  - type: textarea
+    id: error_logs
+    attributes:
+      label: "Relevant Logs or Error Output"
+      description: "Paste any relevant logs or error messages, if available."
+      render: shell
+      placeholder: "e.g., HTTP error codes, invalid XML warnings, etc."
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: "Additional Context"
+      description: "Add any other context, screenshots, or related information to help us troubleshoot."
+      placeholder: "e.g., Is this a recurring problem? Did the feed work before?"
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: troubleshooting
+    attributes:
+      label: "Troubleshooting Steps"
+      description: "Please confirm that you have tried the following:"
+      options:
+        - label: "I have checked if the feed URL is correct and accessible in a web browser."
+          required: true
+        - label: "I have checked if the feed URL is correct and accessible with `curl`."
+          required: true
+        - label: "I have verified that the feed is valid using an RSS/Atom validator."
+          required: false
+        - label: "I have searched for existing issues to avoid duplicates."
+          required: true

.github/ISSUE_TEMPLATE/proposal.yml

@@ -0,0 +1,88 @@
+name: "Proposal / RFC"
+description: "Propose a significant change, or architectural decision"
+title: "[Proposal]: "
+type: "Proposal"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to submit a proposal! Please provide detailed information to ensure a productive discussion.
+
+  - type: input
+    id: summary
+    attributes:
+      label: "Proposal Summary"
+      description: "A brief summary of the proposed change or idea."
+      placeholder: "e.g., Refactor database schema for performance optimization"
+    validations:
+      required: true
+
+  - type: textarea
+    id: motivation
+    attributes:
+      label: "Motivation and Context"
+      description: "Explain the problem this proposal addresses. Why is it necessary? What are the current limitations or pain points?"
+      placeholder: |
+        e.g.,
+        - The current database schema causes performance bottlenecks when querying large datasets.
+        - Adding this feature will improve scalability and reliability for large-scale use cases.
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposed_solution
+    attributes:
+      label: "Proposed Solution"
+      description: "Describe the proposed solution or approach. Include technical details, diagrams, and examples where possible."
+      placeholder: |
+        e.g.,
+        - Redesign the schema to normalize tables and introduce indexing.
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: "Alternatives Considered"
+      description: "List any alternative approaches that were considered and explain why they were rejected."
+      placeholder: |
+        e.g.,
+        - Use Redis for caching, but it adds operational complexity.
+        - Stick with the current schema and optimize queries, but this has limited impact on performance.
+    validations:
+      required: false
+
+  - type: textarea
+    id: impact
+    attributes:
+      label: "Impact and Risks"
+      description: "Describe the potential impact of this change. Highlight possible risks and backward compatibility concerns."
+      placeholder: |
+        e.g.,
+        - May require data migration with downtime.
+        - Could introduce breaking changes in API responses.
+        - Affects core functionality, requiring extensive testing.
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: "Additional Context or References"
+      description: "Add any relevant context, links to related discussions, RFCs, or design documents."
+      placeholder: "e.g., Links to research, GitHub issues, or similar projects"
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: agreement
+    attributes:
+      label: "Checklist"
+      description: "Please confirm the following:"
+      options:
+        - label: "I have reviewed existing proposals to ensure this change hasn't been proposed before."
+          required: true
+        - label: "I agree to provide follow-up updates and maintain discussion on this proposal."
+          required: true
+        - label: "I agree to follow the project's contribution guidelines."
+          required: true

.github/dependabot.yml

@@ -3,17 +3,29 @@ updates:
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
-      interval: "weekly"
-    reviewers:
-      - "fguillot"
-    assignees:
-      - "fguillot"
+      interval: "daily"
 
   - package-ecosystem: "docker"
+    directory: "/packaging/docker/alpine"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/packaging/docker/distroless"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "packaging/debian"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "packaging/rpm"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
-    reviewers:
-      - "fguillot"
-    assignees:
-      - "fguillot"

.github/pull_request_template.md

@@ -0,0 +1,7 @@
+Have you followed these guidelines?
+
+- [ ] I have tested my changes
+- [ ] There are no breaking changes
+- [ ] I have thoroughly tested my changes and verified there are no regressions
+- [ ] My commit messages follow the [Conventional Commits specification](https://www.conventionalcommits.org/)
+- [ ] I have read and understood the [contribution guidelines](https://github.com/miniflux/v2/blob/main/CONTRIBUTING.md)

.github/workflows/build_binaries.yml

@@ -0,0 +1,31 @@
+name: Build Binaries
+permissions:
+  contents: read
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Set up Golang
+        uses: actions/setup-go@v6
+        with:
+          go-version: stable
+          check-latest: true
+      - name: Compile binaries
+        env:
+          CGO_ENABLED: 0
+        run: make build
+      - name: Upload binaries
+        uses: actions/upload-artifact@v6
+        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.14
-      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.11, 1.12, 1.13, 1.14]
-    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.14
-      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/codeberg_mirror.yml

@@ -0,0 +1,25 @@
+name: Mirror to Codeberg
+
+on:
+  push:
+    branches: [ main ]
+  delete:
+  workflow_dispatch:
+
+jobs:
+  mirror:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: Mirror to Codeberg
+        env:
+          CODEBERG_USERNAME: ${{ secrets.CODEBERG_USERNAME }}
+          CODEBERG_TOKEN: ${{ secrets.CODEBERG_TOKEN }}
+        run: |
+          git remote add codeberg https://${{ secrets.CODEBERG_USERNAME }}:${{ secrets.CODEBERG_TOKEN }}@codeberg.org/miniflux/v2.git
+          git push --force --prune codeberg \
+            "refs/heads/*:refs/heads/*" \
+            "refs/tags/*:refs/tags/*"

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,59 @@
+name: "CodeQL"
+
+permissions: read-all
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - '**.js'
+      - '**.go'
+      - '!**_test.go'
+      - '.github/workflows/codeql-analysis.yml'
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+    paths:
+      - '**.js'
+      - '**.go'
+      - '!**_test.go'
+      - '.github/workflows/codeql-analysis.yml'
+  schedule:
+    - cron: '45 22 * * 3'
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    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@v6
+
+    - uses: actions/setup-go@v6
+      if: matrix.language == 'go'
+      with:
+        go-version: stable
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v4
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v4
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v4
+      with:
+        category: "/language:${{ matrix.language }}"

.github/workflows/debian_packages.yml

@@ -0,0 +1,86 @@
+name: Debian Packages
+permissions: read-all
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  schedule:
+    - cron: '0 0 * * 1,4' # Runs at 00:00 UTC on Monday and Thursday
+  pull_request:
+    branches: [ main ]
+    paths:
+      - 'packaging/debian/**' # Only run on changes to the debian packaging files
+jobs:
+  test-packages:
+    if: github.event_name == 'schedule' || github.event_name == 'pull_request'
+    name: Test Packages
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+      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 == 'workflow_dispatch'
+    name: Build Packages Manually
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+      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@v6
+      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@v6
+      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

@@ -0,0 +1,99 @@
+name: Docker
+on:
+  schedule:
+    - cron: '0 1 * * *'
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  pull_request:
+    branches: [ main ]
+    paths:
+      - 'packaging/docker/**'
+jobs:
+  docker-images:
+    name: Docker Images
+    permissions:
+      packages: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - 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@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        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
+        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.GITHUB_TOKEN }}
+
+      - 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/alpine/Dockerfile
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          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,49 @@
+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@v6
+    - 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@v6
+      - uses: actions/setup-go@v6
+        with:
+          go-version: stable
+      - uses: golangci/golangci-lint-action@v9
+      - name: Run gofmt linter
+        run: gofmt -d -e .
+
+  commitlint:
+    if: github.event_name == 'pull_request'
+    name: Commit Linter
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.13'
+      - name: Validate PR commits
+        run: python3 .github/workflows/scripts/commit-checker.py --base ${{ github.event.pull_request.base.sha }} --head ${{ github.event.pull_request.head.sha }}

.github/workflows/rpm_packages.yml

@@ -0,0 +1,60 @@
+name: RPM Packages
+permissions: read-all
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  schedule:
+    - cron: '0 0 * * 1,4' # Runs at 00:00 UTC on Monday and Thursday
+  pull_request:
+    branches: [ main ]
+    paths:
+      - 'packaging/rpm/**' # Only run on changes to the rpm packaging files
+      - '.github/workflows/rpm_packages.yml'
+jobs:
+  test-package:
+    if: github.event_name == 'schedule' || github.event_name == 'pull_request'
+    name: Test Packages
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+      with:
+          fetch-depth: 0
+    - name: Build RPM Package
+      run: make rpm VERSION=2.2.x_dev
+    - name: List generated files
+      run: ls -l *.rpm
+  build-package-manually:
+    if: github.event_name == 'workflow_dispatch'
+    name: Build Packages Manually
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+      with:
+          fetch-depth: 0
+    - name: Build RPM Package
+      run: make rpm
+    - name: Upload package
+      uses: actions/upload-artifact@v6
+      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@v6
+      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/scripts/commit-checker.py

@@ -0,0 +1,83 @@
+import subprocess
+import re
+import sys
+import argparse
+from typing import Match
+
+# Conventional commit pattern (including Git revert messages)
+CONVENTIONAL_COMMIT_PATTERN: str = (
+    r"^((build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\([a-z0-9-]+\))?!?: .{1,100}|Revert .+)"
+)
+
+
+def get_commit_message(commit_hash: str) -> str:
+    """Get the commit message for a given commit hash."""
+    try:
+        result: subprocess.CompletedProcess = subprocess.run(
+            ["git", "show", "-s", "--format=%B", commit_hash],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        return result.stdout.strip()
+    except subprocess.CalledProcessError as e:
+        print(f"Error retrieving commit message: {e}")
+        sys.exit(1)
+
+
+def check_commit_message(message: str, pattern: str = CONVENTIONAL_COMMIT_PATTERN) -> bool:
+    """Check if commit message follows conventional commit format."""
+    first_line: str = message.split("\n")[0]
+    match: Match[str] | None = re.match(pattern, first_line)
+    return bool(match)
+
+
+def check_commit_range(base_ref: str, head_ref: str) -> list[dict[str, str]]:
+    """Check all commits in a range for compliance."""
+    try:
+        result: subprocess.CompletedProcess = subprocess.run(
+            ["git", "log", "--format=%H", f"{base_ref}..{head_ref}"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        commit_hashes: list[str] = result.stdout.strip().split("\n")
+
+        # Filter out empty lines
+        commit_hashes = [hash for hash in commit_hashes if hash]
+
+        non_compliant: list[dict[str, str]] = []
+        for commit_hash in commit_hashes:
+            message: str = get_commit_message(commit_hash)
+            if not check_commit_message(message):
+                non_compliant.append({"hash": commit_hash, "message": message.split("\n")[0]})
+
+        return non_compliant
+    except subprocess.CalledProcessError as e:
+        print(f"Error checking commit range: {e}")
+        sys.exit(1)
+
+
+def main() -> None:
+    parser: argparse.ArgumentParser = argparse.ArgumentParser(description="Check conventional commit compliance")
+    parser.add_argument("--base", required=True, help="Base ref (starting commit, exclusive)")
+    parser.add_argument("--head", required=True, help="Head ref (ending commit, inclusive)")
+    args: argparse.Namespace = parser.parse_args()
+
+    non_compliant: list[dict[str, str]] = check_commit_range(args.base, args.head)
+
+    if non_compliant:
+        print("The following commits do not follow the conventional commit format:")
+        for commit in non_compliant:
+            print(f"- {commit['hash'][:8]}: {commit['message']}")
+        print("\nPlease ensure your commit messages follow the format:")
+        print("type(scope): subject")
+        print("\nWhere type is one of: build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test")
+        sys.exit(1)
+    else:
+        print("All commits follow the conventional commit format!")
+        sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()

.github/workflows/tests.yml

@@ -0,0 +1,58 @@
+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]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+    - name: Set up Go
+      uses: actions/setup-go@v6
+      with:
+        go-version: stable
+    - name: Run unit tests with coverage and race conditions checking
+      if: matrix.os == 'ubuntu-latest'
+      run: make test
+    - name: Run unit tests without coverage and race conditions checking
+      if: matrix.os != 'ubuntu-latest'
+      run: go 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: Checkout
+      uses: actions/checkout@v6
+    - name: Set up Go
+      uses: actions/setup-go@v6
+      with:
+        go-version: stable
+    - name: Install Postgres client
+      run: sudo apt update && sudo apt install -y postgresql-client
+    - name: Run integration tests
+      run: make integration-test
+      env:
+        PGHOST: 127.0.0.1
+        PGPASSWORD: postgres

.gitignore

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

.golangci.yml

@@ -0,0 +1,23 @@
+version: "2"
+linters:
+  default: standard
+  disable:
+    - errcheck
+  enable:
+    - errname
+    - gocritic
+    - goheader
+    - loggercheck
+    - misspell
+    - perfsprint
+    - prealloc
+    - sqlclosecheck
+    - staticcheck
+    - whitespace
+  settings:
+    loggercheck:
+      slog: true
+    goheader:
+      template: |-
+        SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+        SPDX-License-Identifier: Apache-2.0

CONTRIBUTING.md

@@ -0,0 +1,178 @@
+# Contributing to Miniflux
+
+This document outlines how to contribute effectively to Miniflux.
+
+## Philosophy
+
+Miniflux follows a **minimalist philosophy**. The feature set is intentionally kept limited to avoid bloatware. Before contributing, please understand that:
+
+- **Improving existing features takes priority over adding new ones**
+- **Quality over quantity** - well-implemented, focused features are preferred
+- **Simplicity is key** - complex solutions are discouraged in favor of simple, maintainable code
+
+## Before You Start
+
+### Feature Requests
+
+Before implementing a new feature:
+
+- Check if it aligns with Miniflux's philosophy
+- Consider if the feature could be implemented differently to maintain simplicity
+- Remember that developing software takes significant time, and this is a volunteer-driven project
+- If you need a specific feature, the best approach is to contribute it yourself
+
+### Bug Reports
+
+When reporting bugs:
+
+- Search existing issues first to avoid duplicates
+- Provide clear reproduction steps
+- Include relevant system information (OS, browser, Miniflux version)
+- Include error messages, screenshots, and logs when applicable
+
+## Development Setup
+
+### Requirements
+
+- **Git**
+- **Go >= 1.24**
+- **PostgreSQL**
+
+### Getting Started
+
+1. **Fork the repository** on GitHub
+2. **Clone your fork locally:**
+   ```bash
+   git clone https://github.com/YOUR_USERNAME/miniflux.git
+   cd miniflux
+   ```
+
+3. **Build the application binary:**
+   ```bash
+   make miniflux
+   ```
+
+4. **Run locally in debug mode:**
+   ```bash
+   make run
+   ```
+
+### Database Setup
+
+For development and testing, you can run a local PostgreSQL database with Docker:
+
+```bash
+# Start PostgreSQL container
+docker run --rm --name miniflux2-db -p 5432:5432 \
+  -e POSTGRES_DB=miniflux2 \
+  -e POSTGRES_USER=postgres \
+  -e POSTGRES_PASSWORD=postgres \
+  postgres
+```
+
+You can also use an existing PostgreSQL instance. Make sure to set the `DATABASE_URL` environment variable accordingly.
+
+## Development Workflow
+
+### Code Quality
+
+1. **Run the linter:**
+   ```bash
+   make lint
+   ```
+   Requires `staticcheck` and `golangci-lint` to be installed.
+
+2. **Run unit tests:**
+   ```bash
+   make test
+   ```
+
+3. **Run integration tests:**
+   ```bash
+   make integration-test
+   make clean-integration-test
+   ```
+
+### Building
+
+- **Current platform:** `make miniflux`
+- **All platforms:** `make build`
+- **Specific platforms:** `make linux-amd64`, `make darwin-arm64`, etc.
+- **Docker image:** `make docker-image`
+
+### Cross-Platform Support
+
+Miniflux supports multiple architectures. When making changes, ensure compatibility across:
+- Linux (amd64, arm64, armv7, armv6, armv5)
+- macOS (amd64, arm64)
+- FreeBSD, OpenBSD, Windows (amd64)
+
+## Pull Request Guidelines
+
+### What Is Preferred
+
+✅ **Good Pull Requests:**
+
+- Focus on a single issue or feature
+- Include tests for new functionality
+- Maintain or improve performance
+- Follow existing code style and patterns
+- The commit messages follow the [conventional commit format](https://www.conventionalcommits.org/) (e.g., `feat: add new feature`, `fix: resolve bug`)
+- Update documentation when necessary
+
+### What to Avoid
+
+❌ **Pull Requests That Cannot Be Accepted:**
+
+- **Too many changes** - makes review difficult
+- **Breaking changes** - disrupts existing functionality
+- **New bugs or regressions** - reduces software quality
+- **Unnecessary dependencies** - conflicts with minimalist approach
+- **Performance degradation** - slows down the software
+- **Poor-quality code** - hard to maintain
+- **Dependent PRs** - creates review complexity
+- **Radical UI changes** - disrupts user experience
+- **Conflicts with philosophy** - doesn't align with minimalist approach
+
+### Pull Request Template
+
+When creating a pull request, please include:
+
+- **Description:** What does this PR do?
+- **Motivation:** Why is this change needed?
+- **Testing:** How was this tested?
+- **Breaking Changes:** Are there any breaking changes?
+- **Related Issues:** Link to any related issues
+
+## Code Style
+
+- Follow Go conventions and best practices
+- Use `gofmt` to format your Go code, and `jshint` for JavaScript
+- Write clear, descriptive variable and function names
+- Include comments for complex logic
+- Keep functions small and focused
+
+## Testing
+
+### Unit Tests
+- Write unit tests for new functions and methods
+- Ensure tests are fast and don't require external dependencies
+- Aim for good test coverage
+
+### Integration Tests
+- Add integration tests for new API endpoints
+- Tests run against a real PostgreSQL database
+- Ensure tests clean up after themselves
+
+## Communication
+
+- **Discussions:** Use GitHub Discussions for general questions and community interaction
+- **Issues:** Use GitHub issues for bug reports and feature requests
+- **Pull Requests:** Use PR comments for code-specific discussions
+- **Philosophy Questions:** Refer to the FAQ for common questions about project direction
+
+## Questions?
+
+- Check the [FAQ](https://miniflux.app/faq.html) for common questions
+- Review the [development documentation](https://miniflux.app/docs/development.html) and [internationalization guide](https://miniflux.app/docs/i18n.html)
+- Look at existing issues and pull requests for examples

ChangeLog

@@ -1,509 +0,0 @@
-Version 2.0.22 (Jun 19, 2020)
------------------------------
-
-* Remove child-src CSP policy (deprecated)
-* Add /version endpoint
-* Add the ability to use custom css
-* Handle more invalid dates
-* Add CSS styles for textarea
-* Add index to speed up slow query
-* Speed up feed list page rendering
-* Add alternative scheduler based on the number of entries
-* Setup Dependabot on GitHub
-* Update Docker image to Alpine 3.12
-* Add feed option to ignore HTTP cache
-* Fix some Italian and German translations
-* Added scraper rule for RayWenderlich.com, TheOatmeal.com, financialsamurai.com, dilbert.com and turnoff.us
-* Replace link to categories by a link to the list of entries in "Category > Feeds" page
-* Change feed title to a link to the original website
-* Add icons to feeds and categories list
-* Update dependencies and remove vendor folder
-
-Version 2.0.21 (Mar 28, 2020)
------------------------------
-
-* Add SVG icons to entry actions
-* Add support for Invidious
-    - Embed Invidious player for invidio.us feeds
-    - Add new rewrite rule to use Invidious player for Youtube feeds
-* Check during application startup if the database schema is up to date
-* Change default theme for public pages to "System Serif"
-* Add feature to share an article (create a public link of a feed entry)
-* Fix SQL injection in full-text search rank ordering
-* Add generic OpenID Connect provider (OAuth2)
-* Use more secure TLS configuration for autocert server (increase SSL Labs score from B to A+)
-* Add feature to create per-application API Keys
-* Add Go 1.14 to GitHub Actions
-* Add scraper rule for wdwnt.com
-* Add API client function to refresh all feeds
-* Add API endpoint to refresh all feeds
-* Add Auth Proxy authentication
-* Use rel=prev/next on pagination links
-
-Version 2.0.20 (Feb 15, 2020)
------------------------------
-
-* Add Japanese translation
-* History: show entries in the order in which they were read
-* Add button to add to Home screen
-* Ignore enclosures without URL
-* Correct spelling of "toggle"
-* List view: align information to the left side, and the actionable buttons to the right
-* Redirect to /unread when getting a 404 for an unread expired entry
-* Do not advance to the next item when using the 'v' shortcut on the list of starred items
-* Wrap around when navigating with keyboard shortcuts on a list view
-* Remove unused Feed.Entries and Entry.Category from API client
-* Add comments link keyboard shortcut
-* Allow application/xhtml+xml links as comments URL in Atom replies
-* Allow only absolute URLs in comments URL
-* Use internal XML workarounds to detect feed format
-* Make menu consistent across feed pages
-* Make sure external URLs are not encoded incorrectly by Go template engine
-* Make sure whitelisted URI schemes are handled properly by the sanitizer
-* Use white background for favicon (Improve legibility when using a dark theme)
-* Remove dependency on Sed to build Docker images
-* Normalize URL query string before executing HTTP requests
-* Improve Dublin Core support for RDF feeds
-* Improve Podcast support (iTunes and Google Play feeds)
-* Add support for Atom 0.3
-* Add support for Atom "replies" link relation
-* Return outer HTML when scraping elements
-* Update scraper rule for "Le Monde"
-* Filter valid XML characters for UTF-8 XML documents before decoding
-* Trim spaces for RDF entry links
-
-Version 2.0.19 (Dec 1, 2019)
-----------------------------
-
-* Add shortcut "V" to open original link in current tab
-* Add the possibility to add rules during feed creation
-* Wrap attachments into <details> disclosure element
-* Show attachment size on entry page
-* Add support of RSS Media elements (group, description, peer link, and thumbnails)
-* Add rewrite functions: convert_text_link and nl2br
-* Add scraper rule for openingsource.org
-* Add Makefile target to build only amd64 Docker image
-* Make sure to remove integration settings when removing a user
-* Add API parameter to filter entries by category
-* Display list of feeds per category
-* Show the number of read and unread entries for each feed
-* Make sure settings menu is consistent
-* Remove fixed table-layout for entry content
-* Update autocert lib because ACME v1 is EOL
-* Do not lighten blockquote font color
-* Update de_DE translation
-* Send a response when changing status of removed entries in Fever API
-* Add meta tag to disable Google Translate
-* Improve storage module
-* Improve XML decoder to remove illegal characters
-* Compare Fever token case-insensitively
-* Make sure integration tests are marked as failed in Github Actions
-* Add new formats to date parser
-* Add notification message when using keyboard shortcuts: f, s, and m.
-* Avoid keyboard shortcuts to conflict with Firefox’s "Find as you type" feature
-
-Version 2.0.18 (Sep 25, 2019)
------------------------------
-
-* Add Docker image variant for arm32v7
-* Add theme variants
-    - Use CSS variables instead of inherence
-    - Rename default theme to "Light - Serif"
-    - Rename Black theme to "Dark - Serif"
-    - Rename "Sans-Serif" theme to "Light - Sans Serif"
-    - Add "System" theme that use system preferences: Dark or Light
-    - Add Serif and Sans-Serif variants for each color theme
-* Avoid constraint error when having duplicate entries during feed creation
-* Disable strict XML parsing
-* Ignore invalid content type
-* Update man page
-* Replace Travis by GitHub Actions
-* Rename cleanup config variables and deprecate old ones
-    - CLEANUP_FREQUENCY_HOURS instead of CLEANUP_FREQUENCY
-    - CLEANUP_ARCHIVE_READ_DAYS instead of ARCHIVE_READ_DAYS
-* Make configurable the number of days to remove old sessions
-* Add native lazy loading for images and iframes
-* Do not buffer responses in the image proxy
-* Update dependencies
-* Add Go 1.13 to test matrix
-* Replace link border by outline to avoid slight content shift
-* New rewrite function: add_mailto_subject
-* Import OPML from URL
-* Fix HTML injection in addImageTitle
-* Accept HTML entities when parsing XML
-
-Version 2.0.17 (Aug 3, 2019)
-----------------------------
-
-* Update Docker image to Alpine Linux 3.10.1
-* Pass auth header to manifest request (crossorigin attribute)
-* Sort feed categories before serialization
-* Fix syntax errors in man page
-* Add .search margin-right
-* Ask for confirmation before flushing history, marking page as read, and mark all as read
-* Add option to disable feeds
-
-Version 2.0.16 (Jun 8, 2019)
-----------------------------
-
-* Add option to toggle date/time in log messages
-* Add optional config file parser in addition to environment variables
-* Make HTTP Client timeout and max body size configurable
-* Refactor config package:
-    - Parse configuration only once during startup time
-    - Store configuration values in a global variable
-* Flip behavior of j and k keyboard shortcuts
-* Bump Postgresql client library to v1.1.1 to bring in SCRAM-SHA-256 authentication
-* Add option to enable/disable keyboard shortcuts
-* Add missing translation
-* Improve page reload when showing unread/all entries:
-    - Show only unread entries = refresh current page
-    - Show all entries = go to next page
-* Always display feed entries even when there is a feed error
-* Use loading label instead of saving when submitting login form
-* Add OPML v1 support during importation
-* Add 'allow-popups' to iframe sandbox permissions
-
-Version 2.0.15 (Mar 16, 2019)
------------------------------
-
-* Move Dockerfile to main repo
-* Change location of the binary from /usr/local/bin to /usr/bin in Docker image
-* Add double tap detection for next/previous page navigation
-* Allow users to disable auto-remove
-* Make parser compatible with Go 1.12
-* Add Golang 1.12 to CI
-* Use feed ID instead of user ID to check entry URLs presence
-* Fix typo in stylesheet
-* Sort search results by relevance
-* Use preferably the published date for Atom feeds
-* Add Spanish translation
-* Rename session cookies
-* Handle the case when application session is expired and not user session
-
-Version 2.0.14 (Jan 13, 2019)
------------------------------
-
-* Only attempt to change password if the confirmation field is filled in (Firefox)
-* Remove URL from client user agent
-* Make the feed list order case-insensitive
-* Handle XHTML Summary elements for Atom feeds
-* Make UTF-8 the default encoding for XML feeds
-* Add more targets to Makefile
-* Add -mod=vendor in Makefile
-* Move health check endpoint from ui package to httpd service
-* Add workaround for non GMT dates (RFC822, RFC850, and RFC1123)
-* Make sure `<strong>` elements are bold
-* Show scrollbars only when necessary for <pre> elements
-* Add Italian translation
-* Allow to switch between unread only and all entries on category/feed views
-* Add function storage.UpdateFeedError()
-* Add BBC News scraping rule
-* Ignore JSON feeds from EnsureUnicode()
-* Preserve category selection when no feed is found
-* Update XML encoding regex to take single quotes into consideration
-* Send cli errors to stderr
-* Update dependencies
-* Make password prompt compatible with Windows
-* Make configurable the number of days to archive read items
-* Change log level to debug when starting workers
-* Do not show $DATABASE_URL warning when showing application info
-* Move image proxy filter to template functions
-* Update scraper rule for lemonde.fr
-* Refactor manual entry scraper
-* Apply rewriter rules on manual "Fetch Original Content"
-* Add Makefile target for current OS and architecture
-* Improve Makefile
-
-Version 2.0.13 (Nov 25, 2018)
------------------------------
-
-* Add man page
-* Add support for Systemd Socket Activation (experimental)
-* Add the possiblity to listen on Unix sockets
-* Add config options to disable HTTP and scheduler services
-* Archive more read entries in cleanup job
-* Change default database connection string (backward compatible)
-* Improve logging messages in ui package
-* Improve overall Simplified Chinese translations
-* Improve time since post date displays:
-    - "15 days" now is "15 days" rather than "3 weeks" ago
-    - "32 days" is now "1 month" rather than "2 months" ago
-    - "366 days" is now "1 year" rather than "2 years" ago
-* Allow the scraper to parse XHTML documents
-* Remove charset=utf-8 from JSON responses
-* Ignore hotkeys containing Control, Alt or Meta keys
-* Handle more encoding conversion edge cases
-* Disable go test caching
-* Avoid duplication of ldflags in Makefile
-* Fix wrong translation key for category pages
-* Code refactoring:
-    - Simplify application HTTP middlewares
-    - Replace daemon and scheduler package with service package
-    - Move UI middlewares and routes to ui package
-    - Move API middleware and routes to api package
-    - Move Fever middleware and routes to fever package
-
-Version 2.0.12 (Oct 26, 2018)
------------------------------
-
-* Add OpenBSD build
-* Improve logging for OAuth2 callback
-* Make "g f" go to feed, or list of feeds
-* Add more details in feed storage errors to facilitate debugging
-* Add entries storage error to feed errors count
-* Set arbitrary maximum size for tsvector column
-* Unsubscribe from feed through link or "#"
-* Simplify feed entries filtering
-* Simplify feed fetcher
-* Simplify feed parser and format detection
-* Improve unit tests in url package
-* Add short cli flags -i and -v
-* Convert text links and line feeds to HTML in YouTube channels
-* Change link state when marking all entries as read
-* Add missing package descriptions for GoDoc
-* Fix typo in license header
-* Refactor HTTP response builder
-* Improve Fever API performances when marking a feed or group as read
-* Set focus on article link when pressing prev/next hotkeys
-* Improve request package and add more unit tests
-* Add more unit tests for config package
-* Simplify locale package usage (refactoring)
-* Translate application in Russian
-* Use disclosure widget <details> for advanced feed options
-* Use unique translation IDs instead of English text as key
-* Add more unit tests for template functions
-* Fix invalid output when truncating Unicode text in templates
-* Add the possibility to override default user agent for each feed
-* Split Makefile linux targets by architecture
-* Add compiler, Arch, and OS to info command
-* Avoid line break between emoji and (un)read/(un)star links
-* Build Docker image for multiple architectures (amd64, arm32v6, arm64v8)
-
-Version 2.0.11 (Sep 11, 2018)
------------------------------
-
-* Set cookie flag `SameSite` to Lax mode
-* Use predefined ciphers when TLS is configured
-* Avoid displaying an error when shutting down the daemon
-* Add "Mark this page as read" to the bottom
-* Store client IP address in request context
-* Refactor HTTP context handling
-* Make user creation via environment variables idempotent
-* Use regular text version of ✔︎ instead of emoji version on iOS
-* Add toggle status button to entry page
-* Migrate to Go Modules and Go 1.11
-* Show count of feeds with permanent errors in header menu
-* Display remote client IP in logs when having a login failure (Fail2Ban)
-* Add remove button in feed edit page
-* Split integration tests into multiple files
-* Update scraper rule for heise.de
-* Expose real error messages for internal server API errors
-* Move Golang API client in project source tree (the separate project is deprecated)
-* Use canonical imports
-* Add Procfile
-* Create database package (refactoring)
-* Update user agent with new website URL
-* Update German translation
-
-Version 2.0.10 (July 22, 2018)
-------------------------------
-
-* Avoid browser caching issues when assets changes
-* Add Gzip/Deflate compression for HTML, JSON, CSS and Javascript responses
-* Improve themes handling
-    * Store user theme in session
-    * Logged out users will keep their theme
-    * Add theme background color to web manifest and meta tag
-* Update application icon with different sizes
-* Add support for published tag in Atom feeds
-* Add tooltip to feed domain in feeds list (title attribute)
-* Prevent vertical scrolling on swipe
-* Show feed title instead of domain in items list
-* Add service worker to cache feed icons
-* Make image proxy configurable via IMAGE_PROXY environment variable:
-    * none = No proxy
-    * http-only = Proxy only non-HTTPS images (default)
-    * all = Proxy everything
-* Add alt attribute for feed icons
-* Update CI jshint check
-* Add embedly.com to iframe whitelist
-* Use passive event listeners for touch events
-* Add `add_dynamic_image` rewriter for JavaScript-loaded images
-* Change feed password field type to text to avoid auto-completion with Firefox
-    * Using autocomplete="off" or autocomplete="new-password" doesn't change anything
-    * Changing the input ID doesn't change anything
-    * Using a different input name doesn't change anything
-    * Only Chrome supports autocomplete="new-password"
-* Add base URL validation
-* Update default stylesheet name in HTML layout
-* Pre-generate themes stylesheets at build time
-* Update vendor dependencies
-* Refactor assets bundler and split Javascript files
-* Run sanitizer after all processing and entry content rewrite
-* Remove timestamp from generated files
-* Add support for protocol relative YouTube URLs
-* Add Postgres full-text search for entries
-* Add search form in user interface
-* Add search parameter to the API
-* Improve Dutch locales
-* Sandbox iframes when sanitizing
-* Keep consistent text size on mobile orientation change
-* Change permission of /etc/miniflux.conf to 600 instead of 644 in RPM package
-* Add tzdata package to Docker image
-* Update Docker image to Alpine Linux 3.8
-
-Version 2.0.9 (July 1, 2018)
-----------------------------
-
-* Avoid Chrome to autocomplete no-login password fields
-* Add cli flag to reset all feed errors
-* Do not ignore errored feeds when a user refresh feeds manually
-* Add specific 404 and 401 error messages
-* Strip binaries to reduce size
-* Make sure we always get the pagination in unread mode
-* Fix incorrect data value when toggling bookmark flag on entry page
-* Set opener to null when opening original URL with JavaScript
-* Remove unnecessary style
-* Refactor AddImageTitle rewriter
-    * Only processes images with `src` **and** `title` attributes (others are ignored)
-    * Processes **all** images in the document (not just the first one)
-    * Wraps the image and its title attribute in a `figure` tag with the title attribute's contents in a `figcaption` tag
-* Improve sanitizer to remove `style`, `noscript` and `script` tag contents
-* Improve feed and user API updates with optional values
-* Add new fields for feed username/password
-* Improve memory usage debug log
-* Disable keep-alive for HTTP client
-* Close HTTP response body even for failed requests
-* Add Sans-Serif theme
-* Rewrite iframe Youtube URLs to https://www.youtube-nocookie.com
-* Add more filters for API call `/entries`:
-    * before (unix timestamp)
-    * before_entry_id (int64)
-    * after (unix timestamp)
-    * after_entry_id (int64)
-    * starred (boolean)
-* Rewrite individual entry pagination SQL queries
-* Simplify entry query builder
-* Prevent items from sticking on touchend
-* Extended horizontal overflow to feed and category views
-* Translate missing strings
-* Update German translation
-
-Version 2.0.8 (June 4, 2018)
-----------------------------
-
-* Add Pocket integration
-* Rewrite RealIP() to avoid returning an empty string
-* Convert IP field from text to inet type
-* Improve error handling in integration clients
-* Make unread counter clickable
-* Archive read entries automatically after 60 days
-* Hide horizontal overflow when swiping articles on touch devices
-* Add API endpoint to get logged user
-* Fever API: Return response with an empty list if there is no item
-* Handle feeds with dates formatted as Unix timestamp
-
-Version 2.0.7 (May 7, 2018)
----------------------------
-
-* Add API endpoint to import OPML file
-* Make sure to close request body in HTTP client
-* Do not show save link if no integration is configured
-* Make sure integrations are configured before to make any HTTP requests
-* Avoid people to unlink their OAuth2 account without having a local password
-* Do not use shared variable to translate templates (avoid concurrency issue)
-* Use vanilla HTTP handlers (refactoring)
-* Move HTTP client to its own package (refactoring)
-* Add middleware to read X-Forwarded-Proto header (refactoring)
-* Use Gorilla middleware (refactoring)
-* Scrape parent element for iframe
-* Add SoundCloud and Bandcamp iframe sources
-
-Version 2.0.6 (Apr 20, 2018)
-----------------------------
-
-* Improve graceful shutdown
-* Simplify Heroku deployment
-* Display memory usage and some metrics in logs
-* Increase read/write timeout for HTTP server
-* Add support for Dublin Core date in RDF feeds
-* Do not return an error if the user session is not found
-* Handle some non-english date formats
-* Add missing French translation
-* Rename RSS parser getters
-* Get the right comments URL when having multiple namespaces
-* Ignore caching headers for feeds that send "Expires: 0"
-* Update translations
-
-Version 2.0.5 (Apr 7, 2018)
----------------------------
-
-* Avoid unread counter to be off by one when reading an entry
-* Add Comments URL to entries
-* Add FreeBSD build target
-* Handle RSS author elements with inner HTML
-* Fix typo in translations
-* Add Dutch translation
-* Convert enclosure size field to bigint
-* Switch CI to Go v1.10
-* Fix broken OPML import when compiling with Go 1.10
-
-Version 2.0.4 (Mar 5, 2018)
----------------------------
-
-* Add Simplified Chinese translation
-* Add Nunux Keeper integration
-* Filter the list of timezones
-* Add timezone to entries dates for REST and Fever API
-* Show last login and session creation date in current timezone
-* Fix typo in edit user template
-* Improve parser error messages
-* Remove parentheses around feed error messages
-* Support localized feed errors generated by background workers
-* Print info message if DATABASE_URL is not set
-
-Version 2.0.3 (Feb 19, 2018)
-----------------------------
-
-* Add Polish translation
-* Change color of <q> tags for black theme
-* Add database indexes (don't forget to run database migrations)
-* Handle Atom feeds with HTML title
-* Strip invalid XML characters to avoid parsing errors
-* Improve error handling for HTTP client
-
-Version 2.0.2 (Feb 5, 2018)
----------------------------
-
-* Add support for Let's Encrypt http-01 challenge
-* Move template functions outside engine (refactoring)
-* Take timezone into consideration when calculating relative time
-* Add support for HTTP Strict Transport Security header
-* Add support for base URLs with subfolders
-* Add missing about menu in settings
-* Show API URL endpoints in user interface
-* Do not update entry date while refreshing a feed
-* Add flag to toggle debug logging
-* Improve unread counter updates
-
-Version 2.0.1 (Jan 22, 2018)
-----------------------------
-
-* Change user agent (People are blocking the crawler with mod_security)
-* Move environment variables to config package (refactoring)
-* Add build targets for all ARM architectures
-* Do not crawl existing entry URLs
-* Show translated login page in user language when logged out
-* Handle more encoding edge cases:
-    - Feeds with charset specified only in Content-Type header and not in XML document
-    - Feeds with charset specified in both places
-    - Feeds with charset specified only in XML document and not in HTTP header
-* Add German translation
-* Add mark as read/unread link on list items
-* Add API endpoint for OPML export
-
-Version 2.0.0 (Jan 11, 2018)
-----------------------------
-
-* Initial release of Miniflux 2.

Dockerfile

@@ -1,19 +0,0 @@
-ARG BASE_IMAGE_ARCH="amd64"
-ARG ALPINE_LINUX_VERSION="3.12"
-
-FROM golang:1-alpine${ALPINE_LINUX_VERSION} as build
-ARG APP_VERSION
-ARG APP_ARCH="amd64"
-WORKDIR /go/src/app
-RUN apk add --no-cache --update build-base git
-COPY . .
-RUN make linux-${APP_ARCH} VERSION=${APP_VERSION}
-RUN cp /go/src/app/miniflux-linux-${APP_ARCH} /go/src/app/miniflux
-
-FROM ${BASE_IMAGE_ARCH}/alpine:${ALPINE_LINUX_VERSION}
-EXPOSE 8080
-ENV LISTEN_ADDR 0.0.0.0:8080
-RUN apk --no-cache add ca-certificates tzdata
-COPY --from=build /go/src/app/miniflux /usr/bin/miniflux
-USER nobody
-CMD ["/usr/bin/miniflux"]

Makefile

@@ -1,171 +1,164 @@
-APP := miniflux
-DOCKER_IMAGE := miniflux/miniflux
-VERSION := $(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.BuildDate=$(BUILD_DATE)'"
-PKG_LIST := $(shell go list ./... | grep -v /vendor/)
-DB_URL := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable
+APP             := miniflux
+DOCKER_IMAGE    := miniflux/miniflux
+VERSION         := $(shell git describe --tags --exact-match 2>/dev/null)
+LD_FLAGS        := "-s -w -X 'miniflux.app/v2/internal/version.Version=$(VERSION)'"
+PKG_LIST        := $(shell go list ./... | grep -v /vendor/)
+DB_URL          := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable
+DOCKER_PLATFORM := amd64
 
 export PGPASSWORD := postgres
-export GO111MODULE=on
 
-.PHONY: generate \
+.PHONY: \
 	miniflux \
+	miniflux-no-pie \
 	linux-amd64 \
-	linux-armv8 \
+	linux-arm64 \
 	linux-armv7 \
 	linux-armv6 \
 	linux-armv5 \
 	linux-x86 \
 	darwin-amd64 \
+	darwin-arm64 \
 	freebsd-amd64 \
-	freebsd-x86 \
 	openbsd-amd64 \
-	openbsd-x86 \
-	netbsd-x86 \
 	netbsd-amd64 \
-	windows-amd64 \
-	windows-x86 \
 	build \
 	run \
 	clean \
+	add-string \
 	test \
 	lint \
 	integration-test \
 	clean-integration-test \
 	docker-image \
+	docker-image-distroless \
 	docker-images \
-	docker-manifest
+	rpm \
+	debian \
+	debian-packages
 
-generate:
-	@ go generate -mod=vendor
+miniflux:
+	@ go build -buildmode=pie -ldflags=$(LD_FLAGS) -o $(APP)
 
-miniflux: generate
-	@ go build -ldflags=$(LD_FLAGS) -o $(APP) main.go
+miniflux-no-pie:
+	@ go build -ldflags=$(LD_FLAGS) -o $(APP)
 
-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)-$@
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
-linux-armv8: generate
-	@ GOOS=linux GOARCH=arm64 go build -ldflags=$(LD_FLAGS) -o $(APP)-linux-armv8 main.go
+linux-arm64:
+	@ CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@
+	@ 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)-$@
+	@ 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)-$@
+	@ 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)-$@
+	@ 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)-$@
+	@ 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)-$@
+	@ 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)-$@
+	@ 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)-$@
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
-build: linux-amd64 linux-armv8 linux-armv7 linux-armv6 linux-armv5 darwin-amd64 freebsd-amd64 openbsd-amd64 windows-amd64
+build: linux-amd64 linux-arm64 linux-armv7 linux-armv6 linux-armv5 darwin-amd64 darwin-arm64 freebsd-amd64 openbsd-amd64
 
-# NOTE: unsupported targets
-netbsd-amd64: generate
-	@ GOOS=netbsd GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-netbsd-amd64 main.go
-
-linux-x86: generate
-	@ GOOS=linux GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-linux-x86 main.go
-
-freebsd-x86: generate
-	@ GOOS=freebsd GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-freebsd-x86 main.go
-
-netbsd-x86: generate
-	@ GOOS=netbsd GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-netbsd-x86 main.go
-
-openbsd-x86: generate
-	@ GOOS=openbsd GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-freebsd-x86 main.go
-
-windows-x86: generate
-	@ GOOS=windows GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-windows-x86 main.go
-
-run: generate
-	@ 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)
+	@ rm -f $(APP)-* $(APP) $(APP)*.rpm $(APP)*.deb $(APP)*.exe $(APP)*.sha256
+
+add-string:
+	cd internal/locale/translations && \
+	for file in *.json; do \
+		jq --indent 4 --arg key "$(KEY)" --arg val "$(VAL)" \
+		   '. + {($$key): $$val} | to_entries | sort_by(.key) | from_entries' "$$file" > tmp && \
+		mv tmp "$$file"; \
+	done
 
 test:
 	go test -cover -race -count=1 ./...
 
 lint:
-	golint -set_exit_status ${PKG_LIST}
+	go vet ./...
+	gofmt -d -e .
+	golangci-lint run
 
 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 \
+	LOG_LEVEL=debug \
+	go run main.go >/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`
 	@ rm -f /tmp/miniflux.pid /tmp/miniflux.log
-	@ rm miniflux-test
 	@ psql -U postgres -c 'drop database if exists miniflux_test;'
 
 docker-image:
-	docker build -t $(DOCKER_IMAGE):$(VERSION) \
-		--build-arg APP_VERSION=$(VERSION) \
-		--build-arg APP_ARCH=amd64 \
-		--build-arg BASE_IMAGE_ARCH=amd64 .
+	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 build -t $(DOCKER_IMAGE):amd64-$(VERSION) \
-		--build-arg APP_VERSION=$(VERSION) \
-		--build-arg APP_ARCH=amd64 \
-		--build-arg BASE_IMAGE_ARCH=amd64 .
-	docker tag $(DOCKER_IMAGE):amd64-$(VERSION) $(DOCKER_IMAGE):amd64-latest
+	docker buildx build \
+		--platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 \
+		--file packaging/docker/alpine/Dockerfile \
+		--tag $(DOCKER_IMAGE):$(VERSION) \
+		--push .
 
-	docker build -t $(DOCKER_IMAGE):arm32v6-$(VERSION) \
-		--build-arg APP_VERSION=$(VERSION) \
-		--build-arg APP_ARCH=armv6 \
-		--build-arg BASE_IMAGE_ARCH=arm32v6 .
-	docker tag $(DOCKER_IMAGE):arm32v6-$(VERSION) $(DOCKER_IMAGE):arm32v6-latest
+rpm: clean
+	@ docker build \
+		-t miniflux-rpm-builder \
+		-f packaging/rpm/Dockerfile \
+		.
+	@ docker run --rm \
+		-v ${PWD}:/root/rpmbuild/RPMS/x86_64 miniflux-rpm-builder \
+		rpmbuild -bb --define "_miniflux_version $(VERSION)" /root/rpmbuild/SPECS/miniflux.spec
 
-	docker build -t $(DOCKER_IMAGE):arm32v7-$(VERSION) \
-		--build-arg APP_VERSION=$(VERSION) \
-		--build-arg APP_ARCH=armv7 \
-		--build-arg BASE_IMAGE_ARCH=arm32v7 .
-	docker tag $(DOCKER_IMAGE):arm32v7-$(VERSION) $(DOCKER_IMAGE):arm32v7-latest
+debian:
+	@ docker buildx build --load \
+		--platform linux/$(DOCKER_PLATFORM) \
+		-t miniflux-deb-builder \
+		-f packaging/debian/Dockerfile \
+		.
+	@ docker run --rm --platform linux/$(DOCKER_PLATFORM) \
+		-v ${PWD}:/pkg miniflux-deb-builder
 
-	docker build -t $(DOCKER_IMAGE):arm64v8-$(VERSION) \
-		--build-arg APP_VERSION=$(VERSION) \
-		--build-arg APP_ARCH=armv8 \
-		--build-arg BASE_IMAGE_ARCH=arm64v8 .
-	docker tag $(DOCKER_IMAGE):arm64v8-$(VERSION) $(DOCKER_IMAGE):arm64v8-latest
-
-docker-manifest:
-	for version in $(VERSION) latest; do \
-		docker push $(DOCKER_IMAGE):amd64-$${version} && \
-		docker push $(DOCKER_IMAGE):arm32v6-$${version} && \
-		docker push $(DOCKER_IMAGE):arm32v7-$${version} && \
-		docker push $(DOCKER_IMAGE):arm64v8-$${version} && \
-		docker manifest create --amend $(DOCKER_IMAGE):$${version} \
-			$(DOCKER_IMAGE):amd64-$${version} \
-			$(DOCKER_IMAGE):arm32v6-$${version} \
-			$(DOCKER_IMAGE):arm32v7-$${version} \
-			$(DOCKER_IMAGE):arm64v8-$${version} && \
-		docker manifest annotate $(DOCKER_IMAGE):$${version} \
-			$(DOCKER_IMAGE):arm32v6-$${version} --os linux --arch arm --variant v6 && \
-		docker manifest annotate $(DOCKER_IMAGE):$${version} \
-			$(DOCKER_IMAGE):arm32v7-$${version} --os linux --arch arm --variant v7 && \
-		docker manifest annotate $(DOCKER_IMAGE):$${version} \
-			$(DOCKER_IMAGE):arm64v8-$${version} --os linux --arch arm64 --variant v8 && \
-		docker manifest push --purge $(DOCKER_IMAGE):$${version} ;\
-	done
+debian-packages: clean
+	$(MAKE) debian DOCKER_PLATFORM=amd64
+	$(MAKE) debian DOCKER_PLATFORM=arm64
+	$(MAKE) debian DOCKER_PLATFORM=arm/v7

README.md

@@ -1,21 +1,114 @@
 Miniflux 2
 ==========
-[![GoDoc](https://godoc.org/miniflux.app?status.svg)](https://godoc.org/miniflux.app)
-
-Miniflux is a minimalist and opinionated feed reader:
-
-- Written in Go (Golang)
-- Works only with Postgresql
-- Doesn't use any ORM
-- Doesn't use any complicated framework
-- Use only modern vanilla Javascript (ES6 and Fetch API)
-- Single binary compiled statically without dependency
-- The number of features is voluntarily limited
 
+Miniflux is a minimalist and opinionated feed reader.
 It's simple, fast, lightweight and super easy to install.
 
 Official website: <https://miniflux.app>
 
+Features
+--------
+
+### Feed Reader
+
+- Supported feed formats: Atom 0.3/1.0, RSS 1.0/2.0, and JSON Feed 1.0/1.1.
+- [OPML](https://en.wikipedia.org/wiki/OPML) file import/export and URL import.
+- Supports multiple attachments (podcasts, videos, music, and images enclosures).
+- Plays videos from YouTube directly inside Miniflux.
+- Organizes articles using categories and bookmarks.
+- Share individual articles publicly.
+- Fetches website icons (favicons).
+- Saves articles to third-party services.
+- Provides full-text search (powered by Postgres).
+- Available in 20 languages: Portuguese (Brazilian), Chinese (Simplified and Traditional), Dutch, English (US), Finnish, French, German, Greek, Hindi, Indonesian, Italian, Japanese, Polish, Romanian, Russian, Taiwanese POJ, Ukrainian, Spanish, and Turkish.
+
+### Privacy and Security
+
+- Removes pixel trackers.
+- Strips tracking parameters from URLs (e.g., `utm_source`, `utm_medium`, `utm_campaign`, `fbclid`, etc.).
+- Retrieves original links when feeds are sourced from FeedBurner.
+- Opens external links with attributes `rel="noopener noreferrer" referrerpolicy="no-referrer"` for improved security.
+- Implements the HTTP header `Referrer-Policy: no-referrer` to prevent referrer leakage.
+- Provides a media proxy to avoid tracking and resolve mixed content warnings when using HTTPS.
+- Plays YouTube videos via the privacy-focused domain `youtube-nocookie.com`.
+- Supports alternative YouTube video players such as [Invidious](https://invidio.us).
+- Blocks external JavaScript to prevent tracking and enhance security.
+- Sanitizes external content before rendering it.
+- Enforces a [Content Security](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) and a [Trusted Types Policy](https://developer.mozilla.org/en-US/docs/Web/API/Trusted_Types_API) to only application JavaScript and blocks inline scripts and styles. 
+
+### Bot Protection Bypass Mechanisms
+
+- Optionally disable HTTP/2 to mitigate fingerprinting.
+- Allows configuration of a custom user agent.
+- Supports adding custom cookies for specific use cases.
+- Enables the use of proxies for enhanced privacy or bypassing restrictions.
+
+### Content Manipulation
+
+- Fetches the original article and extracts only the relevant content using a local Readability parser.
+- Allows custom scraper rules based on <abbr title="Cascading Style Sheets">CSS</abbr> selectors.
+- Supports custom rewriting rules for content manipulation.
+- Provides a regex filter to include or exclude articles based on specific patterns.
+- Optionally permits self-signed or invalid certificates (disabled by default).
+- Scrapes YouTube's website to retrieve video duration as read time or uses the YouTube API (disabled by default).
+
+### User Interface
+
+- Optimized stylesheet for readability.
+- Responsive design that adapts seamlessly to desktop, tablet, and mobile devices.
+- Minimalistic and distraction-free user interface.
+- No requirement to download an app from Apple App Store or Google Play Store.
+- Can be added directly to the home screen for quick access.
+- Supports a wide range of keyboard shortcuts for efficient navigation.
+- Optional touch gesture support for navigation on mobile devices.
+- Custom stylesheets and JavaScript to personalize the user interface to your preferences.
+- Themes:
+    - Light (Sans-Serif)
+    - Light (Serif)
+    - Dark (Sans-Serif)
+    - Dark (Serif)
+    - System (Sans-Serif) – Automatically switches between Dark and Light themes based on system preferences.
+    - System (Serif)
+
+### Integrations
+
+- 25+ integrations with third-party services: [Apprise](https://github.com/caronc/apprise), [Betula](https://sr.ht/~bouncepaw/betula/), [Cubox](https://cubox.cc/), [Discord](https://discord.com/), [Espial](https://github.com/jonschoning/espial), [Instapaper](https://www.instapaper.com/), [LinkAce](https://www.linkace.org/), [Linkding](https://github.com/sissbruecker/linkding), [LinkTaco](https://linktaco.com), [LinkWarden](https://linkwarden.app/), [Matrix](https://matrix.org), [Notion](https://www.notion.com/), [Ntfy](https://ntfy.sh/), [Nunux Keeper](https://keeper.nunux.org/), [Pinboard](https://pinboard.in/), [Pushover](https://pushover.net), [RainDrop](https://raindrop.io/), [Readeck](https://readeck.org/en/), [Readwise Reader](https://readwise.io/read), [RssBridge](https://rss-bridge.org/), [Shaarli](https://github.com/shaarli/Shaarli), [Shiori](https://github.com/go-shiori/shiori), [Slack](https://slack.com/), [Telegram](https://telegram.org), [Wallabag](https://www.wallabag.org/), etc.
+- Bookmarklet for subscribing to websites directly from any web browser.
+- Webhooks for real-time notifications or custom integrations.
+- Compatibility with existing mobile applications using the Fever or Google Reader API.
+- REST API with client libraries available in [Go](https://github.com/miniflux/v2/tree/main/client) and [Python](https://github.com/miniflux/python-client).
+
+### Authentication
+
+- Local username and password.
+- Passkeys ([WebAuthn](https://en.wikipedia.org/wiki/WebAuthn)).
+- Google (OAuth2).
+- Generic OpenID Connect.
+- Reverse-Proxy authentication.
+
+### Technical Stuff
+
+- Written in [Go (Golang)](https://golang.org/).
+- Single binary compiled statically without dependency.
+- Works only with [PostgreSQL](https://www.postgresql.org/).
+- Does not use any ORM or any complicated frameworks.
+- Uses modern vanilla JavaScript only when necessary.
+- All static files are bundled into the application binary using the Go `embed` package.
+- Supports the Systemd `sd_notify` protocol for process monitoring.
+- Configures HTTPS automatically with Let's Encrypt.
+- Allows the use of custom <abbr title="Secure Sockets Layer">SSL</abbr> certificates.
+- Supports [HTTP/2](https://en.wikipedia.org/wiki/HTTP/2) when TLS is enabled.
+- Updates feeds in the background using an internal scheduler or a traditional cron job.
+- Uses native lazy loading for images and iframes.
+- Compatible only with modern browsers.
+- Adheres to the [Twelve-Factor App](https://12factor.net/) methodology.
+- Provides official Debian/RPM packages and pre-built binaries.
+- Publishes a Docker image to Docker Hub, GitHub Registry, and Quay.io Registry, with ARM architecture support.
+- Uses a limited amount of third-party go dependencies
+- Has a comprehensive testsuite, with both unit tests and integration tests.
+- Only uses a couple of MB of memory and a negligible amount of CPU, even with several hundreds of feeds.
+- Respects/sends Last-Modified, If-Modified-Since, If-None-Match, Cache-Control, Expires and ETags headers, and has a default polling interval of 1h.
+
 Documentation
 -------------
 
@@ -30,7 +123,7 @@ The Miniflux documentation is available here: <https://miniflux.app/docs/> ([Man
 - [Command Line Usage](https://miniflux.app/docs/cli.html)
 - [User Interface Usage](https://miniflux.app/docs/ui.html)
 - [Keyboard Shortcuts](https://miniflux.app/docs/keyboard_shortcuts.html)
-- [Integration with External Services](https://miniflux.app/docs/services.html)
+- [Integration with External Services](https://miniflux.app/docs/#integrations)
 - [Rewrite and Scraper Rules](https://miniflux.app/docs/rules.html)
 - [API Reference](https://miniflux.app/docs/api.html)
 - [Development](https://miniflux.app/docs/development.html)
@@ -51,5 +144,5 @@ Dark theme when using keyboard navigation:
 Credits
 -------
 
-- Authors: Frédéric Guillot - [List of contributors](https://github.com/miniflux/miniflux/graphs/contributors)
+- Authors: Frédéric Guillot - [List of contributors](https://github.com/miniflux/v2/graphs/contributors)
 - Distributed under Apache 2.0 License

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/api.go

@@ -1,51 +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 api // import "miniflux.app/api"
-
-import (
-	"miniflux.app/reader/feed"
-	"miniflux.app/storage"
-	"miniflux.app/worker"
-
-	"github.com/gorilla/mux"
-)
-
-// Serve declares API routes for the application.
-func Serve(router *mux.Router, store *storage.Storage, pool *worker.Pool, feedHandler *feed.Handler) {
-	handler := &handler{store, pool, feedHandler}
-
-	sr := router.PathPrefix("/v1").Subrouter()
-	middleware := newMiddleware(store)
-	sr.Use(middleware.apiKeyAuth)
-	sr.Use(middleware.basicAuth)
-	sr.HandleFunc("/users", handler.createUser).Methods("POST")
-	sr.HandleFunc("/users", handler.users).Methods("GET")
-	sr.HandleFunc("/users/{userID:[0-9]+}", handler.userByID).Methods("GET")
-	sr.HandleFunc("/users/{userID:[0-9]+}", handler.updateUser).Methods("PUT")
-	sr.HandleFunc("/users/{userID:[0-9]+}", handler.removeUser).Methods("DELETE")
-	sr.HandleFunc("/users/{username}", handler.userByUsername).Methods("GET")
-	sr.HandleFunc("/me", handler.currentUser).Methods("GET")
-	sr.HandleFunc("/categories", handler.createCategory).Methods("POST")
-	sr.HandleFunc("/categories", handler.getCategories).Methods("GET")
-	sr.HandleFunc("/categories/{categoryID}", handler.updateCategory).Methods("PUT")
-	sr.HandleFunc("/categories/{categoryID}", handler.removeCategory).Methods("DELETE")
-	sr.HandleFunc("/discover", handler.getSubscriptions).Methods("POST")
-	sr.HandleFunc("/feeds", handler.createFeed).Methods("POST")
-	sr.HandleFunc("/feeds", handler.getFeeds).Methods("GET")
-	sr.HandleFunc("/feeds/refresh", handler.refreshAllFeeds).Methods("PUT")
-	sr.HandleFunc("/feeds/{feedID}/refresh", handler.refreshFeed).Methods("PUT")
-	sr.HandleFunc("/feeds/{feedID}", handler.getFeed).Methods("GET")
-	sr.HandleFunc("/feeds/{feedID}", handler.updateFeed).Methods("PUT")
-	sr.HandleFunc("/feeds/{feedID}", handler.removeFeed).Methods("DELETE")
-	sr.HandleFunc("/feeds/{feedID}/icon", handler.feedIcon).Methods("GET")
-	sr.HandleFunc("/export", handler.exportFeeds).Methods("GET")
-	sr.HandleFunc("/import", handler.importFeeds).Methods("POST")
-	sr.HandleFunc("/feeds/{feedID}/entries", handler.getFeedEntries).Methods("GET")
-	sr.HandleFunc("/feeds/{feedID}/entries/{entryID}", handler.getFeedEntry).Methods("GET")
-	sr.HandleFunc("/entries", handler.getEntries).Methods("GET")
-	sr.HandleFunc("/entries", handler.setEntryStatus).Methods("PUT")
-	sr.HandleFunc("/entries/{entryID}", handler.getEntry).Methods("GET")
-	sr.HandleFunc("/entries/{entryID}/bookmark", handler.toggleBookmark).Methods("PUT")
-}

api/category.go

@@ -1,92 +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 (
-	"errors"
-	"net/http"
-
-	"miniflux.app/http/request"
-	"miniflux.app/http/response/json"
-)
-
-func (h *handler) createCategory(w http.ResponseWriter, r *http.Request) {
-	category, err := decodeCategoryPayload(r.Body)
-	if err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	userID := request.UserID(r)
-	category.UserID = userID
-	if err := category.ValidateCategoryCreation(); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	if c, err := h.store.CategoryByTitle(userID, category.Title); err != nil || c != nil {
-		json.BadRequest(w, r, errors.New("This category already exists"))
-		return
-	}
-
-	if err := h.store.CreateCategory(category); err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json.Created(w, r, category)
-}
-
-func (h *handler) updateCategory(w http.ResponseWriter, r *http.Request) {
-	categoryID := request.RouteInt64Param(r, "categoryID")
-
-	category, err := decodeCategoryPayload(r.Body)
-	if err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	category.UserID = request.UserID(r)
-	category.ID = categoryID
-	if err := category.ValidateCategoryModification(); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	err = h.store.UpdateCategory(category)
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json.Created(w, r, category)
-}
-
-func (h *handler) getCategories(w http.ResponseWriter, r *http.Request) {
-	categories, err := h.store.Categories(request.UserID(r))
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json.OK(w, r, categories)
-}
-
-func (h *handler) removeCategory(w http.ResponseWriter, r *http.Request) {
-	userID := request.UserID(r)
-	categoryID := request.RouteInt64Param(r, "categoryID")
-
-	if !h.store.CategoryExists(userID, categoryID) {
-		json.NotFound(w, r)
-		return
-	}
-
-	if err := h.store.RemoveCategory(userID, categoryID); err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json.NoContent(w, r)
-}

api/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 api implements API endpoints for the application.
-
-*/
-package api // import "miniflux.app/api"

api/entry.go

@@ -1,228 +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 (
-	"errors"
-	"net/http"
-	"time"
-
-	"miniflux.app/http/request"
-	"miniflux.app/http/response/json"
-	"miniflux.app/model"
-	"miniflux.app/storage"
-)
-
-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")
-
-	status := request.QueryStringParam(r, "status", "")
-	if status != "" {
-		if err := model.ValidateEntryStatus(status); err != nil {
-			json.BadRequest(w, r, err)
-			return
-		}
-	}
-
-	order := request.QueryStringParam(r, "order", model.DefaultSortingOrder)
-	if err := model.ValidateEntryOrder(order); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	direction := request.QueryStringParam(r, "direction", model.DefaultSortingDirection)
-	if err := model.ValidateDirection(direction); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	limit := request.QueryIntParam(r, "limit", 100)
-	offset := request.QueryIntParam(r, "offset", 0)
-	if err := model.ValidateRange(offset, limit); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	builder := h.store.NewEntryQueryBuilder(request.UserID(r))
-	builder.WithFeedID(feedID)
-	builder.WithStatus(status)
-	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) getEntries(w http.ResponseWriter, r *http.Request) {
-	status := request.QueryStringParam(r, "status", "")
-	if status != "" {
-		if err := model.ValidateEntryStatus(status); err != nil {
-			json.BadRequest(w, r, err)
-			return
-		}
-	}
-
-	order := request.QueryStringParam(r, "order", model.DefaultSortingOrder)
-	if err := model.ValidateEntryOrder(order); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	direction := request.QueryStringParam(r, "direction", model.DefaultSortingDirection)
-	if err := model.ValidateDirection(direction); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	limit := request.QueryIntParam(r, "limit", 100)
-	offset := request.QueryIntParam(r, "offset", 0)
-	if err := model.ValidateRange(offset, limit); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	builder := h.store.NewEntryQueryBuilder(request.UserID(r))
-	builder.WithStatus(status)
-	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) {
-	entryIDs, status, err := decodeEntryStatusPayload(r.Body)
-	if err != nil {
-		json.BadRequest(w, r, errors.New("Invalid JSON payload"))
-		return
-	}
-
-	if err := model.ValidateEntryStatus(status); err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	if err := h.store.SetEntriesStatus(request.UserID(r), entryIDs, 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/feed.go

@@ -1,183 +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 (
-	"errors"
-	"net/http"
-
-	"miniflux.app/http/request"
-	"miniflux.app/http/response/json"
-)
-
-func (h *handler) createFeed(w http.ResponseWriter, r *http.Request) {
-	feedInfo, err := decodeFeedCreationPayload(r.Body)
-	if err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	if feedInfo.FeedURL == "" {
-		json.BadRequest(w, r, errors.New("The feed_url is required"))
-		return
-	}
-
-	if feedInfo.CategoryID <= 0 {
-		json.BadRequest(w, r, errors.New("The category_id is required"))
-		return
-	}
-
-	userID := request.UserID(r)
-
-	if h.store.FeedURLExists(userID, feedInfo.FeedURL) {
-		json.BadRequest(w, r, errors.New("This feed_url already exists"))
-		return
-	}
-
-	if !h.store.CategoryExists(userID, feedInfo.CategoryID) {
-		json.BadRequest(w, r, errors.New("This category_id doesn't exists or doesn't belongs to this user"))
-		return
-	}
-
-	feed, err := h.feedHandler.CreateFeed(
-		userID,
-		feedInfo.CategoryID,
-		feedInfo.FeedURL,
-		feedInfo.Crawler,
-		feedInfo.UserAgent,
-		feedInfo.Username,
-		feedInfo.Password,
-		feedInfo.ScraperRules,
-		feedInfo.RewriteRules,
-	)
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	type result struct {
-		FeedID int64 `json:"feed_id"`
-	}
-
-	json.Created(w, r, &result{FeedID: feed.ID})
-}
-
-func (h *handler) refreshFeed(w http.ResponseWriter, r *http.Request) {
-	feedID := request.RouteInt64Param(r, "feedID")
-	userID := request.UserID(r)
-
-	if !h.store.FeedExists(userID, feedID) {
-		json.NotFound(w, r)
-		return
-	}
-
-	err := h.feedHandler.RefreshFeed(userID, feedID)
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json.NoContent(w, r)
-}
-
-func (h *handler) refreshAllFeeds(w http.ResponseWriter, r *http.Request) {
-	userID := request.UserID(r)
-	jobs, err := h.store.NewUserBatch(userID, h.store.CountFeeds(userID))
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	go func() {
-		h.pool.Push(jobs)
-	}()
-
-	json.NoContent(w, r)
-}
-
-func (h *handler) updateFeed(w http.ResponseWriter, r *http.Request) {
-	feedID := request.RouteInt64Param(r, "feedID")
-	feedChanges, err := decodeFeedModificationPayload(r.Body)
-	if err != nil {
-		json.BadRequest(w, r, err)
-		return
-	}
-
-	userID := request.UserID(r)
-
-	originalFeed, err := h.store.FeedByID(userID, feedID)
-	if err != nil {
-		json.NotFound(w, r)
-		return
-	}
-
-	if originalFeed == nil {
-		json.NotFound(w, r)
-		return
-	}
-
-	feedChanges.Update(originalFeed)
-
-	if !h.store.CategoryExists(userID, originalFeed.Category.ID) {
-		json.BadRequest(w, r, errors.New("This category_id doesn't exists or doesn't belongs to this user"))
-		return
-	}
-
-	if err := h.store.UpdateFeed(originalFeed); err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	originalFeed, err = h.store.FeedByID(userID, feedID)
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json.Created(w, r, originalFeed)
-}
-
-func (h *handler) getFeeds(w http.ResponseWriter, r *http.Request) {
-	feeds, err := h.store.Feeds(request.UserID(r))
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json.OK(w, r, feeds)
-}
-
-func (h *handler) getFeed(w http.ResponseWriter, r *http.Request) {
-	feedID := request.RouteInt64Param(r, "feedID")
-	feed, err := h.store.FeedByID(request.UserID(r), feedID)
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	if feed == nil {
-		json.NotFound(w, r)
-		return
-	}
-
-	json.OK(w, r, feed)
-}
-
-func (h *handler) removeFeed(w http.ResponseWriter, r *http.Request) {
-	feedID := request.RouteInt64Param(r, "feedID")
-	userID := request.UserID(r)
-
-	if !h.store.FeedExists(userID, feedID) {
-		json.NotFound(w, r)
-		return
-	}
-
-	if err := h.store.RemoveFeed(userID, feedID); err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json.NoContent(w, r)
-}

api/handler.go

@@ -1,17 +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/reader/feed"
-	"miniflux.app/storage"
-	"miniflux.app/worker"
-)
-
-type handler struct {
-	store       *storage.Storage
-	pool        *worker.Pool
-	feedHandler *feed.Handler
-}

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, &feedIcon{
-		ID:       icon.ID,
-		MimeType: icon.MimeType,
-		Data:     icon.DataURL(),
-	})
-}

api/middleware.go

@@ -1,110 +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 api // import "miniflux.app/api"
-
-import (
-	"context"
-	"net/http"
-
-	"miniflux.app/http/request"
-	"miniflux.app/http/response/json"
-	"miniflux.app/logger"
-	"miniflux.app/storage"
-)
-
-type middleware struct {
-	store *storage.Storage
-}
-
-func newMiddleware(s *storage.Storage) *middleware {
-	return &middleware{s}
-}
-
-func (m *middleware) apiKeyAuth(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		clientIP := request.ClientIP(r)
-		token := r.Header.Get("X-Auth-Token")
-
-		if token == "" {
-			logger.Debug("[API][TokenAuth] [ClientIP=%s] No API Key provided, go to the next middleware", clientIP)
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		user, err := m.store.UserByAPIKey(token)
-		if err != nil {
-			logger.Error("[API][TokenAuth] %v", err)
-			json.ServerError(w, r, err)
-			return
-		}
-
-		if user == nil {
-			logger.Error("[API][TokenAuth] [ClientIP=%s] No user found with the given API key", clientIP)
-			json.Unauthorized(w, r)
-			return
-		}
-
-		logger.Info("[API][TokenAuth] [ClientIP=%s] User authenticated: %s", clientIP, user.Username)
-		m.store.SetLastLogin(user.ID)
-		m.store.SetAPIKeyUsedTimestamp(user.ID, token)
-
-		ctx := r.Context()
-		ctx = context.WithValue(ctx, request.UserIDContextKey, user.ID)
-		ctx = context.WithValue(ctx, request.UserTimezoneContextKey, user.Timezone)
-		ctx = context.WithValue(ctx, request.IsAdminUserContextKey, user.IsAdmin)
-		ctx = context.WithValue(ctx, request.IsAuthenticatedContextKey, true)
-
-		next.ServeHTTP(w, r.WithContext(ctx))
-	})
-}
-
-func (m *middleware) basicAuth(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if request.IsAuthenticated(r) {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
-
-		clientIP := request.ClientIP(r)
-		username, password, authOK := r.BasicAuth()
-		if !authOK {
-			logger.Debug("[API][BasicAuth] [ClientIP=%s] No authentication headers sent", clientIP)
-			json.Unauthorized(w, r)
-			return
-		}
-
-		if err := m.store.CheckPassword(username, password); err != nil {
-			logger.Error("[API][BasicAuth] [ClientIP=%s] Invalid username or password: %s", clientIP, username)
-			json.Unauthorized(w, r)
-			return
-		}
-
-		user, err := m.store.UserByUsername(username)
-		if err != nil {
-			logger.Error("[API][BasicAuth] %v", err)
-			json.ServerError(w, r, err)
-			return
-		}
-
-		if user == nil {
-			logger.Error("[API][BasicAuth] [ClientIP=%s] User not found: %s", clientIP, username)
-			json.Unauthorized(w, r)
-			return
-		}
-
-		logger.Info("[API][BasicAuth] [ClientIP=%s] User authenticated: %s", clientIP, username)
-		m.store.SetLastLogin(user.ID)
-
-		ctx := r.Context()
-		ctx = context.WithValue(ctx, request.UserIDContextKey, user.ID)
-		ctx = context.WithValue(ctx, request.UserTimezoneContextKey, user.Timezone)
-		ctx = context.WithValue(ctx, request.IsAdminUserContextKey, user.IsAdmin)
-		ctx = context.WithValue(ctx, request.IsAuthenticatedContextKey, true)
-
-		next.ServeHTTP(w, r.WithContext(ctx))
-	})
-}

api/payload.go

@@ -1,230 +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 (
-	"encoding/json"
-	"fmt"
-	"io"
-
-	"miniflux.app/model"
-)
-
-type feedIcon 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 feedCreation 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"`
-	ScraperRules string `json:"scraper_rules"`
-	RewriteRules string `json:"rewrite_rules"`
-}
-
-type subscriptionDiscovery struct {
-	URL       string `json:"url"`
-	UserAgent string `json:"user_agent"`
-	Username  string `json:"username"`
-	Password  string `json:"password"`
-}
-
-type feedModification 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"`
-	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"`
-}
-
-func (f *feedModification) Update(feed *model.Feed) {
-	if f.FeedURL != nil && *f.FeedURL != "" {
-		feed.FeedURL = *f.FeedURL
-	}
-
-	if f.SiteURL != nil && *f.SiteURL != "" {
-		feed.SiteURL = *f.SiteURL
-	}
-
-	if f.Title != nil && *f.Title != "" {
-		feed.Title = *f.Title
-	}
-
-	if f.ScraperRules != nil {
-		feed.ScraperRules = *f.ScraperRules
-	}
-
-	if f.RewriteRules != nil {
-		feed.RewriteRules = *f.RewriteRules
-	}
-
-	if f.Crawler != nil {
-		feed.Crawler = *f.Crawler
-	}
-
-	if f.UserAgent != nil {
-		feed.UserAgent = *f.UserAgent
-	}
-
-	if f.Username != nil {
-		feed.Username = *f.Username
-	}
-
-	if f.Password != nil {
-		feed.Password = *f.Password
-	}
-
-	if f.CategoryID != nil && *f.CategoryID > 0 {
-		feed.Category.ID = *f.CategoryID
-	}
-
-	if f.Disabled != nil {
-		feed.Disabled = *f.Disabled
-	}
-}
-
-type userModification 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"`
-}
-
-func (u *userModification) Update(user *model.User) {
-	if u.Username != nil {
-		user.Username = *u.Username
-	}
-
-	if u.Password != nil {
-		user.Password = *u.Password
-	}
-
-	if u.IsAdmin != nil {
-		user.IsAdmin = *u.IsAdmin
-	}
-
-	if u.Theme != nil {
-		user.Theme = *u.Theme
-	}
-
-	if u.Language != nil {
-		user.Language = *u.Language
-	}
-
-	if u.Timezone != nil {
-		user.Timezone = *u.Timezone
-	}
-
-	if u.EntryDirection != nil {
-		user.EntryDirection = *u.EntryDirection
-	}
-}
-
-func decodeUserModificationPayload(r io.ReadCloser) (*userModification, error) {
-	defer r.Close()
-
-	var user userModification
-	decoder := json.NewDecoder(r)
-	if err := decoder.Decode(&user); err != nil {
-		return nil, fmt.Errorf("Unable to decode user modification JSON object: %v", err)
-	}
-
-	return &user, nil
-}
-
-func decodeUserCreationPayload(r io.ReadCloser) (*model.User, error) {
-	defer r.Close()
-
-	var user model.User
-	decoder := json.NewDecoder(r)
-	if err := decoder.Decode(&user); err != nil {
-		return nil, fmt.Errorf("Unable to decode user modification JSON object: %v", err)
-	}
-
-	return &user, nil
-}
-
-func decodeURLPayload(r io.ReadCloser) (*subscriptionDiscovery, error) {
-	defer r.Close()
-
-	var s subscriptionDiscovery
-	decoder := json.NewDecoder(r)
-	if err := decoder.Decode(&s); err != nil {
-		return nil, fmt.Errorf("invalid JSON payload: %v", err)
-	}
-
-	return &s, nil
-}
-
-func decodeEntryStatusPayload(r io.ReadCloser) ([]int64, string, error) {
-	type payload struct {
-		EntryIDs []int64 `json:"entry_ids"`
-		Status   string  `json:"status"`
-	}
-
-	var p payload
-	decoder := json.NewDecoder(r)
-	defer r.Close()
-	if err := decoder.Decode(&p); err != nil {
-		return nil, "", fmt.Errorf("invalid JSON payload: %v", err)
-	}
-
-	return p.EntryIDs, p.Status, nil
-}
-
-func decodeFeedCreationPayload(r io.ReadCloser) (*feedCreation, error) {
-	defer r.Close()
-
-	var fc feedCreation
-	decoder := json.NewDecoder(r)
-	if err := decoder.Decode(&fc); err != nil {
-		return nil, fmt.Errorf("invalid JSON payload: %v", err)
-	}
-
-	return &fc, nil
-}
-
-func decodeFeedModificationPayload(r io.ReadCloser) (*feedModification, error) {
-	defer r.Close()
-
-	var feed feedModification
-	decoder := json.NewDecoder(r)
-	if err := decoder.Decode(&feed); err != nil {
-		return nil, fmt.Errorf("Unable to decode feed modification JSON object: %v", err)
-	}
-
-	return &feed, nil
-}
-
-func decodeCategoryPayload(r io.ReadCloser) (*model.Category, error) {
-	var category model.Category
-
-	decoder := json.NewDecoder(r)
-	defer r.Close()
-	if err := decoder.Decode(&category); err != nil {
-		return nil, fmt.Errorf("Unable to decode category JSON object: %v", err)
-	}
-
-	return &category, nil
-}

api/payload_test.go

@@ -1,219 +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 api // import "miniflux.app/api"
-
-import (
-	"testing"
-
-	"miniflux.app/model"
-)
-
-func TestUpdateFeedURL(t *testing.T) {
-	feedURL := "http://example.com/"
-	changes := &feedModification{FeedURL: &feedURL}
-	feed := &model.Feed{FeedURL: "http://example.org/"}
-	changes.Update(feed)
-
-	if feed.FeedURL != feedURL {
-		t.Fatalf(`Unexpected value, got %q instead of %q`, feed.FeedURL, feedURL)
-	}
-}
-
-func TestUpdateFeedURLWithEmptyString(t *testing.T) {
-	feedURL := ""
-	changes := &feedModification{FeedURL: &feedURL}
-	feed := &model.Feed{FeedURL: "http://example.org/"}
-	changes.Update(feed)
-
-	if feed.FeedURL == feedURL {
-		t.Fatal(`The FeedURL should not be modified`)
-	}
-}
-
-func TestUpdateFeedURLWhenNotSet(t *testing.T) {
-	changes := &feedModification{}
-	feed := &model.Feed{FeedURL: "http://example.org/"}
-	changes.Update(feed)
-
-	if feed.FeedURL != "http://example.org/" {
-		t.Fatal(`The FeedURL should not be modified`)
-	}
-}
-
-func TestUpdateFeedSiteURL(t *testing.T) {
-	siteURL := "http://example.com/"
-	changes := &feedModification{SiteURL: &siteURL}
-	feed := &model.Feed{SiteURL: "http://example.org/"}
-	changes.Update(feed)
-
-	if feed.SiteURL != siteURL {
-		t.Fatalf(`Unexpected value, got %q instead of %q`, feed.SiteURL, siteURL)
-	}
-}
-
-func TestUpdateFeedSiteURLWithEmptyString(t *testing.T) {
-	siteURL := ""
-	changes := &feedModification{FeedURL: &siteURL}
-	feed := &model.Feed{SiteURL: "http://example.org/"}
-	changes.Update(feed)
-
-	if feed.SiteURL == siteURL {
-		t.Fatal(`The FeedURL should not be modified`)
-	}
-}
-
-func TestUpdateFeedSiteURLWhenNotSet(t *testing.T) {
-	changes := &feedModification{}
-	feed := &model.Feed{SiteURL: "http://example.org/"}
-	changes.Update(feed)
-
-	if feed.SiteURL != "http://example.org/" {
-		t.Fatal(`The SiteURL should not be modified`)
-	}
-}
-
-func TestUpdateFeedTitle(t *testing.T) {
-	title := "Example 2"
-	changes := &feedModification{Title: &title}
-	feed := &model.Feed{Title: "Example"}
-	changes.Update(feed)
-
-	if feed.Title != title {
-		t.Fatalf(`Unexpected value, got %q instead of %q`, feed.Title, title)
-	}
-}
-
-func TestUpdateFeedTitleWithEmptyString(t *testing.T) {
-	title := ""
-	changes := &feedModification{Title: &title}
-	feed := &model.Feed{Title: "Example"}
-	changes.Update(feed)
-
-	if feed.Title == title {
-		t.Fatal(`The Title should not be modified`)
-	}
-}
-
-func TestUpdateFeedTitleWhenNotSet(t *testing.T) {
-	changes := &feedModification{}
-	feed := &model.Feed{Title: "Example"}
-	changes.Update(feed)
-
-	if feed.Title != "Example" {
-		t.Fatal(`The Title should not be modified`)
-	}
-}
-
-func TestUpdateFeedUsername(t *testing.T) {
-	username := "Alice"
-	changes := &feedModification{Username: &username}
-	feed := &model.Feed{Username: "Bob"}
-	changes.Update(feed)
-
-	if feed.Username != username {
-		t.Fatalf(`Unexpected value, got %q instead of %q`, feed.Username, username)
-	}
-}
-
-func TestUpdateFeedUsernameWithEmptyString(t *testing.T) {
-	username := ""
-	changes := &feedModification{Username: &username}
-	feed := &model.Feed{Username: "Bob"}
-	changes.Update(feed)
-
-	if feed.Username != "" {
-		t.Fatal(`The Username should be empty now`)
-	}
-}
-
-func TestUpdateFeedUsernameWhenNotSet(t *testing.T) {
-	changes := &feedModification{}
-	feed := &model.Feed{Username: "Alice"}
-	changes.Update(feed)
-
-	if feed.Username != "Alice" {
-		t.Fatal(`The Username should not be modified`)
-	}
-}
-
-func TestUpdateFeedDisabled(t *testing.T) {
-	valueTrue := true
-	valueFalse := false
-	scenarios := []struct {
-		changes  *feedModification
-		feed     *model.Feed
-		expected bool
-	}{
-		{&feedModification{}, &model.Feed{Disabled: true}, true},
-		{&feedModification{Disabled: &valueTrue}, &model.Feed{Disabled: true}, true},
-		{&feedModification{Disabled: &valueFalse}, &model.Feed{Disabled: true}, false},
-		{&feedModification{}, &model.Feed{Disabled: false}, false},
-		{&feedModification{Disabled: &valueTrue}, &model.Feed{Disabled: false}, true},
-		{&feedModification{Disabled: &valueFalse}, &model.Feed{Disabled: false}, false},
-	}
-
-	for _, scenario := range scenarios {
-		scenario.changes.Update(scenario.feed)
-		if scenario.feed.Disabled != scenario.expected {
-			t.Errorf(`Unexpected result, got %v, want: %v`,
-				scenario.feed.Disabled,
-				scenario.expected,
-			)
-		}
-	}
-}
-
-func TestUpdateFeedCategory(t *testing.T) {
-	categoryID := int64(1)
-	changes := &feedModification{CategoryID: &categoryID}
-	feed := &model.Feed{Category: &model.Category{ID: 42}}
-	changes.Update(feed)
-
-	if feed.Category.ID != categoryID {
-		t.Fatalf(`Unexpected value, got %q instead of %q`, feed.Username, categoryID)
-	}
-}
-
-func TestUpdateFeedCategoryWithZero(t *testing.T) {
-	categoryID := int64(0)
-	changes := &feedModification{CategoryID: &categoryID}
-	feed := &model.Feed{Category: &model.Category{ID: 42}}
-	changes.Update(feed)
-
-	if feed.Category.ID != 42 {
-		t.Fatal(`The CategoryID should not be modified`)
-	}
-}
-
-func TestUpdateFeedCategoryWhenNotSet(t *testing.T) {
-	changes := &feedModification{}
-	feed := &model.Feed{Category: &model.Category{ID: 42}}
-	changes.Update(feed)
-
-	if feed.Category.ID != 42 {
-		t.Fatal(`The CategoryID should not be modified`)
-	}
-}
-
-func TestUpdateUserTheme(t *testing.T) {
-	theme := "Example 2"
-	changes := &userModification{Theme: &theme}
-	user := &model.User{Theme: "Example"}
-	changes.Update(user)
-
-	if user.Theme != theme {
-		t.Fatalf(`Unexpected value, got %q instead of %q`, user.Theme, theme)
-	}
-}
-
-func TestUserThemeWhenNotSet(t *testing.T) {
-	changes := &userModification{}
-	user := &model.User{Theme: "Example"}
-	changes.Update(user)
-
-	if user.Theme != "Example" {
-		t.Fatal(`The user Theme should not be modified`)
-	}
-}

api/subscription.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/response/json"
-	"miniflux.app/reader/subscription"
-)
-
-func (h *handler) getSubscriptions(w http.ResponseWriter, r *http.Request) {
-	subscriptionInfo, bodyErr := decodeURLPayload(r.Body)
-	if bodyErr != nil {
-		json.BadRequest(w, r, bodyErr)
-		return
-	}
-
-	subscriptions, finderErr := subscription.FindSubscriptions(
-		subscriptionInfo.URL,
-		subscriptionInfo.UserAgent,
-		subscriptionInfo.Username,
-		subscriptionInfo.Password,
-	)
-	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,155 +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() {
-		database.Migrate(db)
-	}
-
-	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,40 +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/logger"
-	"miniflux.app/model"
-	"miniflux.app/storage"
-)
-
-func createAdmin(store *storage.Storage) {
-	user := model.NewUser()
-	user.Username = os.Getenv("ADMIN_USERNAME")
-	user.Password = os.Getenv("ADMIN_PASSWORD")
-	user.IsAdmin = true
-
-	if user.Username == "" || user.Password == "" {
-		user.Username, user.Password = askCredentials()
-	}
-
-	if err := user.ValidateUserCreation(); err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-		os.Exit(1)
-	}
-
-	if store.UserExists(user.Username) {
-		logger.Info(`User %q already exists, skipping creation`, user.Username)
-		return
-	}
-
-	if err := store.CreateUser(user); err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-		os.Exit(1)
-	}
-}

cli/daemon.go

@@ -1,67 +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"
-	"runtime"
-	"syscall"
-	"time"
-
-	"miniflux.app/config"
-	"miniflux.app/logger"
-	"miniflux.app/reader/feed"
-	"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)
-
-	feedHandler := feed.NewFeedHandler(store)
-	pool := worker.NewPool(feedHandler, config.Opts.WorkerPoolSize())
-
-	go showProcessStatistics()
-
-	if config.Opts.HasSchedulerService() {
-		scheduler.Serve(store, pool)
-	}
-
-	var httpServer *http.Server
-	if config.Opts.HasHTTPService() {
-		httpServer = httpd.Serve(store, pool, feedHandler)
-	}
-
-	<-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")
-}
-
-func showProcessStatistics() {
-	for {
-		var m runtime.MemStats
-		runtime.ReadMemStats(&m)
-		logger.Debug("Sys=%vK, InUse=%vK, HeapInUse=%vK, StackSys=%vK, StackInUse=%vK, GoRoutines=%d, NumCPU=%d",
-			m.Sys/1024, (m.Sys-m.HeapReleased)/1024, m.HeapInuse/1024, m.StackSys/1024, m.StackInuse/1024,
-			runtime.NumGoroutine(), runtime.NumCPU())
-		time.Sleep(30 * time.Second)
-	}
-}

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,39 +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 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)
-	}
-
-	user.Password = password
-	if err := user.ValidatePassword(); err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-		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,13 +1,15 @@
 Miniflux API 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.
 
 Installation
 ------------
 
 ```bash
-go get -u miniflux.app/client
+go get -u miniflux.app/v2/client
 ```
 
 Example
@@ -18,17 +20,17 @@ package main
 
 import (
 	"fmt"
-    "io/ioutil"
+	"os"
 
-	miniflux "miniflux.app/client"
+	miniflux "miniflux.app/v2/client"
 )
 
 func main() {
     // Authentication with username/password:
-    client := miniflux.New("https://api.example.org", "admin", "secret")
+    client := miniflux.NewClient("https://api.example.org", "admin", "secret")
 
     // Authentication with an API Key:
-    client := miniflux.New("https://api.example.org", "my-secret-token")
+    client := miniflux.NewClient("https://api.example.org", "my-secret-token")
 
     // Fetch all feeds.
     feeds, err := client.Feeds()
@@ -45,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/core.go

@@ -1,178 +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"`
-	LastLoginAt    *time.Time        `json:"last_login_at"`
-	Extra          map[string]string `json:"extra"`
-}
-
-func (u User) String() string {
-	return fmt.Sprintf("#%d - %s (admin=%v)", u.ID, u.Username, u.IsAdmin)
-}
-
-// UserModification is used to update a user.
-type UserModification 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"`
-}
-
-// 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"`
-	ScraperRules       string    `json:"scraper_rules"`
-	RewriteRules       string    `json:"rewrite_rules"`
-	Crawler            bool      `json:"crawler"`
-	UserAgent          string    `json:"user_agent"`
-	Username           string    `json:"username"`
-	Password           string    `json:"password"`
-	Category           *Category `json:"category,omitempty"`
-}
-
-// FeedModification represents changes for a feed.
-type FeedModification 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"`
-	Crawler      *bool   `json:"crawler"`
-	UserAgent    *string `json:"user_agent"`
-	Username     *string `json:"username"`
-	Password     *string `json:"password"`
-	CategoryID   *int64  `json:"category_id"`
-}
-
-// 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"`
-	Content    string     `json:"content"`
-	Author     string     `json:"author"`
-	ShareCode  string     `json:"share_code"`
-	Starred    bool       `json:"starred"`
-	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
-}
-
-// 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,361 @@
+// 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"`
+	AlwaysOpenExternalLinks   bool       `json:"always_open_external_links"`
+	OpenExternalLinksInNewTab bool       `json:"open_external_links_in_new_tab"`
+}
+
+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"`
+	AlwaysOpenExternalLinks   *bool    `json:"always_open_external_links"`
+	OpenExternalLinksInNewTab *bool    `json:"open_external_links_in_new_tab"`
+}
+
+// Users represents a list of users.
+type Users []User
+
+// Category represents a feed category.
+type Category struct {
+	ID           int64  `json:"id"`
+	Title        string `json:"title"`
+	UserID       int64  `json:"user_id,omitempty"`
+	HideGlobally bool   `json:"hide_globally,omitempty"`
+	FeedCount    *int   `json:"feed_count,omitempty"`
+	TotalUnread  *int   `json:"total_unread,omitempty"`
+}
+
+func (c Category) String() string {
+	return fmt.Sprintf("#%d %s", c.ID, c.Title)
+}
+
+// Categories represents a list of categories.
+type Categories []*Category
+
+// CategoryCreationRequest represents the request to create a category.
+type CategoryCreationRequest struct {
+	Title        string `json:"title"`
+	HideGlobally bool   `json:"hide_globally"`
+}
+
+// CategoryModificationRequest represents the request to update a category.
+type CategoryModificationRequest struct {
+	Title        *string `json:"title"`
+	HideGlobally *bool   `json:"hide_globally"`
+}
+
+// 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"`
+	UrlRewriteRules             string    `json:"urlrewrite_rules"`
+	BlocklistRules              string    `json:"blocklist_rules"`
+	KeeplistRules               string    `json:"keeplist_rules"`
+	BlockFilterEntryRules       string    `json:"block_filter_entry_rules"`
+	KeepFilterEntryRules        string    `json:"keep_filter_entry_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"`
+	ProxyURL                    string    `json:"proxy_url"`
+}
+
+// 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"`
+	UrlRewriteRules             string `json:"urlrewrite_rules"`
+	BlocklistRules              string `json:"blocklist_rules"`
+	KeeplistRules               string `json:"keeplist_rules"`
+	BlockFilterEntryRules       string `json:"block_filter_entry_rules"`
+	KeepFilterEntryRules        string `json:"keep_filter_entry_rules"`
+	HideGlobally                bool   `json:"hide_globally"`
+	DisableHTTP2                bool   `json:"disable_http2"`
+	ProxyURL                    string `json:"proxy_url"`
+}
+
+// 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"`
+	UrlRewriteRules             *string `json:"urlrewrite_rules"`
+	BlocklistRules              *string `json:"blocklist_rules"`
+	KeeplistRules               *string `json:"keeplist_rules"`
+	BlockFilterEntryRules       *string `json:"block_filter_entry_rules"`
+	KeepFilterEntryRules        *string `json:"keep_filter_entry_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"`
+	ProxyURL                    *string `json:"proxy_url"`
+}
+
+// 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"`
+}
+
+// APIKey represents an application API key.
+type APIKey struct {
+	ID          int64      `json:"id"`
+	UserID      int64      `json:"user_id"`
+	Token       string     `json:"token"`
+	Description string     `json:"description"`
+	LastUsedAt  *time.Time `json:"last_used_at"`
+	CreatedAt   time.Time  `json:"created_at"`
+}
+
+// APIKeys represents a collection of API keys.
+type APIKeys []*APIKey
+
+// APIKeyCreationRequest represents the request to create an API key.
+type APIKeyCreationRequest struct {
+	Description string `json:"description"`
+}
+
+func SetOptionalField[T any](value T) *T {
+	return &value
+}

client/options.go

@@ -0,0 +1,30 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package client // import "miniflux.app/v2/client"
+
+import "net/http"
+
+type Option func(*request)
+
+// WithAPIKey sets the API key for the client.
+func WithAPIKey(apiKey string) Option {
+	return func(r *request) {
+		r.apiKey = apiKey
+	}
+}
+
+// WithCredentials sets the username and password for the client.
+func WithCredentials(username, password string) Option {
+	return func(r *request) {
+		r.username = username
+		r.password = password
+	}
+}
+
+// WithHTTPClient sets the HTTP client for the client.
+func WithHTTPClient(client *http.Client) Option {
+	return func(r *request) {
+		r.client = client
+	}
+}

client/request.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 (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
@@ -19,7 +18,7 @@ import (
 
 const (
 	userAgent      = "Miniflux Client Library"
-	defaultTimeout = 80
+	defaultTimeout = 80 * time.Second
 )
 
 // List of exposed errors.
@@ -28,6 +27,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 {
@@ -39,29 +40,39 @@ type request struct {
 	username string
 	password string
 	apiKey   string
+	client   *http.Client
 }
 
-func (r *request) Get(path string) (io.ReadCloser, error) {
-	return r.execute(http.MethodGet, path, nil)
+func (r *request) Get(ctx context.Context, path string) (io.ReadCloser, error) {
+	return r.execute(ctx, http.MethodGet, path, nil)
 }
 
-func (r *request) Post(path string, data interface{}) (io.ReadCloser, error) {
-	return r.execute(http.MethodPost, path, data)
+func (r *request) Post(ctx context.Context, path string, data any) (io.ReadCloser, error) {
+	return r.execute(ctx, http.MethodPost, path, data)
 }
 
-func (r *request) PostFile(path string, f io.ReadCloser) (io.ReadCloser, error) {
-	return r.execute(http.MethodPost, path, f)
+func (r *request) PostFile(ctx context.Context, path string, f io.ReadCloser) (io.ReadCloser, error) {
+	return r.execute(ctx, http.MethodPost, path, f)
 }
 
-func (r *request) Put(path string, data interface{}) (io.ReadCloser, error) {
-	return r.execute(http.MethodPut, path, data)
+func (r *request) Put(ctx context.Context, path string, data any) (io.ReadCloser, error) {
+	return r.execute(ctx, http.MethodPut, path, data)
 }
 
-func (r *request) Delete(path string) (io.ReadCloser, error) {
-	return r.execute(http.MethodDelete, path, nil)
+func (r *request) Delete(ctx context.Context, path string) error {
+	_, err := r.execute(ctx, http.MethodDelete, path, nil)
+	return err
 }
 
-func (r *request) execute(method, path string, data interface{}) (io.ReadCloser, error) {
+func (r *request) execute(
+	ctx context.Context,
+	method string,
+	path string,
+	data any,
+) (io.ReadCloser, error) {
+	if r.endpoint == "" {
+		return nil, ErrEmptyEndpoint
+	}
 	if r.endpoint[len(r.endpoint)-1:] == "/" {
 		r.endpoint = r.endpoint[:len(r.endpoint)-1]
 	}
@@ -71,26 +82,27 @@ func (r *request) execute(method, path string, data interface{}) (io.ReadCloser,
 		return nil, err
 	}
 
-	request := &http.Request{
-		URL:    u,
-		Method: method,
-		Header: r.buildHeaders(),
+	request, err := http.NewRequestWithContext(ctx, method, u.String(), nil)
+	if err != nil {
+		return nil, err
 	}
 
+	request.Header = r.buildHeaders()
+
 	if r.username != "" && r.password != "" {
 		request.SetBasicAuth(r.username, r.password)
 	}
 
 	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)))
 		}
 	}
 
-	client := r.buildClient()
+	client := r.client
 	response, err := client.Do(request)
 	if err != nil {
 		return nil, err
@@ -98,38 +110,47 @@ func (r *request) execute(method, path string, data interface{}) (io.ReadCloser,
 
 	switch response.StatusCode {
 	case http.StatusUnauthorized:
+		response.Body.Close()
 		return nil, ErrNotAuthorized
 	case http.StatusForbidden:
+		response.Body.Close()
 		return nil, ErrForbidden
 	case http.StatusInternalServerError:
-		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
+	case http.StatusNoContent:
+		response.Body.Close()
+		return nil, nil
 	case http.StatusBadRequest:
 		defer response.Body.Close()
 
 		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 {
+		response.Body.Close()
 		return nil, fmt.Errorf("miniflux: status code=%d", response.StatusCode)
 	}
 
 	return response.Body, nil
 }
 
-func (r *request) buildClient() http.Client {
-	return http.Client{
-		Timeout: time.Duration(defaultTimeout * time.Second),
-	}
-}
-
 func (r *request) buildHeaders() http.Header {
 	headers := make(http.Header)
 	headers.Add("User-Agent", userAgent)
@@ -141,7 +162,7 @@ func (r *request) buildHeaders() http.Header {
 	return headers
 }
 
-func (r *request) toJSON(v interface{}) []byte {
+func (r *request) toJSON(v any) []byte {
 	b, err := json.Marshal(v)
 	if err != nil {
 		log.Println("Unable to convert interface to JSON:", err)

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,393 +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"
-)
-
-const (
-	defaultHTTPS                              = false
-	defaultLogDateTime                        = false
-	defaultHSTS                               = true
-	defaultHTTPService                        = true
-	defaultSchedulerService                   = true
-	defaultDebug                              = 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
-	defaultCleanupRemoveSessionsDays          = 30
-	defaultProxyImages                        = "http-only"
-	defaultCreateAdmin                        = false
-	defaultOAuth2UserCreation                 = false
-	defaultOAuth2ClientID                     = ""
-	defaultOAuth2ClientSecret                 = ""
-	defaultOAuth2RedirectURL                  = ""
-	defaultOAuth2OidcDiscoveryEndpoint        = ""
-	defaultOAuth2Provider                     = ""
-	defaultPocketConsumerKey                  = ""
-	defaultHTTPClientTimeout                  = 20
-	defaultHTTPClientMaxBodySize              = 15
-	defaultAuthProxyHeader                    = ""
-	defaultAuthProxyUserCreation              = false
-)
-
-// Options contains configuration options.
-type Options struct {
-	HTTPS                              bool
-	logDateTime                        bool
-	hsts                               bool
-	httpService                        bool
-	schedulerService                   bool
-	debug                              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
-	cleanupRemoveSessionsDays          int
-	pollingFrequency                   int
-	batchSize                          int
-	pollingScheduler                   string
-	schedulerEntryFrequencyMinInterval int
-	schedulerEntryFrequencyMaxInterval int
-	workerPoolSize                     int
-	createAdmin                        bool
-	proxyImages                        string
-	oauth2UserCreationAllowed          bool
-	oauth2ClientID                     string
-	oauth2ClientSecret                 string
-	oauth2RedirectURL                  string
-	oauth2OidcDiscoveryEndpoint        string
-	oauth2Provider                     string
-	pocketConsumerKey                  string
-	httpClientTimeout                  int
-	httpClientMaxBodySize              int64
-	authProxyHeader                    string
-	authProxyUserCreation              bool
-}
-
-// NewOptions returns Options with default values.
-func NewOptions() *Options {
-	return &Options{
-		HTTPS:                              defaultHTTPS,
-		logDateTime:                        defaultLogDateTime,
-		hsts:                               defaultHSTS,
-		httpService:                        defaultHTTPService,
-		schedulerService:                   defaultSchedulerService,
-		debug:                              defaultDebug,
-		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,
-		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,
-		authProxyHeader:                    defaultAuthProxyHeader,
-		authProxyUserCreation:              defaultAuthProxyUserCreation,
-	}
-}
-
-// LogDateTime returns true if the date/time should be displayed in log messages.
-func (o *Options) LogDateTime() bool {
-	return o.logDateTime
-}
-
-// HasDebugMode returns true if debug mode is enabled.
-func (o *Options) HasDebugMode() bool {
-	return o.debug
-}
-
-// 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
-}
-
-// 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
-}
-
-// 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
-}
-
-// 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
-}
-
-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("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_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("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("AUTH_PROXY_HEADER: %v\n", o.authProxyHeader))
-	builder.WriteString(fmt.Sprintf("AUTH_PROXY_USER_CREATION: %v\n", o.authProxyUserCreation))
-	return builder.String()
-}

config/parser.go

@@ -1,237 +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 (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	url_parser "net/url"
-	"os"
-	"strconv"
-	"strings"
-
-	"miniflux.app/logger"
-)
-
-// Parser handles configuration parsing.
-type Parser struct {
-	opts *Options
-}
-
-// NewParser returns a new Parser.
-func NewParser() *Parser {
-	return &Parser{
-		opts: NewOptions(),
-	}
-}
-
-// ParseEnvironmentVariables loads configuration values from environment variables.
-func (p *Parser) ParseEnvironmentVariables() (*Options, error) {
-	err := p.parseLines(os.Environ())
-	if err != nil {
-		return nil, err
-	}
-	return p.opts, nil
-}
-
-// ParseFile loads configuration values from a local file.
-func (p *Parser) ParseFile(filename string) (*Options, error) {
-	fp, err := os.Open(filename)
-	if err != nil {
-		return nil, err
-	}
-	defer fp.Close()
-
-	err = p.parseLines(p.parseFileContent(fp))
-	if err != nil {
-		return nil, err
-	}
-	return p.opts, nil
-}
-
-func (p *Parser) parseFileContent(r io.Reader) (lines []string) {
-	scanner := bufio.NewScanner(r)
-	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
-		if len(line) > 0 && !strings.HasPrefix(line, "#") && strings.Index(line, "=") > 0 {
-			lines = append(lines, line)
-		}
-	}
-	return lines
-}
-
-func (p *Parser) parseLines(lines []string) (err error) {
-	var port string
-
-	for _, line := range lines {
-		fields := strings.SplitN(line, "=", 2)
-		key := strings.TrimSpace(fields[0])
-		value := strings.TrimSpace(fields[1])
-
-		switch key {
-		case "LOG_DATE_TIME":
-			p.opts.logDateTime = parseBool(value, defaultLogDateTime)
-		case "DEBUG":
-			p.opts.debug = parseBool(value, defaultDebug)
-		case "BASE_URL":
-			p.opts.baseURL, p.opts.rootURL, p.opts.basePath, err = parseBaseURL(value)
-			if err != nil {
-				return err
-			}
-		case "PORT":
-			port = value
-		case "LISTEN_ADDR":
-			p.opts.listenAddr = parseString(value, defaultListenAddr)
-		case "DATABASE_URL":
-			p.opts.databaseURL = parseString(value, defaultDatabaseURL)
-		case "DATABASE_MAX_CONNS":
-			p.opts.databaseMaxConns = parseInt(value, defaultDatabaseMaxConns)
-		case "DATABASE_MIN_CONNS":
-			p.opts.databaseMinConns = parseInt(value, defaultDatabaseMinConns)
-		case "RUN_MIGRATIONS":
-			p.opts.runMigrations = parseBool(value, defaultRunMigrations)
-		case "DISABLE_HSTS":
-			p.opts.hsts = !parseBool(value, defaultHSTS)
-		case "HTTPS":
-			p.opts.HTTPS = parseBool(value, defaultHTTPS)
-		case "DISABLE_SCHEDULER_SERVICE":
-			p.opts.schedulerService = !parseBool(value, defaultSchedulerService)
-		case "DISABLE_HTTP_SERVICE":
-			p.opts.httpService = !parseBool(value, defaultHTTPService)
-		case "CERT_FILE":
-			p.opts.certFile = parseString(value, defaultCertFile)
-		case "KEY_FILE":
-			p.opts.certKeyFile = parseString(value, defaultKeyFile)
-		case "CERT_DOMAIN":
-			p.opts.certDomain = parseString(value, defaultCertDomain)
-		case "CERT_CACHE":
-			p.opts.certCache = parseString(value, defaultCertCache)
-		case "CLEANUP_FREQUENCY_HOURS":
-			p.opts.cleanupFrequencyHours = parseInt(value, defaultCleanupFrequencyHours)
-		case "CLEANUP_ARCHIVE_READ_DAYS":
-			p.opts.cleanupArchiveReadDays = parseInt(value, defaultCleanupArchiveReadDays)
-		case "CLEANUP_REMOVE_SESSIONS_DAYS":
-			p.opts.cleanupRemoveSessionsDays = parseInt(value, defaultCleanupRemoveSessionsDays)
-		case "CLEANUP_FREQUENCY":
-			logger.Error("[Config] CLEANUP_FREQUENCY has been deprecated in favor of CLEANUP_FREQUENCY_HOURS.")
-
-			if p.opts.cleanupFrequencyHours != defaultCleanupFrequencyHours {
-				logger.Error("[Config] Ignoring CLEANUP_FREQUENCY as CLEANUP_FREQUENCY_HOURS is already specified.")
-			} else {
-				p.opts.cleanupFrequencyHours = parseInt(value, defaultCleanupFrequencyHours)
-			}
-		case "ARCHIVE_READ_DAYS":
-			logger.Error("[Config] ARCHIVE_READ_DAYS has been deprecated in favor of CLEANUP_ARCHIVE_READ_DAYS.")
-
-			if p.opts.cleanupArchiveReadDays != defaultCleanupArchiveReadDays {
-				logger.Error("[Config] Ignoring ARCHIVE_READ_DAYS as CLEANUP_ARCHIVE_READ_DAYS is already specified.")
-			} else {
-				p.opts.cleanupArchiveReadDays = parseInt(value, defaultCleanupArchiveReadDays)
-			}
-		case "WORKER_POOL_SIZE":
-			p.opts.workerPoolSize = parseInt(value, defaultWorkerPoolSize)
-		case "POLLING_FREQUENCY":
-			p.opts.pollingFrequency = parseInt(value, defaultPollingFrequency)
-		case "BATCH_SIZE":
-			p.opts.batchSize = parseInt(value, defaultBatchSize)
-		case "POLLING_SCHEDULER":
-			p.opts.pollingScheduler = strings.ToLower(parseString(value, defaultPollingScheduler))
-		case "SCHEDULER_ENTRY_FREQUENCY_MAX_INTERVAL":
-			p.opts.schedulerEntryFrequencyMaxInterval = parseInt(value, defaultSchedulerEntryFrequencyMaxInterval)
-		case "SCHEDULER_ENTRY_FREQUENCY_MIN_INTERVAL":
-			p.opts.schedulerEntryFrequencyMinInterval = parseInt(value, defaultSchedulerEntryFrequencyMinInterval)
-		case "PROXY_IMAGES":
-			p.opts.proxyImages = parseString(value, defaultProxyImages)
-		case "CREATE_ADMIN":
-			p.opts.createAdmin = parseBool(value, defaultCreateAdmin)
-		case "POCKET_CONSUMER_KEY":
-			p.opts.pocketConsumerKey = parseString(value, defaultPocketConsumerKey)
-		case "OAUTH2_USER_CREATION":
-			p.opts.oauth2UserCreationAllowed = parseBool(value, defaultOAuth2UserCreation)
-		case "OAUTH2_CLIENT_ID":
-			p.opts.oauth2ClientID = parseString(value, defaultOAuth2ClientID)
-		case "OAUTH2_CLIENT_SECRET":
-			p.opts.oauth2ClientSecret = parseString(value, defaultOAuth2ClientSecret)
-		case "OAUTH2_REDIRECT_URL":
-			p.opts.oauth2RedirectURL = parseString(value, defaultOAuth2RedirectURL)
-		case "OAUTH2_OIDC_DISCOVERY_ENDPOINT":
-			p.opts.oauth2OidcDiscoveryEndpoint = parseString(value, defaultOAuth2OidcDiscoveryEndpoint)
-		case "OAUTH2_PROVIDER":
-			p.opts.oauth2Provider = parseString(value, defaultOAuth2Provider)
-		case "HTTP_CLIENT_TIMEOUT":
-			p.opts.httpClientTimeout = parseInt(value, defaultHTTPClientTimeout)
-		case "HTTP_CLIENT_MAX_BODY_SIZE":
-			p.opts.httpClientMaxBodySize = int64(parseInt(value, defaultHTTPClientMaxBodySize) * 1024 * 1024)
-		case "AUTH_PROXY_HEADER":
-			p.opts.authProxyHeader = parseString(value, defaultAuthProxyHeader)
-		case "AUTH_PROXY_USER_CREATION":
-			p.opts.authProxyUserCreation = parseBool(value, defaultAuthProxyUserCreation)
-		}
-	}
-
-	if port != "" {
-		p.opts.listenAddr = ":" + port
-	}
-	return nil
-}
-
-func parseBaseURL(value string) (string, string, string, error) {
-	if value == "" {
-		return defaultBaseURL, defaultRootURL, "", nil
-	}
-
-	if value[len(value)-1:] == "/" {
-		value = value[:len(value)-1]
-	}
-
-	url, err := url_parser.Parse(value)
-	if err != nil {
-		return "", "", "", fmt.Errorf("Invalid BASE_URL: %v", err)
-	}
-
-	scheme := strings.ToLower(url.Scheme)
-	if scheme != "https" && scheme != "http" {
-		return "", "", "", errors.New("Invalid BASE_URL: scheme must be http or https")
-	}
-
-	basePath := url.Path
-	url.Path = ""
-	return value, url.String(), basePath, nil
-}
-
-func parseBool(value string, fallback bool) bool {
-	if value == "" {
-		return fallback
-	}
-
-	value = strings.ToLower(value)
-	if value == "1" || value == "yes" || value == "true" || value == "on" {
-		return true
-	}
-
-	return false
-}
-
-func parseInt(value string, fallback int) int {
-	if value == "" {
-		return fallback
-	}
-
-	v, err := strconv.Atoi(value)
-	if err != nil {
-		return fallback
-	}
-
-	return v
-}
-
-func parseString(value string, fallback string) string {
-	if value == "" {
-		return fallback
-	}
-	return value
-}

config/parser_test.go

@@ -1,61 +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 (
-	"testing"
-)
-
-func TestParseBoolValue(t *testing.T) {
-	scenarios := map[string]bool{
-		"":        true,
-		"1":       true,
-		"Yes":     true,
-		"yes":     true,
-		"True":    true,
-		"true":    true,
-		"on":      true,
-		"false":   false,
-		"off":     false,
-		"invalid": false,
-	}
-
-	for input, expected := range scenarios {
-		result := parseBool(input, true)
-		if result != expected {
-			t.Errorf(`Unexpected result for %q, got %v instead of %v`, input, result, expected)
-		}
-	}
-}
-
-func TestParseStringValueWithUnsetVariable(t *testing.T) {
-	if parseString("", "defaultValue") != "defaultValue" {
-		t.Errorf(`Unset variables should returns the default value`)
-	}
-}
-
-func TestParseStringValue(t *testing.T) {
-	if parseString("test", "defaultValue") != "test" {
-		t.Errorf(`Defined variables should returns the specified value`)
-	}
-}
-
-func TestParseIntValueWithUnsetVariable(t *testing.T) {
-	if parseInt("", 42) != 42 {
-		t.Errorf(`Unset variables should returns the default value`)
-	}
-}
-
-func TestParseIntValueWithInvalidInput(t *testing.T) {
-	if parseInt("invalid integer", 42) != 42 {
-		t.Errorf(`Invalid integer should returns the default value`)
-	}
-}
-
-func TestParseIntValue(t *testing.T) {
-	if parseInt("2018", 42) != 2018 {
-		t.Errorf(`Defined variables should returns the specified value`)
-	}
-}

contrib/README.md

@@ -0,0 +1,4 @@
+The contrib directory contains various useful things contributed by the community.
+
+Community contributions are not officially supported by the maintainers.
+There is no guarantee whatsoever that anything in this folder works.

contrib/ansible/inventories/group_vars/miniflux_vars.yml

@@ -0,0 +1,8 @@
+---
+  miniflux_linux_user: miniflux
+  miniflux_db_user_name: miniflux_db_user
+  miniflux_db_user_password: miniflux_db_user_password
+  miniflux_db: miniflux_db
+  miniflux_admin_name: admin
+  miniflux_admin_passwort: miniflux_admin_password
+  miniflux_port: 8080

contrib/ansible/playbooks/playbook.yml

@@ -0,0 +1,4 @@
+---
+- hosts: miniflux
+  roles:
+    - { role: mgrote.miniflux, tags: "miniflux" }

contrib/ansible/roles/mgrote.miniflux/README.md

@@ -0,0 +1,23 @@
+## mgrote.miniflux
+
+### Details
+Installs and configures Miniflux v2 with ansible
+
+### Works on...
+- [x] Ubuntu (>=18.04)
+
+### Variables and Defaults
+##### Linux User
+    miniflux_linux_user: miniflux
+##### DB User
+    miniflux_db_user_name: miniflux_db_user
+##### DB Password
+    miniflux_db_user_password: qqqqqqqqqqqqq
+##### Database
+    miniflux_db: miniflux_db
+##### Username Miniflux Admin
+    miniflux_admin_name: admin
+##### Password Miniflux Admin
+    miniflux_admin_passwort: hallowelt
+##### Port for Miniflux Frontend
+    miniflux_port: 8080

contrib/ansible/roles/mgrote.miniflux/handlers/main.yml

@@ -0,0 +1,11 @@
+---
+  - name: start_miniflux.service
+    become: yes
+    systemd:
+      name: miniflux
+      state: restarted
+      enabled: yes
+# wait 15 seconds(for systemd)
+  - name: miniflux_wait
+    wait_for:
+      timeout: 15

contrib/ansible/roles/mgrote.miniflux/tasks/main.yml

@@ -0,0 +1,43 @@
+  - name: add Apt-key for miniflux-repo
+    become: yes
+    apt_key:
+      url: https://apt.miniflux.app/KEY.gpg
+      state: present
+
+  - name: add miniflux-repo
+    become: yes
+    apt_repository:
+      repo: 'deb https://apt.miniflux.app/ /' 
+      state: present
+      filename: miniflux_repo
+      update_cache: yes
+
+  - name: install miniflux
+    become: yes
+    apt:
+      name: miniflux
+      state: present
+
+  - name: add miniflux linux_user
+    become: yes
+    user:
+      name: "{{ miniflux_linux_user }}"
+      home: "/var/empty"
+      create_home: "no"
+      system: "yes"
+      shell: "/bin/false"
+
+  - name: create directory "/etc/miniflux.d"
+    become: yes
+    file:
+      path: /etc/miniflux.d
+      state: directory
+
+  - name: copy miniflux.conf
+    become: yes
+    template:
+      src: "miniflux.conf"
+      dest: "/etc/miniflux.conf"
+    notify:
+      - start_miniflux.service
+      - miniflux_wait

contrib/ansible/roles/mgrote.miniflux/templates/miniflux.conf

@@ -0,0 +1,18 @@
+# See https://docs.miniflux.app/
+
+LISTEN_ADDR=0.0.0.0:{{ miniflux_port }}
+DATABASE_URL=user={{ miniflux_db_user_name }} password={{ miniflux_db_user_password }} dbname={{ miniflux_db }} sslmode=disable
+
+POLLING_FREQUENCY=15
+PROXY_IMAGES=http-only
+
+# Run SQL migrations automatically:
+RUN_MIGRATIONS=1
+
+CREATE_ADMIN=1
+ADMIN_USERNAME={{ miniflux_admin_name }}
+ADMIN_PASSWORD={{ miniflux_admin_passwort }}
+
+POLLING_FREQUENCY=10
+
+# Options: https://miniflux.app/miniflux.1.html

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
+}