.dockerignore

@@ -1,3 +0,0 @@
-dist
-*/node_modules
-Dockerfile*

.git-blame-ignore-revs

@@ -1,11 +0,0 @@
-# https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
-
-# Run prettier (https://github.com/binwiederhier/ntfy/pull/746)
-6f6a2d1f693070bf72e89d86748080e4825c9164
-c87549e71a10bc789eac8036078228f06e515a8e
-ca5d736a7169eb6b4b0d849e061d5bf9565dcc53
-2e27f58963feb9e4d1c573d4745d07770777fa7d
-
-# Run eslint (https://github.com/binwiederhier/ntfy/pull/748)
-f558b4dbe9bb5b9e0e87fada1215de2558353173
-8319f1cf26113167fb29fe12edaff5db74caf35f

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: [binwiederhier]
-liberapay: ntfy

.github/ISSUE_TEMPLATE/1_bug_report.md

@@ -1,26 +0,0 @@
----
-name: 🐛 Bug Report
-about: Report any errors and problems
-title: ''
-labels: '🪲 bug'
-assignees: ''
-
----
-
-:lady_beetle: **Describe the bug**
-<!-- A clear and concise description of the problem. -->
-
-:computer: **Components impacted**
-<!-- ntfy server, Android app, iOS app, web app  -->
-
-:bulb: **Screenshots and/or logs**
-<!-- 
-If applicable, add screenshots or share logs help explain your problem.
-To get logs from the ...
-- ntfy server: Enable "log-level: trace" in your server.yml file
-- Android app: Go to "Settings" -> "Record logs", then eventually "Copy/upload logs"
-- web app: Press "F12" and find the "Console" window 
--->
-
-:crystal_ball: **Additional context**
-<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/2_enhancement_request.md

@@ -1,26 +0,0 @@
----
-name: 💡 Feature/Enhancement Request
-about: Got a great idea? Let us know!
-title: ''
-labels: 'enhancement'
-assignees: ''
-
----
-
-<!--
-
-Before you submit, consider asking on Discord/Matrix instead. You'll usually get an answer
-sooner, and there are more people there to help!
-
-- Discord: https://discord.gg/cT7ECsZj9w
-- Matrix: https://matrix.to/#/#ntfy:matrix.org / https://matrix.to/#/#ntfy-space:matrix.org
-
--->
-
-:bulb: **Idea**
-<!-- Share your thoughts; try to be detailed if you can -->
-
-:computer: **Target components**
-<!-- Where should this feature/enhancement be added? -->
-<!-- e.g. ntfy server, Android app, iOS app, web app -->
-

.github/ISSUE_TEMPLATE/3_tech_support.md

@@ -1,21 +0,0 @@
----
-name: 🆘 I need help with ...
-about: Installing ntfy, configuring the app, etc.
-title: ''
-labels: 'tech-support'
-assignees: ''
-
----
-
-
-<!--
-
-STOP! 
-
-This is not the right place to ask for help. Consider asking on Discord/Matrix instead. 
-You'll usually get an answer sooner, and there are more people there to help!
-
-- Discord: https://discord.gg/cT7ECsZj9w
-- Matrix: https://matrix.to/#/#ntfy:matrix.org / https://matrix.to/#/#ntfy-space:matrix.org
-
--->

.github/ISSUE_TEMPLATE/4_question.md

@@ -1,21 +0,0 @@
----
-name: ❓ Question
-about: Ask a question about ntfy
-title: ''
-labels: 'question'
-assignees: ''
-
----
-
-<!--
-
-Before you submit, consider asking on Discord/Matrix instead. You'll usually get an answer
-sooner, and there are more people there to help!
-
-- Discord: https://discord.gg/cT7ECsZj9w
-- Matrix: https://matrix.to/#/#ntfy:matrix.org / https://matrix.to/#/#ntfy-space:matrix.org
-
--->
-
-:question: **Question**
-<!-- Go ahead and ask your question here :) -->

.github/workflows/build.yaml

@@ -1,30 +0,0 @@
-name: build
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout code
-        uses: actions/checkout@v3
-      -
-        name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.20.x'
-      -
-        name: Install node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-          cache: 'npm'
-          cache-dependency-path: './web/package-lock.json'
-      -
-        name: Install dependencies
-        run: make build-deps-ubuntu
-      -
-        name: Build all the things
-        run: make build
-      -
-        name: Print build results and checksums
-        run: make cli-build-results

.github/workflows/docs.yaml

@@ -1,36 +0,0 @@
-name: docs
-on:
-  push:
-    branches:
-      - main
-jobs:
-  publish-docs:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout ntfy code
-        uses: actions/checkout@v3
-      -
-        name: Checkout docs pages code
-        uses: actions/checkout@v3
-        with:
-          repository: binwiederhier/ntfy-docs.github.io
-          path: build/ntfy-docs.github.io
-          token: ${{secrets.NTFY_DOCS_PUSH_TOKEN}}
-          # Expires after 1 year, re-generate via
-          # User -> Settings -> Developer options -> Personal Access Tokens -> Fine Grained Token
-      -
-        name: Build docs
-        run: make docs
-      -
-        name: Copy generated docs
-        run: rsync -av --exclude CNAME --delete server/docs/ build/ntfy-docs.github.io/docs/
-      -
-        name: Publish docs
-        run: |
-          cd build/ntfy-docs.github.io
-          git config user.name "GitHub Actions Bot"
-          git config user.email "<actions@github.com>"          
-          git add docs/
-          git commit -m "Updated docs"
-          git push origin main

.github/workflows/release.yaml

@@ -1,41 +0,0 @@
-name: release
-on:
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout code
-        uses: actions/checkout@v3
-      -
-        name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.20.x'
-      -
-        name: Install node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-          cache: 'npm'
-          cache-dependency-path: './web/package-lock.json'
-      -
-        name: Docker login
-        uses: docker/login-action@v2
-        with:
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-      -
-        name: Install dependencies
-        run: make build-deps-ubuntu
-      -
-        name: Build and publish
-        run: make release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Print build results and checksums
-        run: make cli-build-results

.github/workflows/test.yaml

@@ -1,39 +0,0 @@
-name: test
-on: [push, pull_request]
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout code
-        uses: actions/checkout@v3
-      -
-        name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.20.x'
-      -
-        name: Install node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-          cache: 'npm'
-          cache-dependency-path: './web/package-lock.json'
-      -
-        name: Install dependencies
-        run: make build-deps-ubuntu
-      -
-        name: Build docs (required for tests)
-        run: make docs
-      -
-        name: Build web app (required for tests)
-        run: make web
-      -
-        name: Run tests, formatting, vetting and linting
-        run: make check
-      -
-        name: Run coverage
-        run: make coverage
-      -
-        name: Upload coverage to codecov.io
-        run: make coverage-upload

.gitignore

@@ -1,16 +1,3 @@
 dist/
-dev-dist/
-build/
 .idea/
-.vscode/
-*.swp
-server/docs/
-server/site/
-tools/fbsend/fbsend
-playground/
-secrets/
 *.iml
-node_modules/
-.DS_Store
-__pycache__
-web/dev-dist/

.gitpod.yml

@@ -1,28 +0,0 @@
-tasks:
-  - name: docs
-    before: make docs-deps
-    command: mkdocs serve
-  - name: binary
-    before: |
-      npm install --global nodemon
-      make cli-deps-static-sites
-    command: |
-      nodemon --watch './**/*.go' --ext go --signal SIGTERM --exec "CGO_ENABLED=1 go run main.go serve --listen-http :2586 --debug --base-url $(gp url 2586)"
-    openMode: split-right
-  - name: web
-    before: make web-deps
-    command: cd web && npm start
-    openMode: split-right
-
-vscode:
-  extensions:
-    - golang.go
-    - ms-azuretools.vscode-docker
-
-ports:
-  - name: docs
-    port: 8000
-  - name: binary
-    port: 2586
-  - name: web
-    port: 3000

.goreleaser.yml

@@ -1,77 +1,21 @@
 before:
   hooks:
     - go mod download
-    - go mod tidy
 builds:
-  -
-    id: ntfy_linux_amd64
-    binary: ntfy
+  - binary: ntfy
     env:
-      - CGO_ENABLED=1 # required for go-sqlite3
-    tags: [sqlite_omit_load_extension,osusergo,netgo]
-    ldflags:
-      - "-linkmode=external -extldflags=-static -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}"
-    goos: [linux]
-    goarch: [amd64]
-  -
-    id: ntfy_linux_armv6
-    binary: ntfy
-    env:
-      - CGO_ENABLED=1 # required for go-sqlite3
-      - CC=arm-linux-gnueabi-gcc # apt install gcc-arm-linux-gnueabi
-    tags: [sqlite_omit_load_extension,osusergo,netgo]
-    ldflags:
-      - "-linkmode=external -extldflags=-static -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}"
-    goos: [linux]
-    goarch: [arm]
-    goarm: [6]
-  -
-    id: ntfy_linux_armv7
-    binary: ntfy
-    env:
-      - CGO_ENABLED=1 # required for go-sqlite3
-      - CC=arm-linux-gnueabi-gcc # apt install gcc-arm-linux-gnueabi
-    tags: [sqlite_omit_load_extension,osusergo,netgo]
-    ldflags:
-      - "-linkmode=external -extldflags=-static -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}"
-    goos: [linux]
-    goarch: [arm]
-    goarm: [7]
-  -
-    id: ntfy_linux_arm64
-    binary: ntfy
-    env:
-      - CGO_ENABLED=1 # required for go-sqlite3
-      - CC=aarch64-linux-gnu-gcc # apt install gcc-aarch64-linux-gnu
-    tags: [sqlite_omit_load_extension,osusergo,netgo]
-    ldflags:
-      - "-linkmode=external -extldflags=-static -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}"
-    goos: [linux]
-    goarch: [arm64]
-  -
-    id: ntfy_windows_amd64
-    binary: ntfy
-    env:
-      - CGO_ENABLED=0 # explicitly disable, since we don't need go-sqlite3
-    tags: [noserver] # don't include server files
-    ldflags:
-      - "-X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}"
-    goos: [windows]
-    goarch: [amd64]
-  -
-    id: ntfy_darwin_all
-    binary: ntfy
-    env:
-      - CGO_ENABLED=0 # explicitly disable, since we don't need go-sqlite3
-    tags: [noserver] # don't include server files
-    ldflags:
-      - "-X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}"
-    goos: [darwin]
-    goarch: [amd64, arm64] # will be combined to "universal binary" (see below)
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+    goarch:
+      - amd64
 nfpms:
   -
     package_name: ntfy
-    homepage: https://git.zio.sh/astra/ntfy/v2
+    file_name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Arch }}"
+    homepage: https://heckel.io/ntfy
     maintainer: Philipp C. Heckel <philipp.heckel@gmail.com>
     description: Simple pub-sub notification service
     license: Apache 2.0
@@ -80,69 +24,24 @@ nfpms:
       - rpm
     bindir: /usr/bin
     contents:
-      - src: server/server.yml
-        dst: /etc/ntfy/server.yml
-        type: "config|noreplace"
-      - src: server/ntfy.service
+      - src: config/config.yml
+        dst: /etc/ntfy/config.yml
+        type: config
+      - src: config/ntfy.service
         dst: /lib/systemd/system/ntfy.service
-      - src: client/client.yml
-        dst: /etc/ntfy/client.yml
-        type: "config|noreplace"
-      - src: client/ntfy-client.service
-        dst: /lib/systemd/system/ntfy-client.service
-      - dst: /var/cache/ntfy
-        type: dir
-      - dst: /var/cache/ntfy/attachments
-        type: dir
-      - dst: /var/lib/ntfy
-        type: dir
-      - dst: /usr/share/ntfy/logo.png
-        src: web/public/static/images/ntfy.png
     scripts:
-      preinstall: "scripts/preinst.sh"
-      postinstall: "scripts/postinst.sh"
-      preremove: "scripts/prerm.sh"
       postremove: "scripts/postrm.sh"
 archives:
   -
-    id: ntfy_linux
-    builds:
-      - ntfy_linux_amd64
-      - ntfy_linux_armv6
-      - ntfy_linux_armv7
-      - ntfy_linux_arm64
     wrap_in_directory: true
     files:
       - LICENSE
       - README.md
-      - server/server.yml
-      - server/ntfy.service
-      - client/client.yml
-      - client/ntfy-client.service
-  -
-    id: ntfy_windows
-    builds:
-      - ntfy_windows_amd64
-    format: zip
-    wrap_in_directory: true
-    files:
-      - LICENSE
-      - README.md
-      - client/client.yml
-  -
-    id: ntfy_darwin
-    builds:
-      - ntfy_darwin_all
-    wrap_in_directory: true
-    files:
-      - LICENSE
-      - README.md
-      - client/client.yml
-universal_binaries:
-  -
-    id: ntfy_darwin_all
-    replace: true
-    name_template: ntfy
+      - config/config.yml
+      - config/ntfy.service
+    replacements:
+      386: i386
+      amd64: x86_64
 checksum:
   name_template: 'checksums.txt'
 snapshot:
@@ -154,46 +53,10 @@ changelog:
       - '^docs:'
       - '^test:'
 dockers:
-  - image_templates:
-      - &amd64_image "binwiederhier/ntfy:{{ .Tag }}-amd64"
-    use: buildx
-    dockerfile: Dockerfile
-    goarch: amd64
-    build_flag_templates:
-      - "--platform=linux/amd64"
-  - image_templates:
-      - &arm64v8_image "binwiederhier/ntfy:{{ .Tag }}-arm64v8"
-    use: buildx
-    dockerfile: Dockerfile-arm
-    goarch: arm64
-    build_flag_templates:
-      - "--platform=linux/arm64/v8"
-  - image_templates:
-      - &armv7_image "binwiederhier/ntfy:{{ .Tag }}-armv7"
-    use: buildx
-    dockerfile: Dockerfile-arm
-    goarch: arm
-    goarm: 7
-    build_flag_templates:
-      - "--platform=linux/arm/v7"
-  - image_templates:
-      - &armv6_image "binwiederhier/ntfy:{{ .Tag }}-armv6"
-    use: buildx
-    dockerfile: Dockerfile-arm
-    goarch: arm
-    goarm: 6
-    build_flag_templates:
-      - "--platform=linux/arm/v6"
-docker_manifests:
-  - name_template: "binwiederhier/ntfy:latest"
+  - dockerfile: Dockerfile
+    ids:
+      - ntfy
     image_templates:
-      - *amd64_image
-      - *arm64v8_image
-      - *armv7_image
-      - *armv6_image
-  - name_template: "binwiederhier/ntfy:{{ .Tag }}"
-    image_templates:
-      - *amd64_image
-      - *arm64v8_image
-      - *armv7_image
-      - *armv6_image
+      - "binwiederhier/ntfy:latest"
+      - "binwiederhier/ntfy:{{ .Tag }}"
+      - "binwiederhier/ntfy:v{{ .Major }}.{{ .Minor }}"

CODE_OF_CONDUCT.md

@@ -1,133 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement via Discord/Matrix (binwiederhier),
-or email (ntfy@heckel.io). All complaints will be reviewed and investigated promptly 
-and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
-

Dockerfile

@@ -1,16 +1,5 @@
 FROM alpine
+MAINTAINER Philipp C. Heckel <philipp.heckel@gmail.com>
 
-LABEL org.opencontainers.image.authors="philipp.heckel@gmail.com"
-LABEL org.opencontainers.image.url="https://ntfy.sh/"
-LABEL org.opencontainers.image.documentation="https://docs.ntfy.sh/"
-LABEL org.opencontainers.image.source="https://github.com/binwiederhier/ntfy"
-LABEL org.opencontainers.image.vendor="Philipp C. Heckel"
-LABEL org.opencontainers.image.licenses="Apache-2.0, GPL-2.0"
-LABEL org.opencontainers.image.title="ntfy"
-LABEL org.opencontainers.image.description="Send push notifications to your phone or desktop using PUT/POST"
-
-RUN apk add --no-cache tzdata
 COPY ntfy /usr/bin
-
-EXPOSE 80/tcp
 ENTRYPOINT ["ntfy"]

Dockerfile-arm

@@ -1,18 +0,0 @@
-FROM alpine
-
-LABEL org.opencontainers.image.authors="philipp.heckel@gmail.com"
-LABEL org.opencontainers.image.url="https://ntfy.sh/"
-LABEL org.opencontainers.image.documentation="https://docs.ntfy.sh/"
-LABEL org.opencontainers.image.source="https://github.com/binwiederhier/ntfy"
-LABEL org.opencontainers.image.vendor="Philipp C. Heckel"
-LABEL org.opencontainers.image.licenses="Apache-2.0, GPL-2.0"
-LABEL org.opencontainers.image.title="ntfy"
-LABEL org.opencontainers.image.description="Send push notifications to your phone or desktop using PUT/POST"
-
-# Alpine does not support adding "tzdata" on ARM anymore, see
-# https://github.com/binwiederhier/ntfy/issues/894
-
-COPY ntfy /usr/bin
-
-EXPOSE 80/tcp
-ENTRYPOINT ["ntfy"]

Dockerfile-build

@@ -1,57 +0,0 @@
-FROM golang:1.20-bullseye as builder
-
-ARG VERSION=dev
-ARG COMMIT=unknown
-ARG NODE_MAJOR=18
-
-RUN apt-get update && apt-get install -y \
-       build-essential ca-certificates curl gnupg \
-    && mkdir -p /etc/apt/keyrings \
-    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list \
-    && apt-get update \
-    && apt-get install -y \
-       python3-pip nodejs \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app
-ADD Makefile .
-
-# docs
-ADD ./requirements.txt .
-RUN make docs-deps
-ADD ./mkdocs.yml .
-ADD ./docs ./docs
-RUN make docs-build
- 
-# web
-ADD ./web/package.json ./web/package-lock.json ./web/
-RUN make web-deps
-ADD ./web ./web
-RUN make web-build
-
-# cli & server
-ADD go.mod go.sum main.go ./
-ADD ./client ./client
-ADD ./cmd ./cmd
-ADD ./log ./log
-ADD ./server ./server
-ADD ./user ./user
-ADD ./util ./util
-RUN make VERSION=$VERSION COMMIT=$COMMIT cli-linux-server
-
-FROM alpine
-
-LABEL org.opencontainers.image.authors="philipp.heckel@gmail.com"
-LABEL org.opencontainers.image.url="https://ntfy.sh/"
-LABEL org.opencontainers.image.documentation="https://docs.ntfy.sh/"
-LABEL org.opencontainers.image.source="https://github.com/binwiederhier/ntfy"
-LABEL org.opencontainers.image.vendor="Philipp C. Heckel"
-LABEL org.opencontainers.image.licenses="Apache-2.0, GPL-2.0"
-LABEL org.opencontainers.image.title="ntfy"
-LABEL org.opencontainers.image.description="Send push notifications to your phone or desktop using PUT/POST"
-
-COPY --from=builder /app/dist/ntfy_linux_server/ntfy /usr/bin/ntfy
-
-EXPOSE 80/tcp
-ENTRYPOINT ["ntfy"]

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Philipp C. Heckel
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

LICENSE.GPLv2

@@ -1,340 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    ntfy
-    Copyright (C) 2021 Philipp C. Heckel
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
-

Makefile

@@ -1,344 +1,124 @@
-MAKEFLAGS := --jobs=1
+GO=$(shell which go)
 VERSION := $(shell git describe --tag)
-COMMIT := $(shell git rev-parse --short HEAD)
 
 .PHONY:
 
 help:
-	@echo "Typical commands (more see below):"
-	@echo "  make build                      - Build web app, documentation and server/client (sloowwww)"
-	@echo "  make cli-linux-amd64            - Build server/client binary (amd64, no web app or docs)"
-	@echo "  make install-linux-amd64        - Install ntfy binary to /usr/bin/ntfy (amd64)"
-	@echo "  make web                        - Build the web app"
-	@echo "  make docs                       - Build the documentation"
-	@echo "  make check                      - Run all tests, vetting/formatting checks and linters"
-	@echo
-	@echo "Build everything:"
-	@echo "  make build                      - Build web app, documentation and server/client"
-	@echo "  make clean                      - Clean build/dist folders"
-	@echo
-	@echo "Build server & client (using GoReleaser, not release version):"
-	@echo "  make cli                        - Build server & client (all architectures)"
-	@echo "  make cli-linux-amd64            - Build server & client (Linux, amd64 only)"
-	@echo "  make cli-linux-armv6            - Build server & client (Linux, armv6 only)"
-	@echo "  make cli-linux-armv7            - Build server & client (Linux, armv7 only)"
-	@echo "  make cli-linux-arm64            - Build server & client (Linux, arm64 only)"
-	@echo "  make cli-windows-amd64          - Build client (Windows, amd64 only)"
-	@echo "  make cli-darwin-all             - Build client (macOS, arm64+amd64 universal binary)"
-	@echo
-	@echo "Build server & client (without GoReleaser):"
-	@echo "  make cli-linux-server           - Build client & server (no GoReleaser, current arch, Linux)"
-	@echo "  make cli-darwin-server          - Build client & server (no GoReleaser, current arch, macOS)"
-	@echo "  make cli-client                 - Build client only (no GoReleaser, current arch, Linux/macOS/Windows)"
-	@echo
-	@echo "Build dev Docker:"
-	@echo "  make docker-dev                 - Build client & server for current architecture using Docker only"
-	@echo
-	@echo "Build web app:"
-	@echo "  make web                        - Build the web app"
-	@echo "  make web-deps                   - Install web app dependencies (npm install the universe)"
-	@echo "  make web-build                  - Actually build the web app"
-	@echo "  make web-lint                   - Run eslint on the web app"
-	@echo "  make web-fmt                    - Run prettier on the web app"
-	@echo "  make web-fmt-check              - Run prettier on the web app, but don't change anything"
-	@echo
-	@echo "Build documentation:"
-	@echo "  make docs                       - Build the documentation"
-	@echo "  make docs-deps                  - Install Python dependencies (pip3 install)"
-	@echo "  make docs-build                 - Actually build the documentation"
+	@echo "Typical commands:"
+	@echo "  make check                       - Run all tests, vetting/formatting checks and linters"
+	@echo "  make fmt build-snapshot install  - Build latest and install to local system"
 	@echo
 	@echo "Test/check:"
-	@echo "  make test                       - Run tests"
-	@echo "  make race                       - Run tests with -race flag"
-	@echo "  make coverage                   - Run tests and show coverage"
-	@echo "  make coverage-html              - Run tests and show coverage (as HTML)"
-	@echo "  make coverage-upload            - Upload coverage results to codecov.io"
+	@echo "  make test                        - Run tests"
+	@echo "  make race                        - Run tests with -race flag"
+	@echo "  make coverage                    - Run tests and show coverage"
+	@echo "  make coverage-html               - Run tests and show coverage (as HTML)"
+	@echo "  make coverage-upload             - Upload coverage results to codecov.io"
 	@echo
 	@echo "Lint/format:"
-	@echo "  make fmt                        - Run 'go fmt'"
-	@echo "  make fmt-check                  - Run 'go fmt', but don't change anything"
-	@echo "  make vet                        - Run 'go vet'"
-	@echo "  make lint                       - Run 'golint'"
-	@echo "  make staticcheck                - Run 'staticcheck'"
+	@echo "  make fmt                         - Run 'go fmt'"
+	@echo "  make fmt-check                   - Run 'go fmt', but don't change anything"
+	@echo "  make vet                         - Run 'go vet'"
+	@echo "  make lint                        - Run 'golint'"
+	@echo "  make staticcheck                 - Run 'staticcheck'"
 	@echo
-	@echo "Releasing:"
-	@echo "  make release                    - Create a release"
-	@echo "  make release-snapshot           - Create a test release"
+	@echo "Build:"
+	@echo "  make build                       - Build"
+	@echo "  make build-snapshot              - Build snapshot"
+	@echo "  make build-simple                - Build (using go build, without goreleaser)"
+	@echo "  make clean                       - Clean build folder"
+	@echo
+	@echo "Releasing (requires goreleaser):"
+	@echo "  make release                     - Create a release"
+	@echo "  make release-snapshot            - Create a test release"
 	@echo
 	@echo "Install locally (requires sudo):"
-	@echo "  make install-linux-amd64        - Copy amd64 binary from dist/ to /usr/bin/ntfy"
-	@echo "  make install-linux-armv6        - Copy armv6 binary from dist/ to /usr/bin/ntfy"
-	@echo "  make install-linux-armv7        - Copy armv7 binary from dist/ to /usr/bin/ntfy"
-	@echo "  make install-linux-arm64        - Copy arm64 binary from dist/ to /usr/bin/ntfy"
-	@echo "  make install-linux-deb-amd64    - Install .deb from dist/ (amd64 only)"
-	@echo "  make install-linux-deb-armv6    - Install .deb from dist/ (armv6 only)"
-	@echo "  make install-linux-deb-armv7    - Install .deb from dist/ (armv7 only)"
-	@echo "  make install-linux-deb-arm64    - Install .deb from dist/ (arm64 only)"
+	@echo "  make install                     - Copy binary from dist/ to /usr/bin"
+	@echo "  make install-deb                 - Install .deb from dist/"
+	@echo "  make install-lint                - Install golint"
 
 
-# Building everything
-
-clean: .PHONY
-	rm -rf dist build server/docs server/site
-
-build: web docs cli
-
-update: web-deps-update cli-deps-update docs-deps-update
-	docker pull alpine
-
-docker-dev:
-	docker build \
-		--file ./Dockerfile-build \
-		--tag binwiederhier/ntfy:$(VERSION) \
-		--tag binwiederhier/ntfy:dev \
-		--build-arg VERSION=$(VERSION) \
-		--build-arg COMMIT=$(COMMIT) \
-		./
-
-# Ubuntu-specific
-
-build-deps-ubuntu:
-	sudo apt-get update
-	sudo apt-get install -y \
-		curl \
-		gcc-aarch64-linux-gnu \
-		gcc-arm-linux-gnueabi \
-		jq
-	which pip3 || sudo apt-get install -y python3-pip
-
-# Documentation
-
-docs: docs-deps docs-build
-
-docs-build: .PHONY
-		mkdocs build
-
-docs-deps: .PHONY
-	pip3 install -r requirements.txt
-
-docs-deps-update: .PHONY
-	pip3 install -r requirements.txt --upgrade
-
-
-# Web app
-
-web: web-deps web-build
-
-web-build:
-	cd web \
-		&& npm run build \
-		&& mv build/index.html build/app.html \
-		&& rm -rf ../server/site \
-		&& mv build ../server/site \
-		&& rm \
-			../server/site/config.js
-
-web-deps:
-	cd web && npm install
-	# If this fails for .svg files, optimize them with svgo
-
-web-deps-update:
-	cd web && npm update
-
-web-fmt:
-	cd web && npm run format
-
-web-fmt-check:
-	cd web && npm run format:check
-
-web-lint:
-	cd web && npm run lint
-
-# Main server/client build
-
-cli: cli-deps
-	goreleaser build --snapshot --clean
-
-cli-linux-amd64: cli-deps-static-sites
-	goreleaser build --snapshot --clean --id ntfy_linux_amd64
-
-cli-linux-armv6: cli-deps-static-sites cli-deps-gcc-armv6-armv7
-	goreleaser build --snapshot --clean --id ntfy_linux_armv6
-
-cli-linux-armv7: cli-deps-static-sites cli-deps-gcc-armv6-armv7
-	goreleaser build --snapshot --clean --id ntfy_linux_armv7
-
-cli-linux-arm64: cli-deps-static-sites cli-deps-gcc-arm64
-	goreleaser build --snapshot --clean --id ntfy_linux_arm64
-
-cli-windows-amd64: cli-deps-static-sites
-	goreleaser build --snapshot --clean --id ntfy_windows_amd64
-
-cli-darwin-all: cli-deps-static-sites
-	goreleaser build --snapshot --clean --id ntfy_darwin_all
-
-cli-linux-server: cli-deps-static-sites
-	# This is a target to build the CLI (including the server) manually.
-	# Use this for development, if you really don't want to install GoReleaser ...
-	mkdir -p dist/ntfy_linux_server server/docs
-	CGO_ENABLED=1 go build \
-		-o dist/ntfy_linux_server/ntfy \
-		-tags sqlite_omit_load_extension,osusergo,netgo \
-		-ldflags \
-		"-linkmode=external -extldflags=-static -s -w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(shell date +%s)"
-
-cli-darwin-server: cli-deps-static-sites
-	# This is a target to build the CLI (including the server) manually.
-	# Use this for macOS/iOS development, so you have a local server to test with.
-	mkdir -p dist/ntfy_darwin_server server/docs
-	CGO_ENABLED=1 go build \
-		-o dist/ntfy_darwin_server/ntfy \
-		-tags sqlite_omit_load_extension,osusergo,netgo \
-		-ldflags \
-		"-linkmode=external -s -w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(shell date +%s)"
-
-cli-client: cli-deps-static-sites
-	# This is a target to build the CLI (excluding the server) manually. This should work on Linux/macOS/Windows.
-	# Use this for development, if you really don't want to install GoReleaser ...
-	mkdir -p dist/ntfy_client server/docs
-	CGO_ENABLED=0 go build \
-		-o dist/ntfy_client/ntfy \
-		-tags noserver \
-		-ldflags \
-		"-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(shell date +%s)"
-
-cli-deps: cli-deps-static-sites cli-deps-all cli-deps-gcc
-
-cli-deps-gcc: cli-deps-gcc-armv6-armv7 cli-deps-gcc-arm64
-
-cli-deps-static-sites:
-	mkdir -p server/docs server/site
-	touch server/docs/index.html server/site/app.html
-
-cli-deps-all:
-	go install github.com/goreleaser/goreleaser@latest
-
-cli-deps-gcc-armv6-armv7:
-	which arm-linux-gnueabi-gcc || { echo "ERROR: ARMv6/ARMv7 cross compiler not installed. On Ubuntu, run: apt install gcc-arm-linux-gnueabi"; exit 1; }
-
-cli-deps-gcc-arm64:
-	which aarch64-linux-gnu-gcc || { echo "ERROR: ARM64 cross compiler not installed. On Ubuntu, run: apt install gcc-aarch64-linux-gnu"; exit 1; }
-
-cli-deps-update:
-	go get -u
-	go install honnef.co/go/tools/cmd/staticcheck@latest
-	go install golang.org/x/lint/golint@latest
-	go install github.com/goreleaser/goreleaser@latest
-
-cli-build-results:
-	cat dist/config.yaml
-	[ -f dist/artifacts.json ] && cat dist/artifacts.json | jq . || true
-	[ -f dist/metadata.json ] && cat dist/metadata.json | jq . || true
-	[ -f dist/checksums.txt ] && cat dist/checksums.txt || true
-	find dist -maxdepth 2 -type f \
-		\( -name '*.deb' -or -name '*.rpm' -or -name '*.zip' -or -name '*.tar.gz' -or -name 'ntfy' \) \
-		-and -not -path 'dist/goreleaserdocker*' \
-		-exec sha256sum {} \;
-
 # Test/check targets
 
-check: test web-fmt-check fmt-check vet web-lint lint staticcheck
+check: test fmt-check vet lint staticcheck
 
 test: .PHONY
-	go test $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
-
-testv: .PHONY
-	go test -v $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
+	$(GO) test ./...
 
 race: .PHONY
-	go test -v -race $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
+	$(GO) test -race ./...
 
 coverage:
 	mkdir -p build/coverage
-	go test -v -race -coverprofile=build/coverage/coverage.txt -covermode=atomic $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
-	go tool cover -func build/coverage/coverage.txt
+	$(GO) test -race -coverprofile=build/coverage/coverage.txt -covermode=atomic ./...
+	$(GO) tool cover -func build/coverage/coverage.txt
 
 coverage-html:
 	mkdir -p build/coverage
-	go test -race -coverprofile=build/coverage/coverage.txt -covermode=atomic $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
-	go tool cover -html build/coverage/coverage.txt
+	$(GO) test -race -coverprofile=build/coverage/coverage.txt -covermode=atomic ./...
+	$(GO) tool cover -html build/coverage/coverage.txt
 
 coverage-upload:
 	cd build/coverage && (curl -s https://codecov.io/bash | bash)
 
-
 # Lint/formatting targets
 
-fmt: web-fmt
-	gofmt -s -w .
+fmt:
+	$(GO) fmt ./...
 
 fmt-check:
 	test -z $(shell gofmt -l .)
 
 vet:
-	go vet ./...
+	$(GO) vet ./...
 
 lint:
-	which golint || go install golang.org/x/lint/golint@latest
-	go list ./... | grep -v /vendor/ | xargs -L1 golint -set_exit_status
+	which golint || $(GO) get -u golang.org/x/lint/golint
+	$(GO) list ./... | grep -v /vendor/ | xargs -L1 golint -set_exit_status
 
 staticcheck: .PHONY
 	rm -rf build/staticcheck
-	which staticcheck || go install honnef.co/go/tools/cmd/staticcheck@latest
+	which staticcheck || go get honnef.co/go/tools/cmd/staticcheck
 	mkdir -p build/staticcheck
-	ln -s "go" build/staticcheck/go
+	ln -s "$(GO)" build/staticcheck/go
 	PATH="$(PWD)/build/staticcheck:$(PATH)" staticcheck ./...
 	rm -rf build/staticcheck
 
+# Building targets
+
+build: .PHONY
+	goreleaser build --rm-dist
+
+build-snapshot:
+	goreleaser build --snapshot --rm-dist
+
+build-simple: clean
+	mkdir -p dist/ntfy_linux_amd64
+	$(GO) build \
+		-o dist/ntfy_linux_amd64/ntfy \
+		-ldflags \
+		"-s -w -X main.version=$(VERSION) -X main.commit=$(shell git rev-parse --short HEAD) -X main.date=$(shell date +%s)"
+
+clean: .PHONY
+	rm -rf dist build
+
 
 # Releasing targets
 
-release: clean cli-deps release-checks docs web check
-	goreleaser release --clean
+release:
+	goreleaser release --rm-dist
 
-release-snapshot: clean cli-deps docs web check
-	goreleaser release --snapshot --skip-publish --clean
-
-release-checks:
-	$(eval LATEST_TAG := $(shell git describe --abbrev=0 --tags | cut -c2-))
-	if ! grep -q $(LATEST_TAG) docs/install.md; then\
-	 	echo "ERROR: Must update docs/install.md with latest tag first.";\
-	 	exit 1;\
-	fi
-	if ! grep -q $(LATEST_TAG) docs/releases.md; then\
-		echo "ERROR: Must update docs/releases.md with latest tag first.";\
-		exit 1;\
-	fi
-	if [ -n "$(shell git status -s)" ]; then\
-	  echo "ERROR: Git repository is in an unclean state.";\
-	  exit 1;\
-	fi
+release-snapshot:
+	goreleaser release --snapshot --skip-publish --rm-dist
 
 
 # Installing targets
 
-install-linux-amd64: remove-binary
-	sudo cp -a dist/ntfy_linux_amd64_linux_amd64_v1/ntfy /usr/bin/ntfy
-
-install-linux-armv6: remove-binary
-	sudo cp -a dist/ntfy_linux_armv6_linux_arm_6/ntfy /usr/bin/ntfy
-
-install-linux-armv7: remove-binary
-	sudo cp -a dist/ntfy_linux_armv7_linux_arm_7/ntfy /usr/bin/ntfy
-
-install-linux-arm64: remove-binary
-	sudo cp -a dist/ntfy_linux_arm64_linux_arm64/ntfy /usr/bin/ntfy
-
-remove-binary:
+install:
 	sudo rm -f /usr/bin/ntfy
+	sudo cp -a dist/ntfy_linux_amd64/ntfy /usr/bin/ntfy
 
-install-linux-amd64-deb: purge-package
-	sudo dpkg -i dist/ntfy_*_linux_amd64.deb
-
-install-linux-armv6-deb: purge-package
-	sudo dpkg -i dist/ntfy_*_linux_armv6.deb
-
-install-linux-armv7-deb: purge-package
-	sudo dpkg -i dist/ntfy_*_linux_armv7.deb
-
-install-linux-arm64-deb: purge-package
-	sudo dpkg -i dist/ntfy_*_linux_arm64.deb
-
-purge-package:
+install-deb:
 	sudo systemctl stop ntfy || true
 	sudo apt-get purge ntfy || true
+	sudo dpkg -i dist/*.deb

README.md

@@ -1,9 +1,135 @@
-# ntfy.sh | Send push notifications to your phone or desktop via PUT/POST
+# ntfy
 
-**ntfy** (pronounced "*notify*") is a simple HTTP-based [pub-sub](https://en.wikipedia.org/wiki/Publish%E2%80%93subscribe_pattern) 
-notification service. With ntfy, you can **send notifications to your phone or desktop via scripts** from any computer, 
-**without having to sign up or pay any fees**. If you'd like to run your own instance of the service, you can easily do 
-so since ntfy is open source.
+ntfy (pronounce: *notify*) is a super simple pub-sub notification service. It allows you to send desktop and (soon) phone notifications
+via scripts. I run a free version of it on *[ntfy.sh](https://ntfy.sh)*. **No signups or cost.**
 
+## Usage
 
-### This is a fork of [github.com/binwiederhier/ntfy](https://github.com/binwiederhier/ntfy)
+### Subscribe to a topic
+Topics are created on the fly by subscribing to them. You can create and subscribe to a topic either in a web UI, or in 
+your own app by subscribing to an [SSE](https://en.wikipedia.org/wiki/Server-sent_events)/[EventSource](https://developer.mozilla.org/en-US/docs/Web/API/EventSource),
+or a JSON or raw feed.  
+
+Because there is no sign-up, **the topic is essentially a password**, so pick something that's not easily guessable.  
+
+Here's how you can create a topic `mytopic`, subscribe to it topic and wait for events. This is using `curl`, but you
+can use any library that can do HTTP GETs:
+
+```
+# Subscribe to "mytopic" and output one message per line (\n are replaced with a space)
+curl -s ntfy.sh/mytopic/raw
+
+# Subscribe to "mytopic" and output one JSON message per line
+curl -s ntfy.sh/mytopic/json
+
+# Subscribe to "mytopic" and output an SSE stream (supported via JS/EventSource)
+curl -s ntfy.sh/mytopic/sse
+```
+
+You can easily script it to execute any command when a message arrives. This sends desktop notifications (just like 
+the web UI, but without it):
+```
+while read msg; do 
+  notify-send "$msg"
+done < <(stdbuf -i0 -o0 curl -s ntfy.sh/mytopic/raw)
+```
+
+### Publish messages
+Publishing messages can be done via PUT or POST using. Here's an example using `curl`:
+```
+curl -d "long process is done" ntfy.sh/mytopic
+```
+
+Messages published to a non-existing topic or a topic without subscribers will not be delivered later. There is (currently)
+no buffering of any kind. If you're not listening, the message won't be delivered.
+
+## Installation
+Please check out the [releases page](https://github.com/binwiederhier/ntfy/releases) for binaries and
+deb/rpm packages.
+
+1. Install ntfy using one of the methods described below
+2. Then (optionally) edit `/etc/ntfy/config.yml`
+3. Then just run it with `ntfy` (or `systemctl start ntfy` when using the deb/rpm).
+
+### Binaries and packages
+**Debian/Ubuntu** (*from a repository*)**:**
+```bash
+curl -sSL https://archive.heckel.io/apt/pubkey.txt | sudo apt-key add -
+sudo apt install apt-transport-https
+sudo sh -c "echo 'deb [arch=amd64] https://archive.heckel.io/apt debian main' > /etc/apt/sources.list.d/archive.heckel.io.list"  
+sudo apt update
+sudo apt install ntfy
+```
+
+**Debian/Ubuntu** (*manual install*)**:**
+```bash
+sudo apt install tmux
+wget https://github.com/binwiederhier/ntfy/releases/download/v0.0.2/ntfy_0.0.2_amd64.deb
+dpkg -i ntfy_0.0.2_amd64.deb
+```
+
+**Fedora/RHEL/CentOS:**
+```bash
+rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v0.0.2/ntfy_0.0.2_amd64.rpm
+```
+
+**Docker:**
+```bash
+docker run --rm -it binwiederhier/ntfy
+```
+
+**Go:**
+```bash
+go get -u heckel.io/ntfy
+```
+
+**Manual install** (*any x86_64-based Linux*)**:**
+```bash
+wget https://github.com/binwiederhier/ntfy/releases/download/v0.0.2/ntfy_0.0.2_linux_x86_64.tar.gz
+sudo tar -C /usr/bin -zxf ntfy_0.0.2_linux_x86_64.tar.gz ntfy
+./ntfy
+```
+
+## Building
+Building ntfy is simple. Here's how you do it:
+
+```
+make build-simple
+# Builds to dist/ntfy_linux_amd64/ntfy
+``` 
+
+To build releases, I use [GoReleaser](https://goreleaser.com/). If you have that installed, you can run `make build` or
+`make build-snapshot`.
+
+## FAQ
+
+### Isn't this like ...?
+Probably. I didn't do a whole lot of research before making this.
+
+### Can I use this in my app?
+Yes. As long as you don't abuse it, it'll be available and free of charge.
+
+### What are the uptime guarantees?
+Best effort.
+
+### Why is the web UI so ugly?
+I don't particularly like JS or dealing with CSS. I'll make it pretty after it's functional.
+
+### Will you know what topics exist, can you spy on me?
+If you don't trust me or your messages are sensitive, run your ntfy on your own server. That said, the logs do not 
+contain any topic names or other details about you.
+
+## TODO
+- add HTTPS
+
+## Contributing
+I welcome any and all contributions. Just create a PR or an issue.
+
+## License
+Made with ❤️ by [Philipp C. Heckel](https://heckel.io), distributed under the [Apache License 2.0](LICENSE).
+
+Third party libraries and resources:
+* [github.com/urfave/cli/v2](https://github.com/urfave/cli/v2) (MIT) is used to drive the CLI
+* [Mixkit sound](https://mixkit.co/free-sound-effects/notification/) (Mixkit Free License) used as notification sound
+* [Lato Font](https://www.latofonts.com/) (OFL) is used as a font in the Web UI
+* [GoReleaser](https://goreleaser.com/) (MIT) is used to create releases 

SECURITY.md

@@ -1,10 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-As of today, I only support the latest version of ntfy. Please make sure you stay up-to-date.
-
-## Reporting a Vulnerability
-
-Please report severe security issues privately via ntfy@heckel.io, [Discord](https://discord.gg/cT7ECsZj9w),
-or [Matrix](https://matrix.to/#/#ntfy:matrix.org) (my username is `binwiederhier`).

client/client.go

@@ -1,292 +0,0 @@
-// Package client provides a ntfy client to publish and subscribe to topics
-package client
-
-import (
-	"bufio"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/log"
-	"git.zio.sh/astra/ntfy/v2/util"
-	"io"
-	"net/http"
-	"regexp"
-	"strings"
-	"sync"
-	"time"
-)
-
-const (
-	// MessageEvent identifies a message event
-	MessageEvent = "message"
-)
-
-const (
-	maxResponseBytes = 4096
-)
-
-var (
-	topicRegex = regexp.MustCompile(`^[-_A-Za-z0-9]{1,64}$`) // Same as in server/server.go
-)
-
-// Client is the ntfy client that can be used to publish and subscribe to ntfy topics
-type Client struct {
-	Messages      chan *Message
-	config        *Config
-	subscriptions map[string]*subscription
-	mu            sync.Mutex
-}
-
-// Message is a struct that represents a ntfy message
-type Message struct { // TODO combine with server.message
-	ID         string
-	Event      string
-	Time       int64
-	Topic      string
-	Message    string
-	Title      string
-	Priority   int
-	Tags       []string
-	Click      string
-	Icon       string
-	Attachment *Attachment
-
-	// Additional fields
-	TopicURL       string
-	SubscriptionID string
-	Raw            string
-}
-
-// Attachment represents a message attachment
-type Attachment struct {
-	Name    string `json:"name"`
-	Type    string `json:"type,omitempty"`
-	Size    int64  `json:"size,omitempty"`
-	Expires int64  `json:"expires,omitempty"`
-	URL     string `json:"url"`
-	Owner   string `json:"-"` // IP address of uploader, used for rate limiting
-}
-
-type subscription struct {
-	ID       string
-	topicURL string
-	cancel   context.CancelFunc
-}
-
-// New creates a new Client using a given Config
-func New(config *Config) *Client {
-	return &Client{
-		Messages:      make(chan *Message, 50), // Allow reading a few messages
-		config:        config,
-		subscriptions: make(map[string]*subscription),
-	}
-}
-
-// Publish sends a message to a specific topic, optionally using options.
-// See PublishReader for details.
-func (c *Client) Publish(topic, message string, options ...PublishOption) (*Message, error) {
-	return c.PublishReader(topic, strings.NewReader(message), options...)
-}
-
-// PublishReader sends a message to a specific topic, optionally using options.
-//
-// A topic can be either a full URL (e.g. https://myhost.lan/mytopic), a short URL which is then prepended https://
-// (e.g. myhost.lan -> https://myhost.lan), or a short name which is expanded using the default host in the
-// config (e.g. mytopic -> https://ntfy.sh/mytopic).
-//
-// To pass title, priority and tags, check out WithTitle, WithPriority, WithTagsList, WithDelay, WithNoCache,
-// WithNoFirebase, and the generic WithHeader.
-func (c *Client) PublishReader(topic string, body io.Reader, options ...PublishOption) (*Message, error) {
-	topicURL, err := c.expandTopicURL(topic)
-	if err != nil {
-		return nil, err
-	}
-	req, err := http.NewRequest("POST", topicURL, body)
-	if err != nil {
-		return nil, err
-	}
-	for _, option := range options {
-		if err := option(req); err != nil {
-			return nil, err
-		}
-	}
-	log.Debug("%s Publishing message with headers %s", util.ShortTopicURL(topicURL), req.Header)
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	b, err := io.ReadAll(io.LimitReader(resp.Body, maxResponseBytes))
-	if err != nil {
-		return nil, err
-	}
-	if resp.StatusCode != http.StatusOK {
-		return nil, errors.New(strings.TrimSpace(string(b)))
-	}
-	m, err := toMessage(string(b), topicURL, "")
-	if err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// Poll queries a topic for all (or a limited set) of messages. Unlike Subscribe, this method only polls for
-// messages and does not subscribe to messages that arrive after this call.
-//
-// A topic can be either a full URL (e.g. https://myhost.lan/mytopic), a short URL which is then prepended https://
-// (e.g. myhost.lan -> https://myhost.lan), or a short name which is expanded using the default host in the
-// config (e.g. mytopic -> https://ntfy.sh/mytopic).
-//
-// By default, all messages will be returned, but you can change this behavior using a SubscribeOption.
-// See WithSince, WithSinceAll, WithSinceUnixTime, WithScheduled, and the generic WithQueryParam.
-func (c *Client) Poll(topic string, options ...SubscribeOption) ([]*Message, error) {
-	topicURL, err := c.expandTopicURL(topic)
-	if err != nil {
-		return nil, err
-	}
-	ctx := context.Background()
-	messages := make([]*Message, 0)
-	msgChan := make(chan *Message)
-	errChan := make(chan error)
-	log.Debug("%s Polling from topic", util.ShortTopicURL(topicURL))
-	options = append(options, WithPoll())
-	go func() {
-		err := performSubscribeRequest(ctx, msgChan, topicURL, "", options...)
-		close(msgChan)
-		errChan <- err
-	}()
-	for m := range msgChan {
-		messages = append(messages, m)
-	}
-	return messages, <-errChan
-}
-
-// Subscribe subscribes to a topic to listen for newly incoming messages. The method starts a connection in the
-// background and returns new messages via the Messages channel.
-//
-// A topic can be either a full URL (e.g. https://myhost.lan/mytopic), a short URL which is then prepended https://
-// (e.g. myhost.lan -> https://myhost.lan), or a short name which is expanded using the default host in the
-// config (e.g. mytopic -> https://ntfy.sh/mytopic).
-//
-// By default, only new messages will be returned, but you can change this behavior using a SubscribeOption.
-// See WithSince, WithSinceAll, WithSinceUnixTime, WithScheduled, and the generic WithQueryParam.
-//
-// The method returns a unique subscriptionID that can be used in Unsubscribe.
-//
-// Example:
-//
-//	c := client.New(client.NewConfig())
-//	subscriptionID, _ := c.Subscribe("mytopic")
-//	for m := range c.Messages {
-//	  fmt.Printf("New message: %s", m.Message)
-//	}
-func (c *Client) Subscribe(topic string, options ...SubscribeOption) (string, error) {
-	topicURL, err := c.expandTopicURL(topic)
-	if err != nil {
-		return "", err
-	}
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	subscriptionID := util.RandomString(10)
-	log.Debug("%s Subscribing to topic", util.ShortTopicURL(topicURL))
-	ctx, cancel := context.WithCancel(context.Background())
-	c.subscriptions[subscriptionID] = &subscription{
-		ID:       subscriptionID,
-		topicURL: topicURL,
-		cancel:   cancel,
-	}
-	go handleSubscribeConnLoop(ctx, c.Messages, topicURL, subscriptionID, options...)
-	return subscriptionID, nil
-}
-
-// Unsubscribe unsubscribes from a topic that has been previously subscribed to using the unique
-// subscriptionID returned in Subscribe.
-func (c *Client) Unsubscribe(subscriptionID string) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	sub, ok := c.subscriptions[subscriptionID]
-	if !ok {
-		return
-	}
-	delete(c.subscriptions, subscriptionID)
-	sub.cancel()
-}
-
-func (c *Client) expandTopicURL(topic string) (string, error) {
-	if strings.HasPrefix(topic, "http://") || strings.HasPrefix(topic, "https://") {
-		return topic, nil
-	} else if strings.Contains(topic, "/") {
-		return fmt.Sprintf("https://%s", topic), nil
-	}
-	if !topicRegex.MatchString(topic) {
-		return "", fmt.Errorf("invalid topic name: %s", topic)
-	}
-	return fmt.Sprintf("%s/%s", c.config.DefaultHost, topic), nil
-}
-
-func handleSubscribeConnLoop(ctx context.Context, msgChan chan *Message, topicURL, subcriptionID string, options ...SubscribeOption) {
-	for {
-		// TODO The retry logic is crude and may lose messages. It should record the last message like the
-		//      Android client, use since=, and do incremental backoff too
-		if err := performSubscribeRequest(ctx, msgChan, topicURL, subcriptionID, options...); err != nil {
-			log.Warn("%s Connection failed: %s", util.ShortTopicURL(topicURL), err.Error())
-		}
-		select {
-		case <-ctx.Done():
-			log.Info("%s Connection exited", util.ShortTopicURL(topicURL))
-			return
-		case <-time.After(10 * time.Second): // TODO Add incremental backoff
-		}
-	}
-}
-
-func performSubscribeRequest(ctx context.Context, msgChan chan *Message, topicURL string, subscriptionID string, options ...SubscribeOption) error {
-	streamURL := fmt.Sprintf("%s/json", topicURL)
-	log.Debug("%s Listening to %s", util.ShortTopicURL(topicURL), streamURL)
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, streamURL, nil)
-	if err != nil {
-		return err
-	}
-	for _, option := range options {
-		if err := option(req); err != nil {
-			return err
-		}
-	}
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		b, err := io.ReadAll(io.LimitReader(resp.Body, maxResponseBytes))
-		if err != nil {
-			return err
-		}
-		return errors.New(strings.TrimSpace(string(b)))
-	}
-	scanner := bufio.NewScanner(resp.Body)
-	for scanner.Scan() {
-		messageJSON := scanner.Text()
-		m, err := toMessage(messageJSON, topicURL, subscriptionID)
-		if err != nil {
-			return err
-		}
-		log.Trace("%s Message received: %s", util.ShortTopicURL(topicURL), messageJSON)
-		if m.Event == MessageEvent {
-			msgChan <- m
-		}
-	}
-	return nil
-}
-
-func toMessage(s, topicURL, subscriptionID string) (*Message, error) {
-	var m *Message
-	if err := json.NewDecoder(strings.NewReader(s)).Decode(&m); err != nil {
-		return nil, err
-	}
-	m.TopicURL = topicURL
-	m.SubscriptionID = subscriptionID
-	m.Raw = s
-	return m, nil
-}

client/client.yml

@@ -1,57 +0,0 @@
-# ntfy client config file
-
-# Base URL used to expand short topic names in the "ntfy publish" and "ntfy subscribe" commands.
-# If you self-host a ntfy server, you'll likely want to change this.
-#
-# default-host: https://ntfy.sh
-
-# Default credentials will be used with "ntfy publish" and "ntfy subscribe" if no other credentials are provided.
-# You can set a default token to use or a default user:password combination, but not both. For an empty password,
-# use empty double-quotes ("").
-#
-# To override the default user:password combination or default token for a particular subscription (e.g., to send
-# no Authorization header), set the user:pass/token for the subscription to empty double-quotes ("").
-
-# default-token:
-
-# default-user:
-# default-password:
-
-# Default command will execute after "ntfy subscribe" receives a message if no command is provided in subscription below
-# default-command:
-
-# Subscriptions to topics and their actions. This option is primarily used by the systemd service,
-# or if you cann "ntfy subscribe --from-config" directly.
-#
-# Example:
-#     subscribe:
-#       - topic: mytopic
-#         command: /usr/local/bin/mytopic-triggered.sh
-#       - topic: myserver.com/anothertopic
-#         command: 'echo "$message"'
-#         if:
-#             priority: high,urgent
-#       - topic: secret
-#         command: 'notify-send "$m"'
-#         user: phill
-#         password: mypass
-#       - topic: token_topic
-#         token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-#
-# Variables:
-#     Variable        Aliases               Description
-#     --------------- --------------------- -----------------------------------
-#     $NTFY_ID        $id                   Unique message ID
-#     $NTFY_TIME      $time                 Unix timestamp of the message delivery
-#     $NTFY_TOPIC     $topic                Topic name
-#     $NTFY_MESSAGE   $message, $m          Message body
-#     $NTFY_TITLE     $title, $t            Message title
-#     $NTFY_PRIORITY  $priority, $prio, $p  Message priority (1=min, 5=max)
-#     $NTFY_TAGS      $tags, $tag, $ta      Message tags (comma separated list)
-#     $NTFY_RAW       $raw                  Raw JSON message
-#
-# Filters ('if:'):
-#     You can filter 'message', 'title', 'priority' (comma-separated list, logical OR)
-#     and 'tags' (comma-separated list, logical AND). See https://ntfy.sh/docs/subscribe/api/#filter-messages.
-#
-# subscribe:

client/client_test.go

@@ -1,117 +0,0 @@
-package client_test
-
-import (
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/client"
-	"git.zio.sh/astra/ntfy/v2/log"
-	"git.zio.sh/astra/ntfy/v2/test"
-	"github.com/stretchr/testify/require"
-	"os"
-	"testing"
-	"time"
-)
-
-func TestMain(m *testing.M) {
-	log.SetLevel(log.ErrorLevel)
-	os.Exit(m.Run())
-}
-
-func TestClient_Publish_Subscribe(t *testing.T) {
-	s, port := test.StartServer(t)
-	defer test.StopServer(t, s, port)
-	c := client.New(newTestConfig(port))
-
-	subscriptionID, _ := c.Subscribe("mytopic")
-	time.Sleep(time.Second)
-
-	msg, err := c.Publish("mytopic", "some message")
-	require.Nil(t, err)
-	require.Equal(t, "some message", msg.Message)
-
-	msg, err = c.Publish("mytopic", "some other message",
-		client.WithTitle("some title"),
-		client.WithPriority("high"),
-		client.WithTags([]string{"tag1", "tag 2"}))
-	require.Nil(t, err)
-	require.Equal(t, "some other message", msg.Message)
-	require.Equal(t, "some title", msg.Title)
-	require.Equal(t, []string{"tag1", "tag 2"}, msg.Tags)
-	require.Equal(t, 4, msg.Priority)
-
-	msg, err = c.Publish("mytopic", "some delayed message",
-		client.WithDelay("25 hours"))
-	require.Nil(t, err)
-	require.Equal(t, "some delayed message", msg.Message)
-	require.True(t, time.Now().Add(24*time.Hour).Unix() < msg.Time)
-
-	time.Sleep(200 * time.Millisecond)
-
-	msg = nextMessage(c)
-	require.NotNil(t, msg)
-	require.Equal(t, "some message", msg.Message)
-
-	msg = nextMessage(c)
-	require.NotNil(t, msg)
-	require.Equal(t, "some other message", msg.Message)
-	require.Equal(t, "some title", msg.Title)
-	require.Equal(t, []string{"tag1", "tag 2"}, msg.Tags)
-	require.Equal(t, 4, msg.Priority)
-
-	msg = nextMessage(c)
-	require.Nil(t, msg)
-
-	c.Unsubscribe(subscriptionID)
-	time.Sleep(200 * time.Millisecond)
-
-	msg, err = c.Publish("mytopic", "a message that won't be received")
-	require.Nil(t, err)
-	require.Equal(t, "a message that won't be received", msg.Message)
-
-	msg = nextMessage(c)
-	require.Nil(t, msg)
-}
-
-func TestClient_Publish_Poll(t *testing.T) {
-	s, port := test.StartServer(t)
-	defer test.StopServer(t, s, port)
-	c := client.New(newTestConfig(port))
-
-	msg, err := c.Publish("mytopic", "some message", client.WithNoFirebase(), client.WithTagsList("tag1,tag2"))
-	require.Nil(t, err)
-	require.Equal(t, "some message", msg.Message)
-	require.Equal(t, []string{"tag1", "tag2"}, msg.Tags)
-
-	msg, err = c.Publish("mytopic", "this won't be cached", client.WithNoCache())
-	require.Nil(t, err)
-	require.Equal(t, "this won't be cached", msg.Message)
-
-	msg, err = c.Publish("mytopic", "some delayed message", client.WithDelay("20 min"))
-	require.Nil(t, err)
-	require.Equal(t, "some delayed message", msg.Message)
-
-	messages, err := c.Poll("mytopic")
-	require.Nil(t, err)
-	require.Equal(t, 1, len(messages))
-	require.Equal(t, "some message", messages[0].Message)
-
-	messages, err = c.Poll("mytopic", client.WithScheduled())
-	require.Nil(t, err)
-	require.Equal(t, 2, len(messages))
-	require.Equal(t, "some message", messages[0].Message)
-	require.Equal(t, "some delayed message", messages[1].Message)
-}
-
-func newTestConfig(port int) *client.Config {
-	c := client.NewConfig()
-	c.DefaultHost = fmt.Sprintf("http://127.0.0.1:%d", port)
-	return c
-}
-
-func nextMessage(c *client.Client) *client.Message {
-	select {
-	case m := <-c.Messages:
-		return m
-	default:
-		return nil
-	}
-}

client/config.go

@@ -1,56 +0,0 @@
-package client
-
-import (
-	"gopkg.in/yaml.v2"
-	"os"
-)
-
-const (
-	// DefaultBaseURL is the base URL used to expand short topic names
-	DefaultBaseURL = "https://ntfy.sh"
-)
-
-// Config is the config struct for a Client
-type Config struct {
-	DefaultHost     string      `yaml:"default-host"`
-	DefaultUser     string      `yaml:"default-user"`
-	DefaultPassword *string     `yaml:"default-password"`
-	DefaultToken    string      `yaml:"default-token"`
-	DefaultCommand  string      `yaml:"default-command"`
-	Subscribe       []Subscribe `yaml:"subscribe"`
-}
-
-// Subscribe is the struct for a Subscription within Config
-type Subscribe struct {
-	Topic    string            `yaml:"topic"`
-	User     *string           `yaml:"user"`
-	Password *string           `yaml:"password"`
-	Token    *string           `yaml:"token"`
-	Command  string            `yaml:"command"`
-	If       map[string]string `yaml:"if"`
-}
-
-// NewConfig creates a new Config struct for a Client
-func NewConfig() *Config {
-	return &Config{
-		DefaultHost:     DefaultBaseURL,
-		DefaultUser:     "",
-		DefaultPassword: nil,
-		DefaultToken:    "",
-		DefaultCommand:  "",
-		Subscribe:       nil,
-	}
-}
-
-// LoadConfig loads the Client config from a yaml file
-func LoadConfig(filename string) (*Config, error) {
-	b, err := os.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-	c := NewConfig()
-	if err := yaml.Unmarshal(b, c); err != nil {
-		return nil, err
-	}
-	return c, nil
-}

client/config_test.go

@@ -1,140 +0,0 @@
-package client_test
-
-import (
-	"git.zio.sh/astra/ntfy/v2/client"
-	"github.com/stretchr/testify/require"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestConfig_Load(t *testing.T) {
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(`
-default-host: http://localhost
-default-user: philipp
-default-password: mypass
-default-command: 'echo "Got the message: $message"'
-subscribe:
-  - topic: no-command-with-auth
-    user: phil
-    password: mypass
-  - topic: echo-this
-    command: 'echo "Message received: $message"'
-  - topic: alerts
-    command: notify-send -i /usr/share/ntfy/logo.png "Important" "$m"
-    if:
-            priority: high,urgent
-  - topic: defaults
-`), 0600))
-
-	conf, err := client.LoadConfig(filename)
-	require.Nil(t, err)
-	require.Equal(t, "http://localhost", conf.DefaultHost)
-	require.Equal(t, "philipp", conf.DefaultUser)
-	require.Equal(t, "mypass", *conf.DefaultPassword)
-	require.Equal(t, `echo "Got the message: $message"`, conf.DefaultCommand)
-	require.Equal(t, 4, len(conf.Subscribe))
-	require.Equal(t, "no-command-with-auth", conf.Subscribe[0].Topic)
-	require.Equal(t, "", conf.Subscribe[0].Command)
-	require.Equal(t, "phil", *conf.Subscribe[0].User)
-	require.Equal(t, "mypass", *conf.Subscribe[0].Password)
-	require.Equal(t, "echo-this", conf.Subscribe[1].Topic)
-	require.Equal(t, `echo "Message received: $message"`, conf.Subscribe[1].Command)
-	require.Equal(t, "alerts", conf.Subscribe[2].Topic)
-	require.Equal(t, `notify-send -i /usr/share/ntfy/logo.png "Important" "$m"`, conf.Subscribe[2].Command)
-	require.Equal(t, "high,urgent", conf.Subscribe[2].If["priority"])
-	require.Equal(t, "defaults", conf.Subscribe[3].Topic)
-}
-
-func TestConfig_EmptyPassword(t *testing.T) {
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(`
-default-host: http://localhost
-default-user: philipp
-default-password: ""
-subscribe:
-  - topic: no-command-with-auth
-    user: phil
-    password: ""
-`), 0600))
-
-	conf, err := client.LoadConfig(filename)
-	require.Nil(t, err)
-	require.Equal(t, "http://localhost", conf.DefaultHost)
-	require.Equal(t, "philipp", conf.DefaultUser)
-	require.Equal(t, "", *conf.DefaultPassword)
-	require.Equal(t, 1, len(conf.Subscribe))
-	require.Equal(t, "no-command-with-auth", conf.Subscribe[0].Topic)
-	require.Equal(t, "", conf.Subscribe[0].Command)
-	require.Equal(t, "phil", *conf.Subscribe[0].User)
-	require.Equal(t, "", *conf.Subscribe[0].Password)
-}
-
-func TestConfig_NullPassword(t *testing.T) {
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(`
-default-host: http://localhost
-default-user: philipp
-default-password: ~
-subscribe:
-  - topic: no-command-with-auth
-    user: phil
-    password: ~
-`), 0600))
-
-	conf, err := client.LoadConfig(filename)
-	require.Nil(t, err)
-	require.Equal(t, "http://localhost", conf.DefaultHost)
-	require.Equal(t, "philipp", conf.DefaultUser)
-	require.Nil(t, conf.DefaultPassword)
-	require.Equal(t, 1, len(conf.Subscribe))
-	require.Equal(t, "no-command-with-auth", conf.Subscribe[0].Topic)
-	require.Equal(t, "", conf.Subscribe[0].Command)
-	require.Equal(t, "phil", *conf.Subscribe[0].User)
-	require.Nil(t, conf.Subscribe[0].Password)
-}
-
-func TestConfig_NoPassword(t *testing.T) {
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(`
-default-host: http://localhost
-default-user: philipp
-subscribe:
-  - topic: no-command-with-auth
-    user: phil
-`), 0600))
-
-	conf, err := client.LoadConfig(filename)
-	require.Nil(t, err)
-	require.Equal(t, "http://localhost", conf.DefaultHost)
-	require.Equal(t, "philipp", conf.DefaultUser)
-	require.Nil(t, conf.DefaultPassword)
-	require.Equal(t, 1, len(conf.Subscribe))
-	require.Equal(t, "no-command-with-auth", conf.Subscribe[0].Topic)
-	require.Equal(t, "", conf.Subscribe[0].Command)
-	require.Equal(t, "phil", *conf.Subscribe[0].User)
-	require.Nil(t, conf.Subscribe[0].Password)
-}
-
-func TestConfig_DefaultToken(t *testing.T) {
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(`
-default-host: http://localhost
-default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-subscribe:
-  - topic: mytopic
-`), 0600))
-
-	conf, err := client.LoadConfig(filename)
-	require.Nil(t, err)
-	require.Equal(t, "http://localhost", conf.DefaultHost)
-	require.Equal(t, "", conf.DefaultUser)
-	require.Nil(t, conf.DefaultPassword)
-	require.Equal(t, "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", conf.DefaultToken)
-	require.Equal(t, 1, len(conf.Subscribe))
-	require.Equal(t, "mytopic", conf.Subscribe[0].Topic)
-	require.Nil(t, conf.Subscribe[0].User)
-	require.Nil(t, conf.Subscribe[0].Password)
-	require.Nil(t, conf.Subscribe[0].Token)
-}

client/ntfy-client.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=ntfy client
-After=network.target
-
-[Service]
-User=ntfy
-Group=ntfy
-ExecStart=/usr/bin/ntfy subscribe --config /etc/ntfy/client.yml --from-config
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

client/options.go

@@ -1,204 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/util"
-	"net/http"
-	"strings"
-	"time"
-)
-
-// RequestOption is a generic request option that can be added to Client calls
-type RequestOption = func(r *http.Request) error
-
-// PublishOption is an option that can be passed to the Client.Publish call
-type PublishOption = RequestOption
-
-// SubscribeOption is an option that can be passed to a Client.Subscribe or Client.Poll call
-type SubscribeOption = RequestOption
-
-// WithMessage sets the notification message. This is an alternative way to passing the message body.
-func WithMessage(message string) PublishOption {
-	return WithHeader("X-Message", message)
-}
-
-// WithTitle adds a title to a message
-func WithTitle(title string) PublishOption {
-	return WithHeader("X-Title", title)
-}
-
-// WithPriority adds a priority to a message. The priority can be either a number (1=min, 5=max),
-// or the corresponding names (see util.ParsePriority).
-func WithPriority(priority string) PublishOption {
-	return WithHeader("X-Priority", priority)
-}
-
-// WithTagsList adds a list of tags to a message. The tags parameter must be a comma-separated list
-// of tags. To use a slice, use WithTags instead
-func WithTagsList(tags string) PublishOption {
-	return WithHeader("X-Tags", tags)
-}
-
-// WithTags adds a list of a tags to a message
-func WithTags(tags []string) PublishOption {
-	return WithTagsList(strings.Join(tags, ","))
-}
-
-// WithDelay instructs the server to send the message at a later date. The delay parameter can be a
-// Unix timestamp, a duration string or a natural langage string. See https://ntfy.sh/docs/publish/#scheduled-delivery
-// for details.
-func WithDelay(delay string) PublishOption {
-	return WithHeader("X-Delay", delay)
-}
-
-// WithClick makes the notification action open the given URL as opposed to entering the detail view
-func WithClick(url string) PublishOption {
-	return WithHeader("X-Click", url)
-}
-
-// WithIcon makes the notification use the given URL as its icon
-func WithIcon(icon string) PublishOption {
-	return WithHeader("X-Icon", icon)
-}
-
-// WithActions adds custom user actions to the notification. The value can be either a JSON array or the
-// simple format definition. See https://ntfy.sh/docs/publish/#action-buttons for details.
-func WithActions(value string) PublishOption {
-	return WithHeader("X-Actions", value)
-}
-
-// WithAttach sets a URL that will be used by the client to download an attachment
-func WithAttach(attach string) PublishOption {
-	return WithHeader("X-Attach", attach)
-}
-
-// WithMarkdown instructs the server to interpret the message body as Markdown
-func WithMarkdown() PublishOption {
-	return WithHeader("X-Markdown", "yes")
-}
-
-// WithFilename sets a filename for the attachment, and/or forces the HTTP body to interpreted as an attachment
-func WithFilename(filename string) PublishOption {
-	return WithHeader("X-Filename", filename)
-}
-
-// WithEmail instructs the server to also send the message to the given e-mail address
-func WithEmail(email string) PublishOption {
-	return WithHeader("X-Email", email)
-}
-
-// WithBasicAuth adds the Authorization header for basic auth to the request
-func WithBasicAuth(user, pass string) PublishOption {
-	return WithHeader("Authorization", util.BasicAuth(user, pass))
-}
-
-// WithBearerAuth adds the Authorization header for Bearer auth to the request
-func WithBearerAuth(token string) PublishOption {
-	return WithHeader("Authorization", fmt.Sprintf("Bearer %s", token))
-}
-
-// WithEmptyAuth clears the Authorization header
-func WithEmptyAuth() PublishOption {
-	return RemoveHeader("Authorization")
-}
-
-// WithNoCache instructs the server not to cache the message server-side
-func WithNoCache() PublishOption {
-	return WithHeader("X-Cache", "no")
-}
-
-// WithNoFirebase instructs the server not to forward the message to Firebase
-func WithNoFirebase() PublishOption {
-	return WithHeader("X-Firebase", "no")
-}
-
-// WithSince limits the number of messages returned from the server. The parameter since can be a Unix
-// timestamp (see WithSinceUnixTime), a duration (WithSinceDuration) the word "all" (see WithSinceAll).
-func WithSince(since string) SubscribeOption {
-	return WithQueryParam("since", since)
-}
-
-// WithSinceAll instructs the server to return all messages for the given topic from the server
-func WithSinceAll() SubscribeOption {
-	return WithSince("all")
-}
-
-// WithSinceDuration instructs the server to return all messages since the given duration ago
-func WithSinceDuration(since time.Duration) SubscribeOption {
-	return WithSinceUnixTime(time.Now().Add(-1 * since).Unix())
-}
-
-// WithSinceUnixTime instructs the server to return only messages newer or equal to the given timestamp
-func WithSinceUnixTime(since int64) SubscribeOption {
-	return WithSince(fmt.Sprintf("%d", since))
-}
-
-// WithPoll instructs the server to close the connection after messages have been returned. Don't use this option
-// directly. Use Client.Poll instead.
-func WithPoll() SubscribeOption {
-	return WithQueryParam("poll", "1")
-}
-
-// WithScheduled instructs the server to also return messages that have not been sent yet, i.e. delayed/scheduled
-// messages (see WithDelay). The messages will have a future date.
-func WithScheduled() SubscribeOption {
-	return WithQueryParam("scheduled", "1")
-}
-
-// WithFilter is a generic subscribe option meant to be used to filter for certain messages only
-func WithFilter(param, value string) SubscribeOption {
-	return WithQueryParam(param, value)
-}
-
-// WithMessageFilter instructs the server to only return messages that match the exact message
-func WithMessageFilter(message string) SubscribeOption {
-	return WithQueryParam("message", message)
-}
-
-// WithTitleFilter instructs the server to only return messages with a title that match the exact string
-func WithTitleFilter(title string) SubscribeOption {
-	return WithQueryParam("title", title)
-}
-
-// WithPriorityFilter instructs the server to only return messages with the matching priority. Not that messages
-// without priority also implicitly match priority 3.
-func WithPriorityFilter(priority int) SubscribeOption {
-	return WithQueryParam("priority", fmt.Sprintf("%d", priority))
-}
-
-// WithTagsFilter instructs the server to only return messages that contain all of the given tags
-func WithTagsFilter(tags []string) SubscribeOption {
-	return WithQueryParam("tags", strings.Join(tags, ","))
-}
-
-// WithHeader is a generic option to add headers to a request
-func WithHeader(header, value string) RequestOption {
-	return func(r *http.Request) error {
-		if value != "" {
-			r.Header.Set(header, value)
-		}
-		return nil
-	}
-}
-
-// WithQueryParam is a generic option to add query parameters to a request
-func WithQueryParam(param, value string) RequestOption {
-	return func(r *http.Request) error {
-		if value != "" {
-			q := r.URL.Query()
-			q.Add(param, value)
-			r.URL.RawQuery = q.Encode()
-		}
-		return nil
-	}
-}
-
-// RemoveHeader is a generic option to remove a header from a request
-func RemoveHeader(header string) RequestOption {
-	return func(r *http.Request) error {
-		if header != "" {
-			delete(r.Header, header)
-		}
-		return nil
-	}
-}

cmd/access.go

@@ -1,228 +0,0 @@
-//go:build !noserver
-
-package cmd
-
-import (
-	"errors"
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/user"
-	"git.zio.sh/astra/ntfy/v2/util"
-	"github.com/urfave/cli/v2"
-)
-
-func init() {
-	commands = append(commands, cmdAccess)
-}
-
-const (
-	userEveryone = "everyone"
-)
-
-var flagsAccess = append(
-	append([]cli.Flag{}, flagsUser...),
-	&cli.BoolFlag{Name: "reset", Aliases: []string{"r"}, Usage: "reset access for user (and topic)"},
-)
-
-var cmdAccess = &cli.Command{
-	Name:      "access",
-	Usage:     "Grant/revoke access to a topic, or show access",
-	UsageText: "ntfy access [USERNAME [TOPIC [PERMISSION]]]",
-	Flags:     flagsAccess,
-	Before:    initConfigFileInputSourceFunc("config", flagsAccess, initLogFunc),
-	Action:    execUserAccess,
-	Category:  categoryServer,
-	Description: `Manage the access control list for the ntfy server.
-
-This is a server-only command. It directly manages the user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined. Please also refer
-to the related command 'ntfy user'.
-
-The command allows you to show the access control list, as well as change it, depending on how
-it is called.
-
-Usage:
-  ntfy access                            # Shows access control list (alias: 'ntfy user list')
-  ntfy access USERNAME                   # Shows access control entries for USERNAME
-  ntfy access USERNAME TOPIC PERMISSION  # Allow/deny access for USERNAME to TOPIC
-
-Arguments:
-  USERNAME     an existing user, as created with 'ntfy user add', or "everyone"/"*"
-               to define access rules for anonymous/unauthenticated clients
-  TOPIC        name of a topic with optional wildcards, e.g. "mytopic*"
-  PERMISSION   one of the following:
-               - read-write (alias: rw) 
-               - read-only (aliases: read, ro)
-               - write-only (aliases: write, wo)
-               - deny (alias: none)
-
-Examples:
-  ntfy access                        # Shows access control list (alias: 'ntfy user list')
-  ntfy access phil                   # Shows access for user phil
-  ntfy access phil mytopic rw        # Allow read-write access to mytopic for user phil
-  ntfy access everyone mytopic rw    # Allow anonymous read-write access to mytopic
-  ntfy access everyone "up*" write   # Allow anonymous write-only access to topics "up..." 
-  ntfy access --reset                # Reset entire access control list
-  ntfy access --reset phil           # Reset all access for user phil
-  ntfy access --reset phil mytopic   # Reset access for user phil and topic mytopic
-`,
-}
-
-func execUserAccess(c *cli.Context) error {
-	if c.NArg() > 3 {
-		return errors.New("too many arguments, please check 'ntfy access --help' for usage details")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	username := c.Args().Get(0)
-	if username == userEveryone {
-		username = user.Everyone
-	}
-	topic := c.Args().Get(1)
-	perms := c.Args().Get(2)
-	reset := c.Bool("reset")
-	if reset {
-		if perms != "" {
-			return errors.New("too many arguments, please check 'ntfy access --help' for usage details")
-		}
-		return resetAccess(c, manager, username, topic)
-	} else if perms == "" {
-		if topic != "" {
-			return errors.New("invalid syntax, please check 'ntfy access --help' for usage details")
-		}
-		return showAccess(c, manager, username)
-	}
-	return changeAccess(c, manager, username, topic, perms)
-}
-
-func changeAccess(c *cli.Context, manager *user.Manager, username string, topic string, perms string) error {
-	if !util.Contains([]string{"", "read-write", "rw", "read-only", "read", "ro", "write-only", "write", "wo", "none", "deny"}, perms) {
-		return errors.New("permission must be one of: read-write, read-only, write-only, or deny (or the aliases: read, ro, write, wo, none)")
-	}
-	permission, err := user.ParsePermission(perms)
-	if err != nil {
-		return err
-	}
-	u, err := manager.User(username)
-	if err == user.ErrUserNotFound {
-		return fmt.Errorf("user %s does not exist", username)
-	} else if u.Role == user.RoleAdmin {
-		return fmt.Errorf("user %s is an admin user, access control entries have no effect", username)
-	}
-	if err := manager.AllowAccess(username, topic, permission); err != nil {
-		return err
-	}
-	if permission.IsReadWrite() {
-		fmt.Fprintf(c.App.ErrWriter, "granted read-write access to topic %s\n\n", topic)
-	} else if permission.IsRead() {
-		fmt.Fprintf(c.App.ErrWriter, "granted read-only access to topic %s\n\n", topic)
-	} else if permission.IsWrite() {
-		fmt.Fprintf(c.App.ErrWriter, "granted write-only access to topic %s\n\n", topic)
-	} else {
-		fmt.Fprintf(c.App.ErrWriter, "revoked all access to topic %s\n\n", topic)
-	}
-	return showUserAccess(c, manager, username)
-}
-
-func resetAccess(c *cli.Context, manager *user.Manager, username, topic string) error {
-	if username == "" {
-		return resetAllAccess(c, manager)
-	} else if topic == "" {
-		return resetUserAccess(c, manager, username)
-	}
-	return resetUserTopicAccess(c, manager, username, topic)
-}
-
-func resetAllAccess(c *cli.Context, manager *user.Manager) error {
-	if err := manager.ResetAccess("", ""); err != nil {
-		return err
-	}
-	fmt.Fprintln(c.App.ErrWriter, "reset access for all users")
-	return nil
-}
-
-func resetUserAccess(c *cli.Context, manager *user.Manager, username string) error {
-	if err := manager.ResetAccess(username, ""); err != nil {
-		return err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "reset access for user %s\n\n", username)
-	return showUserAccess(c, manager, username)
-}
-
-func resetUserTopicAccess(c *cli.Context, manager *user.Manager, username string, topic string) error {
-	if err := manager.ResetAccess(username, topic); err != nil {
-		return err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "reset access for user %s and topic %s\n\n", username, topic)
-	return showUserAccess(c, manager, username)
-}
-
-func showAccess(c *cli.Context, manager *user.Manager, username string) error {
-	if username == "" {
-		return showAllAccess(c, manager)
-	}
-	return showUserAccess(c, manager, username)
-}
-
-func showAllAccess(c *cli.Context, manager *user.Manager) error {
-	users, err := manager.Users()
-	if err != nil {
-		return err
-	}
-	return showUsers(c, manager, users)
-}
-
-func showUserAccess(c *cli.Context, manager *user.Manager, username string) error {
-	users, err := manager.User(username)
-	if err == user.ErrUserNotFound {
-		return fmt.Errorf("user %s does not exist", username)
-	} else if err != nil {
-		return err
-	}
-	return showUsers(c, manager, []*user.User{users})
-}
-
-func showUsers(c *cli.Context, manager *user.Manager, users []*user.User) error {
-	for _, u := range users {
-		grants, err := manager.Grants(u.Name)
-		if err != nil {
-			return err
-		}
-		tier := "none"
-		if u.Tier != nil {
-			tier = u.Tier.Name
-		}
-		fmt.Fprintf(c.App.ErrWriter, "user %s (role: %s, tier: %s)\n", u.Name, u.Role, tier)
-		if u.Role == user.RoleAdmin {
-			fmt.Fprintf(c.App.ErrWriter, "- read-write access to all topics (admin role)\n")
-		} else if len(grants) > 0 {
-			for _, grant := range grants {
-				if grant.Allow.IsReadWrite() {
-					fmt.Fprintf(c.App.ErrWriter, "- read-write access to topic %s\n", grant.TopicPattern)
-				} else if grant.Allow.IsRead() {
-					fmt.Fprintf(c.App.ErrWriter, "- read-only access to topic %s\n", grant.TopicPattern)
-				} else if grant.Allow.IsWrite() {
-					fmt.Fprintf(c.App.ErrWriter, "- write-only access to topic %s\n", grant.TopicPattern)
-				} else {
-					fmt.Fprintf(c.App.ErrWriter, "- no access to topic %s\n", grant.TopicPattern)
-				}
-			}
-		} else {
-			fmt.Fprintf(c.App.ErrWriter, "- no topic-specific permissions\n")
-		}
-		if u.Name == user.Everyone {
-			access := manager.DefaultAccess()
-			if access.IsReadWrite() {
-				fmt.Fprintln(c.App.ErrWriter, "- read-write access to all (other) topics (server config)")
-			} else if access.IsRead() {
-				fmt.Fprintln(c.App.ErrWriter, "- read-only access to all (other) topics (server config)")
-			} else if access.IsWrite() {
-				fmt.Fprintln(c.App.ErrWriter, "- write-only access to all (other) topics (server config)")
-			} else {
-				fmt.Fprintln(c.App.ErrWriter, "- no access to any (other) topics (server config)")
-			}
-		}
-	}
-	return nil
-}

cmd/access_test.go

@@ -1,89 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/server"
-	"git.zio.sh/astra/ntfy/v2/test"
-	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v2"
-	"testing"
-)
-
-func TestCLI_Access_Show(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	app, _, _, stderr := newTestApp()
-	require.Nil(t, runAccessCommand(app, conf))
-	require.Contains(t, stderr.String(), "user * (role: anonymous, tier: none)\n- no topic-specific permissions\n- no access to any (other) topics (server config)")
-}
-
-func TestCLI_Access_Grant_And_Publish(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	app, stdin, _, _ := newTestApp()
-	stdin.WriteString("philpass\nphilpass\nbenpass\nbenpass")
-	require.Nil(t, runUserCommand(app, conf, "add", "--role=admin", "phil"))
-	require.Nil(t, runUserCommand(app, conf, "add", "ben"))
-	require.Nil(t, runAccessCommand(app, conf, "ben", "announcements", "rw"))
-	require.Nil(t, runAccessCommand(app, conf, "ben", "sometopic", "read"))
-	require.Nil(t, runAccessCommand(app, conf, "everyone", "announcements", "read"))
-
-	app, _, _, stderr := newTestApp()
-	require.Nil(t, runAccessCommand(app, conf))
-	expected := `user phil (role: admin, tier: none)
-- read-write access to all topics (admin role)
-user ben (role: user, tier: none)
-- read-write access to topic announcements
-- read-only access to topic sometopic
-user * (role: anonymous, tier: none)
-- read-only access to topic announcements
-- no access to any (other) topics (server config)
-`
-	require.Equal(t, expected, stderr.String())
-
-	// See if access permissions match
-	app, _, _, _ = newTestApp()
-	require.Error(t, app.Run([]string{
-		"ntfy",
-		"publish",
-		fmt.Sprintf("http://127.0.0.1:%d/announcements", port),
-	}))
-	require.Nil(t, app.Run([]string{
-		"ntfy",
-		"publish",
-		"-u", "ben:benpass",
-		fmt.Sprintf("http://127.0.0.1:%d/announcements", port),
-	}))
-	require.Nil(t, app.Run([]string{
-		"ntfy",
-		"publish",
-		"-u", "phil:philpass",
-		fmt.Sprintf("http://127.0.0.1:%d/announcements", port),
-	}))
-	require.Nil(t, app.Run([]string{
-		"ntfy",
-		"subscribe",
-		"--poll",
-		fmt.Sprintf("http://127.0.0.1:%d/announcements", port),
-	}))
-	require.Error(t, app.Run([]string{
-		"ntfy",
-		"subscribe",
-		"--poll",
-		fmt.Sprintf("http://127.0.0.1:%d/something-else", port),
-	}))
-}
-
-func runAccessCommand(app *cli.App, conf *server.Config, args ...string) error {
-	userArgs := []string{
-		"ntfy",
-		"--log-level=ERROR",
-		"access",
-		"--config=" + conf.File, // Dummy config file to avoid lookups of real file
-		"--auth-file=" + conf.AuthFile,
-		"--auth-default-access=" + conf.AuthDefault.String(),
-	}
-	return app.Run(append(userArgs, args...))
-}

cmd/app.go

@@ -3,88 +3,71 @@ package cmd
 
 import (
 	"fmt"
-	"git.zio.sh/astra/ntfy/v2/log"
 	"github.com/urfave/cli/v2"
 	"github.com/urfave/cli/v2/altsrc"
+	"heckel.io/ntfy/config"
+	"heckel.io/ntfy/server"
+	"log"
 	"os"
-	"regexp"
-)
-
-const (
-	categoryClient = "Client commands"
-	categoryServer = "Server commands"
-)
-
-var commands = make([]*cli.Command, 0)
-
-var flagsDefault = []cli.Flag{
-	&cli.BoolFlag{Name: "debug", Aliases: []string{"d"}, EnvVars: []string{"NTFY_DEBUG"}, Usage: "enable debug logging"},
-	&cli.BoolFlag{Name: "trace", EnvVars: []string{"NTFY_TRACE"}, Usage: "enable tracing (very verbose, be careful)"},
-	&cli.BoolFlag{Name: "no-log-dates", Aliases: []string{"no_log_dates"}, EnvVars: []string{"NTFY_NO_LOG_DATES"}, Usage: "disable the date/time prefix"},
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "log-level", Aliases: []string{"log_level"}, Value: log.InfoLevel.String(), EnvVars: []string{"NTFY_LOG_LEVEL"}, Usage: "set log level"}),
-	altsrc.NewStringSliceFlag(&cli.StringSliceFlag{Name: "log-level-overrides", Aliases: []string{"log_level_overrides"}, EnvVars: []string{"NTFY_LOG_LEVEL_OVERRIDES"}, Usage: "set log level overrides"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "log-format", Aliases: []string{"log_format"}, Value: log.TextFormat.String(), EnvVars: []string{"NTFY_LOG_FORMAT"}, Usage: "set log format"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "log-file", Aliases: []string{"log_file"}, EnvVars: []string{"NTFY_LOG_FILE"}, Usage: "set log file, default is STDOUT"}),
-}
-
-var (
-	logLevelOverrideRegex = regexp.MustCompile(`(?i)^([^=\s]+)(?:\s*=\s*(\S+))?\s*->\s*(TRACE|DEBUG|INFO|WARN|ERROR)$`)
 )
 
 // New creates a new CLI application
 func New() *cli.App {
+	flags := []cli.Flag{
+		&cli.StringFlag{Name: "config", Aliases: []string{"c"}, EnvVars: []string{"NTFY_CONFIG_FILE"}, Value: "/etc/ntfy/config.yml", DefaultText: "/etc/ntfy/config.yml", Usage: "config file"},
+		altsrc.NewStringFlag(&cli.StringFlag{Name: "listen-http", Aliases: []string{"l"}, EnvVars: []string{"NTFY_LISTEN_HTTP"}, Value: config.DefaultListenHTTP, Usage: "ip:port used to as listen address"}),
+	}
 	return &cli.App{
 		Name:                   "ntfy",
 		Usage:                  "Simple pub-sub notification service",
 		UsageText:              "ntfy [OPTION..]",
+		HideHelp:               true,
 		HideVersion:            true,
+		EnableBashCompletion:   true,
 		UseShortOptionHandling: true,
 		Reader:                 os.Stdin,
 		Writer:                 os.Stdout,
 		ErrWriter:              os.Stderr,
-		Commands:               commands,
-		Flags:                  flagsDefault,
-		Before:                 initLogFunc,
+		Action:                 execRun,
+		Before:                 initConfigFileInputSource("config", flags),
+		Flags:                  flags,
 	}
 }
 
-func initLogFunc(c *cli.Context) error {
-	log.SetLevel(log.ToLevel(c.String("log-level")))
-	log.SetFormat(log.ToFormat(c.String("log-format")))
-	if c.Bool("trace") {
-		log.SetLevel(log.TraceLevel)
-	} else if c.Bool("debug") {
-		log.SetLevel(log.DebugLevel)
+func execRun(c *cli.Context) error {
+	// Read all the options
+	listenHTTP := c.String("listen-http")
+
+	// Run main bot, can be killed by signal
+	conf := config.New(listenHTTP)
+	s := server.New(conf)
+	if err := s.Run(); err != nil {
+		log.Fatalln(err)
 	}
-	if c.Bool("no-log-dates") {
-		log.DisableDates()
-	}
-	if err := applyLogLevelOverrides(c.StringSlice("log-level-overrides")); err != nil {
-		return err
-	}
-	logFile := c.String("log-file")
-	if logFile != "" {
-		w, err := os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600)
+
+	log.Printf("Exiting.")
+	return nil
+}
+
+// initConfigFileInputSource is like altsrc.InitInputSourceWithContext and altsrc.NewYamlSourceFromFlagFunc, but checks
+// if the config flag is exists and only loads it if it does. If the flag is set and the file exists, it fails.
+func initConfigFileInputSource(configFlag string, flags []cli.Flag) cli.BeforeFunc {
+	return func(context *cli.Context) error {
+		configFile := context.String(configFlag)
+		if context.IsSet(configFlag) && !fileExists(configFile) {
+			return fmt.Errorf("config file %s does not exist", configFile)
+		} else if !context.IsSet(configFlag) && !fileExists(configFile) {
+			return nil
+		}
+		inputSource, err := altsrc.NewYamlSourceFromFile(configFile)
 		if err != nil {
 			return err
 		}
-		log.SetOutput(w)
+		return altsrc.ApplyInputSourceValues(context, inputSource, flags)
 	}
-	return nil
 }
 
-func applyLogLevelOverrides(rawOverrides []string) error {
-	for _, override := range rawOverrides {
-		m := logLevelOverrideRegex.FindStringSubmatch(override)
-		if len(m) == 4 {
-			field, value, level := m[1], m[2], m[3]
-			log.SetLevelOverride(field, value, log.ToLevel(level))
-		} else if len(m) == 3 {
-			field, level := m[1], m[2]
-			log.SetLevelOverride(field, "", log.ToLevel(level)) // Matches any value
-		} else {
-			return fmt.Errorf(`invalid log level override "%s", must be "field=value -> loglevel", e.g. "user_id=u_123 -> DEBUG"`, override)
-		}
-	}
-	return nil
+func fileExists(filename string) bool {
+	stat, _ := os.Stat(filename)
+	return stat != nil
 }

cmd/app_test.go

@@ -1,36 +0,0 @@
-package cmd
-
-import (
-	"bytes"
-	"encoding/json"
-	"git.zio.sh/astra/ntfy/v2/client"
-	"git.zio.sh/astra/ntfy/v2/log"
-	"github.com/urfave/cli/v2"
-	"os"
-	"strings"
-	"testing"
-)
-
-// This only contains helpers so far
-
-func TestMain(m *testing.M) {
-	log.SetLevel(log.ErrorLevel)
-	os.Exit(m.Run())
-}
-
-func newTestApp() (*cli.App, *bytes.Buffer, *bytes.Buffer, *bytes.Buffer) {
-	var stdin, stdout, stderr bytes.Buffer
-	app := New()
-	app.Reader = &stdin
-	app.Writer = &stdout
-	app.ErrWriter = &stderr
-	return app, &stdin, &stdout, &stderr
-}
-
-func toMessage(t *testing.T, s string) *client.Message {
-	var m *client.Message
-	if err := json.NewDecoder(strings.NewReader(s)).Decode(&m); err != nil {
-		t.Fatal(err)
-	}
-	return m
-}

cmd/config_loader.go

@@ -1,60 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/util"
-	"github.com/urfave/cli/v2"
-	"github.com/urfave/cli/v2/altsrc"
-	"gopkg.in/yaml.v2"
-	"os"
-)
-
-// initConfigFileInputSourceFunc is like altsrc.InitInputSourceWithContext and altsrc.NewYamlSourceFromFlagFunc, but checks
-// if the config flag is exists and only loads it if it does. If the flag is set and the file exists, it fails.
-func initConfigFileInputSourceFunc(configFlag string, flags []cli.Flag, next cli.BeforeFunc) cli.BeforeFunc {
-	return func(context *cli.Context) error {
-		configFile := context.String(configFlag)
-		if context.IsSet(configFlag) && !util.FileExists(configFile) {
-			return fmt.Errorf("config file %s does not exist", configFile)
-		} else if !context.IsSet(configFlag) && !util.FileExists(configFile) {
-			return nil
-		}
-		inputSource, err := newYamlSourceFromFile(configFile, flags)
-		if err != nil {
-			return err
-		}
-		if err := altsrc.ApplyInputSourceValues(context, inputSource, flags); err != nil {
-			return err
-		}
-		if next != nil {
-			if err := next(context); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-}
-
-// newYamlSourceFromFile creates a new Yaml InputSourceContext from a filepath.
-//
-// This function also maps aliases, so a .yml file can contain short options, or options with underscores
-// instead of dashes. See https://github.com/binwiederhier/ntfy/issues/255.
-func newYamlSourceFromFile(file string, flags []cli.Flag) (altsrc.InputSourceContext, error) {
-	var rawConfig map[any]any
-	b, err := os.ReadFile(file)
-	if err != nil {
-		return nil, err
-	}
-	if err := yaml.Unmarshal(b, &rawConfig); err != nil {
-		return nil, err
-	}
-	for _, f := range flags {
-		flagName := f.Names()[0]
-		for _, flagAlias := range f.Names()[1:] {
-			if _, ok := rawConfig[flagAlias]; ok {
-				rawConfig[flagName] = rawConfig[flagAlias]
-			}
-		}
-	}
-	return altsrc.NewMapInputSource(file, rawConfig), nil
-}

cmd/config_loader_test.go

@@ -1,38 +0,0 @@
-package cmd
-
-import (
-	"github.com/stretchr/testify/require"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestNewYamlSourceFromFile(t *testing.T) {
-	filename := filepath.Join(t.TempDir(), "server.yml")
-	contents := `
-# Normal options
-listen-https: ":10443"
-
-# Note the underscore!
-listen_http: ":1080"
-
-# OMG this is allowed now ...
-K: /some/file.pem
-`
-	require.Nil(t, os.WriteFile(filename, []byte(contents), 0600))
-
-	ctx, err := newYamlSourceFromFile(filename, flagsServe)
-	require.Nil(t, err)
-
-	listenHTTPS, err := ctx.String("listen-https")
-	require.Nil(t, err)
-	require.Equal(t, ":10443", listenHTTPS)
-
-	listenHTTP, err := ctx.String("listen-http") // No underscore!
-	require.Nil(t, err)
-	require.Equal(t, ":1080", listenHTTP)
-
-	keyFile, err := ctx.String("key-file") // Long option!
-	require.Nil(t, err)
-	require.Equal(t, "/some/file.pem", keyFile)
-}

cmd/publish.go

@@ -1,314 +0,0 @@
-package cmd
-
-import (
-	"errors"
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/client"
-	"git.zio.sh/astra/ntfy/v2/log"
-	"git.zio.sh/astra/ntfy/v2/util"
-	"github.com/urfave/cli/v2"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-func init() {
-	commands = append(commands, cmdPublish)
-}
-
-var flagsPublish = append(
-	append([]cli.Flag{}, flagsDefault...),
-	&cli.StringFlag{Name: "config", Aliases: []string{"c"}, EnvVars: []string{"NTFY_CONFIG"}, Usage: "client config file"},
-	&cli.StringFlag{Name: "title", Aliases: []string{"t"}, EnvVars: []string{"NTFY_TITLE"}, Usage: "message title"},
-	&cli.StringFlag{Name: "message", Aliases: []string{"m"}, EnvVars: []string{"NTFY_MESSAGE"}, Usage: "message body"},
-	&cli.StringFlag{Name: "priority", Aliases: []string{"p"}, EnvVars: []string{"NTFY_PRIORITY"}, Usage: "priority of the message (1=min, 2=low, 3=default, 4=high, 5=max)"},
-	&cli.StringFlag{Name: "tags", Aliases: []string{"tag", "T"}, EnvVars: []string{"NTFY_TAGS"}, Usage: "comma separated list of tags and emojis"},
-	&cli.StringFlag{Name: "delay", Aliases: []string{"at", "in", "D"}, EnvVars: []string{"NTFY_DELAY"}, Usage: "delay/schedule message"},
-	&cli.StringFlag{Name: "click", Aliases: []string{"U"}, EnvVars: []string{"NTFY_CLICK"}, Usage: "URL to open when notification is clicked"},
-	&cli.StringFlag{Name: "icon", Aliases: []string{"i"}, EnvVars: []string{"NTFY_ICON"}, Usage: "URL to use as notification icon"},
-	&cli.StringFlag{Name: "actions", Aliases: []string{"A"}, EnvVars: []string{"NTFY_ACTIONS"}, Usage: "actions JSON array or simple definition"},
-	&cli.StringFlag{Name: "attach", Aliases: []string{"a"}, EnvVars: []string{"NTFY_ATTACH"}, Usage: "URL to send as an external attachment"},
-	&cli.BoolFlag{Name: "markdown", Aliases: []string{"md"}, EnvVars: []string{"NTFY_MARKDOWN"}, Usage: "Message is formatted as Markdown"},
-	&cli.StringFlag{Name: "filename", Aliases: []string{"name", "n"}, EnvVars: []string{"NTFY_FILENAME"}, Usage: "filename for the attachment"},
-	&cli.StringFlag{Name: "file", Aliases: []string{"f"}, EnvVars: []string{"NTFY_FILE"}, Usage: "file to upload as an attachment"},
-	&cli.StringFlag{Name: "email", Aliases: []string{"mail", "e"}, EnvVars: []string{"NTFY_EMAIL"}, Usage: "also send to e-mail address"},
-	&cli.StringFlag{Name: "user", Aliases: []string{"u"}, EnvVars: []string{"NTFY_USER"}, Usage: "username[:password] used to auth against the server"},
-	&cli.StringFlag{Name: "token", Aliases: []string{"k"}, EnvVars: []string{"NTFY_TOKEN"}, Usage: "access token used to auth against the server"},
-	&cli.IntFlag{Name: "wait-pid", Aliases: []string{"wait_pid", "pid"}, EnvVars: []string{"NTFY_WAIT_PID"}, Usage: "wait until PID exits before publishing"},
-	&cli.BoolFlag{Name: "wait-cmd", Aliases: []string{"wait_cmd", "cmd", "done"}, EnvVars: []string{"NTFY_WAIT_CMD"}, Usage: "run command and wait until it finishes before publishing"},
-	&cli.BoolFlag{Name: "no-cache", Aliases: []string{"no_cache", "C"}, EnvVars: []string{"NTFY_NO_CACHE"}, Usage: "do not cache message server-side"},
-	&cli.BoolFlag{Name: "no-firebase", Aliases: []string{"no_firebase", "F"}, EnvVars: []string{"NTFY_NO_FIREBASE"}, Usage: "do not forward message to Firebase"},
-	&cli.BoolFlag{Name: "quiet", Aliases: []string{"q"}, EnvVars: []string{"NTFY_QUIET"}, Usage: "do not print message"},
-)
-
-var cmdPublish = &cli.Command{
-	Name:    "publish",
-	Aliases: []string{"pub", "send", "trigger"},
-	Usage:   "Send message via a ntfy server",
-	UsageText: `ntfy publish [OPTIONS..] TOPIC [MESSAGE...]
-ntfy publish [OPTIONS..] --wait-cmd COMMAND...
-NTFY_TOPIC=.. ntfy publish [OPTIONS..] [MESSAGE...]`,
-	Action:   execPublish,
-	Category: categoryClient,
-	Flags:    flagsPublish,
-	Before:   initLogFunc,
-	Description: `Publish a message to a ntfy server.
-
-Examples:
-  ntfy publish mytopic This is my message                 # Send simple message
-  ntfy send myserver.com/mytopic "This is my message"     # Send message to different default host
-  ntfy pub -p high backups "Backups failed"               # Send high priority message
-  ntfy pub --tags=warning,skull backups "Backups failed"  # Add tags/emojis to message
-  ntfy pub --delay=10s delayed_topic Laterzz              # Delay message by 10s
-  ntfy pub --at=8:30am delayed_topic Laterzz              # Send message at 8:30am
-  ntfy pub -e phil@example.com alerts 'App is down!'      # Also send email to phil@example.com
-  ntfy pub --click="https://reddit.com" redd 'New msg'    # Opens Reddit when notification is clicked
-  ntfy pub --icon="http://some.tld/icon.png" 'Icon!'      # Send notification with custom icon
-  ntfy pub --attach="http://some.tld/file.zip" files      # Send ZIP archive from URL as attachment
-  ntfy pub --file=flower.jpg flowers 'Nice!'              # Send image.jpg as attachment
-  ntfy pub -u phil:mypass secret Psst                     # Publish with username/password
-  ntfy pub --wait-pid 1234 mytopic                        # Wait for process 1234 to exit before publishing
-  ntfy pub --wait-cmd mytopic rsync -av ./ /tmp/a         # Run command and publish after it completes
-  NTFY_USER=phil:mypass ntfy pub secret Psst              # Use env variables to set username/password
-  NTFY_TOPIC=mytopic ntfy pub "some message"              # Use NTFY_TOPIC variable as topic 
-  cat flower.jpg | ntfy pub --file=- flowers 'Nice!'      # Same as above, send image.jpg as attachment
-  ntfy trigger mywebhook                                  # Sending without message, useful for webhooks
- 
-Please also check out the docs on publishing messages. Especially for the --tags and --delay options, 
-it has incredibly useful information: https://ntfy.sh/docs/publish/.
-
-` + clientCommandDescriptionSuffix,
-}
-
-func execPublish(c *cli.Context) error {
-	conf, err := loadConfig(c)
-	if err != nil {
-		return err
-	}
-	title := c.String("title")
-	priority := c.String("priority")
-	tags := c.String("tags")
-	delay := c.String("delay")
-	click := c.String("click")
-	icon := c.String("icon")
-	actions := c.String("actions")
-	attach := c.String("attach")
-	markdown := c.Bool("markdown")
-	filename := c.String("filename")
-	file := c.String("file")
-	email := c.String("email")
-	user := c.String("user")
-	token := c.String("token")
-	noCache := c.Bool("no-cache")
-	noFirebase := c.Bool("no-firebase")
-	quiet := c.Bool("quiet")
-	pid := c.Int("wait-pid")
-
-	// Checks
-	if user != "" && token != "" {
-		return errors.New("cannot set both --user and --token")
-	}
-
-	// Do the things
-	topic, message, command, err := parseTopicMessageCommand(c)
-	if err != nil {
-		return err
-	}
-	var options []client.PublishOption
-	if title != "" {
-		options = append(options, client.WithTitle(title))
-	}
-	if priority != "" {
-		options = append(options, client.WithPriority(priority))
-	}
-	if tags != "" {
-		options = append(options, client.WithTagsList(tags))
-	}
-	if delay != "" {
-		options = append(options, client.WithDelay(delay))
-	}
-	if click != "" {
-		options = append(options, client.WithClick(click))
-	}
-	if icon != "" {
-		options = append(options, client.WithIcon(icon))
-	}
-	if actions != "" {
-		options = append(options, client.WithActions(strings.ReplaceAll(actions, "\n", " ")))
-	}
-	if attach != "" {
-		options = append(options, client.WithAttach(attach))
-	}
-	if markdown {
-		options = append(options, client.WithMarkdown())
-	}
-	if filename != "" {
-		options = append(options, client.WithFilename(filename))
-	}
-	if email != "" {
-		options = append(options, client.WithEmail(email))
-	}
-	if noCache {
-		options = append(options, client.WithNoCache())
-	}
-	if noFirebase {
-		options = append(options, client.WithNoFirebase())
-	}
-	if token != "" {
-		options = append(options, client.WithBearerAuth(token))
-	} else if user != "" {
-		var pass string
-		parts := strings.SplitN(user, ":", 2)
-		if len(parts) == 2 {
-			user = parts[0]
-			pass = parts[1]
-		} else {
-			fmt.Fprint(c.App.ErrWriter, "Enter Password: ")
-			p, err := util.ReadPassword(c.App.Reader)
-			if err != nil {
-				return err
-			}
-			pass = string(p)
-			fmt.Fprintf(c.App.ErrWriter, "\r%s\r", strings.Repeat(" ", 20))
-		}
-		options = append(options, client.WithBasicAuth(user, pass))
-	} else if conf.DefaultToken != "" {
-		options = append(options, client.WithBearerAuth(conf.DefaultToken))
-	} else if conf.DefaultUser != "" && conf.DefaultPassword != nil {
-		options = append(options, client.WithBasicAuth(conf.DefaultUser, *conf.DefaultPassword))
-	}
-	if pid > 0 {
-		newMessage, err := waitForProcess(pid)
-		if err != nil {
-			return err
-		} else if message == "" {
-			message = newMessage
-		}
-	} else if len(command) > 0 {
-		newMessage, err := runAndWaitForCommand(command)
-		if err != nil {
-			return err
-		} else if message == "" {
-			message = newMessage
-		}
-	}
-	var body io.Reader
-	if file == "" {
-		body = strings.NewReader(message)
-	} else {
-		if message != "" {
-			options = append(options, client.WithMessage(message))
-		}
-		if file == "-" {
-			if filename == "" {
-				options = append(options, client.WithFilename("stdin"))
-			}
-			body = c.App.Reader
-		} else {
-			if filename == "" {
-				options = append(options, client.WithFilename(filepath.Base(file)))
-			}
-			body, err = os.Open(file)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	cl := client.New(conf)
-	m, err := cl.PublishReader(topic, body, options...)
-	if err != nil {
-		return err
-	}
-	if !quiet {
-		fmt.Fprintln(c.App.Writer, strings.TrimSpace(m.Raw))
-	}
-	return nil
-}
-
-// parseTopicMessageCommand reads the topic and the remaining arguments from the context.
-
-// There are a few cases to consider:
-//
-//	ntfy publish <topic> [<message>]
-//	ntfy publish --wait-cmd <topic> <command>
-//	NTFY_TOPIC=.. ntfy publish [<message>]
-//	NTFY_TOPIC=.. ntfy publish --wait-cmd <command>
-func parseTopicMessageCommand(c *cli.Context) (topic string, message string, command []string, err error) {
-	var args []string
-	topic, args, err = parseTopicAndArgs(c)
-	if err != nil {
-		return
-	}
-	if c.Bool("wait-cmd") {
-		if len(args) == 0 {
-			err = errors.New("must specify command when --wait-cmd is passed, type 'ntfy publish --help' for help")
-			return
-		}
-		command = args
-	} else {
-		message = strings.Join(args, " ")
-	}
-	if c.String("message") != "" {
-		message = c.String("message")
-	}
-	return
-}
-
-func parseTopicAndArgs(c *cli.Context) (topic string, args []string, err error) {
-	envTopic := os.Getenv("NTFY_TOPIC")
-	if envTopic != "" {
-		topic = envTopic
-		return topic, remainingArgs(c, 0), nil
-	}
-	if c.NArg() < 1 {
-		return "", nil, errors.New("must specify topic, type 'ntfy publish --help' for help")
-	}
-	return c.Args().Get(0), remainingArgs(c, 1), nil
-}
-
-func remainingArgs(c *cli.Context, fromIndex int) []string {
-	if c.NArg() > fromIndex {
-		return c.Args().Slice()[fromIndex:]
-	}
-	return []string{}
-}
-
-func waitForProcess(pid int) (message string, err error) {
-	if !processExists(pid) {
-		return "", fmt.Errorf("process with PID %d not running", pid)
-	}
-	start := time.Now()
-	log.Debug("Waiting for process with PID %d to exit", pid)
-	for processExists(pid) {
-		time.Sleep(500 * time.Millisecond)
-	}
-	runtime := time.Since(start).Round(time.Millisecond)
-	log.Debug("Process with PID %d exited after %s", pid, runtime)
-	return fmt.Sprintf("Process with PID %d exited after %s", pid, runtime), nil
-}
-
-func runAndWaitForCommand(command []string) (message string, err error) {
-	prettyCmd := util.QuoteCommand(command)
-	log.Debug("Running command: %s", prettyCmd)
-	start := time.Now()
-	cmd := exec.Command(command[0], command[1:]...)
-	if log.IsTrace() {
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-	}
-	err = cmd.Run()
-	runtime := time.Since(start).Round(time.Millisecond)
-	if err != nil {
-		if exitError, ok := err.(*exec.ExitError); ok {
-			log.Debug("Command failed after %s (exit code %d): %s", runtime, exitError.ExitCode(), prettyCmd)
-			return fmt.Sprintf("Command failed after %s (exit code %d): %s", runtime, exitError.ExitCode(), prettyCmd), nil
-		}
-		// Hard fail when command does not exist or could not be properly launched
-		return "", fmt.Errorf("command failed: %s, error: %s", prettyCmd, err.Error())
-	}
-	log.Debug("Command succeeded after %s: %s", runtime, prettyCmd)
-	return fmt.Sprintf("Command succeeded after %s: %s", runtime, prettyCmd), nil
-}

cmd/publish_test.go

@@ -1,300 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/test"
-	"git.zio.sh/astra/ntfy/v2/util"
-	"github.com/stretchr/testify/require"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestCLI_Publish_Subscribe_Poll_Real_Server(t *testing.T) {
-	testMessage := util.RandomString(10)
-	app, _, _, _ := newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "ntfytest", "ntfy unit test " + testMessage}))
-
-	_, err := util.Retry(func() (*int, error) {
-		app2, _, stdout, _ := newTestApp()
-		if err := app2.Run([]string{"ntfy", "subscribe", "--poll", "ntfytest"}); err != nil {
-			return nil, err
-		}
-		if !strings.Contains(stdout.String(), testMessage) {
-			return nil, fmt.Errorf("test message %s not found in topic", testMessage)
-		}
-		return util.Int(1), nil
-	}, time.Second, 2*time.Second, 5*time.Second) // Since #502, ntfy.sh writes messages to the cache asynchronously, after a timeout of ~1.5s
-	require.Nil(t, err)
-}
-
-func TestCLI_Publish_Subscribe_Poll(t *testing.T) {
-	s, port := test.StartServer(t)
-	defer test.StopServer(t, s, port)
-	topic := fmt.Sprintf("http://127.0.0.1:%d/mytopic", port)
-
-	app, _, stdout, _ := newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", topic, "some message"}))
-	m := toMessage(t, stdout.String())
-	require.Equal(t, "some message", m.Message)
-
-	app2, _, stdout, _ := newTestApp()
-	require.Nil(t, app2.Run([]string{"ntfy", "subscribe", "--poll", topic}))
-	m = toMessage(t, stdout.String())
-	require.Equal(t, "some message", m.Message)
-}
-
-func TestCLI_Publish_All_The_Things(t *testing.T) {
-	s, port := test.StartServer(t)
-	defer test.StopServer(t, s, port)
-	topic := fmt.Sprintf("http://127.0.0.1:%d/mytopic", port)
-
-	app, _, stdout, _ := newTestApp()
-	require.Nil(t, app.Run([]string{
-		"ntfy", "publish",
-		"--title", "this is a title",
-		"--priority", "high",
-		"--tags", "tag1,tag2",
-		// No --delay, --email
-		"--click", "https://ntfy.sh",
-		"--icon", "https://ntfy.sh/static/img/ntfy.png",
-		"--attach", "https://f-droid.org/F-Droid.apk",
-		"--filename", "fdroid.apk",
-		"--no-cache",
-		"--no-firebase",
-		topic,
-		"some message",
-	}))
-	m := toMessage(t, stdout.String())
-	require.Equal(t, "message", m.Event)
-	require.Equal(t, "mytopic", m.Topic)
-	require.Equal(t, "some message", m.Message)
-	require.Equal(t, "this is a title", m.Title)
-	require.Equal(t, 4, m.Priority)
-	require.Equal(t, []string{"tag1", "tag2"}, m.Tags)
-	require.Equal(t, "https://ntfy.sh", m.Click)
-	require.Equal(t, "https://f-droid.org/F-Droid.apk", m.Attachment.URL)
-	require.Equal(t, "fdroid.apk", m.Attachment.Name)
-	require.Equal(t, int64(0), m.Attachment.Size)
-	require.Equal(t, "", m.Attachment.Owner)
-	require.Equal(t, int64(0), m.Attachment.Expires)
-	require.Equal(t, "", m.Attachment.Type)
-	require.Equal(t, "https://ntfy.sh/static/img/ntfy.png", m.Icon)
-}
-
-func TestCLI_Publish_Wait_PID_And_Cmd(t *testing.T) {
-	s, port := test.StartServer(t)
-	defer test.StopServer(t, s, port)
-	topic := fmt.Sprintf("http://127.0.0.1:%d/mytopic", port)
-
-	// Test: sleep 0.5
-	sleep := exec.Command("sleep", "0.5")
-	require.Nil(t, sleep.Start())
-	go sleep.Wait() // Must be called to release resources
-	start := time.Now()
-	app, _, stdout, _ := newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "--wait-pid", strconv.Itoa(sleep.Process.Pid), topic}))
-	m := toMessage(t, stdout.String())
-	require.True(t, time.Since(start) >= 500*time.Millisecond)
-	require.Regexp(t, `Process with PID \d+ exited after `, m.Message)
-
-	// Test: PID does not exist
-	app, _, _, _ = newTestApp()
-	err := app.Run([]string{"ntfy", "publish", "--wait-pid", "1234567", topic})
-	require.Error(t, err)
-	require.Equal(t, "process with PID 1234567 not running", err.Error())
-
-	// Test: Successful command (exit 0)
-	start = time.Now()
-	app, _, stdout, _ = newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "--wait-cmd", topic, "sleep", "0.5"}))
-	m = toMessage(t, stdout.String())
-	require.True(t, time.Since(start) >= 500*time.Millisecond)
-	require.Contains(t, m.Message, `Command succeeded after `)
-	require.Contains(t, m.Message, `: sleep 0.5`)
-
-	// Test: Failing command (exit 1)
-	app, _, stdout, _ = newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "--wait-cmd", topic, "/bin/false", "false doesn't care about its args"}))
-	m = toMessage(t, stdout.String())
-	require.Contains(t, m.Message, `Command failed after `)
-	require.Contains(t, m.Message, `(exit code 1): /bin/false "false doesn't care about its args"`, m.Message)
-
-	// Test: Non-existing command (hard fail!)
-	app, _, _, _ = newTestApp()
-	err = app.Run([]string{"ntfy", "publish", "--wait-cmd", topic, "does-not-exist-no-really", "really though"})
-	require.Error(t, err)
-	require.Equal(t, `command failed: does-not-exist-no-really "really though", error: exec: "does-not-exist-no-really": executable file not found in $PATH`, err.Error())
-
-	// Tests with NTFY_TOPIC set ////
-	t.Setenv("NTFY_TOPIC", topic)
-
-	// Test: Successful command with NTFY_TOPIC
-	app, _, stdout, _ = newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "--cmd", "echo", "hi there"}))
-	m = toMessage(t, stdout.String())
-	require.Equal(t, "mytopic", m.Topic)
-
-	// Test: Successful --wait-pid with NTFY_TOPIC
-	sleep = exec.Command("sleep", "0.2")
-	require.Nil(t, sleep.Start())
-	go sleep.Wait() // Must be called to release resources
-	app, _, stdout, _ = newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "--wait-pid", strconv.Itoa(sleep.Process.Pid)}))
-	m = toMessage(t, stdout.String())
-	require.Regexp(t, `Process with PID \d+ exited after .+ms`, m.Message)
-}
-
-func TestCLI_Publish_Default_UserPass(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic", r.URL.Path)
-		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-user: philipp
-default-password: mypass
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "mytopic", "triggered"}))
-	m := toMessage(t, stdout.String())
-	require.Equal(t, "triggered", m.Message)
-}
-
-func TestCLI_Publish_Default_Token(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic", r.URL.Path)
-		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "mytopic", "triggered"}))
-	m := toMessage(t, stdout.String())
-	require.Equal(t, "triggered", m.Message)
-}
-
-func TestCLI_Publish_Default_UserPass_CLI_Token(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic", r.URL.Path)
-		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-user: philipp
-default-password: mypass
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "--token", "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", "mytopic", "triggered"}))
-	m := toMessage(t, stdout.String())
-	require.Equal(t, "triggered", m.Message)
-}
-
-func TestCLI_Publish_Default_Token_CLI_UserPass(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic", r.URL.Path)
-		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "--user", "philipp:mypass", "mytopic", "triggered"}))
-	m := toMessage(t, stdout.String())
-	require.Equal(t, "triggered", m.Message)
-}
-
-func TestCLI_Publish_Default_Token_CLI_Token(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic", r.URL.Path)
-		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-token: tk_FAKETOKEN01234567890FAKETOKEN
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "--token", "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", "mytopic", "triggered"}))
-	m := toMessage(t, stdout.String())
-	require.Equal(t, "triggered", m.Message)
-}
-
-func TestCLI_Publish_Default_UserPass_CLI_UserPass(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic", r.URL.Path)
-		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-user: philipp
-default-password: fakepass
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "--user", "philipp:mypass", "mytopic", "triggered"}))
-	m := toMessage(t, stdout.String())
-	require.Equal(t, "triggered", m.Message)
-}
-
-func TestCLI_Publish_Token_And_UserPass(t *testing.T) {
-	app, _, _, _ := newTestApp()
-	err := app.Run([]string{"ntfy", "publish", "--token", "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", "--user", "philipp:mypass", "mytopic", "triggered"})
-	require.Error(t, err)
-	require.Equal(t, "cannot set both --user and --token", err.Error())
-}

cmd/publish_unix.go

@@ -1,11 +0,0 @@
-//go:build darwin || linux || dragonfly || freebsd || netbsd || openbsd
-// +build darwin linux dragonfly freebsd netbsd openbsd
-
-package cmd
-
-import "syscall"
-
-func processExists(pid int) bool {
-	err := syscall.Kill(pid, syscall.Signal(0))
-	return err == nil
-}

cmd/publish_windows.go

@@ -1,10 +0,0 @@
-package cmd
-
-import (
-	"os"
-)
-
-func processExists(pid int) bool {
-	_, err := os.FindProcess(pid)
-	return err == nil
-}

cmd/serve.go

@@ -1,454 +0,0 @@
-//go:build !noserver
-
-package cmd
-
-import (
-	"errors"
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/user"
-	"github.com/stripe/stripe-go/v74"
-	"io/fs"
-	"math"
-	"net"
-	"net/netip"
-	"os"
-	"os/signal"
-	"strings"
-	"syscall"
-	"time"
-
-	"git.zio.sh/astra/ntfy/v2/log"
-
-	"git.zio.sh/astra/ntfy/v2/server"
-	"git.zio.sh/astra/ntfy/v2/util"
-	"github.com/urfave/cli/v2"
-	"github.com/urfave/cli/v2/altsrc"
-)
-
-func init() {
-	commands = append(commands, cmdServe)
-}
-
-const (
-	defaultServerConfigFile = "/etc/ntfy/server.yml"
-)
-
-var flagsServe = append(
-	append([]cli.Flag{}, flagsDefault...),
-	&cli.StringFlag{Name: "config", Aliases: []string{"c"}, EnvVars: []string{"NTFY_CONFIG_FILE"}, Value: defaultServerConfigFile, DefaultText: defaultServerConfigFile, Usage: "config file"},
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "base-url", Aliases: []string{"base_url", "B"}, EnvVars: []string{"NTFY_BASE_URL"}, Usage: "externally visible base URL for this host (e.g. https://ntfy.sh)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "listen-http", Aliases: []string{"listen_http", "l"}, EnvVars: []string{"NTFY_LISTEN_HTTP"}, Value: server.DefaultListenHTTP, Usage: "ip:port used as HTTP listen address"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "listen-https", Aliases: []string{"listen_https", "L"}, EnvVars: []string{"NTFY_LISTEN_HTTPS"}, Usage: "ip:port used as HTTPS listen address"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "listen-unix", Aliases: []string{"listen_unix", "U"}, EnvVars: []string{"NTFY_LISTEN_UNIX"}, Usage: "listen on unix socket path"}),
-	altsrc.NewIntFlag(&cli.IntFlag{Name: "listen-unix-mode", Aliases: []string{"listen_unix_mode"}, EnvVars: []string{"NTFY_LISTEN_UNIX_MODE"}, DefaultText: "system default", Usage: "file permissions of unix socket, e.g. 0700"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "key-file", Aliases: []string{"key_file", "K"}, EnvVars: []string{"NTFY_KEY_FILE"}, Usage: "private key file, if listen-https is set"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "cert-file", Aliases: []string{"cert_file", "E"}, EnvVars: []string{"NTFY_CERT_FILE"}, Usage: "certificate file, if listen-https is set"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "firebase-key-file", Aliases: []string{"firebase_key_file", "F"}, EnvVars: []string{"NTFY_FIREBASE_KEY_FILE"}, Usage: "Firebase credentials file; if set additionally publish to FCM topic"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "cache-file", Aliases: []string{"cache_file", "C"}, EnvVars: []string{"NTFY_CACHE_FILE"}, Usage: "cache file used for message caching"}),
-	altsrc.NewDurationFlag(&cli.DurationFlag{Name: "cache-duration", Aliases: []string{"cache_duration", "b"}, EnvVars: []string{"NTFY_CACHE_DURATION"}, Value: server.DefaultCacheDuration, Usage: "buffer messages for this time to allow `since` requests"}),
-	altsrc.NewIntFlag(&cli.IntFlag{Name: "cache-batch-size", Aliases: []string{"cache_batch_size"}, EnvVars: []string{"NTFY_BATCH_SIZE"}, Usage: "max size of messages to batch together when writing to message cache (if zero, writes are synchronous)"}),
-	altsrc.NewDurationFlag(&cli.DurationFlag{Name: "cache-batch-timeout", Aliases: []string{"cache_batch_timeout"}, EnvVars: []string{"NTFY_CACHE_BATCH_TIMEOUT"}, Usage: "timeout for batched async writes to the message cache (if zero, writes are synchronous)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "cache-startup-queries", Aliases: []string{"cache_startup_queries"}, EnvVars: []string{"NTFY_CACHE_STARTUP_QUERIES"}, Usage: "queries run when the cache database is initialized"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "auth-file", Aliases: []string{"auth_file", "H"}, EnvVars: []string{"NTFY_AUTH_FILE"}, Usage: "auth database file used for access control"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "auth-startup-queries", Aliases: []string{"auth_startup_queries"}, EnvVars: []string{"NTFY_AUTH_STARTUP_QUERIES"}, Usage: "queries run when the auth database is initialized"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "auth-default-access", Aliases: []string{"auth_default_access", "p"}, EnvVars: []string{"NTFY_AUTH_DEFAULT_ACCESS"}, Value: "read-write", Usage: "default permissions if no matching entries in the auth database are found"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "attachment-cache-dir", Aliases: []string{"attachment_cache_dir"}, EnvVars: []string{"NTFY_ATTACHMENT_CACHE_DIR"}, Usage: "cache directory for attached files"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "attachment-total-size-limit", Aliases: []string{"attachment_total_size_limit", "A"}, EnvVars: []string{"NTFY_ATTACHMENT_TOTAL_SIZE_LIMIT"}, DefaultText: "5G", Usage: "limit of the on-disk attachment cache"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "attachment-file-size-limit", Aliases: []string{"attachment_file_size_limit", "Y"}, EnvVars: []string{"NTFY_ATTACHMENT_FILE_SIZE_LIMIT"}, DefaultText: "15M", Usage: "per-file attachment size limit (e.g. 300k, 2M, 100M)"}),
-	altsrc.NewDurationFlag(&cli.DurationFlag{Name: "attachment-expiry-duration", Aliases: []string{"attachment_expiry_duration", "X"}, EnvVars: []string{"NTFY_ATTACHMENT_EXPIRY_DURATION"}, Value: server.DefaultAttachmentExpiryDuration, DefaultText: "3h", Usage: "duration after which uploaded attachments will be deleted (e.g. 3h, 20h)"}),
-	altsrc.NewDurationFlag(&cli.DurationFlag{Name: "keepalive-interval", Aliases: []string{"keepalive_interval", "k"}, EnvVars: []string{"NTFY_KEEPALIVE_INTERVAL"}, Value: server.DefaultKeepaliveInterval, Usage: "interval of keepalive messages"}),
-	altsrc.NewDurationFlag(&cli.DurationFlag{Name: "manager-interval", Aliases: []string{"manager_interval", "m"}, EnvVars: []string{"NTFY_MANAGER_INTERVAL"}, Value: server.DefaultManagerInterval, Usage: "interval of for message pruning and stats printing"}),
-	altsrc.NewStringSliceFlag(&cli.StringSliceFlag{Name: "disallowed-topics", Aliases: []string{"disallowed_topics"}, EnvVars: []string{"NTFY_DISALLOWED_TOPICS"}, Usage: "topics that are not allowed to be used"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "web-root", Aliases: []string{"web_root"}, EnvVars: []string{"NTFY_WEB_ROOT"}, Value: "/", Usage: "sets root of the web app (e.g. /, or /app), or disables it (disable)"}),
-	altsrc.NewBoolFlag(&cli.BoolFlag{Name: "enable-signup", Aliases: []string{"enable_signup"}, EnvVars: []string{"NTFY_ENABLE_SIGNUP"}, Value: false, Usage: "allows users to sign up via the web app, or API"}),
-	altsrc.NewBoolFlag(&cli.BoolFlag{Name: "enable-login", Aliases: []string{"enable_login"}, EnvVars: []string{"NTFY_ENABLE_LOGIN"}, Value: false, Usage: "allows users to log in via the web app, or API"}),
-	altsrc.NewBoolFlag(&cli.BoolFlag{Name: "enable-reservations", Aliases: []string{"enable_reservations"}, EnvVars: []string{"NTFY_ENABLE_RESERVATIONS"}, Value: false, Usage: "allows users to reserve topics (if their tier allows it)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "upstream-base-url", Aliases: []string{"upstream_base_url"}, EnvVars: []string{"NTFY_UPSTREAM_BASE_URL"}, Value: "", Usage: "forward poll request to an upstream server, this is needed for iOS push notifications for self-hosted servers"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "upstream-access-token", Aliases: []string{"upstream_access_token"}, EnvVars: []string{"NTFY_UPSTREAM_ACCESS_TOKEN"}, Value: "", Usage: "access token to use for the upstream server; needed only if upstream rate limits are exceeded or upstream server requires auth"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-sender-addr", Aliases: []string{"smtp_sender_addr"}, EnvVars: []string{"NTFY_SMTP_SENDER_ADDR"}, Usage: "SMTP server address (host:port) for outgoing emails"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-sender-user", Aliases: []string{"smtp_sender_user"}, EnvVars: []string{"NTFY_SMTP_SENDER_USER"}, Usage: "SMTP user (if e-mail sending is enabled)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-sender-pass", Aliases: []string{"smtp_sender_pass"}, EnvVars: []string{"NTFY_SMTP_SENDER_PASS"}, Usage: "SMTP password (if e-mail sending is enabled)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-sender-from", Aliases: []string{"smtp_sender_from"}, EnvVars: []string{"NTFY_SMTP_SENDER_FROM"}, Usage: "SMTP sender address (if e-mail sending is enabled)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-server-listen", Aliases: []string{"smtp_server_listen"}, EnvVars: []string{"NTFY_SMTP_SERVER_LISTEN"}, Usage: "SMTP server address (ip:port) for incoming emails, e.g. :25"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-server-domain", Aliases: []string{"smtp_server_domain"}, EnvVars: []string{"NTFY_SMTP_SERVER_DOMAIN"}, Usage: "SMTP domain for incoming e-mail, e.g. ntfy.sh"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-server-addr-prefix", Aliases: []string{"smtp_server_addr_prefix"}, EnvVars: []string{"NTFY_SMTP_SERVER_ADDR_PREFIX"}, Usage: "SMTP email address prefix for topics to prevent spam (e.g. 'ntfy-')"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "twilio-account", Aliases: []string{"twilio_account"}, EnvVars: []string{"NTFY_TWILIO_ACCOUNT"}, Usage: "Twilio account SID, used for phone calls, e.g. AC123..."}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "twilio-auth-token", Aliases: []string{"twilio_auth_token"}, EnvVars: []string{"NTFY_TWILIO_AUTH_TOKEN"}, Usage: "Twilio auth token"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "twilio-phone-number", Aliases: []string{"twilio_phone_number"}, EnvVars: []string{"NTFY_TWILIO_PHONE_NUMBER"}, Usage: "Twilio number to use for outgoing calls"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "twilio-verify-service", Aliases: []string{"twilio_verify_service"}, EnvVars: []string{"NTFY_TWILIO_VERIFY_SERVICE"}, Usage: "Twilio Verify service ID, used for phone number verification"}),
-	altsrc.NewIntFlag(&cli.IntFlag{Name: "global-topic-limit", Aliases: []string{"global_topic_limit", "T"}, EnvVars: []string{"NTFY_GLOBAL_TOPIC_LIMIT"}, Value: server.DefaultTotalTopicLimit, Usage: "total number of topics allowed"}),
-	altsrc.NewIntFlag(&cli.IntFlag{Name: "visitor-subscription-limit", Aliases: []string{"visitor_subscription_limit"}, EnvVars: []string{"NTFY_VISITOR_SUBSCRIPTION_LIMIT"}, Value: server.DefaultVisitorSubscriptionLimit, Usage: "number of subscriptions per visitor"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "visitor-attachment-total-size-limit", Aliases: []string{"visitor_attachment_total_size_limit"}, EnvVars: []string{"NTFY_VISITOR_ATTACHMENT_TOTAL_SIZE_LIMIT"}, Value: "100M", Usage: "total storage limit used for attachments per visitor"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "visitor-attachment-daily-bandwidth-limit", Aliases: []string{"visitor_attachment_daily_bandwidth_limit"}, EnvVars: []string{"NTFY_VISITOR_ATTACHMENT_DAILY_BANDWIDTH_LIMIT"}, Value: "500M", Usage: "total daily attachment download/upload bandwidth limit per visitor"}),
-	altsrc.NewIntFlag(&cli.IntFlag{Name: "visitor-request-limit-burst", Aliases: []string{"visitor_request_limit_burst"}, EnvVars: []string{"NTFY_VISITOR_REQUEST_LIMIT_BURST"}, Value: server.DefaultVisitorRequestLimitBurst, Usage: "initial limit of requests per visitor"}),
-	altsrc.NewDurationFlag(&cli.DurationFlag{Name: "visitor-request-limit-replenish", Aliases: []string{"visitor_request_limit_replenish"}, EnvVars: []string{"NTFY_VISITOR_REQUEST_LIMIT_REPLENISH"}, Value: server.DefaultVisitorRequestLimitReplenish, Usage: "interval at which burst limit is replenished (one per x)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "visitor-request-limit-exempt-hosts", Aliases: []string{"visitor_request_limit_exempt_hosts"}, EnvVars: []string{"NTFY_VISITOR_REQUEST_LIMIT_EXEMPT_HOSTS"}, Value: "", Usage: "hostnames and/or IP addresses of hosts that will be exempt from the visitor request limit"}),
-	altsrc.NewIntFlag(&cli.IntFlag{Name: "visitor-message-daily-limit", Aliases: []string{"visitor_message_daily_limit"}, EnvVars: []string{"NTFY_VISITOR_MESSAGE_DAILY_LIMIT"}, Value: server.DefaultVisitorMessageDailyLimit, Usage: "max messages per visitor per day, derived from request limit if unset"}),
-	altsrc.NewIntFlag(&cli.IntFlag{Name: "visitor-email-limit-burst", Aliases: []string{"visitor_email_limit_burst"}, EnvVars: []string{"NTFY_VISITOR_EMAIL_LIMIT_BURST"}, Value: server.DefaultVisitorEmailLimitBurst, Usage: "initial limit of e-mails per visitor"}),
-	altsrc.NewDurationFlag(&cli.DurationFlag{Name: "visitor-email-limit-replenish", Aliases: []string{"visitor_email_limit_replenish"}, EnvVars: []string{"NTFY_VISITOR_EMAIL_LIMIT_REPLENISH"}, Value: server.DefaultVisitorEmailLimitReplenish, Usage: "interval at which burst limit is replenished (one per x)"}),
-	altsrc.NewBoolFlag(&cli.BoolFlag{Name: "visitor-subscriber-rate-limiting", Aliases: []string{"visitor_subscriber_rate_limiting"}, EnvVars: []string{"NTFY_VISITOR_SUBSCRIBER_RATE_LIMITING"}, Value: false, Usage: "enables subscriber-based rate limiting"}),
-	altsrc.NewBoolFlag(&cli.BoolFlag{Name: "behind-proxy", Aliases: []string{"behind_proxy", "P"}, EnvVars: []string{"NTFY_BEHIND_PROXY"}, Value: false, Usage: "if set, use X-Forwarded-For header to determine visitor IP address (for rate limiting)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "stripe-secret-key", Aliases: []string{"stripe_secret_key"}, EnvVars: []string{"NTFY_STRIPE_SECRET_KEY"}, Value: "", Usage: "key used for the Stripe API communication, this enables payments"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "stripe-webhook-key", Aliases: []string{"stripe_webhook_key"}, EnvVars: []string{"NTFY_STRIPE_WEBHOOK_KEY"}, Value: "", Usage: "key required to validate the authenticity of incoming webhooks from Stripe"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "billing-contact", Aliases: []string{"billing_contact"}, EnvVars: []string{"NTFY_BILLING_CONTACT"}, Value: "", Usage: "e-mail or website to display in upgrade dialog (only if payments are enabled)"}),
-	altsrc.NewBoolFlag(&cli.BoolFlag{Name: "enable-metrics", Aliases: []string{"enable_metrics"}, EnvVars: []string{"NTFY_ENABLE_METRICS"}, Value: false, Usage: "if set, Prometheus metrics are exposed via the /metrics endpoint"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "metrics-listen-http", Aliases: []string{"metrics_listen_http"}, EnvVars: []string{"NTFY_METRICS_LISTEN_HTTP"}, Usage: "ip:port used to expose the metrics endpoint (implicitly enables metrics)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "profile-listen-http", Aliases: []string{"profile_listen_http"}, EnvVars: []string{"NTFY_PROFILE_LISTEN_HTTP"}, Usage: "ip:port used to expose the profiling endpoints (implicitly enables profiling)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "web-push-public-key", Aliases: []string{"web_push_public_key"}, EnvVars: []string{"NTFY_WEB_PUSH_PUBLIC_KEY"}, Usage: "public key used for web push notifications"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "web-push-private-key", Aliases: []string{"web_push_private_key"}, EnvVars: []string{"NTFY_WEB_PUSH_PRIVATE_KEY"}, Usage: "private key used for web push notifications"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "web-push-file", Aliases: []string{"web_push_file"}, EnvVars: []string{"NTFY_WEB_PUSH_FILE"}, Usage: "file used to store web push subscriptions"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "web-push-email-address", Aliases: []string{"web_push_email_address"}, EnvVars: []string{"NTFY_WEB_PUSH_EMAIL_ADDRESS"}, Usage: "e-mail address of sender, required to use browser push services"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "web-push-startup-queries", Aliases: []string{"web_push_startup_queries"}, EnvVars: []string{"NTFY_WEB_PUSH_STARTUP_QUERIES"}, Usage: "queries run when the web push database is initialized"}),
-)
-
-var cmdServe = &cli.Command{
-	Name:      "serve",
-	Usage:     "Run the ntfy server",
-	UsageText: "ntfy serve [OPTIONS..]",
-	Action:    execServe,
-	Category:  categoryServer,
-	Flags:     flagsServe,
-	Before:    initConfigFileInputSourceFunc("config", flagsServe, initLogFunc),
-	Description: `Run the ntfy server and listen for incoming requests
-
-The command will load the configuration from /etc/ntfy/server.yml. Config options can 
-be overridden using the command line options.
-
-Examples:
-  ntfy serve                      # Starts server in the foreground (on port 80)
-  ntfy serve --listen-http :8080  # Starts server with alternate port`,
-}
-
-func execServe(c *cli.Context) error {
-	if c.NArg() > 0 {
-		return errors.New("no arguments expected, see 'ntfy serve --help' for help")
-	}
-
-	// Read all the options
-	config := c.String("config")
-	baseURL := c.String("base-url")
-	listenHTTP := c.String("listen-http")
-	listenHTTPS := c.String("listen-https")
-	listenUnix := c.String("listen-unix")
-	listenUnixMode := c.Int("listen-unix-mode")
-	keyFile := c.String("key-file")
-	certFile := c.String("cert-file")
-	firebaseKeyFile := c.String("firebase-key-file")
-	webPushPrivateKey := c.String("web-push-private-key")
-	webPushPublicKey := c.String("web-push-public-key")
-	webPushFile := c.String("web-push-file")
-	webPushEmailAddress := c.String("web-push-email-address")
-	webPushStartupQueries := c.String("web-push-startup-queries")
-	cacheFile := c.String("cache-file")
-	cacheDuration := c.Duration("cache-duration")
-	cacheStartupQueries := c.String("cache-startup-queries")
-	cacheBatchSize := c.Int("cache-batch-size")
-	cacheBatchTimeout := c.Duration("cache-batch-timeout")
-	authFile := c.String("auth-file")
-	authStartupQueries := c.String("auth-startup-queries")
-	authDefaultAccess := c.String("auth-default-access")
-	attachmentCacheDir := c.String("attachment-cache-dir")
-	attachmentTotalSizeLimitStr := c.String("attachment-total-size-limit")
-	attachmentFileSizeLimitStr := c.String("attachment-file-size-limit")
-	attachmentExpiryDuration := c.Duration("attachment-expiry-duration")
-	keepaliveInterval := c.Duration("keepalive-interval")
-	managerInterval := c.Duration("manager-interval")
-	disallowedTopics := c.StringSlice("disallowed-topics")
-	webRoot := c.String("web-root")
-	enableSignup := c.Bool("enable-signup")
-	enableLogin := c.Bool("enable-login")
-	enableReservations := c.Bool("enable-reservations")
-	upstreamBaseURL := c.String("upstream-base-url")
-	upstreamAccessToken := c.String("upstream-access-token")
-	smtpSenderAddr := c.String("smtp-sender-addr")
-	smtpSenderUser := c.String("smtp-sender-user")
-	smtpSenderPass := c.String("smtp-sender-pass")
-	smtpSenderFrom := c.String("smtp-sender-from")
-	smtpServerListen := c.String("smtp-server-listen")
-	smtpServerDomain := c.String("smtp-server-domain")
-	smtpServerAddrPrefix := c.String("smtp-server-addr-prefix")
-	twilioAccount := c.String("twilio-account")
-	twilioAuthToken := c.String("twilio-auth-token")
-	twilioPhoneNumber := c.String("twilio-phone-number")
-	twilioVerifyService := c.String("twilio-verify-service")
-	totalTopicLimit := c.Int("global-topic-limit")
-	visitorSubscriptionLimit := c.Int("visitor-subscription-limit")
-	visitorSubscriberRateLimiting := c.Bool("visitor-subscriber-rate-limiting")
-	visitorAttachmentTotalSizeLimitStr := c.String("visitor-attachment-total-size-limit")
-	visitorAttachmentDailyBandwidthLimitStr := c.String("visitor-attachment-daily-bandwidth-limit")
-	visitorRequestLimitBurst := c.Int("visitor-request-limit-burst")
-	visitorRequestLimitReplenish := c.Duration("visitor-request-limit-replenish")
-	visitorRequestLimitExemptHosts := util.SplitNoEmpty(c.String("visitor-request-limit-exempt-hosts"), ",")
-	visitorMessageDailyLimit := c.Int("visitor-message-daily-limit")
-	visitorEmailLimitBurst := c.Int("visitor-email-limit-burst")
-	visitorEmailLimitReplenish := c.Duration("visitor-email-limit-replenish")
-	behindProxy := c.Bool("behind-proxy")
-	stripeSecretKey := c.String("stripe-secret-key")
-	stripeWebhookKey := c.String("stripe-webhook-key")
-	billingContact := c.String("billing-contact")
-	metricsListenHTTP := c.String("metrics-listen-http")
-	enableMetrics := c.Bool("enable-metrics") || metricsListenHTTP != ""
-	profileListenHTTP := c.String("profile-listen-http")
-
-	// Check values
-	if firebaseKeyFile != "" && !util.FileExists(firebaseKeyFile) {
-		return errors.New("if set, FCM key file must exist")
-	} else if webPushPublicKey != "" && (webPushPrivateKey == "" || webPushFile == "" || webPushEmailAddress == "" || baseURL == "") {
-		return errors.New("if web push is enabled, web-push-private-key, web-push-public-key, web-push-file, web-push-email-address, and base-url should be set. run 'ntfy webpush keys' to generate keys")
-	} else if keepaliveInterval < 5*time.Second {
-		return errors.New("keepalive interval cannot be lower than five seconds")
-	} else if managerInterval < 5*time.Second {
-		return errors.New("manager interval cannot be lower than five seconds")
-	} else if cacheDuration > 0 && cacheDuration < managerInterval {
-		return errors.New("cache duration cannot be lower than manager interval")
-	} else if keyFile != "" && !util.FileExists(keyFile) {
-		return errors.New("if set, key file must exist")
-	} else if certFile != "" && !util.FileExists(certFile) {
-		return errors.New("if set, certificate file must exist")
-	} else if listenHTTPS != "" && (keyFile == "" || certFile == "") {
-		return errors.New("if listen-https is set, both key-file and cert-file must be set")
-	} else if smtpSenderAddr != "" && (baseURL == "" || smtpSenderFrom == "") {
-		return errors.New("if smtp-sender-addr is set, base-url, and smtp-sender-from must also be set")
-	} else if smtpServerListen != "" && smtpServerDomain == "" {
-		return errors.New("if smtp-server-listen is set, smtp-server-domain must also be set")
-	} else if attachmentCacheDir != "" && baseURL == "" {
-		return errors.New("if attachment-cache-dir is set, base-url must also be set")
-	} else if baseURL != "" && !strings.HasPrefix(baseURL, "http://") && !strings.HasPrefix(baseURL, "https://") {
-		return errors.New("if set, base-url must start with http:// or https://")
-	} else if baseURL != "" && strings.HasSuffix(baseURL, "/") {
-		return errors.New("if set, base-url must not end with a slash (/)")
-	} else if upstreamBaseURL != "" && !strings.HasPrefix(upstreamBaseURL, "http://") && !strings.HasPrefix(upstreamBaseURL, "https://") {
-		return errors.New("if set, upstream-base-url must start with http:// or https://")
-	} else if upstreamBaseURL != "" && strings.HasSuffix(upstreamBaseURL, "/") {
-		return errors.New("if set, upstream-base-url must not end with a slash (/)")
-	} else if upstreamBaseURL != "" && baseURL == "" {
-		return errors.New("if upstream-base-url is set, base-url must also be set")
-	} else if upstreamBaseURL != "" && baseURL != "" && baseURL == upstreamBaseURL {
-		return errors.New("base-url and upstream-base-url cannot be identical, you'll likely want to set upstream-base-url to https://ntfy.sh, see https://ntfy.sh/docs/config/#ios-instant-notifications")
-	} else if authFile == "" && (enableSignup || enableLogin || enableReservations || stripeSecretKey != "") {
-		return errors.New("cannot set enable-signup, enable-login, enable-reserve-topics, or stripe-secret-key if auth-file is not set")
-	} else if enableSignup && !enableLogin {
-		return errors.New("cannot set enable-signup without also setting enable-login")
-	} else if stripeSecretKey != "" && (stripeWebhookKey == "" || baseURL == "") {
-		return errors.New("if stripe-secret-key is set, stripe-webhook-key and base-url must also be set")
-	} else if twilioAccount != "" && (twilioAuthToken == "" || twilioPhoneNumber == "" || twilioVerifyService == "" || baseURL == "" || authFile == "") {
-		return errors.New("if twilio-account is set, twilio-auth-token, twilio-phone-number, twilio-verify-service, base-url, and auth-file must also be set")
-	}
-
-	// Backwards compatibility
-	if webRoot == "app" {
-		webRoot = "/"
-	} else if webRoot == "home" {
-		webRoot = "/app"
-	} else if webRoot == "disable" {
-		webRoot = ""
-	} else if !strings.HasPrefix(webRoot, "/") {
-		webRoot = "/" + webRoot
-	}
-
-	// Default auth permissions
-	authDefault, err := user.ParsePermission(authDefaultAccess)
-	if err != nil {
-		return errors.New("if set, auth-default-access must start set to 'read-write', 'read-only', 'write-only' or 'deny-all'")
-	}
-
-	// Special case: Unset default
-	if listenHTTP == "-" {
-		listenHTTP = ""
-	}
-
-	// Convert sizes to bytes
-	attachmentTotalSizeLimit, err := parseSize(attachmentTotalSizeLimitStr, server.DefaultAttachmentTotalSizeLimit)
-	if err != nil {
-		return err
-	}
-	attachmentFileSizeLimit, err := parseSize(attachmentFileSizeLimitStr, server.DefaultAttachmentFileSizeLimit)
-	if err != nil {
-		return err
-	}
-	visitorAttachmentTotalSizeLimit, err := parseSize(visitorAttachmentTotalSizeLimitStr, server.DefaultVisitorAttachmentTotalSizeLimit)
-	if err != nil {
-		return err
-	}
-	visitorAttachmentDailyBandwidthLimit, err := parseSize(visitorAttachmentDailyBandwidthLimitStr, server.DefaultVisitorAttachmentDailyBandwidthLimit)
-	if err != nil {
-		return err
-	} else if visitorAttachmentDailyBandwidthLimit > math.MaxInt {
-		return fmt.Errorf("config option visitor-attachment-daily-bandwidth-limit must be lower than %d", math.MaxInt)
-	}
-
-	// Resolve hosts
-	visitorRequestLimitExemptIPs := make([]netip.Prefix, 0)
-	for _, host := range visitorRequestLimitExemptHosts {
-		ips, err := parseIPHostPrefix(host)
-		if err != nil {
-			log.Warn("cannot resolve host %s: %s, ignoring visitor request exemption", host, err.Error())
-			continue
-		}
-		visitorRequestLimitExemptIPs = append(visitorRequestLimitExemptIPs, ips...)
-	}
-
-	// Stripe things
-	if stripeSecretKey != "" {
-		stripe.EnableTelemetry = false // Whoa!
-		stripe.Key = stripeSecretKey
-	}
-
-	// Add default forbidden topics
-	disallowedTopics = append(disallowedTopics, server.DefaultDisallowedTopics...)
-
-	// Run server
-	conf := server.NewConfig()
-	conf.File = config
-	conf.BaseURL = baseURL
-	conf.ListenHTTP = listenHTTP
-	conf.ListenHTTPS = listenHTTPS
-	conf.ListenUnix = listenUnix
-	conf.ListenUnixMode = fs.FileMode(listenUnixMode)
-	conf.KeyFile = keyFile
-	conf.CertFile = certFile
-	conf.FirebaseKeyFile = firebaseKeyFile
-	conf.CacheFile = cacheFile
-	conf.CacheDuration = cacheDuration
-	conf.CacheStartupQueries = cacheStartupQueries
-	conf.CacheBatchSize = cacheBatchSize
-	conf.CacheBatchTimeout = cacheBatchTimeout
-	conf.AuthFile = authFile
-	conf.AuthStartupQueries = authStartupQueries
-	conf.AuthDefault = authDefault
-	conf.AttachmentCacheDir = attachmentCacheDir
-	conf.AttachmentTotalSizeLimit = attachmentTotalSizeLimit
-	conf.AttachmentFileSizeLimit = attachmentFileSizeLimit
-	conf.AttachmentExpiryDuration = attachmentExpiryDuration
-	conf.KeepaliveInterval = keepaliveInterval
-	conf.ManagerInterval = managerInterval
-	conf.DisallowedTopics = disallowedTopics
-	conf.WebRoot = webRoot
-	conf.UpstreamBaseURL = upstreamBaseURL
-	conf.UpstreamAccessToken = upstreamAccessToken
-	conf.SMTPSenderAddr = smtpSenderAddr
-	conf.SMTPSenderUser = smtpSenderUser
-	conf.SMTPSenderPass = smtpSenderPass
-	conf.SMTPSenderFrom = smtpSenderFrom
-	conf.SMTPServerListen = smtpServerListen
-	conf.SMTPServerDomain = smtpServerDomain
-	conf.SMTPServerAddrPrefix = smtpServerAddrPrefix
-	conf.TwilioAccount = twilioAccount
-	conf.TwilioAuthToken = twilioAuthToken
-	conf.TwilioPhoneNumber = twilioPhoneNumber
-	conf.TwilioVerifyService = twilioVerifyService
-	conf.TotalTopicLimit = totalTopicLimit
-	conf.VisitorSubscriptionLimit = visitorSubscriptionLimit
-	conf.VisitorAttachmentTotalSizeLimit = visitorAttachmentTotalSizeLimit
-	conf.VisitorAttachmentDailyBandwidthLimit = visitorAttachmentDailyBandwidthLimit
-	conf.VisitorRequestLimitBurst = visitorRequestLimitBurst
-	conf.VisitorRequestLimitReplenish = visitorRequestLimitReplenish
-	conf.VisitorRequestExemptIPAddrs = visitorRequestLimitExemptIPs
-	conf.VisitorMessageDailyLimit = visitorMessageDailyLimit
-	conf.VisitorEmailLimitBurst = visitorEmailLimitBurst
-	conf.VisitorEmailLimitReplenish = visitorEmailLimitReplenish
-	conf.VisitorSubscriberRateLimiting = visitorSubscriberRateLimiting
-	conf.BehindProxy = behindProxy
-	conf.StripeSecretKey = stripeSecretKey
-	conf.StripeWebhookKey = stripeWebhookKey
-	conf.BillingContact = billingContact
-	conf.EnableSignup = enableSignup
-	conf.EnableLogin = enableLogin
-	conf.EnableReservations = enableReservations
-	conf.EnableMetrics = enableMetrics
-	conf.MetricsListenHTTP = metricsListenHTTP
-	conf.ProfileListenHTTP = profileListenHTTP
-	conf.Version = c.App.Version
-	conf.WebPushPrivateKey = webPushPrivateKey
-	conf.WebPushPublicKey = webPushPublicKey
-	conf.WebPushFile = webPushFile
-	conf.WebPushEmailAddress = webPushEmailAddress
-	conf.WebPushStartupQueries = webPushStartupQueries
-
-	// Set up hot-reloading of config
-	go sigHandlerConfigReload(config)
-
-	// Run server
-	s, err := server.New(conf)
-	if err != nil {
-		log.Fatal(err.Error())
-	} else if err := s.Run(); err != nil {
-		log.Fatal(err.Error())
-	}
-	log.Info("Exiting.")
-	return nil
-}
-
-func parseSize(s string, defaultValue int64) (v int64, err error) {
-	if s == "" {
-		return defaultValue, nil
-	}
-	v, err = util.ParseSize(s)
-	if err != nil {
-		return 0, err
-	}
-	return v, nil
-}
-
-func sigHandlerConfigReload(config string) {
-	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, syscall.SIGHUP)
-	for range sigs {
-		log.Info("Partially hot reloading configuration ...")
-		inputSource, err := newYamlSourceFromFile(config, flagsServe)
-		if err != nil {
-			log.Warn("Hot reload failed: %s", err.Error())
-			continue
-		}
-		if err := reloadLogLevel(inputSource); err != nil {
-			log.Warn("Reloading log level failed: %s", err.Error())
-		}
-	}
-}
-
-func parseIPHostPrefix(host string) (prefixes []netip.Prefix, err error) {
-	// Try parsing as prefix, e.g. 10.0.1.0/24
-	prefix, err := netip.ParsePrefix(host)
-	if err == nil {
-		prefixes = append(prefixes, prefix.Masked())
-		return prefixes, nil
-	}
-	// Not a prefix, parse as host or IP (LookupHost passes through an IP as is)
-	ips, err := net.LookupHost(host)
-	if err != nil {
-		return nil, err
-	}
-	for _, ipStr := range ips {
-		ip, err := netip.ParseAddr(ipStr)
-		if err == nil {
-			prefix, err := ip.Prefix(ip.BitLen())
-			if err != nil {
-				return nil, fmt.Errorf("%s successfully parsed but unable to make prefix: %s", ip.String(), err.Error())
-			}
-			prefixes = append(prefixes, prefix.Masked())
-		}
-	}
-	return
-}
-
-func reloadLogLevel(inputSource altsrc.InputSourceContext) error {
-	newLevelStr, err := inputSource.String("log-level")
-	if err != nil {
-		return fmt.Errorf("cannot load log level: %s", err.Error())
-	}
-	overrides, err := inputSource.StringSlice("log-level-overrides")
-	if err != nil {
-		return fmt.Errorf("cannot load log level overrides (1): %s", err.Error())
-	}
-	log.ResetLevelOverrides()
-	if err := applyLogLevelOverrides(overrides); err != nil {
-		return fmt.Errorf("cannot load log level overrides (2): %s", err.Error())
-	}
-	log.SetLevel(log.ToLevel(newLevelStr))
-	if len(overrides) > 0 {
-		log.Info("Log level is %v, %d override(s) in place", strings.ToUpper(newLevelStr), len(overrides))
-	} else {
-		log.Info("Log level is %v", strings.ToUpper(newLevelStr))
-	}
-	return nil
-}

cmd/serve_test.go

@@ -1,95 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"math/rand"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"git.zio.sh/astra/ntfy/v2/client"
-	"git.zio.sh/astra/ntfy/v2/test"
-	"git.zio.sh/astra/ntfy/v2/util"
-	"github.com/gorilla/websocket"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func init() {
-	rand.Seed(time.Now().UnixMilli())
-}
-
-func TestCLI_Serve_Unix_Curl(t *testing.T) {
-	sockFile := filepath.Join(t.TempDir(), "ntfy.sock")
-	configFile := newEmptyFile(t) // Avoid issues with existing server.yml file on system
-	go func() {
-		app, _, _, _ := newTestApp()
-		err := app.Run([]string{"ntfy", "serve", "--config=" + configFile, "--listen-http=-", "--listen-unix=" + sockFile})
-		require.Nil(t, err)
-	}()
-	for i := 0; i < 40 && !util.FileExists(sockFile); i++ {
-		time.Sleep(50 * time.Millisecond)
-	}
-	require.True(t, util.FileExists(sockFile))
-
-	cmd := exec.Command("curl", "-s", "--unix-socket", sockFile, "-d", "this is a message", "localhost/mytopic")
-	out, err := cmd.Output()
-	require.Nil(t, err)
-	m := toMessage(t, string(out))
-	require.Equal(t, "this is a message", m.Message)
-}
-
-func TestCLI_Serve_WebSocket(t *testing.T) {
-	port := 10000 + rand.Intn(20000)
-	go func() {
-		configFile := newEmptyFile(t) // Avoid issues with existing server.yml file on system
-		app, _, _, _ := newTestApp()
-		err := app.Run([]string{"ntfy", "serve", "--config=" + configFile, fmt.Sprintf("--listen-http=:%d", port)})
-		require.Nil(t, err)
-	}()
-	test.WaitForPortUp(t, port)
-
-	ws, _, err := websocket.DefaultDialer.Dial(fmt.Sprintf("ws://127.0.0.1:%d/mytopic/ws", port), nil)
-	require.Nil(t, err)
-
-	messageType, data, err := ws.ReadMessage()
-	require.Nil(t, err)
-	require.Equal(t, websocket.TextMessage, messageType)
-	require.Equal(t, "open", toMessage(t, string(data)).Event)
-
-	c := client.New(client.NewConfig())
-	_, err = c.Publish(fmt.Sprintf("http://127.0.0.1:%d/mytopic", port), "my message")
-	require.Nil(t, err)
-
-	messageType, data, err = ws.ReadMessage()
-	require.Nil(t, err)
-	require.Equal(t, websocket.TextMessage, messageType)
-
-	m := toMessage(t, string(data))
-	require.Equal(t, "my message", m.Message)
-	require.Equal(t, "mytopic", m.Topic)
-}
-
-func TestIP_Host_Parsing(t *testing.T) {
-	cases := map[string]string{
-		"1.1.1.1":          "1.1.1.1/32",
-		"fd00::1234":       "fd00::1234/128",
-		"192.168.0.3/24":   "192.168.0.0/24",
-		"10.1.2.3/8":       "10.0.0.0/8",
-		"201:be93::4a6/21": "201:b800::/21",
-	}
-	for q, expectedAnswer := range cases {
-		ips, err := parseIPHostPrefix(q)
-		require.Nil(t, err)
-		assert.Equal(t, 1, len(ips))
-		assert.Equal(t, expectedAnswer, ips[0].String())
-	}
-}
-
-func newEmptyFile(t *testing.T) string {
-	filename := filepath.Join(t.TempDir(), "empty")
-	require.Nil(t, os.WriteFile(filename, []byte{}, 0600))
-	return filename
-}

cmd/subscribe.go

@@ -1,339 +0,0 @@
-package cmd
-
-import (
-	"errors"
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/client"
-	"git.zio.sh/astra/ntfy/v2/log"
-	"git.zio.sh/astra/ntfy/v2/util"
-	"github.com/urfave/cli/v2"
-	"os"
-	"os/exec"
-	"os/user"
-	"path/filepath"
-	"sort"
-	"strings"
-)
-
-func init() {
-	commands = append(commands, cmdSubscribe)
-}
-
-const (
-	clientRootConfigFileUnixAbsolute    = "/etc/ntfy/client.yml"
-	clientUserConfigFileUnixRelative    = "ntfy/client.yml"
-	clientUserConfigFileWindowsRelative = "ntfy\\client.yml"
-)
-
-var flagsSubscribe = append(
-	append([]cli.Flag{}, flagsDefault...),
-	&cli.StringFlag{Name: "config", Aliases: []string{"c"}, Usage: "client config file"},
-	&cli.StringFlag{Name: "since", Aliases: []string{"s"}, Usage: "return events since `SINCE` (Unix timestamp, or all)"},
-	&cli.StringFlag{Name: "user", Aliases: []string{"u"}, EnvVars: []string{"NTFY_USER"}, Usage: "username[:password] used to auth against the server"},
-	&cli.StringFlag{Name: "token", Aliases: []string{"k"}, EnvVars: []string{"NTFY_TOKEN"}, Usage: "access token used to auth against the server"},
-	&cli.BoolFlag{Name: "from-config", Aliases: []string{"from_config", "C"}, Usage: "read subscriptions from config file (service mode)"},
-	&cli.BoolFlag{Name: "poll", Aliases: []string{"p"}, Usage: "return events and exit, do not listen for new events"},
-	&cli.BoolFlag{Name: "scheduled", Aliases: []string{"sched", "S"}, Usage: "also return scheduled/delayed events"},
-)
-
-var cmdSubscribe = &cli.Command{
-	Name:      "subscribe",
-	Aliases:   []string{"sub"},
-	Usage:     "Subscribe to one or more topics on a ntfy server",
-	UsageText: "ntfy subscribe [OPTIONS..] [TOPIC]",
-	Action:    execSubscribe,
-	Category:  categoryClient,
-	Flags:     flagsSubscribe,
-	Before:    initLogFunc,
-	Description: `Subscribe to a topic from a ntfy server, and either print or execute a command for 
-every arriving message. There are 3 modes in which the command can be run:
-
-ntfy subscribe TOPIC
-  This prints the JSON representation of every incoming message. It is useful when you
-  have a command that wants to stream-read incoming JSON messages. Unless --poll is passed,
-  this command stays open forever. 
-
-  Examples:
-    ntfy subscribe mytopic            # Prints JSON for incoming messages for ntfy.sh/mytopic
-    ntfy sub home.lan/backups         # Subscribe to topic on different server
-    ntfy sub --poll home.lan/backups  # Just query for latest messages and exit
-    ntfy sub -u phil:mypass secret    # Subscribe with username/password
-  
-ntfy subscribe TOPIC COMMAND
-  This executes COMMAND for every incoming messages. The message fields are passed to the
-  command as environment variables:
-
-    Variable        Aliases               Description
-    --------------- --------------------- -----------------------------------
-    $NTFY_ID        $id                   Unique message ID
-    $NTFY_TIME      $time                 Unix timestamp of the message delivery
-    $NTFY_TOPIC     $topic                Topic name
-    $NTFY_MESSAGE   $message, $m          Message body
-    $NTFY_TITLE     $title, $t            Message title
-    $NTFY_PRIORITY  $priority, $prio, $p  Message priority (1=min, 5=max)
-    $NTFY_TAGS      $tags, $tag, $ta      Message tags (comma separated list)
-    $NTFY_RAW       $raw                  Raw JSON message
-
-  Examples:
-    ntfy sub mytopic 'notify-send "$m"'    # Execute command for incoming messages
-    ntfy sub topic1 myscript.sh            # Execute script for incoming messages
-
-ntfy subscribe --from-config
-  Service mode (used in ntfy-client.service). This reads the config file and sets up 
-  subscriptions for every topic in the "subscribe:" block (see config file).
-
-  Examples: 
-    ntfy sub --from-config                           # Read topics from config file
-    ntfy sub --config=myclient.yml --from-config     # Read topics from alternate config file
-
-` + clientCommandDescriptionSuffix,
-}
-
-func execSubscribe(c *cli.Context) error {
-	// Read config and options
-	conf, err := loadConfig(c)
-	if err != nil {
-		return err
-	}
-	cl := client.New(conf)
-	since := c.String("since")
-	user := c.String("user")
-	token := c.String("token")
-	poll := c.Bool("poll")
-	scheduled := c.Bool("scheduled")
-	fromConfig := c.Bool("from-config")
-	topic := c.Args().Get(0)
-	command := c.Args().Get(1)
-
-	// Checks
-	if user != "" && token != "" {
-		return errors.New("cannot set both --user and --token")
-	}
-
-	if !fromConfig {
-		conf.Subscribe = nil // wipe if --from-config not passed
-	}
-	var options []client.SubscribeOption
-	if since != "" {
-		options = append(options, client.WithSince(since))
-	}
-	if token != "" {
-		options = append(options, client.WithBearerAuth(token))
-	} else if user != "" {
-		var pass string
-		parts := strings.SplitN(user, ":", 2)
-		if len(parts) == 2 {
-			user = parts[0]
-			pass = parts[1]
-		} else {
-			fmt.Fprint(c.App.ErrWriter, "Enter Password: ")
-			p, err := util.ReadPassword(c.App.Reader)
-			if err != nil {
-				return err
-			}
-			pass = string(p)
-			fmt.Fprintf(c.App.ErrWriter, "\r%s\r", strings.Repeat(" ", 20))
-		}
-		options = append(options, client.WithBasicAuth(user, pass))
-	} else if conf.DefaultToken != "" {
-		options = append(options, client.WithBearerAuth(conf.DefaultToken))
-	} else if conf.DefaultUser != "" && conf.DefaultPassword != nil {
-		options = append(options, client.WithBasicAuth(conf.DefaultUser, *conf.DefaultPassword))
-	}
-	if scheduled {
-		options = append(options, client.WithScheduled())
-	}
-	if topic == "" && len(conf.Subscribe) == 0 {
-		return errors.New("must specify topic, type 'ntfy subscribe --help' for help")
-	}
-
-	// Execute poll or subscribe
-	if poll {
-		return doPoll(c, cl, conf, topic, command, options...)
-	}
-	return doSubscribe(c, cl, conf, topic, command, options...)
-}
-
-func doPoll(c *cli.Context, cl *client.Client, conf *client.Config, topic, command string, options ...client.SubscribeOption) error {
-	for _, s := range conf.Subscribe { // may be nil
-		if auth := maybeAddAuthHeader(s, conf); auth != nil {
-			options = append(options, auth)
-		}
-		if err := doPollSingle(c, cl, s.Topic, s.Command, options...); err != nil {
-			return err
-		}
-	}
-	if topic != "" {
-		if err := doPollSingle(c, cl, topic, command, options...); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func doPollSingle(c *cli.Context, cl *client.Client, topic, command string, options ...client.SubscribeOption) error {
-	messages, err := cl.Poll(topic, options...)
-	if err != nil {
-		return err
-	}
-	for _, m := range messages {
-		printMessageOrRunCommand(c, m, command)
-	}
-	return nil
-}
-
-func doSubscribe(c *cli.Context, cl *client.Client, conf *client.Config, topic, command string, options ...client.SubscribeOption) error {
-	cmds := make(map[string]string)    // Subscription ID -> command
-	for _, s := range conf.Subscribe { // May be nil
-		topicOptions := append(make([]client.SubscribeOption, 0), options...)
-		for filter, value := range s.If {
-			topicOptions = append(topicOptions, client.WithFilter(filter, value))
-		}
-
-		if auth := maybeAddAuthHeader(s, conf); auth != nil {
-			topicOptions = append(topicOptions, auth)
-		}
-
-		subscriptionID, err := cl.Subscribe(s.Topic, topicOptions...)
-		if err != nil {
-			return err
-		}
-		if s.Command != "" {
-			cmds[subscriptionID] = s.Command
-		} else if conf.DefaultCommand != "" {
-			cmds[subscriptionID] = conf.DefaultCommand
-		} else {
-			cmds[subscriptionID] = ""
-		}
-	}
-	if topic != "" {
-		subscriptionID, err := cl.Subscribe(topic, options...)
-		if err != nil {
-			return err
-		}
-		cmds[subscriptionID] = command
-	}
-	for m := range cl.Messages {
-		cmd, ok := cmds[m.SubscriptionID]
-		if !ok {
-			continue
-		}
-		log.Debug("%s Dispatching received message: %s", logMessagePrefix(m), m.Raw)
-		printMessageOrRunCommand(c, m, cmd)
-	}
-	return nil
-}
-
-func maybeAddAuthHeader(s client.Subscribe, conf *client.Config) client.SubscribeOption {
-	// if an explicit empty token or empty user:pass is given, exit without auth
-	if (s.Token != nil && *s.Token == "") || (s.User != nil && *s.User == "" && s.Password != nil && *s.Password == "") {
-		return client.WithEmptyAuth()
-	}
-
-	// check for subscription token then subscription user:pass
-	if s.Token != nil && *s.Token != "" {
-		return client.WithBearerAuth(*s.Token)
-	}
-	if s.User != nil && *s.User != "" && s.Password != nil {
-		return client.WithBasicAuth(*s.User, *s.Password)
-	}
-
-	// if no subscription token nor subscription user:pass, check for default token then default user:pass
-	if conf.DefaultToken != "" {
-		return client.WithBearerAuth(conf.DefaultToken)
-	}
-	if conf.DefaultUser != "" && conf.DefaultPassword != nil {
-		return client.WithBasicAuth(conf.DefaultUser, *conf.DefaultPassword)
-	}
-	return nil
-}
-
-func printMessageOrRunCommand(c *cli.Context, m *client.Message, command string) {
-	if command != "" {
-		runCommand(c, command, m)
-	} else {
-		log.Debug("%s Printing raw message", logMessagePrefix(m))
-		fmt.Fprintln(c.App.Writer, m.Raw)
-	}
-}
-
-func runCommand(c *cli.Context, command string, m *client.Message) {
-	if err := runCommandInternal(c, command, m); err != nil {
-		log.Warn("%s Command failed: %s", logMessagePrefix(m), err.Error())
-	}
-}
-
-func runCommandInternal(c *cli.Context, script string, m *client.Message) error {
-	scriptFile := fmt.Sprintf("%s/ntfy-subscribe-%s.%s", os.TempDir(), util.RandomString(10), scriptExt)
-	log.Debug("%s Running command '%s' via temporary script %s", logMessagePrefix(m), script, scriptFile)
-	script = scriptHeader + script
-	if err := os.WriteFile(scriptFile, []byte(script), 0700); err != nil {
-		return err
-	}
-	defer os.Remove(scriptFile)
-	log.Debug("%s Executing script %s", logMessagePrefix(m), scriptFile)
-	cmd := exec.Command(scriptLauncher[0], append(scriptLauncher[1:], scriptFile)...)
-	cmd.Stdin = c.App.Reader
-	cmd.Stdout = c.App.Writer
-	cmd.Stderr = c.App.ErrWriter
-	cmd.Env = envVars(m)
-	return cmd.Run()
-}
-
-func envVars(m *client.Message) []string {
-	env := make([]string, 0)
-	env = append(env, envVar(m.ID, "NTFY_ID", "id")...)
-	env = append(env, envVar(m.Topic, "NTFY_TOPIC", "topic")...)
-	env = append(env, envVar(fmt.Sprintf("%d", m.Time), "NTFY_TIME", "time")...)
-	env = append(env, envVar(m.Message, "NTFY_MESSAGE", "message", "m")...)
-	env = append(env, envVar(m.Title, "NTFY_TITLE", "title", "t")...)
-	env = append(env, envVar(fmt.Sprintf("%d", m.Priority), "NTFY_PRIORITY", "priority", "prio", "p")...)
-	env = append(env, envVar(strings.Join(m.Tags, ","), "NTFY_TAGS", "tags", "tag", "ta")...)
-	env = append(env, envVar(m.Raw, "NTFY_RAW", "raw")...)
-	sort.Strings(env)
-	if log.IsTrace() {
-		log.Trace("%s With environment:\n%s", logMessagePrefix(m), strings.Join(env, "\n"))
-	}
-	return append(os.Environ(), env...)
-}
-
-func envVar(value string, vars ...string) []string {
-	env := make([]string, 0)
-	for _, v := range vars {
-		env = append(env, fmt.Sprintf("%s=%s", v, value))
-	}
-	return env
-}
-
-func loadConfig(c *cli.Context) (*client.Config, error) {
-	filename := c.String("config")
-	if filename != "" {
-		return client.LoadConfig(filename)
-	}
-	configFile := defaultClientConfigFile()
-	if s, _ := os.Stat(configFile); s != nil {
-		return client.LoadConfig(configFile)
-	}
-	return client.NewConfig(), nil
-}
-
-//lint:ignore U1000 Conditionally used in different builds
-func defaultClientConfigFileUnix() string {
-	u, _ := user.Current()
-	configFile := clientRootConfigFileUnixAbsolute
-	if u.Uid != "0" {
-		homeDir, _ := os.UserConfigDir()
-		return filepath.Join(homeDir, clientUserConfigFileUnixRelative)
-	}
-	return configFile
-}
-
-//lint:ignore U1000 Conditionally used in different builds
-func defaultClientConfigFileWindows() string {
-	homeDir, _ := os.UserConfigDir()
-	return filepath.Join(homeDir, clientUserConfigFileWindowsRelative)
-}
-
-func logMessagePrefix(m *client.Message) string {
-	return fmt.Sprintf("%s/%s", util.ShortTopicURL(m.TopicURL), m.ID)
-}

cmd/subscribe_darwin.go

@@ -1,16 +0,0 @@
-package cmd
-
-const (
-	scriptExt                      = "sh"
-	scriptHeader                   = "#!/bin/sh\n"
-	clientCommandDescriptionSuffix = `The default config file for all client commands is /etc/ntfy/client.yml (if root user),
-or "~/Library/Application Support/ntfy/client.yml" for all other users.`
-)
-
-var (
-	scriptLauncher = []string{"sh", "-c"}
-)
-
-func defaultClientConfigFile() string {
-	return defaultClientConfigFileUnix()
-}

cmd/subscribe_test.go

@@ -1,417 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"github.com/stretchr/testify/require"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-func TestCLI_Subscribe_Default_UserPass_Subscription_Token(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-user: philipp
-default-password: mypass
-subscribe:
-  - topic: mytopic
-    token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Default_Token_Subscription_UserPass(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-subscribe:
-  - topic: mytopic
-    user: philipp
-    password: mypass
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Default_Token_Subscription_Token(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-token: tk_FAKETOKEN01234567890FAKETOKEN
-subscribe:
-  - topic: mytopic
-    token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Default_UserPass_Subscription_UserPass(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-user: fake
-default-password: password
-subscribe:
-  - topic: mytopic
-    user: philipp
-    password: mypass
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Default_Token_Subscription_Empty(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-subscribe:
-  - topic: mytopic
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Default_UserPass_Subscription_Empty(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-user: philipp
-default-password: mypass
-subscribe:
-  - topic: mytopic
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Default_Empty_Subscription_Token(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-subscribe:
-  - topic: mytopic
-    token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Default_Empty_Subscription_UserPass(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-subscribe:
-  - topic: mytopic
-    user: philipp
-    password: mypass
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Default_Token_CLI_Token(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-token: tk_FAKETOKEN0123456789FAKETOKEN
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename, "--token", "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", "mytopic"}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Default_Token_CLI_UserPass(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename, "--user", "philipp:mypass", "mytopic"}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Default_Token_Subscription_Token_CLI_UserPass(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-token: tk_FAKETOKEN01234567890FAKETOKEN
-subscribe:
-  - topic: mytopic
-    token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename, "--user", "philipp:mypass"}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Token_And_UserPass(t *testing.T) {
-	app, _, _, _ := newTestApp()
-	err := app.Run([]string{"ntfy", "subscribe", "--poll", "--token", "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", "--user", "philipp:mypass", "mytopic", "triggered"})
-	require.Error(t, err)
-	require.Equal(t, "cannot set both --user and --token", err.Error())
-}
-
-func TestCLI_Subscribe_Default_Token(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename, "mytopic"}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Default_UserPass(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-user: philipp
-default-password: mypass
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename, "mytopic"}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Override_Default_UserPass_With_Empty_UserPass(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-user: philipp
-default-password: mypass
-subscribe:
-  - topic: mytopic
-    user: ""
-    password: ""
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}
-
-func TestCLI_Subscribe_Override_Default_Token_With_Empty_Token(t *testing.T) {
-	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, "/mytopic/json", r.URL.Path)
-		require.Equal(t, "", r.Header.Get("Authorization"))
-
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(message))
-	}))
-	defer server.Close()
-
-	filename := filepath.Join(t.TempDir(), "client.yml")
-	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
-default-host: %s
-default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-subscribe:
-  - topic: mytopic
-    token: ""
-`, server.URL)), 0600))
-
-	app, _, stdout, _ := newTestApp()
-
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
-
-	require.Equal(t, message, strings.TrimSpace(stdout.String()))
-}

cmd/subscribe_unix.go

@@ -1,18 +0,0 @@
-//go:build linux || dragonfly || freebsd || netbsd || openbsd
-
-package cmd
-
-const (
-	scriptExt                      = "sh"
-	scriptHeader                   = "#!/bin/sh\n"
-	clientCommandDescriptionSuffix = `The default config file for all client commands is /etc/ntfy/client.yml (if root user),
-or ~/.config/ntfy/client.yml for all other users.`
-)
-
-var (
-	scriptLauncher = []string{"sh", "-c"}
-)
-
-func defaultClientConfigFile() string {
-	return defaultClientConfigFileUnix()
-}

cmd/subscribe_windows.go

@@ -1,15 +0,0 @@
-package cmd
-
-const (
-	scriptExt                      = "bat"
-	scriptHeader                   = ""
-	clientCommandDescriptionSuffix = `The default config file for all client commands is %AppData%\ntfy\client.yml.`
-)
-
-var (
-	scriptLauncher = []string{"cmd.exe", "/Q", "/C"}
-)
-
-func defaultClientConfigFile() string {
-	return defaultClientConfigFileWindows()
-}

cmd/tier.go

@@ -1,374 +0,0 @@
-//go:build !noserver
-
-package cmd
-
-import (
-	"errors"
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/user"
-	"git.zio.sh/astra/ntfy/v2/util"
-	"github.com/urfave/cli/v2"
-)
-
-func init() {
-	commands = append(commands, cmdTier)
-}
-
-const (
-	defaultMessageLimit             = 5000
-	defaultMessageExpiryDuration    = "12h"
-	defaultEmailLimit               = 20
-	defaultCallLimit                = 0
-	defaultReservationLimit         = 3
-	defaultAttachmentFileSizeLimit  = "15M"
-	defaultAttachmentTotalSizeLimit = "100M"
-	defaultAttachmentExpiryDuration = "6h"
-	defaultAttachmentBandwidthLimit = "1G"
-)
-
-var (
-	flagsTier = append([]cli.Flag{}, flagsUser...)
-)
-
-var cmdTier = &cli.Command{
-	Name:      "tier",
-	Usage:     "Manage/show tiers",
-	UsageText: "ntfy tier [list|add|change|remove] ...",
-	Flags:     flagsTier,
-	Before:    initConfigFileInputSourceFunc("config", flagsUser, initLogFunc),
-	Category:  categoryServer,
-	Subcommands: []*cli.Command{
-		{
-			Name:      "add",
-			Aliases:   []string{"a"},
-			Usage:     "Adds a new tier",
-			UsageText: "ntfy tier add [OPTIONS] CODE",
-			Action:    execTierAdd,
-			Flags: []cli.Flag{
-				&cli.StringFlag{Name: "name", Usage: "tier name"},
-				&cli.Int64Flag{Name: "message-limit", Value: defaultMessageLimit, Usage: "daily message limit"},
-				&cli.StringFlag{Name: "message-expiry-duration", Value: defaultMessageExpiryDuration, Usage: "duration after which messages are deleted"},
-				&cli.Int64Flag{Name: "email-limit", Value: defaultEmailLimit, Usage: "daily email limit"},
-				&cli.Int64Flag{Name: "call-limit", Value: defaultCallLimit, Usage: "daily phone call limit"},
-				&cli.Int64Flag{Name: "reservation-limit", Value: defaultReservationLimit, Usage: "topic reservation limit"},
-				&cli.StringFlag{Name: "attachment-file-size-limit", Value: defaultAttachmentFileSizeLimit, Usage: "per-attachment file size limit"},
-				&cli.StringFlag{Name: "attachment-total-size-limit", Value: defaultAttachmentTotalSizeLimit, Usage: "total size limit of attachments for the user"},
-				&cli.StringFlag{Name: "attachment-expiry-duration", Value: defaultAttachmentExpiryDuration, Usage: "duration after which attachments are deleted"},
-				&cli.StringFlag{Name: "attachment-bandwidth-limit", Value: defaultAttachmentBandwidthLimit, Usage: "daily bandwidth limit for attachment uploads/downloads"},
-				&cli.StringFlag{Name: "stripe-monthly-price-id", Usage: "Monthly Stripe price ID for paid tiers (e.g. price_12345)"},
-				&cli.StringFlag{Name: "stripe-yearly-price-id", Usage: "Yearly Stripe price ID for paid tiers (e.g. price_12345)"},
-				&cli.BoolFlag{Name: "ignore-exists", Usage: "if the tier already exists, perform no action and exit"},
-			},
-			Description: `Add a new tier to the ntfy user database.
-
-Tiers can be used to grant users higher limits, such as daily message limits, attachment size, or
-make it possible for users to reserve topics.
-
-This is a server-only command. It directly reads from user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined.
-
-Examples:
-  ntfy tier add pro                     # Add tier with code "pro", using the defaults
-  ntfy tier add \                       # Add a tier with custom limits
-    --name="Pro" \
-    --message-limit=10000 \
-    --message-expiry-duration=24h \
-    --email-limit=50 \
-    --reservation-limit=10 \
-    --attachment-file-size-limit=100M \
-    --attachment-total-size-limit=1G \
-    --attachment-expiry-duration=12h \
-    --attachment-bandwidth-limit=5G \
-    pro
-`,
-		},
-		{
-			Name:      "change",
-			Aliases:   []string{"ch"},
-			Usage:     "Change a tier",
-			UsageText: "ntfy tier change [OPTIONS] CODE",
-			Action:    execTierChange,
-			Flags: []cli.Flag{
-				&cli.StringFlag{Name: "name", Usage: "tier name"},
-				&cli.Int64Flag{Name: "message-limit", Usage: "daily message limit"},
-				&cli.StringFlag{Name: "message-expiry-duration", Usage: "duration after which messages are deleted"},
-				&cli.Int64Flag{Name: "email-limit", Usage: "daily email limit"},
-				&cli.Int64Flag{Name: "call-limit", Usage: "daily phone call limit"},
-				&cli.Int64Flag{Name: "reservation-limit", Usage: "topic reservation limit"},
-				&cli.StringFlag{Name: "attachment-file-size-limit", Usage: "per-attachment file size limit"},
-				&cli.StringFlag{Name: "attachment-total-size-limit", Usage: "total size limit of attachments for the user"},
-				&cli.StringFlag{Name: "attachment-expiry-duration", Usage: "duration after which attachments are deleted"},
-				&cli.StringFlag{Name: "attachment-bandwidth-limit", Usage: "daily bandwidth limit for attachment uploads/downloads"},
-				&cli.StringFlag{Name: "stripe-monthly-price-id", Usage: "Monthly Stripe price ID for paid tiers (e.g. price_12345)"},
-				&cli.StringFlag{Name: "stripe-yearly-price-id", Usage: "Yearly Stripe price ID for paid tiers (e.g. price_12345)"},
-			},
-			Description: `Updates a tier to change the limits.
-
-After updating a tier, you may have to restart the ntfy server to apply them 
-to all visitors. 
-
-This is a server-only command. It directly reads from user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined.
-
-Examples:
-  ntfy tier change --name="Pro" pro        # Update the name of an existing tier
-  ntfy tier change \                       # Update multiple limits and fields
-    --message-expiry-duration=24h \
-    --stripe-monthly-price-id=price_1234 \
-    --stripe-monthly-price-id=price_5678 \
-    pro
-`,
-		},
-		{
-			Name:      "remove",
-			Aliases:   []string{"del", "rm"},
-			Usage:     "Removes a tier",
-			UsageText: "ntfy tier remove CODE",
-			Action:    execTierDel,
-			Description: `Remove a tier from the ntfy user database.
-
-You cannot remove a tier if there are users associated with a tier. Use "ntfy user change-tier"
-to remove or switch their tier first.
-
-This is a server-only command. It directly reads from user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined.
-
-Example:
-  ntfy tier del pro
-`,
-		},
-		{
-			Name:    "list",
-			Aliases: []string{"l"},
-			Usage:   "Shows a list of tiers",
-			Action:  execTierList,
-			Description: `Shows a list of all configured tiers.
-
-This is a server-only command. It directly reads from user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined.
-`,
-		},
-	},
-	Description: `Manage tiers of the ntfy server.
-
-The command allows you to add/remove/change tiers in the ntfy user database. Tiers are used
-to grant users higher limits, such as daily message limits, attachment size, or make it 
-possible for users to reserve topics.
-
-This is a server-only command. It directly manages the user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined.
-
-Examples:
-  ntfy tier add pro                     # Add tier with code "pro", using the defaults
-  ntfy tier change --name="Pro" pro     # Update the name of an existing tier
-  ntfy tier del pro                     # Delete an existing tier
-`,
-}
-
-func execTierAdd(c *cli.Context) error {
-	code := c.Args().Get(0)
-	if code == "" {
-		return errors.New("tier code expected, type 'ntfy tier add --help' for help")
-	} else if !user.AllowedTier(code) {
-		return errors.New("tier code must consist only of numbers and letters")
-	} else if c.String("stripe-monthly-price-id") != "" && c.String("stripe-yearly-price-id") == "" {
-		return errors.New("if stripe-monthly-price-id is set, stripe-yearly-price-id must also be set")
-	} else if c.String("stripe-monthly-price-id") == "" && c.String("stripe-yearly-price-id") != "" {
-		return errors.New("if stripe-yearly-price-id is set, stripe-monthly-price-id must also be set")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	if tier, _ := manager.Tier(code); tier != nil {
-		if c.Bool("ignore-exists") {
-			fmt.Fprintf(c.App.ErrWriter, "tier %s already exists (exited successfully)\n", code)
-			return nil
-		}
-		return fmt.Errorf("tier %s already exists", code)
-	}
-	name := c.String("name")
-	if name == "" {
-		name = code
-	}
-	messageExpiryDuration, err := util.ParseDuration(c.String("message-expiry-duration"))
-	if err != nil {
-		return err
-	}
-	attachmentFileSizeLimit, err := util.ParseSize(c.String("attachment-file-size-limit"))
-	if err != nil {
-		return err
-	}
-	attachmentTotalSizeLimit, err := util.ParseSize(c.String("attachment-total-size-limit"))
-	if err != nil {
-		return err
-	}
-	attachmentBandwidthLimit, err := util.ParseSize(c.String("attachment-bandwidth-limit"))
-	if err != nil {
-		return err
-	}
-	attachmentExpiryDuration, err := util.ParseDuration(c.String("attachment-expiry-duration"))
-	if err != nil {
-		return err
-	}
-	tier := &user.Tier{
-		ID:                       "", // Generated
-		Code:                     code,
-		Name:                     name,
-		MessageLimit:             c.Int64("message-limit"),
-		MessageExpiryDuration:    messageExpiryDuration,
-		EmailLimit:               c.Int64("email-limit"),
-		CallLimit:                c.Int64("call-limit"),
-		ReservationLimit:         c.Int64("reservation-limit"),
-		AttachmentFileSizeLimit:  attachmentFileSizeLimit,
-		AttachmentTotalSizeLimit: attachmentTotalSizeLimit,
-		AttachmentExpiryDuration: attachmentExpiryDuration,
-		AttachmentBandwidthLimit: attachmentBandwidthLimit,
-		StripeMonthlyPriceID:     c.String("stripe-monthly-price-id"),
-		StripeYearlyPriceID:      c.String("stripe-yearly-price-id"),
-	}
-	if err := manager.AddTier(tier); err != nil {
-		return err
-	}
-	tier, err = manager.Tier(code)
-	if err != nil {
-		return err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "tier added\n\n")
-	printTier(c, tier)
-	return nil
-}
-
-func execTierChange(c *cli.Context) error {
-	code := c.Args().Get(0)
-	if code == "" {
-		return errors.New("tier code expected, type 'ntfy tier change --help' for help")
-	} else if !user.AllowedTier(code) {
-		return errors.New("tier code must consist only of numbers and letters")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	tier, err := manager.Tier(code)
-	if err == user.ErrTierNotFound {
-		return fmt.Errorf("tier %s does not exist", code)
-	} else if err != nil {
-		return err
-	}
-	if c.IsSet("name") {
-		tier.Name = c.String("name")
-	}
-	if c.IsSet("message-limit") {
-		tier.MessageLimit = c.Int64("message-limit")
-	}
-	if c.IsSet("message-expiry-duration") {
-		tier.MessageExpiryDuration, err = util.ParseDuration(c.String("message-expiry-duration"))
-		if err != nil {
-			return err
-		}
-	}
-	if c.IsSet("email-limit") {
-		tier.EmailLimit = c.Int64("email-limit")
-	}
-	if c.IsSet("call-limit") {
-		tier.CallLimit = c.Int64("call-limit")
-	}
-	if c.IsSet("reservation-limit") {
-		tier.ReservationLimit = c.Int64("reservation-limit")
-	}
-	if c.IsSet("attachment-file-size-limit") {
-		tier.AttachmentFileSizeLimit, err = util.ParseSize(c.String("attachment-file-size-limit"))
-		if err != nil {
-			return err
-		}
-	}
-	if c.IsSet("attachment-total-size-limit") {
-		tier.AttachmentTotalSizeLimit, err = util.ParseSize(c.String("attachment-total-size-limit"))
-		if err != nil {
-			return err
-		}
-	}
-	if c.IsSet("attachment-expiry-duration") {
-		tier.AttachmentExpiryDuration, err = util.ParseDuration(c.String("attachment-expiry-duration"))
-		if err != nil {
-			return err
-		}
-	}
-	if c.IsSet("attachment-bandwidth-limit") {
-		tier.AttachmentBandwidthLimit, err = util.ParseSize(c.String("attachment-bandwidth-limit"))
-		if err != nil {
-			return err
-		}
-	}
-	if c.IsSet("stripe-monthly-price-id") {
-		tier.StripeMonthlyPriceID = c.String("stripe-monthly-price-id")
-	}
-	if c.IsSet("stripe-yearly-price-id") {
-		tier.StripeYearlyPriceID = c.String("stripe-yearly-price-id")
-	}
-	if tier.StripeMonthlyPriceID != "" && tier.StripeYearlyPriceID == "" {
-		return errors.New("if stripe-monthly-price-id is set, stripe-yearly-price-id must also be set")
-	} else if tier.StripeMonthlyPriceID == "" && tier.StripeYearlyPriceID != "" {
-		return errors.New("if stripe-yearly-price-id is set, stripe-monthly-price-id must also be set")
-	}
-	if err := manager.UpdateTier(tier); err != nil {
-		return err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "tier updated\n\n")
-	printTier(c, tier)
-	return nil
-}
-
-func execTierDel(c *cli.Context) error {
-	code := c.Args().Get(0)
-	if code == "" {
-		return errors.New("tier code expected, type 'ntfy tier del --help' for help")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	if _, err := manager.Tier(code); err == user.ErrTierNotFound {
-		return fmt.Errorf("tier %s does not exist", code)
-	}
-	if err := manager.RemoveTier(code); err != nil {
-		return err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "tier %s removed\n", code)
-	return nil
-}
-
-func execTierList(c *cli.Context) error {
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	tiers, err := manager.Tiers()
-	if err != nil {
-		return err
-	}
-	for _, tier := range tiers {
-		printTier(c, tier)
-	}
-	return nil
-}
-
-func printTier(c *cli.Context, tier *user.Tier) {
-	prices := "(none)"
-	if tier.StripeMonthlyPriceID != "" && tier.StripeYearlyPriceID != "" {
-		prices = fmt.Sprintf("%s / %s", tier.StripeMonthlyPriceID, tier.StripeYearlyPriceID)
-	}
-	fmt.Fprintf(c.App.ErrWriter, "tier %s (id: %s)\n", tier.Code, tier.ID)
-	fmt.Fprintf(c.App.ErrWriter, "- Name: %s\n", tier.Name)
-	fmt.Fprintf(c.App.ErrWriter, "- Message limit: %d\n", tier.MessageLimit)
-	fmt.Fprintf(c.App.ErrWriter, "- Message expiry duration: %s (%d seconds)\n", tier.MessageExpiryDuration.String(), int64(tier.MessageExpiryDuration.Seconds()))
-	fmt.Fprintf(c.App.ErrWriter, "- Email limit: %d\n", tier.EmailLimit)
-	fmt.Fprintf(c.App.ErrWriter, "- Phone call limit: %d\n", tier.CallLimit)
-	fmt.Fprintf(c.App.ErrWriter, "- Reservation limit: %d\n", tier.ReservationLimit)
-	fmt.Fprintf(c.App.ErrWriter, "- Attachment file size limit: %s\n", util.FormatSize(tier.AttachmentFileSizeLimit))
-	fmt.Fprintf(c.App.ErrWriter, "- Attachment total size limit: %s\n", util.FormatSize(tier.AttachmentTotalSizeLimit))
-	fmt.Fprintf(c.App.ErrWriter, "- Attachment expiry duration: %s (%d seconds)\n", tier.AttachmentExpiryDuration.String(), int64(tier.AttachmentExpiryDuration.Seconds()))
-	fmt.Fprintf(c.App.ErrWriter, "- Attachment daily bandwidth limit: %s\n", util.FormatSize(tier.AttachmentBandwidthLimit))
-	fmt.Fprintf(c.App.ErrWriter, "- Stripe prices (monthly/yearly): %s\n", prices)
-}

cmd/tier_test.go

@@ -1,67 +0,0 @@
-package cmd
-
-import (
-	"git.zio.sh/astra/ntfy/v2/server"
-	"git.zio.sh/astra/ntfy/v2/test"
-	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v2"
-	"testing"
-)
-
-func TestCLI_Tier_AddListChangeDelete(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	app, _, _, stderr := newTestApp()
-	require.Nil(t, runTierCommand(app, conf, "add", "--name", "Pro", "--message-limit", "1234", "pro"))
-	require.Contains(t, stderr.String(), "tier added\n\ntier pro (id: ti_")
-
-	err := runTierCommand(app, conf, "add", "pro")
-	require.NotNil(t, err)
-	require.Equal(t, "tier pro already exists", err.Error())
-
-	app, _, _, stderr = newTestApp()
-	require.Nil(t, runTierCommand(app, conf, "list"))
-	require.Contains(t, stderr.String(), "tier pro (id: ti_")
-	require.Contains(t, stderr.String(), "- Name: Pro")
-	require.Contains(t, stderr.String(), "- Message limit: 1234")
-
-	app, _, _, stderr = newTestApp()
-	require.Nil(t, runTierCommand(app, conf, "change",
-		"--message-limit=999",
-		"--message-expiry-duration=2d",
-		"--email-limit=91",
-		"--reservation-limit=98",
-		"--attachment-file-size-limit=100m",
-		"--attachment-expiry-duration=1d",
-		"--attachment-total-size-limit=10G",
-		"--attachment-bandwidth-limit=100G",
-		"--stripe-monthly-price-id=price_991",
-		"--stripe-yearly-price-id=price_992",
-		"pro",
-	))
-	require.Contains(t, stderr.String(), "- Message limit: 999")
-	require.Contains(t, stderr.String(), "- Message expiry duration: 48h")
-	require.Contains(t, stderr.String(), "- Email limit: 91")
-	require.Contains(t, stderr.String(), "- Reservation limit: 98")
-	require.Contains(t, stderr.String(), "- Attachment file size limit: 100.0 MB")
-	require.Contains(t, stderr.String(), "- Attachment expiry duration: 24h")
-	require.Contains(t, stderr.String(), "- Attachment total size limit: 10.0 GB")
-	require.Contains(t, stderr.String(), "- Stripe prices (monthly/yearly): price_991 / price_992")
-
-	app, _, _, stderr = newTestApp()
-	require.Nil(t, runTierCommand(app, conf, "remove", "pro"))
-	require.Contains(t, stderr.String(), "tier pro removed")
-}
-
-func runTierCommand(app *cli.App, conf *server.Config, args ...string) error {
-	userArgs := []string{
-		"ntfy",
-		"--log-level=ERROR",
-		"tier",
-		"--config=" + conf.File, // Dummy config file to avoid lookups of real file
-		"--auth-file=" + conf.AuthFile,
-		"--auth-default-access=" + conf.AuthDefault.String(),
-	}
-	return app.Run(append(userArgs, args...))
-}

cmd/token.go

@@ -1,210 +0,0 @@
-//go:build !noserver
-
-package cmd
-
-import (
-	"errors"
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/user"
-	"git.zio.sh/astra/ntfy/v2/util"
-	"github.com/urfave/cli/v2"
-	"net/netip"
-	"time"
-)
-
-func init() {
-	commands = append(commands, cmdToken)
-}
-
-var flagsToken = append([]cli.Flag{}, flagsUser...)
-
-var cmdToken = &cli.Command{
-	Name:      "token",
-	Usage:     "Create, list or delete user tokens",
-	UsageText: "ntfy token [list|add|remove] ...",
-	Flags:     flagsToken,
-	Before:    initConfigFileInputSourceFunc("config", flagsToken, initLogFunc),
-	Category:  categoryServer,
-	Subcommands: []*cli.Command{
-		{
-			Name:      "add",
-			Aliases:   []string{"a"},
-			Usage:     "Create a new token",
-			UsageText: "ntfy token add [--expires=<duration>] [--label=..] USERNAME",
-			Action:    execTokenAdd,
-			Flags: []cli.Flag{
-				&cli.StringFlag{Name: "expires", Aliases: []string{"e"}, Value: "", Usage: "token expires after"},
-				&cli.StringFlag{Name: "label", Aliases: []string{"l"}, Value: "", Usage: "token label"},
-			},
-			Description: `Create a new user access token.
-
-User access tokens can be used to publish, subscribe, or perform any other user-specific tasks.
-Tokens have full access, and can perform any task a user can do. They are meant to be used to 
-avoid spreading the password to various places.
-
-This is a server-only command. It directly reads from user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined.
-
-Examples:
-  ntfy token add phil                   # Create token for user phil which never expires
-  ntfy token add --expires=2d phil      # Create token for user phil which expires in 2 days
-  ntfy token add -e "tuesday, 8pm" phil # Create token for user phil which expires next Tuesday
-  ntfy token add -l backups phil        # Create token for user phil with label "backups"`,
-		},
-		{
-			Name:      "remove",
-			Aliases:   []string{"del", "rm"},
-			Usage:     "Removes a token",
-			UsageText: "ntfy token remove USERNAME TOKEN",
-			Action:    execTokenDel,
-			Description: `Remove a token from the ntfy user database.
-
-Example:
-  ntfy token del phil tk_th2srHVlxrANQHAso5t0HuQ1J1TjN`,
-		},
-		{
-			Name:    "list",
-			Aliases: []string{"l"},
-			Usage:   "Shows a list of tokens",
-			Action:  execTokenList,
-			Description: `Shows a list of all tokens.
-
-This is a server-only command. It directly reads from user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined.`,
-		},
-	},
-	Description: `Manage access tokens for individual users.
-
-User access tokens can be used to publish, subscribe, or perform any other user-specific tasks.
-Tokens have full access, and can perform any task a user can do. They are meant to be used to 
-avoid spreading the password to various places.
-
-This is a server-only command. It directly manages the user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined.
-
-Examples:
-  ntfy token list                               # Shows list of tokens for all users
-  ntfy token list phil                          # Shows list of tokens for user phil
-  ntfy token add phil                           # Create token for user phil which never expires
-  ntfy token add --expires=2d phil              # Create token for user phil which expires in 2 days
-  ntfy token remove phil tk_th2srHVlxr...       # Delete token`,
-}
-
-func execTokenAdd(c *cli.Context) error {
-	username := c.Args().Get(0)
-	expiresStr := c.String("expires")
-	label := c.String("label")
-	if username == "" {
-		return errors.New("username expected, type 'ntfy token add --help' for help")
-	} else if username == userEveryone || username == user.Everyone {
-		return errors.New("username not allowed")
-	}
-	expires := time.Unix(0, 0)
-	if expiresStr != "" {
-		var err error
-		expires, err = util.ParseFutureTime(expiresStr, time.Now())
-		if err != nil {
-			return err
-		}
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	u, err := manager.User(username)
-	if err == user.ErrUserNotFound {
-		return fmt.Errorf("user %s does not exist", username)
-	} else if err != nil {
-		return err
-	}
-	token, err := manager.CreateToken(u.ID, label, expires, netip.IPv4Unspecified())
-	if err != nil {
-		return err
-	}
-	if expires.Unix() == 0 {
-		fmt.Fprintf(c.App.ErrWriter, "token %s created for user %s, never expires\n", token.Value, u.Name)
-	} else {
-		fmt.Fprintf(c.App.ErrWriter, "token %s created for user %s, expires %v\n", token.Value, u.Name, expires.Format(time.UnixDate))
-	}
-	return nil
-}
-
-func execTokenDel(c *cli.Context) error {
-	username, token := c.Args().Get(0), c.Args().Get(1)
-	if username == "" || token == "" {
-		return errors.New("username and token expected, type 'ntfy token remove --help' for help")
-	} else if username == userEveryone || username == user.Everyone {
-		return errors.New("username not allowed")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	u, err := manager.User(username)
-	if err == user.ErrUserNotFound {
-		return fmt.Errorf("user %s does not exist", username)
-	} else if err != nil {
-		return err
-	}
-	if err := manager.RemoveToken(u.ID, token); err != nil {
-		return err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "token %s for user %s removed\n", token, username)
-	return nil
-}
-
-func execTokenList(c *cli.Context) error {
-	username := c.Args().Get(0)
-	if username == userEveryone || username == user.Everyone {
-		return errors.New("username not allowed")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	var users []*user.User
-	if username != "" {
-		u, err := manager.User(username)
-		if err == user.ErrUserNotFound {
-			return fmt.Errorf("user %s does not exist", username)
-		} else if err != nil {
-			return err
-		}
-		users = append(users, u)
-	} else {
-		users, err = manager.Users()
-		if err != nil {
-			return err
-		}
-	}
-	usersWithTokens := 0
-	for _, u := range users {
-		tokens, err := manager.Tokens(u.ID)
-		if err != nil {
-			return err
-		} else if len(tokens) == 0 && username != "" {
-			fmt.Fprintf(c.App.ErrWriter, "user %s has no access tokens\n", username)
-			return nil
-		} else if len(tokens) == 0 {
-			continue
-		}
-		usersWithTokens++
-		fmt.Fprintf(c.App.ErrWriter, "user %s\n", u.Name)
-		for _, t := range tokens {
-			var label, expires string
-			if t.Label != "" {
-				label = fmt.Sprintf(" (%s)", t.Label)
-			}
-			if t.Expires.Unix() == 0 {
-				expires = "never expires"
-			} else {
-				expires = fmt.Sprintf("expires %s", t.Expires.Format(time.RFC822))
-			}
-			fmt.Fprintf(c.App.ErrWriter, "- %s%s, %s, accessed from %s at %s\n", t.Value, label, expires, t.LastOrigin.String(), t.LastAccess.Format(time.RFC822))
-		}
-	}
-	if usersWithTokens == 0 {
-		fmt.Fprintf(c.App.ErrWriter, "no users with tokens\n")
-	}
-	return nil
-}

cmd/token_test.go

@@ -1,50 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/server"
-	"git.zio.sh/astra/ntfy/v2/test"
-	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v2"
-	"regexp"
-	"testing"
-)
-
-func TestCLI_Token_AddListRemove(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	app, stdin, _, stderr := newTestApp()
-	stdin.WriteString("mypass\nmypass")
-	require.Nil(t, runUserCommand(app, conf, "add", "phil"))
-	require.Contains(t, stderr.String(), "user phil added with role user")
-
-	app, _, _, stderr = newTestApp()
-	require.Nil(t, runTokenCommand(app, conf, "add", "phil"))
-	require.Regexp(t, `token tk_.+ created for user phil, never expires`, stderr.String())
-
-	app, _, _, stderr = newTestApp()
-	require.Nil(t, runTokenCommand(app, conf, "list", "phil"))
-	require.Regexp(t, `user phil\n- tk_.+, never expires, accessed from 0.0.0.0 at .+`, stderr.String())
-	re := regexp.MustCompile(`tk_\w+`)
-	token := re.FindString(stderr.String())
-
-	app, _, _, stderr = newTestApp()
-	require.Nil(t, runTokenCommand(app, conf, "remove", "phil", token))
-	require.Regexp(t, fmt.Sprintf("token %s for user phil removed", token), stderr.String())
-
-	app, _, _, stderr = newTestApp()
-	require.Nil(t, runTokenCommand(app, conf, "list"))
-	require.Equal(t, "no users with tokens\n", stderr.String())
-}
-
-func runTokenCommand(app *cli.App, conf *server.Config, args ...string) error {
-	userArgs := []string{
-		"ntfy",
-		"--log-level=ERROR",
-		"token",
-		"--config=" + conf.File, // Dummy config file to avoid lookups of real file
-		"--auth-file=" + conf.AuthFile,
-	}
-	return app.Run(append(userArgs, args...))
-}

cmd/user.go

@@ -1,357 +0,0 @@
-//go:build !noserver
-
-package cmd
-
-import (
-	"crypto/subtle"
-	"errors"
-	"fmt"
-	"git.zio.sh/astra/ntfy/v2/user"
-	"os"
-	"strings"
-
-	"git.zio.sh/astra/ntfy/v2/util"
-	"github.com/urfave/cli/v2"
-	"github.com/urfave/cli/v2/altsrc"
-)
-
-const (
-	tierReset = "-"
-)
-
-func init() {
-	commands = append(commands, cmdUser)
-}
-
-var flagsUser = append(
-	append([]cli.Flag{}, flagsDefault...),
-	&cli.StringFlag{Name: "config", Aliases: []string{"c"}, EnvVars: []string{"NTFY_CONFIG_FILE"}, Value: defaultServerConfigFile, DefaultText: defaultServerConfigFile, Usage: "config file"},
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "auth-file", Aliases: []string{"auth_file", "H"}, EnvVars: []string{"NTFY_AUTH_FILE"}, Usage: "auth database file used for access control"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "auth-default-access", Aliases: []string{"auth_default_access", "p"}, EnvVars: []string{"NTFY_AUTH_DEFAULT_ACCESS"}, Value: "read-write", Usage: "default permissions if no matching entries in the auth database are found"}),
-)
-
-var cmdUser = &cli.Command{
-	Name:      "user",
-	Usage:     "Manage/show users",
-	UsageText: "ntfy user [list|add|remove|change-pass|change-role] ...",
-	Flags:     flagsUser,
-	Before:    initConfigFileInputSourceFunc("config", flagsUser, initLogFunc),
-	Category:  categoryServer,
-	Subcommands: []*cli.Command{
-		{
-			Name:      "add",
-			Aliases:   []string{"a"},
-			Usage:     "Adds a new user",
-			UsageText: "ntfy user add [--role=admin|user] USERNAME\nNTFY_PASSWORD=... ntfy user add [--role=admin|user] USERNAME",
-			Action:    execUserAdd,
-			Flags: []cli.Flag{
-				&cli.StringFlag{Name: "role", Aliases: []string{"r"}, Value: string(user.RoleUser), Usage: "user role"},
-				&cli.BoolFlag{Name: "ignore-exists", Usage: "if the user already exists, perform no action and exit"},
-			},
-			Description: `Add a new user to the ntfy user database.
-
-A user can be either a regular user, or an admin. A regular user has no read or write access (unless
-granted otherwise by the auth-default-access setting). An admin user has read and write access to all
-topics.
-
-Examples:
-  ntfy user add phil                     # Add regular user phil  
-  ntfy user add --role=admin phil        # Add admin user phil
-  NTFY_PASSWORD=... ntfy user add phil   # Add user, using env variable to set password (for scripts)
-
-You may set the NTFY_PASSWORD environment variable to pass the password. This is useful if 
-you are creating users via scripts.
-`,
-		},
-		{
-			Name:      "remove",
-			Aliases:   []string{"del", "rm"},
-			Usage:     "Removes a user",
-			UsageText: "ntfy user remove USERNAME",
-			Action:    execUserDel,
-			Description: `Remove a user from the ntfy user database.
-
-Example:
-  ntfy user del phil
-`,
-		},
-		{
-			Name:      "change-pass",
-			Aliases:   []string{"chp"},
-			Usage:     "Changes a user's password",
-			UsageText: "ntfy user change-pass USERNAME\nNTFY_PASSWORD=... ntfy user change-pass USERNAME",
-			Action:    execUserChangePass,
-			Description: `Change the password for the given user.
-
-The new password will be read from STDIN, and it'll be confirmed by typing
-it twice. 
-
-Example:
-  ntfy user change-pass phil
-  NTFY_PASSWORD=.. ntfy user change-pass phil
-
-You may set the NTFY_PASSWORD environment variable to pass the new password. This is 
-useful if you are updating users via scripts.
-
-`,
-		},
-		{
-			Name:      "change-role",
-			Aliases:   []string{"chr"},
-			Usage:     "Changes the role of a user",
-			UsageText: "ntfy user change-role USERNAME ROLE",
-			Action:    execUserChangeRole,
-			Description: `Change the role for the given user to admin or user.
-
-This command can be used to change the role of a user either from a regular user
-to an admin user, or the other way around:
-
-- admin: an admin has read/write access to all topics
-- user: a regular user only has access to what was explicitly granted via 'ntfy access'
-
-When changing the role of a user to "admin", all access control entries for that 
-user are removed, since they are no longer necessary.
-
-Example:
-  ntfy user change-role phil admin   # Make user phil an admin 
-  ntfy user change-role phil user    # Remove admin role from user phil 
-`,
-		},
-		{
-			Name:      "change-tier",
-			Aliases:   []string{"cht"},
-			Usage:     "Changes the tier of a user",
-			UsageText: "ntfy user change-tier USERNAME (TIER|-)",
-			Action:    execUserChangeTier,
-			Description: `Change the tier for the given user.
-
-This command can be used to change the tier of a user. Tiers define usage limits, such
-as messages per day, attachment file sizes, etc.
-
-Example:
-  ntfy user change-tier phil pro   # Change tier to "pro" for user "phil"  
-  ntfy user change-tier phil -     # Remove tier from user "phil" entirely 
-`,
-		},
-		{
-			Name:    "list",
-			Aliases: []string{"l"},
-			Usage:   "Shows a list of users",
-			Action:  execUserList,
-			Description: `Shows a list of all configured users, including the everyone ('*') user.
-
-This command is an alias to calling 'ntfy access' (display access control list).
-
-This is a server-only command. It directly reads from user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined.
-`,
-		},
-	},
-	Description: `Manage users of the ntfy server.
-
-The command allows you to add/remove/change users in the ntfy user database, as well as change 
-passwords or roles.
-
-This is a server-only command. It directly manages the user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined. Please also refer
-to the related command 'ntfy access'.
-
-Examples:
-  ntfy user list                               # Shows list of users (alias: 'ntfy access')                      
-  ntfy user add phil                           # Add regular user phil  
-  NTFY_PASSWORD=... ntfy user add phil         # As above, using env variable to set password (for scripts)
-  ntfy user add --role=admin phil              # Add admin user phil
-  ntfy user del phil                           # Delete user phil
-  ntfy user change-pass phil                   # Change password for user phil
-  NTFY_PASSWORD=.. ntfy user change-pass phil  # As above, using env variable to set password (for scripts)
-  ntfy user change-role phil admin             # Make user phil an admin 
-
-For the 'ntfy user add' and 'ntfy user change-pass' commands, you may set the NTFY_PASSWORD environment
-variable to pass the new password. This is useful if you are creating/updating users via scripts.
-`,
-}
-
-func execUserAdd(c *cli.Context) error {
-	username := c.Args().Get(0)
-	role := user.Role(c.String("role"))
-	password := os.Getenv("NTFY_PASSWORD")
-	if username == "" {
-		return errors.New("username expected, type 'ntfy user add --help' for help")
-	} else if username == userEveryone || username == user.Everyone {
-		return errors.New("username not allowed")
-	} else if !user.AllowedRole(role) {
-		return errors.New("role must be either 'user' or 'admin'")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	if user, _ := manager.User(username); user != nil {
-		if c.Bool("ignore-exists") {
-			fmt.Fprintf(c.App.ErrWriter, "user %s already exists (exited successfully)\n", username)
-			return nil
-		}
-		return fmt.Errorf("user %s already exists", username)
-	}
-	if password == "" {
-		p, err := readPasswordAndConfirm(c)
-		if err != nil {
-			return err
-		}
-
-		password = p
-	}
-	if err := manager.AddUser(username, password, role); err != nil {
-		return err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "user %s added with role %s\n", username, role)
-	return nil
-}
-
-func execUserDel(c *cli.Context) error {
-	username := c.Args().Get(0)
-	if username == "" {
-		return errors.New("username expected, type 'ntfy user del --help' for help")
-	} else if username == userEveryone || username == user.Everyone {
-		return errors.New("username not allowed")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	if _, err := manager.User(username); err == user.ErrUserNotFound {
-		return fmt.Errorf("user %s does not exist", username)
-	}
-	if err := manager.RemoveUser(username); err != nil {
-		return err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "user %s removed\n", username)
-	return nil
-}
-
-func execUserChangePass(c *cli.Context) error {
-	username := c.Args().Get(0)
-	password := os.Getenv("NTFY_PASSWORD")
-	if username == "" {
-		return errors.New("username expected, type 'ntfy user change-pass --help' for help")
-	} else if username == userEveryone || username == user.Everyone {
-		return errors.New("username not allowed")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	if _, err := manager.User(username); err == user.ErrUserNotFound {
-		return fmt.Errorf("user %s does not exist", username)
-	}
-	if password == "" {
-		password, err = readPasswordAndConfirm(c)
-		if err != nil {
-			return err
-		}
-	}
-	if err := manager.ChangePassword(username, password); err != nil {
-		return err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "changed password for user %s\n", username)
-	return nil
-}
-
-func execUserChangeRole(c *cli.Context) error {
-	username := c.Args().Get(0)
-	role := user.Role(c.Args().Get(1))
-	if username == "" || !user.AllowedRole(role) {
-		return errors.New("username and new role expected, type 'ntfy user change-role --help' for help")
-	} else if username == userEveryone || username == user.Everyone {
-		return errors.New("username not allowed")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	if _, err := manager.User(username); err == user.ErrUserNotFound {
-		return fmt.Errorf("user %s does not exist", username)
-	}
-	if err := manager.ChangeRole(username, role); err != nil {
-		return err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "changed role for user %s to %s\n", username, role)
-	return nil
-}
-
-func execUserChangeTier(c *cli.Context) error {
-	username := c.Args().Get(0)
-	tier := c.Args().Get(1)
-	if username == "" {
-		return errors.New("username and new tier expected, type 'ntfy user change-tier --help' for help")
-	} else if !user.AllowedTier(tier) && tier != tierReset {
-		return errors.New("invalid tier, must be tier code, or - to reset")
-	} else if username == userEveryone || username == user.Everyone {
-		return errors.New("username not allowed")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	if _, err := manager.User(username); err == user.ErrUserNotFound {
-		return fmt.Errorf("user %s does not exist", username)
-	}
-	if tier == tierReset {
-		if err := manager.ResetTier(username); err != nil {
-			return err
-		}
-		fmt.Fprintf(c.App.ErrWriter, "removed tier from user %s\n", username)
-	} else {
-		if err := manager.ChangeTier(username, tier); err != nil {
-			return err
-		}
-		fmt.Fprintf(c.App.ErrWriter, "changed tier for user %s to %s\n", username, tier)
-	}
-	return nil
-}
-
-func execUserList(c *cli.Context) error {
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	users, err := manager.Users()
-	if err != nil {
-		return err
-	}
-	return showUsers(c, manager, users)
-}
-
-func createUserManager(c *cli.Context) (*user.Manager, error) {
-	authFile := c.String("auth-file")
-	authStartupQueries := c.String("auth-startup-queries")
-	authDefaultAccess := c.String("auth-default-access")
-	if authFile == "" {
-		return nil, errors.New("option auth-file not set; auth is unconfigured for this server")
-	} else if !util.FileExists(authFile) {
-		return nil, errors.New("auth-file does not exist; please start the server at least once to create it")
-	}
-	authDefault, err := user.ParsePermission(authDefaultAccess)
-	if err != nil {
-		return nil, errors.New("if set, auth-default-access must start set to 'read-write', 'read-only', 'write-only' or 'deny-all'")
-	}
-	return user.NewManager(authFile, authStartupQueries, authDefault, user.DefaultUserPasswordBcryptCost, user.DefaultUserStatsQueueWriterInterval)
-}
-
-func readPasswordAndConfirm(c *cli.Context) (string, error) {
-	fmt.Fprint(c.App.ErrWriter, "password: ")
-	password, err := util.ReadPassword(c.App.Reader)
-	if err != nil {
-		return "", err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "\r%s\rconfirm: ", strings.Repeat(" ", 25))
-	confirm, err := util.ReadPassword(c.App.Reader)
-	if err != nil {
-		return "", err
-	}
-	fmt.Fprintf(c.App.ErrWriter, "\r%s\r", strings.Repeat(" ", 25))
-	if subtle.ConstantTimeCompare(confirm, password) != 1 {
-		return "", errors.New("passwords do not match: try it again, but this time type slooowwwlly")
-	}
-	return string(password), nil
-}

cmd/user_test.go

@@ -1,137 +0,0 @@
-package cmd
-
-import (
-	"git.zio.sh/astra/ntfy/v2/server"
-	"git.zio.sh/astra/ntfy/v2/test"
-	"git.zio.sh/astra/ntfy/v2/user"
-	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v2"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestCLI_User_Add(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	app, stdin, _, stderr := newTestApp()
-	stdin.WriteString("mypass\nmypass")
-	require.Nil(t, runUserCommand(app, conf, "add", "phil"))
-	require.Contains(t, stderr.String(), "user phil added with role user")
-}
-
-func TestCLI_User_Add_Exists(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	app, stdin, _, stderr := newTestApp()
-	stdin.WriteString("mypass\nmypass")
-	require.Nil(t, runUserCommand(app, conf, "add", "phil"))
-	require.Contains(t, stderr.String(), "user phil added with role user")
-
-	app, stdin, _, _ = newTestApp()
-	stdin.WriteString("mypass\nmypass")
-	err := runUserCommand(app, conf, "add", "phil")
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "user phil already exists")
-}
-
-func TestCLI_User_Add_Admin(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	app, stdin, _, stderr := newTestApp()
-	stdin.WriteString("mypass\nmypass")
-	require.Nil(t, runUserCommand(app, conf, "add", "--role=admin", "phil"))
-	require.Contains(t, stderr.String(), "user phil added with role admin")
-}
-
-func TestCLI_User_Add_Password_Mismatch(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	app, stdin, _, _ := newTestApp()
-	stdin.WriteString("mypass\nNOTMATCH")
-	err := runUserCommand(app, conf, "add", "phil")
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "passwords do not match: try it again, but this time type slooowwwlly")
-}
-
-func TestCLI_User_ChangePass(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	// Add user
-	app, stdin, _, stderr := newTestApp()
-	stdin.WriteString("mypass\nmypass")
-	require.Nil(t, runUserCommand(app, conf, "add", "phil"))
-	require.Contains(t, stderr.String(), "user phil added with role user")
-
-	// Change pass
-	app, stdin, _, stderr = newTestApp()
-	stdin.WriteString("newpass\nnewpass")
-	require.Nil(t, runUserCommand(app, conf, "change-pass", "phil"))
-	require.Contains(t, stderr.String(), "changed password for user phil")
-}
-
-func TestCLI_User_ChangeRole(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	// Add user
-	app, stdin, _, stderr := newTestApp()
-	stdin.WriteString("mypass\nmypass")
-	require.Nil(t, runUserCommand(app, conf, "add", "phil"))
-	require.Contains(t, stderr.String(), "user phil added with role user")
-
-	// Change role
-	app, _, _, stderr = newTestApp()
-	require.Nil(t, runUserCommand(app, conf, "change-role", "phil", "admin"))
-	require.Contains(t, stderr.String(), "changed role for user phil to admin")
-}
-
-func TestCLI_User_Delete(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	// Add user
-	app, stdin, _, stderr := newTestApp()
-	stdin.WriteString("mypass\nmypass")
-	require.Nil(t, runUserCommand(app, conf, "add", "phil"))
-	require.Contains(t, stderr.String(), "user phil added with role user")
-
-	// Delete user
-	app, _, _, stderr = newTestApp()
-	require.Nil(t, runUserCommand(app, conf, "del", "phil"))
-	require.Contains(t, stderr.String(), "user phil removed")
-
-	// Delete user again (does not exist)
-	app, _, _, _ = newTestApp()
-	err := runUserCommand(app, conf, "del", "phil")
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "user phil does not exist")
-}
-
-func newTestServerWithAuth(t *testing.T) (s *server.Server, conf *server.Config, port int) {
-	configFile := filepath.Join(t.TempDir(), "server-dummy.yml")
-	require.Nil(t, os.WriteFile(configFile, []byte(""), 0600)) // Dummy config file to avoid lookup of real server.yml
-	conf = server.NewConfig()
-	conf.File = configFile
-	conf.AuthFile = filepath.Join(t.TempDir(), "user.db")
-	conf.AuthDefault = user.PermissionDenyAll
-	s, port = test.StartServerWithConfig(t, conf)
-	return
-}
-
-func runUserCommand(app *cli.App, conf *server.Config, args ...string) error {
-	userArgs := []string{
-		"ntfy",
-		"--log-level=ERROR",
-		"user",
-		"--config=" + conf.File, // Dummy config file to avoid lookups of real file
-		"--auth-file=" + conf.AuthFile,
-		"--auth-default-access=" + conf.AuthDefault.String(),
-	}
-	return app.Run(append(userArgs, args...))
-}

cmd/webpush.go

@@ -1,48 +0,0 @@
-//go:build !noserver
-
-package cmd
-
-import (
-	"fmt"
-
-	"github.com/SherClockHolmes/webpush-go"
-	"github.com/urfave/cli/v2"
-)
-
-func init() {
-	commands = append(commands, cmdWebPush)
-}
-
-var cmdWebPush = &cli.Command{
-	Name:      "webpush",
-	Usage:     "Generate keys, in the future manage web push subscriptions",
-	UsageText: "ntfy webpush [keys]",
-	Category:  categoryServer,
-
-	Subcommands: []*cli.Command{
-		{
-			Action:    generateWebPushKeys,
-			Name:      "keys",
-			Usage:     "Generate VAPID keys to enable browser background push notifications",
-			UsageText: "ntfy webpush keys",
-			Category:  categoryServer,
-		},
-	},
-}
-
-func generateWebPushKeys(c *cli.Context) error {
-	privateKey, publicKey, err := webpush.GenerateVAPIDKeys()
-	if err != nil {
-		return err
-	}
-	_, err = fmt.Fprintf(c.App.ErrWriter, `Web Push keys generated. Add the following lines to your config file:
-
-web-push-public-key: %s
-web-push-private-key: %s
-web-push-file: /var/cache/ntfy/webpush.db # or similar
-web-push-email-address: <email address>
-
-See https://ntfy.sh/docs/config/#web-push for details.
-`, publicKey, privateKey)
-	return err
-}

cmd/webpush_test.go

@@ -1,24 +0,0 @@
-package cmd
-
-import (
-	"testing"
-
-	"git.zio.sh/astra/ntfy/v2/server"
-	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v2"
-)
-
-func TestCLI_WebPush_GenerateKeys(t *testing.T) {
-	app, _, _, stderr := newTestApp()
-	require.Nil(t, runWebPushCommand(app, server.NewConfig(), "keys"))
-	require.Contains(t, stderr.String(), "Web Push keys generated.")
-}
-
-func runWebPushCommand(app *cli.App, conf *server.Config, args ...string) error {
-	webPushArgs := []string{
-		"ntfy",
-		"--log-level=ERROR",
-		"webpush",
-	}
-	return app.Run(append(webPushArgs, args...))
-}

config/config.go

@@ -0,0 +1,38 @@
+// Package config provides the main configuration
+package config
+
+import (
+	"golang.org/x/time/rate"
+	"time"
+)
+
+// Defines default config settings
+const (
+	DefaultListenHTTP      = ":80"
+	defaultManagerInterval = time.Minute
+)
+
+// Defines the max number of requests, here:
+// 50 requests bucket, replenished at a rate of 1 per second
+var (
+	defaultLimit      = rate.Every(time.Second)
+	defaultLimitBurst = 50
+)
+
+// Config is the main config struct for the application. Use New to instantiate a default config struct.
+type Config struct {
+	ListenHTTP      string
+	Limit           rate.Limit
+	LimitBurst      int
+	ManagerInterval time.Duration
+}
+
+// New instantiates a default new config
+func New(listenHTTP string) *Config {
+	return &Config{
+		ListenHTTP:      listenHTTP,
+		Limit:           defaultLimit,
+		LimitBurst:      defaultLimitBurst,
+		ManagerInterval: defaultManagerInterval,
+	}
+}

config/config.yml

@@ -0,0 +1,9 @@
+# ntfy config file
+
+# Listen address for the HTTP web server
+#
+# Format:    <hostname>:<port>
+# Default:   :80
+# Required:  No
+#
+# listen-http: ":80"

config/ntfy.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=ntfy server
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/ntfy
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

docker-compose.yml

@@ -1,17 +0,0 @@
-version: "2.1"
-services:
-  ntfy:
-    image: binwiederhier/ntfy
-    container_name: ntfy
-    command:
-      - serve
-    environment:
-      - TZ=UTC    # optional: Change to your desired timezone
-    user: UID:GID # optional: Set custom user/group or uid/gid
-    volumes:
-      - /var/cache/ntfy:/var/cache/ntfy
-      - /etc/ntfy:/etc/ntfy
-    ports:
-      - 80:80
-    restart: unless-stopped
-

docs/_overrides/main.html

@@ -1,50 +0,0 @@
-{% extends "base.html" %}
-
-{% block announce %}
-<style>
-    div[data-md-component="announce"] {
-        z-index: 10;
-    }
-
-    div[data-md-component="announce"] a {
-        color: white;
-    }
-
-    div[data-md-component="announce"] a:hover, div[data-md-component="announce"] a:focus {
-        transition: ease-in 150ms;
-        color: #ccc;
-    }
-
-    div[data-md-component="announce"] .md-banner__button {
-        color: #ccc;
-    }
-
-    div[data-md-component="announce"] .md-banner.hidden {
-        display: none;
-    }
-
-    div[data-md-component="announce"] .twemoji {
-        margin-top: 2px;
-    }
-</style>
-<button id="announce-bar-close" class="md-banner__button md-icon" aria-label="Don't show this again">
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-        <path d="M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41Z"></path>
-    </svg>
-</button>
-If you like ntfy, please consider sponsoring me via <a target="_blank" href="https://github.com/sponsors/binwiederhier"><strong>GitHub Sponsors</strong></a>
-or <a target="_blank" href="https://en.liberapay.com/ntfy/"><strong>Liberapay</strong></a>
-<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 36 36" class="twemoji md-footer-custom-text">
-    <path fill="#DD2E44" d="M35.885 11.833c0-5.45-4.418-9.868-9.867-9.868-3.308 0-6.227 1.633-8.018 4.129-1.791-2.496-4.71-4.129-8.017-4.129-5.45 0-9.868 4.417-9.868 9.868 0 .772.098 1.52.266 2.241C1.751 22.587 11.216 31.568 18 34.034c6.783-2.466 16.249-11.447 17.617-19.959.17-.721.268-1.469.268-2.242z"/>
-</svg>, or subscribing to <a target="_blank" href="https://ntfy.sh/app"><strong>ntfy Pro</strong></a>.
-<script>
-    announceBarKey = 'announce-bar-closed-sponsor';
-    document.getElementById('announce-bar-close').addEventListener('click', (e) => {
-        localStorage.setItem(announceBarKey, 'true');
-        document.querySelector('div[data-md-component="announce"] .md-banner').style.display = 'none';
-    });
-    if (localStorage.getItem(announceBarKey) === 'true') {
-        document.querySelector('div[data-md-component="announce"] .md-banner').style.display = 'none';
-    }
-</script>
-{% endblock %}

docs/deprecations.md

@@ -1,60 +0,0 @@
-# Deprecation notices
-This page is used to list deprecation notices for ntfy. Deprecated commands and options will be 
-**removed after 1-3 months** from the time they were deprecated. How long the feature is deprecated
-before the behavior is changed depends on the severity of the change, and how prominent the feature is.
-
-## Active deprecations
-_No active deprecations_
-
-## Previous deprecations
-
-### ntfy CLI: `ntfy publish --env-topic` will be removed
-> Active since 2022-06-20, behavior changed with v1.30.1
-
-The `ntfy publish --env-topic` option will be removed. It'll still be possible to specify a topic via the
-`NTFY_TOPIC` environment variable, but it won't be necessary anymore to specify the `--env-topic` flag.
-
-=== "Before"
-    ```
-    $ NTFY_TOPIC=mytopic ntfy publish --env-topic "this is the message"
-    ```
-
-=== "After"
-    ```
-    $ NTFY_TOPIC=mytopic ntfy publish "this is the message"
-    ```
-
-### <del>Android app: WebSockets will become the default connection protocol</del>
-> Active since 2022-03-13, behavior will not change (deprecation removed 2022-06-20)
-
-Instant delivery connections and connections to self-hosted servers in the Android app were going to switch
-to use the WebSockets protocol by default. It was decided to keep JSON stream as the most compatible default
-and add a notice banner in the Android app instead.
-
-### Android app: Using `since=<timestamp>` instead of `since=<id>`
-> Active since 2022-02-27, behavior changed with v1.14.0
-
-The Android app started using `since=<id>` instead of `since=<timestamp>`, which means as of Android app v1.14.0, 
-it will not work with servers older than v1.16.0 anymore. This is to simplify handling of deduplication in the Android app.
-
-The `since=<timestamp>` endpoint will continue to work. This is merely a notice that the Android app behavior will change.
-
-### Running server via `ntfy` (instead of `ntfy serve`)
-> Deprecated 2021-12-17, behavior changed with v1.10.0
-
-As more commands are added to the `ntfy` CLI tool, using just `ntfy` to run the server is not practical
-anymore. Please use `ntfy serve` instead. This also applies to Docker images, as they can also execute more than
-just the server.
-
-=== "Before"
-    ```
-    $ ntfy
-    2021/12/17 08:16:01 Listening on :80/http
-    ```
-
-=== "After"
-    ```
-    $ ntfy serve
-    2021/12/17 08:16:01 Listening on :80/http
-    ```
-

docs/develop.md

@@ -1,446 +0,0 @@
-# Development
-Hurray 🥳 🎉, you are interested in writing code for ntfy! **That's awesome.** 😎
-
-I tried my very best to write up detailed instructions, but if at any point in time you run into issues, don't 
-hesitate to **contact me on [Discord](https://discord.gg/cT7ECsZj9w) or [Matrix](https://matrix.to/#/#ntfy:matrix.org)**.
-
-## ntfy server
-The ntfy server source code is available [on GitHub](https://github.com/binwiederhier/ntfy). The codebase for the
-server consists of three components:
-
-* **The main server/client** is written in [Go](https://go.dev/) (so you'll need Go). Its main entrypoint is at 
-  [main.go](https://github.com/binwiederhier/ntfy/blob/main/main.go), and the meat you're likely interested in is 
-  in [server.go](https://github.com/binwiederhier/ntfy/blob/main/server/server.go). Notably, the server uses a 
-  [SQLite](https://sqlite.org) library called [go-sqlite3](https://github.com/mattn/go-sqlite3), which requires 
-  [Cgo](https://go.dev/blog/cgo) and `CGO_ENABLED=1` to be set. Otherwise things will not work (see below).
-* **The documentation** is generated by [MkDocs](https://www.mkdocs.org/) and [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/),
-  which is written in [Python](https://www.python.org/). You'll need Python and MkDocs (via `pip`) only if you want to
-  build the docs.
-* **The web app** is written in [React](https://reactjs.org/), using [MUI](https://mui.com/). It uses [Vite](https://vitejs.dev/)
-  to build the production build. If you want to modify the web app, you need [nodejs](https://nodejs.org/en/) (for `npm`) 
-  and install all the 100,000 dependencies (*sigh*).
-
-All of these components are built and then **baked into one binary**. 
-
-### Navigating the code
-Code:
-
-* [main.go](https://github.com/binwiederhier/ntfy/blob/main/main.go) - Main entrypoint into the CLI, for both server and client
-* [cmd/](https://github.com/binwiederhier/ntfy/tree/main/cmd) - CLI commands, such as `serve` or `publish`
-* [server/](https://github.com/binwiederhier/ntfy/tree/main/server) - The meat of the server logic
-* [docs/](https://github.com/binwiederhier/ntfy/tree/main/docs) - The [MkDocs](https://www.mkdocs.org/) documentation, also see `mkdocs.yml`
-* [web/](https://github.com/binwiederhier/ntfy/tree/main/web) - The [React](https://reactjs.org/) application, also see `web/package.json`
-
-Build related:
-
-* [Makefile](https://github.com/binwiederhier/ntfy/blob/main/Makefile) - Main entrypoint for all things related to building
-* [.goreleaser.yml](https://github.com/binwiederhier/ntfy/blob/main/.goreleaser.yml) - Describes all build outputs (for [GoReleaser](https://goreleaser.com/))
-* [go.mod](https://github.com/binwiederhier/ntfy/blob/main/go.mod) - Go modules dependency file
-* [mkdocs.yml](https://github.com/binwiederhier/ntfy/blob/main/mkdocs.yml) - Config file for the docs (for [MkDocs](https://www.mkdocs.org/))
-* [web/package.json](https://github.com/binwiederhier/ntfy/blob/main/web/package.json) - Build and dependency file for web app (for npm)
-
-
-The `web/` and `docs/` folder are the sources for web app and documentation. During the build process,
-the generated output is copied to `server/site` (web app and landing page) and `server/docs` (documentation).
-
-### Build/test on Gitpod
-To get a quick working development environment you can use [Gitpod](https://gitpod.io), an in-browser IDE 
-that makes it easy to develop ntfy without having to set up a desktop IDE. For any real development,
-I do suggest a proper IDE like [IntelliJ IDEA](https://www.jetbrains.com/idea/).
-
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/binwiederhier/ntfy)
-
-### Build requirements
-
-* [Go](https://go.dev/) (required for main server)
-* [gcc](https://gcc.gnu.org/) (required main server, for SQLite cgo-based bindings)
-* [Make](https://www.gnu.org/software/make/) (required for convenience)
-* [libsqlite3/libsqlite3-dev](https://www.sqlite.org/) (required for main server, for SQLite cgo-based bindings)
-* [GoReleaser](https://goreleaser.com/) (required for a proper main server build)
-* [Python](https://www.python.org/) (for `pip`, only to build the docs) 
-* [nodejs](https://nodejs.org/en/) (for `npm`, only to build the web app)
-
-### Install dependencies
-These steps **assume Ubuntu**. Steps may vary on different Linux distributions.
-
-First, install [Go](https://go.dev/) (see [official instructions](https://go.dev/doc/install)):
-``` shell
-wget https://go.dev/dl/go1.19.1.linux-amd64.tar.gz
-sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.19.1.linux-amd64.tar.gz
-export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
-go version   # verifies that it worked
-```
-
-Install [GoReleaser](https://goreleaser.com/) (see [official instructions](https://goreleaser.com/install/)):
-``` shell
-go install github.com/goreleaser/goreleaser@latest
-goreleaser -v   # verifies that it worked
-```
-
-Install [nodejs](https://nodejs.org/en/) (see [official instructions](https://nodejs.org/en/download/package-manager/)):
-``` shell
-curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
-sudo apt-get install -y nodejs
-npm -v   # verifies that it worked
-```
-
-Then install a few other things required:
-``` shell
-sudo apt install \
-    build-essential \
-    libsqlite3-dev \
-    gcc-arm-linux-gnueabi \
-    gcc-aarch64-linux-gnu \
-    python3-pip \
-    git
-```
-
-### Check out code
-Now check out via git from the [GitHub repository](https://github.com/binwiederhier/ntfy):
-
-=== "via HTTPS"
-    ``` shell
-    git clone https://github.com/binwiederhier/ntfy.git
-    cd ntfy
-    ```
-
-=== "via SSH"
-    ``` shell
-    git clone git@github.com:binwiederhier/ntfy.git 
-    cd ntfy
-    ```
-
-### Build all the things
-Now you can finally build everything. There are tons of `make` targets, so maybe just review what's there first 
-by typing `make`:
-
-``` shell
-$ make 
-Typical commands (more see below):
-  make build                   - Build web app, documentation and server/client (sloowwww)
-  make cli-linux-amd64         - Build server/client binary (amd64, no web app or docs)
-  make install-linux-amd64     - Install ntfy binary to /usr/bin/ntfy (amd64)
-  make web                     - Build the web app
-  make docs                    - Build the documentation
-  make check                   - Run all tests, vetting/formatting checks and linters
-...
-```
-
-If you want to build the **ntfy binary including web app and docs for all supported architectures** (amd64, armv7, and arm64), 
-you can simply run `make build`:
-
-``` shell
-$ make build
-...
-# This builds web app, docs, and the ntfy binary (for amd64, armv7 and arm64). 
-# This will be SLOW (5+ minutes on my laptop on the first run). Maybe look at the other make targets?
-```
-
-You'll see all the outputs in the `dist/` folder afterwards:
-
-``` bash
-$ find dist 
-dist
-dist/metadata.json
-dist/ntfy_arm64_linux_arm64
-dist/ntfy_arm64_linux_arm64/ntfy
-dist/ntfy_armv7_linux_arm_7
-dist/ntfy_armv7_linux_arm_7/ntfy
-dist/ntfy_amd64_linux_amd64
-dist/ntfy_amd64_linux_amd64/ntfy
-dist/config.yaml
-dist/artifacts.json
-```
-
-If you also want to build the **Debian/RPM packages and the Docker images for all supported architectures**, you can 
-use the `make release-snapshot` target:
-
-``` shell
-$ make release-snapshot
-...
-# This will be REALLY SLOW (sometimes 5+ minutes on my laptop)
-```
-
-During development, you may want to be more picky and build only certain things. Here are a few examples.
-
-### Build a Docker image only for Linux
-
-This is useful to test the final build with web app, docs, and server without any dependencies locally
-
-``` shell
-$ make docker-dev
-$ docker run --rm -p 80:80 binwiederhier/ntfy:dev serve
-```
-
-### Build the ntfy binary
-To build only the `ntfy` binary **without the web app or documentation**, use the `make cli-...` targets:
-
-``` shell
-$ make
-Build server & client (using GoReleaser, not release version):
-  make cli                        - Build server & client (all architectures)
-  make cli-linux-amd64            - Build server & client (Linux, amd64 only)
-  make cli-linux-armv6            - Build server & client (Linux, armv6 only)
-  make cli-linux-armv7            - Build server & client (Linux, armv7 only)
-  make cli-linux-arm64            - Build server & client (Linux, arm64 only)
-  make cli-windows-amd64          - Build client (Windows, amd64 only)
-  make cli-darwin-all             - Build client (macOS, arm64+amd64 universal binary)
-```
-
-So if you're on an amd64/x86_64-based machine, you may just want to run `make cli-linux-amd64` during testing. On a modern
-system, this shouldn't take longer than 5-10 seconds. I often combine it with `install-linux-amd64` so I can run the binary
-right away:
-
-``` shell
-$ make cli-linux-amd64 install-linux-amd64
-$ ntfy serve
-```
-
-**During development of the main app, you can also just use `go run main.go`**, as long as you run 
-`make cli-deps-static-sites`at least once and `CGO_ENABLED=1`:
-
-``` shell
-$ export CGO_ENABLED=1
-$ make cli-deps-static-sites
-$ go run main.go serve
-2022/03/18 08:43:55 Listening on :2586[http]
-...
-```
-
-If you don't run `cli-deps-static-sites`, you may see an error *`pattern ...: no matching files found`*:
-```
-$ go run main.go serve
-server/server.go:85:13: pattern docs: no matching files found
-```
-
-This is because we use `go:embed` to embed the documentation and web app, so the Go code expects files to be
-present at `server/docs` and `server/site`. If they are not, you'll see the above error. The `cli-deps-static-sites`
-target creates dummy files that ensure that you'll be able to build.
-
-While not officially supported (or released), you can build and run the server **on macOS** as well. Simply run 
-`make cli-darwin-server` to build a binary, or `go run main.go serve` (see above) to run it.
-
-### Build the web app
-The sources for the web app live in `web/`. As long as you have `npm` installed (see above), building the web app 
-is really simple. Just type `make web` and you're in business:
-
-``` shell
-$ make web
-...
-```
-
-This will build the web app using Create React App and then **copy the production build to the `server/site` folder**, so 
-that when you `make cli` (or `make cli-linux-amd64`, ...), you will have the web app included in the `ntfy` binary.
-
-If you're developing on the web app, it's best to just `cd web` and run `npm start` manually. This will open your browser
-at `http://127.0.0.1:3000` with the web app, and as you edit the source files, they will be recompiled and the browser 
-will automatically refresh:
-
-``` shell
-$ cd web
-$ npm start
-```
-
-### Testing Web Push locally
-
-Reference: <https://stackoverflow.com/questions/34160509/options-for-testing-service-workers-via-http>
-
-#### With the dev servers
-
-1. Get web push keys `go run main.go webpush keys`
-
-2. Run the server with web push enabled
-
-    ```sh
-    go run main.go \
-      --log-level debug \
-      serve \
-        --web-push-public-key KEY \
-        --web-push-private-key KEY \
-        --web-push-email-address <email> \
-        --web-push-file=/tmp/webpush.db
-    ```
-
-3. In `web/public/config.js`:
-
-   - Set `base_url` to `http://localhost`, This is required as web push can only be used with the server matching the `base_url`.
-
-   - Set the `web_push_public_key` correctly.
-
-4. Run `npm run start`
-
-#### With a built package
-
-1. Run `make web-build`
-
-2. Run the server (step 2 above)
-
-3. Open <http://localhost/>
-### Build the docs
-The sources for the docs live in `docs/`. Similarly to the web app, you can simply run `make docs` to build the 
-documentation. As long as you have `mkdocs` installed (see above), this should work fine:
-
-``` shell
-$ make docs
-...
-```
-
-If you are changing the documentation, you should be running `mkdocs serve` directly. This will build the documentation, 
-serve the files at `http://127.0.0.1:8000/`, and rebuild every time you save the source files: 
-
-```
-$ mkdocs serve
-INFO     -  Building documentation...
-INFO     -  Cleaning site directory
-INFO     -  Documentation built in 5.53 seconds
-INFO     -  [16:28:14] Serving on http://127.0.0.1:8000/
-```
-
-Then you can navigate to http://127.0.0.1:8000/ and whenever you change a markdown file in your text editor it'll automatically update.
-
-## Android app
-The ntfy Android app source code is available [on GitHub](https://github.com/binwiederhier/ntfy-android).
-The Android app has two flavors:
-
-* **Google Play:** The `play` flavor includes [Firebase (FCM)](https://firebase.google.com/) and requires a Firebase account
-* **F-Droid:** The `fdroid` flavor does not include Firebase or Google dependencies
-
-### Navigating the code
-* [main/](https://github.com/binwiederhier/ntfy-android/tree/main/app/src/main) - Main Android app source code
-* [play/](https://github.com/binwiederhier/ntfy-android/tree/main/app/src/play) - Google Play / Firebase specific code
-* [fdroid/](https://github.com/binwiederhier/ntfy-android/tree/main/app/src/fdroid) - F-Droid Firebase stubs
-* [build.gradle](https://github.com/binwiederhier/ntfy-android/blob/main/app/build.gradle) - Main build file
-
-### IDE/Environment
-You should download [Android Studio](https://developer.android.com/studio) (or [IntelliJ IDEA](https://www.jetbrains.com/idea/) 
-with the relevant Android plugins). Everything else will just be a pain for you. Do yourself a favor. 😀 
-
-### Check out the code
-First check out the repository:
-
-=== "via HTTPS"
-    ``` shell
-    git clone https://github.com/binwiederhier/ntfy-android.git
-    cd ntfy-android
-    ```
-
-=== "via SSH"
-    ``` shell
-    git clone git@github.com:binwiederhier/ntfy-android.git
-    cd ntfy-android
-    ```
-
-Then either follow the steps for building with or without Firebase.
-
-### Build F-Droid flavor (no FCM)
-!!! info
-    I do build the ntfy Android app using IntelliJ IDEA (Android Studio), so I don't know if these Gradle commands will
-    work without issues. Please give me feedback if it does/doesn't work for you.
-
-Without Firebase, you may want to still change the default `app_base_url` in [values.xml](https://github.com/binwiederhier/ntfy-android/blob/main/app/src/main/res/values/values.xml)
-if you're self-hosting the server. Then run:
-```
-# Remove Google dependencies (FCM)
-sed -i -e '/google-services/d' build.gradle
-sed -i -e '/google-services/d' app/build.gradle
-
-# To build an unsigned .apk (app/build/outputs/apk/fdroid/*.apk)
-./gradlew assembleFdroidRelease
-
-# To build a bundle .aab (app/fdroid/release/*.aab)
-./gradlew bundleFdroidRelease
-```
-
-### Build Play flavor (FCM)
-!!! info
-    I do build the ntfy Android app using IntelliJ IDEA (Android Studio), so I don't know if these Gradle commands will
-    work without issues. Please give me feedback if it does/doesn't work for you.
-
-To build your own version with Firebase, you must:
-
-* Create a Firebase/FCM account
-* Place your account file at `app/google-services.json`
-* And change `app_base_url` in [values.xml](https://github.com/binwiederhier/ntfy-android/blob/main/app/src/main/res/values/values.xml)
-* Then run:
-```
-# To build an unsigned .apk (app/build/outputs/apk/play/*.apk)
-./gradlew assemblePlayRelease
-
-# To build a bundle .aab (app/play/release/*.aab)
-./gradlew bundlePlayRelease
-```
-
-## iOS app
-Building the iOS app is very involved. Please report any inconsistencies or issues with it. The requirements are 
-strictly based off of my development on this app. There may be other versions of macOS / XCode that work.
-
-### Requirements
-1. macOS Monterey or later
-1. XCode 13.2+
-1. A physical iOS device (for push notifications, Firebase does not work in the XCode simulator)
-1. Firebase account
-1. Apple Developer license? (I forget if it's possible to do testing without purchasing the license)
-
-### Apple setup
-
-!!! info
-    Along with this step, the [PLIST Deployment](#plist-deployment-and-configuration) step is also required 
-    for these changes to take effect in the iOS app.
-
-1. [Create a new key in Apple Developer Member Center](https://developer.apple.com/account/resources/authkeys/add)
-  1. Select "Apple Push Notifications service (APNs)"
-1. Download the newly created key (should have a file name similar to `AuthKey_ZZZZZZ.p8`, where `ZZZZZZ` is the **Key ID**)
-1. Record your **Team ID** - it can be seen in the top-right corner of the page, or on your Account > Membership page
-1. Next, navigate to "Project Settings" in the firebase console for your project, and select the iOS app you created. Then, click "Cloud Messaging" in the left sidebar, and scroll down to the "APNs Authentication Key" section. Click "Upload Key", and upload the key you downloaded from Apple Developer.
-
-!!! warning  
-    If you don't do the above setups for APNS, **notifications will not post instantly or sometimes at all**. This is because of the missing APNS key, which is required for firebase to send notifications to the iOS app. See below for a snip from the firebase docs.
-
-If you don't have an APNs authentication key, you can still send notifications to iOS devices, but they won't be delivered
-instantly. Instead, they'll be delivered when the device wakes up to check for new notifications or when your application
-sends a firebase request to check for them. The time to check for new notifications can vary from a few seconds to hours,
-days or even weeks. Enabling APNs authentication keys ensures that notifications are delivered instantly and is strongly
-recommended.
-
-### Firebase setup
-
-1. If you haven't already, create a Google / Firebase account
-1. Visit the [Firebase console](https://console.firebase.google.com)
-1. Create a new Firebase project:
-  1. Enter a project name
-  1. Disable Google Analytics (currently iOS app does not support analytics)
-1. On the "Project settings" page, add an iOS app
-  1. Apple bundle ID - "com.copephobia.ntfy-ios" (this can be changed to match XCode's ntfy.sh target > "Bundle Identifier" value)
-  1. Register the app
-  1. Download the config file - GoogleInfo.plist (this will need to be included in the ntfy-ios repository / XCode)
-1. Generate a new service account private key for the ntfy server
-  1. Go to "Project settings" > "Service accounts"
-  1. Click "Generate new private key" to generate and download a private key to use for sending messages via the ntfy server
-
-### ntfy server
-Note that the ntfy server is not officially supported on macOS. It should, however, be able to run on macOS using these
-steps:
-
-1. If not already made, make the `/etc/ntfy/` directory and move the service account private key to that folder
-1. Copy the `server/server.yml` file from the ntfy repository to `/etc/ntfy/`
-1. Modify the `/etc/ntfy/server.yml` file `firebase-key-file` value to the path of the private key
-1. Install go: `brew install go`
-1. In the ntfy repository, run `make cli-darwin-server`.
-
-### XCode setup
-
-1. Follow step 4 of [Add Firebase to your Apple project](https://firebase.google.com/docs/ios/setup) to install the 
-   `firebase-ios-sdk` in XCode, if it's not already present - you can select any packages in addition to Firebase Core / Firebase Messaging
-1. Similarly, install the SQLite.swift package dependency in XCode
-1. When running the debug build, ensure XCode is pointed to the connected iOS device - registering for push notifications does not work in the iOS simulators
-
-### PLIST config
-To have instant notifications/better notification delivery when using firebase, you will need to add the 
-`GoogleService-Info.plist` file to your project. Here's how to do that:
-
-1. In XCode, find the NTFY app target. **Not** the NSE app target.
-1. Find the Asset/ folder in the project navigator
-1. Drag the `GoogleService-Info.plist` file into the Asset/ folder that you get from the firebase console. It can be 
-   found in the "Project settings" > "General" > "Your apps"  with a button labled "GoogleService-Info.plist"
-
-After that, you should be all set!

docs/examples.md

@@ -1,619 +0,0 @@
-# Examples
-
-There are a million ways to use ntfy, but here are some inspirations. I try to collect
-<a href="https://github.com/binwiederhier/ntfy/tree/main/examples">examples on GitHub</a>, so be sure to check
-those out, too.
-
-!!! info
-    Many of these examples were contributed by ntfy users. If you have other examples of how you use ntfy, please
-    [create a pull request](https://github.com/binwiederhier/ntfy/pulls), and I'll happily include it. Also note, that
-    I cannot guarantee that all of these examples are functional. Many of them I have not tried myself.
-
-## Cronjobs
-ntfy is perfect for any kind of cronjobs or just when long processes are done (backups, pipelines, rsync copy commands, ...).
-
-I started adding notifications pretty much all of my scripts. Typically, I just chain the <tt>curl</tt> call
-directly to the command I'm running. The following example will either send <i>Laptop backup succeeded</i>
-or ⚠️ <i>Laptop backup failed</i> directly to my phone:
-
-``` bash
-rsync -a root@laptop /backups/laptop \
-  && zfs snapshot ... \
-  && curl -H prio:low -d "Laptop backup succeeded" ntfy.sh/backups \
-  || curl -H tags:warning -H prio:high -d "Laptop backup failed" ntfy.sh/backups
-```
-
-Here's one for the history books. I desperately want the `github.com/ntfy` organization, but all my tickets with
-GitHub have been hopeless. In case it ever becomes available, I want to know immediately.
-
-```
-# Check github/ntfy user
-*/6 * * * * if curl -s https://api.github.com/users/ntfy | grep "Not Found"; then curl -d "github.com/ntfy is available" -H "Tags: tada" -H "Prio: high" ntfy.sh/my-alerts; fi
-```
-
-
-## Low disk space alerts
-Here's a simple cronjob that I use to alert me when the disk space on the root disk is running low. It's simple, but 
-effective. 
-
-``` bash 
-#!/bin/bash
-
-mingigs=10
-avail=$(df | awk '$6 == "/" && $4 < '$mingigs' * 1024*1024 { print $4/1024/1024 }')
-topicurl=https://ntfy.sh/mytopic
-
-if [ -n "$avail" ]; then
-  curl \
-    -d "Only $avail GB available on the root disk. Better clean that up." \
-    -H "Title: Low disk space alert on $(hostname)" \
-    -H "Priority: high" \
-    -H "Tags: warning,cd" \
-    $topicurl
-fi
-```
-
-## SSH login alerts
-Years ago my home server was broken into. That shook me hard, so every time someone logs into any machine that I
-own, I now message myself. Here's an example of how to use <a href="https://en.wikipedia.org/wiki/Linux_PAM">PAM</a>
-to notify yourself on SSH login.
-
-=== "/etc/pam.d/sshd"
-    ```
-    # at the end of the file
-    session optional pam_exec.so /usr/bin/ntfy-ssh-login.sh
-    ```
-
-=== "/usr/bin/ntfy-ssh-login.sh"
-    ```bash
-    #!/bin/bash
-    if [ "${PAM_TYPE}" = "open_session" ]; then
-      curl \
-        -H prio:high \
-        -H tags:warning \
-        -d "SSH login: ${PAM_USER} from ${PAM_RHOST}" \
-        ntfy.sh/alerts
-    fi
-    ```
-
-## Collect data from multiple machines
-The other day I was running tasks on 20 servers, and I wanted to collect the interim results
-as a CSV in one place. Each of the servers was publishing to a topic as the results completed (`publish-result.sh`), 
-and I had one central collector to grab the results as they came in (`collect-results.sh`).
-
-It looked something like this:
-
-=== "collect-results.sh"
-    ```bash
-    while read result; do
-      [ -n "$result" ] && echo "$result" >> results.csv
-    done < <(stdbuf -i0 -o0 curl -s ntfy.sh/results/raw)
-    ```
-=== "publish-result.sh" 
-    ```bash
-    // This script was run on each of the 20 servers. It was doing heavy processing ...
-    
-    // Publish script results
-    curl -d "$(hostname),$count,$time" ntfy.sh/results
-    ```
-
-## Ansible, Salt and Puppet
-You can easily integrate ntfy into Ansible, Salt, or Puppet to notify you when runs are done or are highstated.
-One of my co-workers uses the following Ansible task to let him know when things are done:
-
-``` yaml
-- name: Send ntfy.sh update
-  uri:
-    url: "https://ntfy.sh/{{ ntfy_channel }}"
-    method: POST
-    body: "{{ inventory_hostname }} reseeding complete"
-```
-
-There's also a dedicated Ansible action plugin (one which runs on the Ansible controller) called
-[ansible-ntfy](https://github.com/jpmens/ansible-ntfy). The following task posts a message
-to ntfy at its default URL (`attrs` and other attributes are optional):
-
-``` yaml
-- name: "Notify ntfy that we're done"
-  ntfy:
-       msg: "deployment on {{ inventory_hostname }} is complete. 🐄"
-       attrs:
-          tags: [ heavy_check_mark ]
-          priority: 1
-```
-
-## GitHub Actions
-You can send a message during a workflow run with curl. Here is an example sending info about the repo, commit and job status.
-``` yaml
-- name: Actions Ntfy
-  run: |
-    curl \
-      -u ${{ secrets.NTFY_CRED }} \
-      -H "Title: Title here" \
-      -H "Content-Type: text/plain" \
-      -d $'Repo: ${{ github.repository }}\nCommit: ${{ github.sha }}\nRef: ${{ github.ref }}\nStatus: ${{ job.status}}' \
-      ${{ secrets.NTFY_URL }}
-```
-
-## Changedetection.io
-ntfy is an excellent choice for getting notifications when a website has a change sent to your mobile (or desktop), 
-[changedetection.io](https://changedetection.io) or on GitHub ([dgtlmoon/changedetection.io](https://github.com/dgtlmoon/changedetection.io)) 
-uses [apprise](https://github.com/caronc/apprise) library for notification integrations.
-
-To add any ntfy(s) notification to a website change simply add the [ntfy style URL](https://github.com/caronc/apprise/wiki/Notify_ntfy) 
-to the notification list.
-
-For example `ntfy://{topic}` or `ntfy://{user}:{password}@{host}:{port}/{topics}`
-
-In your changedetection.io installation, click `Edit` > `Notifications` on a single website watch (or group) then add 
-the special ntfy Apprise Notification URL to the Notification List.
-
-![ntfy alerts on website change](static/img/cdio-setup.jpg)
-
-## Watchtower (shoutrrr)
-You can use [shoutrrr](https://containrrr.dev/shoutrrr/latest/services/ntfy/) to send 
-[Watchtower](https://github.com/containrrr/watchtower/) notifications to your ntfy topic.
-
-Example docker-compose.yml:
-
-``` yaml
-services:
-  watchtower:
-    image: containrrr/watchtower
-    environment:
-      - WATCHTOWER_NOTIFICATIONS=shoutrrr
-      - WATCHTOWER_NOTIFICATION_URL=ntfy://ntfy.sh/my_watchtower_topic?title=WatchtowerUpdates
-```
-
-Or, if you only want to send notifications using shoutrrr:
-```
-shoutrrr send -u "ntfy://ntfy.sh/my_watchtower_topic?title=WatchtowerUpdates" -m "testMessage"
-```
-
-## Sonarr, Radarr, Lidarr, Readarr, Prowlarr, SABnzbd
-
-<!-- Sonarr v4 is in beta as of May 2023, should be updated to remove v3 reference when stable -->
-
-Radarr, Prowlarr, and Sonarr v4 support ntfy natively under Settings > Connect.
-
-Sonarr v3, Readarr, and SABnzbd support custom scripts for downloads, warnings, grabs, etc.
-Some simple bash scripts to achieve this are kindly provided in [nickexyz's ntfy-shellscripts repository](https://github.com/nickexyz/ntfy-shellscripts).
-
-## Node-RED
-You can use the HTTP request node to send messages with [Node-RED](https://nodered.org), some examples:
-
-<details>
-<summary>Example: Send a message (click to expand)</summary>
-
-``` json
-[
-    {
-        "id": "c956e688cc74ad8e",
-        "type": "http request",
-        "z": "fabdd7a3.4045a",
-        "name": "ntfy.sh",
-        "method": "POST",
-        "ret": "txt",
-        "paytoqs": "ignore",
-        "url": "https://ntfy.sh/mytopic",
-        "tls": "",
-        "persist": false,
-        "proxy": "",
-        "authType": "",
-        "senderr": false,
-        "credentials":
-        {
-            "user": "",
-            "password": ""
-        },
-        "x": 590,
-        "y": 3160,
-        "wires":
-        [
-            []
-        ]
-    },
-    {
-        "id": "32ee1eade51fae50",
-        "type": "function",
-        "z": "fabdd7a3.4045a",
-        "name": "data",
-        "func": "msg.payload = \"Something happened\";\nmsg.headers = {};\nmsg.headers['tags'] = 'house';\nmsg.headers['X-Title'] = 'Home Assistant';\n\nreturn msg;",
-        "outputs": 1,
-        "noerr": 0,
-        "initialize": "",
-        "finalize": "",
-        "libs": [],
-        "x": 470,
-        "y": 3160,
-        "wires":
-        [
-            [
-                "c956e688cc74ad8e"
-            ]
-        ]
-    },
-    {
-        "id": "b287e59cd2311815",
-        "type": "inject",
-        "z": "fabdd7a3.4045a",
-        "name": "Manual start",
-        "props":
-        [
-            {
-                "p": "payload"
-            },
-            {
-                "p": "topic",
-                "vt": "str"
-            }
-        ],
-        "repeat": "",
-        "crontab": "",
-        "once": false,
-        "onceDelay": "20",
-        "topic": "",
-        "payload": "",
-        "payloadType": "date",
-        "x": 330,
-        "y": 3160,
-        "wires":
-        [
-            [
-                "32ee1eade51fae50"
-            ]
-        ]
-    }
-]
-```
-
-</details>
-
-![Node red message flow](static/img/nodered-message.png)
-
-<details>
-<summary>Example: Send a picture (click to expand)</summary>
-
-``` json
-[
-    {
-        "id": "d135a13eadeb9d6d",
-        "type": "http request",
-        "z": "fabdd7a3.4045a",
-        "name": "Download image",
-        "method": "GET",
-        "ret": "bin",
-        "paytoqs": "ignore",
-        "url": "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png",
-        "tls": "",
-        "persist": false,
-        "proxy": "",
-        "authType": "",
-        "senderr": false,
-        "credentials":
-        {
-            "user": "",
-            "password": ""
-        },
-        "x": 490,
-        "y": 3320,
-        "wires":
-        [
-            [
-                "6e75bc41d2ec4a03"
-            ]
-        ]
-    },
-    {
-        "id": "6e75bc41d2ec4a03",
-        "type": "function",
-        "z": "fabdd7a3.4045a",
-        "name": "data",
-        "func": "msg.payload = msg.payload;\nmsg.headers = {};\nmsg.headers['tags'] = 'house';\nmsg.headers['X-Title'] = 'Home Assistant - Picture';\n\nreturn msg;",
-        "outputs": 1,
-        "noerr": 0,
-        "initialize": "",
-        "finalize": "",
-        "libs": [],
-        "x": 650,
-        "y": 3320,
-        "wires":
-        [
-            [
-                "eb160615b6ceda98"
-            ]
-        ]
-    },
-    {
-        "id": "eb160615b6ceda98",
-        "type": "http request",
-        "z": "fabdd7a3.4045a",
-        "name": "ntfy.sh",
-        "method": "PUT",
-        "ret": "bin",
-        "paytoqs": "ignore",
-        "url": "https://ntfy.sh/mytopic",
-        "tls": "",
-        "persist": false,
-        "proxy": "",
-        "authType": "",
-        "senderr": false,
-        "credentials":
-        {
-            "user": "",
-            "password": ""
-        },
-        "x": 770,
-        "y": 3320,
-        "wires":
-        [
-            []
-        ]
-    },
-    {
-        "id": "5b8dbf15c8a7a3a5",
-        "type": "inject",
-        "z": "fabdd7a3.4045a",
-        "name": "Manual start",
-        "props":
-        [
-            {
-                "p": "payload"
-            },
-            {
-                "p": "topic",
-                "vt": "str"
-            }
-        ],
-        "repeat": "",
-        "crontab": "",
-        "once": false,
-        "onceDelay": "20",
-        "topic": "",
-        "payload": "",
-        "payloadType": "date",
-        "x": 310,
-        "y": 3320,
-        "wires":
-        [
-            [
-                "d135a13eadeb9d6d"
-            ]
-        ]
-    }
-]
-```
-
-</details>
-
-![Node red picture flow](static/img/nodered-picture.png)
-
-## Gatus
-To use ntfy with [Gatus](https://github.com/TwiN/gatus), you can use the `ntfy` alerting provider like so:
-
-```yaml
-alerting:
-  ntfy:
-    url: "https://ntfy.sh"
-    topic: "YOUR_NTFY_TOPIC"
-    priority: 3
-```
-
-For more information on using ntfy with Gatus, refer to [Configuring ntfy alerts](https://github.com/TwiN/gatus#configuring-ntfy-alerts).
-
-<details>
-  <summary>Alternative: Using the custom alerting provider</summary>
-
-```yaml
-alerting:
-  custom:
-    url: "https://ntfy.sh"
-    method: "POST"
-    body: |
-      {
-        "topic": "mytopic",
-        "message": "[ENDPOINT_NAME] - [ALERT_DESCRIPTION]",
-        "title": "Gatus",
-        "tags": ["[ALERT_TRIGGERED_OR_RESOLVED]"],
-        "priority": 3
-      }
-    default-alert:
-      enabled: true
-      description: "health check failed"
-      send-on-resolved: true
-      failure-threshold: 3
-      success-threshold: 3
-    placeholders:
-      ALERT_TRIGGERED_OR_RESOLVED:
-        TRIGGERED: "warning"
-        RESOLVED: "white_check_mark"
-```
-
-</details>
-
-
-## Jellyseerr/Overseerr webhook
-Here is an example for [jellyseerr](https://github.com/Fallenbagel/jellyseerr)/[overseerr](https://overseerr.dev/) webhook
-JSON payload. Remember to change the `https://request.example.com` to your URL as the value of the JSON key click. 
-And if you're not using the request `topic`, make sure to change it in the JSON payload to your topic.
-
-``` json
-{
-    "topic": "requests",
-    "title": "{{event}}",
-    "message": "{{subject}}\n{{message}}\n\nRequested by: {{requestedBy_username}}\n\nStatus: {{media_status}}\nRequest Id: {{request_id}}",
-    "priority": 4,
-    "attach": "{{image}}",
-    "click": "https://requests.example.com/{{media_type}}/{{media_tmdbid}}"
-}
-```
-
-## Home Assistant
-Here is an example for the configuration.yml file to setup a REST notify component.
-Since Home Assistant is going to POST JSON, you need to specify the root of your ntfy resource.
-
-```yaml
-notify:
-  - name: ntfy
-    platform: rest
-    method: POST_JSON
-    data:
-      topic: YOUR_NTFY_TOPIC
-    title_param_name: title
-    message_param_name: message
-    resource: https://ntfy.sh
-```
-
-If you need to authenticate to your ntfy resource, define the authentication, username and password as below:
-
-```yaml
-notify:
-  - name: ntfy
-    platform: rest
-    method: POST_JSON
-    authentication: basic
-    username: YOUR_USERNAME
-    password: YOUR_PASSWORD
-    data:
-      topic: YOUR_NTFY_TOPIC
-    title_param_name: title
-    message_param_name: message
-    resource: https://ntfy.sh
-```
-
-If you need to add any other [ntfy specific parameters](https://ntfy.sh/docs/publish/#publish-as-json) such as priority, tags, etc., add them to the `data` array in the example yml. For example:
-
-```yaml
-notify:
-  - name: ntfy
-    platform: rest
-    method: POST_JSON
-    data:
-      topic: YOUR_NTFY_TOPIC
-      priority: 4
-    title_param_name: title
-    message_param_name: message
-    resource: https://ntfy.sh
-```
-
-## Uptime Kuma
-Go to your [Uptime Kuma](https://github.com/louislam/uptime-kuma) Settings > Notifications, click on **Setup Notification**.
-Then set your desired **title** (e.g. "Uptime Kuma"), **ntfy topic**, **Server URL** and **priority (1-5)**:
-
-<div id="uptimekuma-screenshots" class="screenshots">
-    <a href="../static/img/uptimekuma-settings.png"><img src="../static/img/uptimekuma-settings.png"/></a>
-    <a href="../static/img/uptimekuma-setup.png"><img src="../static/img/uptimekuma-setup.png"/></a>
-</div>
-
-You can now test the notifications and apply them to monitors:
-
-<div id="uptimekuma-monitor-screenshots" class="screenshots">
-    <a href="../static/img/uptimekuma-ios-test.jpg"><img src="../static/img/uptimekuma-ios-test.jpg"/></a>
-    <a href="../static/img/uptimekuma-ios-down.jpg"><img src="../static/img/uptimekuma-ios-down.jpg"/></a>
-    <a href="../static/img/uptimekuma-ios-up.jpg"><img src="../static/img/uptimekuma-ios-up.jpg"/></a>
-</div>
-
-## UptimeRobot
-Go to your [UptimeRobot](https://github.com/uptimerobot) My Settings > Alert Contacts > Add Alert Contact
-Select **Alert Contact Type** = Webhook. Then set your desired **Friendly Name** (e.g. "ntfy-sh-UP"), **URL to Notify**, **POST value** and select checkbox **Send as JSON (application/json)**. Make sure to send the JSON POST request to ntfy.domain.com without the topic name in the url and include the "topic" name in the JSON body.
-
-<div id="uptimerobot-monitor-setup" class="screenshots">
-    <a href="../static/img/uptimerobot-setup.jpg"><img src="../static/img/uptimerobot-setup.jpg"/></a>
-</div>
-
-``` json
-{
-    "topic":"myTopic",
-    "title": "*monitorFriendlyName* *alertTypeFriendlyName*",
-    "message": "*alertDetails*", 
-    "tags": ["green_circle"],
-    "priority": 3,
-    "click": https://uptimerobot.com/dashboard#*monitorID*
-}
-```
-You can create two Alert Contacts each with a different icon and priority, for example:
-
-``` json
-{
-    "topic":"myTopic",
-    "title": "*monitorFriendlyName* *alertTypeFriendlyName*",
-    "message": "*alertDetails*", 
-    "tags": ["red_circle"],
-    "priority": 3,
-    "click": https://uptimerobot.com/dashboard#*monitorID*
-}
-```
-You can now add the created Alerts Contact(s) to the monitor(s) and test the notifications:
-
-<div id="uptimerobot-monitor-screenshots" class="screenshots">
-    <a href="../static/img/uptimerobot-test.jpg"><img src="../static/img/uptimerobot-test.jpg"/></a>
-</div>
-
-
-## Apprise
-ntfy is integrated natively into [Apprise](https://github.com/caronc/apprise) (also check out the 
-[Apprise/ntfy wiki page](https://github.com/caronc/apprise/wiki/Notify_ntfy)).
-
-You can use it like this:
-
-```
-apprise -vv -t "Test Message Title" -b "Test Message Body" \
-   ntfy://mytopic
-```
-
-Or with your own server like this:
-
-```
-apprise -vv -t "Test Message Title" -b "Test Message Body" \
-   ntfy://ntfy.example.com/mytopic
-```
-
-
-## Rundeck
-Rundeck by default sends only HTML email which is not processed by ntfy SMTP server. Append following configurations to 
-[rundeck-config.properties](https://docs.rundeck.com/docs/administration/configuration/config-file-reference.html) :
-
-```
-# Template
-rundeck.mail.template.file=/path/to/template.html
-rundeck.mail.template.log.formatted=false
-```
-
-Example `template.html`:
-```html
-<div>Execution ${execution.id} was <b>${execution.status}</b></div>
-<ul>
-    <li><a href="${execution.href}">Execution result</a></li>
-    <li><a href="${job.href}">Job</a></li>
-    <li><a href="${execution.projectHref}">Project: ${execution.project}</a></li>
-    <li><a href="${rundeck.href}">Rundeck</a></li>
-</ul>
-```
-
-Add notification on Rundeck (attachment type must be: `Attached as file to email`):
-![Rundeck](static/img/rundeck.png)
-
-## Traccar
-This will only work on selfhosted [traccar](https://www.traccar.org/) ([Github](https://github.com/traccar/traccar)) instances, as you need to be able to set `sms.http.*` keys, which is not possible through the UI attributes
-
-The easiest way to integrate traccar with ntfy, is to configure ntfy as the SMS provider for your instance. You then can set your ntfy topic as your account's phone number in traccar. Sending the email notifications to ntfy will not work, as ntfy does not support HTML emails.
-
-**Caution:** JSON publishing is only possible, when POST-ing to the root URL of the ntfy instance. (see [documentation](publish.md#publish-as-json))
-```xml
-        <entry key='sms.http.url'>https://ntfy.sh</entry>
-        <entry key='sms.http.template'>
-            {
-                "topic": "{phone}",
-                "message": "{message}"
-            }
-        </entry>
-```
-If [access control](config.md#access-control) is enabled, and the target topic does not support anonymous writes, you'll also have to provide an authorization header, for example in form of a privileged token
-```xml
-        <entry key='sms.http.authorization'>Bearer tk_JhbsnoMrgy2FcfHeofv97Pi5uXaZZ</entry>
-```
-or by simply providing traccar with a valid username/password combination.
-```xml
-        <entry key='sms.http.user'>phil</entry>
-        <entry key='sms.http.password'>mypass</entry>
-```

docs/faq.md

@@ -1,104 +0,0 @@
-# Frequently asked questions (FAQ)
-
-## Isn't this like ...?
-Who knows. I didn't do a lot of research before making this. It was fun making it.
-
-## Can I use this in my app? Will it stay free?
-Yes. As long as you don't abuse it, it'll be available and free of charge. While I will always allow usage of the ntfy.sh
-server without signup and free of charge, I may also offer paid plans in the future.
-
-## What are the uptime guarantees?
-Best effort. 
-
-ntfy currently runs on a single DigitalOcean droplet, without any scale out strategy or redundancies. When the time comes,
-I'll add scale out features, but for now it is what it is.
-
-In the first year of its life, and to this day (Dec'22), ntfy had **no outages** that I can remember. Other than short 
-blips and some HTTP 500 spikes, it has been rock solid.   
-
-There is a [status page](https://ntfy.statuspage.io/) which is updated based on some automated checks via the amazingly 
-awesome [healthchecks.io](https://healthchecks.io/) (_no affiliation, just a fan_).
-
-## What happens if there are multiple subscribers to the same topic?
-As per usual with pub-sub, all subscribers receive notifications if they are subscribed to a topic.
-
-## Will you know what topics exist, can you spy on me?
-If you don't trust me or your messages are sensitive, run your own server. It's open source.
-That said, the logs do contain topic names and IP addresses, but I don't use them for anything other than
-troubleshooting and rate limiting. Messages are cached for the duration configured in `server.yml` (12h by default) 
-to facilitate service restarts, message polling and to overcome client network disruptions.
-
-## Can I self-host it?
-Yes. The server (including this Web UI) can be self-hosted, and the Android/iOS app supports adding topics from
-your own server as well. Check out the [install instructions](install.md).
-
-## Is Firebase used?
-In addition to caching messages locally and delivering them to long-polling subscribers, all messages are also
-published to Firebase Cloud Messaging (FCM) (if `FirebaseKeyFile` is set, which it is on ntfy.sh). This
-is to facilitate notifications on Android. 
-
-If you do not care for Firebase, I suggest you install the [F-Droid version](https://f-droid.org/en/packages/io.heckel.ntfy/)
-of the app and [self-host your own ntfy server](install.md).
-
-## How much battery does the Android app use?
-If you use the ntfy.sh server, and you don't use the [instant delivery](subscribe/phone.md#instant-delivery) feature, 
-the Android/iOS app uses no additional battery, since Firebase Cloud Messaging (FCM) is used. If you use your own server, 
-or you use *instant delivery* (Android only),  or install from F-droid ([which does not support FCM](https://f-droid.org/docs/Inclusion_Policy/)),
-the app has to maintain a constant connection to the server, which consumes about 0-1% of battery in 17h of use (on my phone). 
-There has been a ton of testing and improvement around this. I think it's pretty decent now.
-
-## Paid plans? I thought it was open source?
-All of ntfy will remain open source, with a free software license (Apache 2.0 and GPLv2). If you'd like to self-host, you
-can (and should do that). The paid plans I am offering are for people that do not want to self-host, and/or need higher
-limits.
-
-## What is instant delivery?
-[Instant delivery](subscribe/phone.md#instant-delivery) is a feature in the Android app. If turned on, the app maintains a constant connection to the
-server and listens for incoming notifications. This consumes additional battery (see above),
-but delivers notifications instantly.
-
-## Can you implement feature X?
-Yes, maybe. Check out [existing GitHub issues](https://github.com/binwiederhier/ntfy/issues) to see if somebody else had
-the same idea before you, or file a new issue. I'll likely get back to you within a few days.
-
-## I'm having issues with iOS, can you help? The iOS app is behind compared to the Android app, can you fix that?
-The iOS is very bare bones and quite frankly a little buggy. I wanted to get something out the door to make the iOS users
-happy, but halfway through I got frustrated with iOS development and paused development. I will eventually get back to
-it, or hopefully, somebody else will come along and help out. Please review the [known issues](known-issues.md) for details.
-
-## Can I disable the web app? Can I protect it with a login screen?
-The web app is a static website without a backend (other than the ntfy API). All data is stored locally in the browser
-cache and local storage. That means it does not need to be protected with a login screen, and it poses no additional 
-security risk. So technically, it does not need to be disabled.
-
-However, if you still want to disable it, you can do so with the `web-root: disable` option in the `server.yml` file. 
-
-Think of the ntfy web app like an Android/iOS app. It is freely available and accessible to anyone, yet useless without
-a proper backend. So as long as you secure your backend with ACLs, exposing the ntfy web app to the Internet is harmless.
-
-## If topic names are public, could I not just brute force them?
-If you don't have [ACLs set up](config.md#access-control), the topic name is your password, it says so everywhere. If you
-choose a easy-to-guess/dumb topic name, people will be able to guess it. If you choose a randomly generated topic name,
-the topic is as good as a good password.
-
-As for brute forcing: It's not possible to brute force a ntfy server for very long, as you'll get quickly rate limited.
-In the default configuration, you'll be able to do 60 requests as a burst, and then 1 request per 10 seconds. Assuming you
-choose a random 10 digit topic name using only A-Z, a-z, 0-9, _ and -, there are 64^10 possible topic names. Even if you
-could do hundreds of requests per seconds (which you cannot), it would take many years to brute force a topic name.
-
-For ntfy.sh, there's even a fail2ban in place which will ban your IP pretty quickly.
-
-## Where can I donate?
-I have just very recently started accepting donations via [GitHub Sponsors](https://github.com/sponsors/binwiederhier).
-I would be humbled if you helped me carry the server and developer account costs. Even small donations are very much
-appreciated.
-
-## Can I email you? Can I DM you on Discord/Matrix?
-While I love chatting on [Discord](https://discord.gg/cT7ECsZj9w), [Matrix](https://matrix.to/#/#ntfy-space:matrix.org), 
-[Lemmy](https://discuss.ntfy.sh/c/ntfy), or [GitHub](https://github.com/binwiederhier/ntfy/issues), I generally 
-**do not respond to emails about ntfy or direct messages** about ntfy, unless you are paying for a 
-[ntfy Pro](https://ntfy.sh/#pricing) plan, or you are inquiring about business opportunities. 
-
-I am sorry, but answering individual questions about ntfy on a 1-on-1 basis is not scalable. Answering your questions 
-in the above-mentioned forums benefits others, since I can link to the discussion at a later point in time, or other users
-may be able to help out. I hope you understand.

docs/hooks.py

@@ -1,6 +0,0 @@
-import os
-import shutil
-
-def copy_fonts(config, **kwargs):
-    site_dir = config['site_dir']
-    shutil.copytree('docs/static/fonts', os.path.join(site_dir, 'get'))

docs/index.md

@@ -1,95 +0,0 @@
-# Getting started
-ntfy lets you **send push notifications to your phone or desktop via scripts from any computer**, using simple HTTP PUT
-or POST requests. I use it to notify myself when scripts fail, or long-running commands complete.
-
-## Step 1: Get the app
-<a href="https://play.google.com/store/apps/details?id=io.heckel.ntfy"><img src="../../static/img/badge-googleplay.png"></a>
-<a href="https://f-droid.org/en/packages/io.heckel.ntfy/"><img src="../../static/img/badge-fdroid.png"></a>
-<a href="https://apps.apple.com/us/app/ntfy/id1625396347"><img src="../../static/img/badge-appstore.png"></a>
-
-To [receive notifications on your phone](subscribe/phone.md), install the app, either via Google Play or F-Droid.
-Once installed, open it and subscribe to a topic of your choosing. Topics don't have to explicitly be created, so just
-pick a name and use it later when you [publish a message](publish.md). Note that **topic names are public, so it's wise 
-to choose something that cannot be guessed easily.** 
-
-For this guide, we'll just use `mytopic` as our topic name:
-
-<figure markdown>
-  ![adding a topic](static/img/getting-started-add.png){ width=500 }
-  <figcaption>Creating/adding your first topic</figcaption>
-</figure>
-
-That's it. After you tap "Subscribe", the app is listening for new messages on that topic.
-
-## Step 2: Send a message
-Now let's [send a message](publish.md) to our topic. It's easy in every language, since we're just using HTTP PUT/POST,
-or with the [ntfy CLI](install.md). The message is in the request body. Here's an example showing how to publish a 
-simple message using a POST request:
-
-=== "Command line (curl)"
-    ```
-    curl -d "Backup successful 😀" ntfy.sh/mytopic
-    ```
-
-=== "ntfy CLI"
-    ```
-    ntfy publish mytopic "Backup successful 😀"
-    ```
-
-=== "HTTP"
-    ``` http
-    POST /mytopic HTTP/1.1
-    Host: ntfy.sh
-    
-    Backup successful 😀
-    ```
-
-=== "JavaScript"
-    ``` javascript
-    fetch('https://ntfy.sh/mytopic', {
-        method: 'POST', // PUT works too
-        body: 'Backup successful 😀'
-    })
-    ```
-
-=== "Go"
-    ``` go
-    http.Post("https://ntfy.sh/mytopic", "text/plain",
-       strings.NewReader("Backup successful 😀"))
-    ```
-
-=== "Python"
-    ``` python
-    requests.post("https://ntfy.sh/mytopic",
-        data="Backup successful 😀".encode(encoding='utf-8'))
-    ```
-
-=== "PHP"
-    ``` php-inline
-    file_get_contents('https://ntfy.sh/mytopic', false, stream_context_create([
-        'http' => [
-            'method' => 'POST', // PUT also works
-            'header' => 'Content-Type: text/plain',
-            'content' => 'Backup successful 😀'
-        ]
-    ]));
-    ```
-
-This will create a notification that looks like this:
-
-<figure markdown>
-  ![basic notification](static/img/android-screenshot-basic-notification.png){ width=500 }
-  <figcaption>Android notification</figcaption>
-</figure>
-
-That's it. You're all set. Go play and read the rest of the docs. I highly recommend reading at least the page on
-[publishing messages](publish.md), as well as the detailed page on the [Android/iOS app](subscribe/phone.md).
-
-Here's another video showing the entire process:
-
-<figure>
-  <video controls muted autoplay loop width="650" src="static/img/android-video-overview.mp4"></video>
-  <figcaption>Sending push notifications to your Android phone</figcaption>
-</figure>
-
-

docs/install.md

@@ -1,613 +0,0 @@
-# Installing ntfy
-The `ntfy` CLI allows you to [publish messages](publish.md), [subscribe to topics](subscribe/cli.md) as well as to
-self-host your own ntfy server. It's all pretty straight forward. Just install the binary, package or Docker image, 
-configure it and run it. Just like any other software. No fuzz. 
-
-!!! info
-    The following steps are only required if you want to **self-host your own ntfy server or you want to use the ntfy CLI**.
-    If you just want to [send messages using ntfy.sh](publish.md), you don't need to install anything. You can just use
-    `curl`.
-
-## General steps
-The ntfy server comes as a statically linked binary and is shipped as tarball, deb/rpm packages and as a Docker image.
-We support amd64, armv7 and arm64.
-
-1. Install ntfy using one of the methods described below
-2. Then (optionally) edit `/etc/ntfy/server.yml` for the server (Linux only, see [configuration](config.md) or [sample server.yml](https://github.com/binwiederhier/ntfy/blob/main/server/server.yml))
-3. Or (optionally) create/edit `~/.config/ntfy/client.yml` (for the non-root user), `~/Library/Application Support/ntfy/client.yml` (for the macOS non-root user), or `/etc/ntfy/client.yml` (for the root user), see [sample client.yml](https://github.com/binwiederhier/ntfy/blob/main/client/client.yml))
-
-To run the ntfy server, then just run `ntfy serve` (or `systemctl start ntfy` when using the deb/rpm).
-To send messages, use `ntfy publish`. To subscribe to topics, use `ntfy subscribe` (see [subscribing via CLI](subscribe/cli.md)
-for details). 
-
-If you like tutorials, check out :simple-youtube: [Kris Occhipinti's ntfy install guide](https://www.youtube.com/watch?v=bZzqrX05mNU) on YouTube, or
-[Alex's Docker-based setup guide](https://blog.alexsguardian.net/posts/2023/09/12/selfhosting-ntfy/). Both are great
-resources to get started. _I am not affiliated with Kris or Alex, I just liked their video/post._
-
-## Linux binaries
-Please check out the [releases page](https://github.com/binwiederhier/ntfy/releases) for binaries and
-deb/rpm packages.
-
-=== "x86_64/amd64"
-    ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_amd64.tar.gz
-    tar zxvf ntfy_2.7.0_linux_amd64.tar.gz
-    sudo cp -a ntfy_2.7.0_linux_amd64/ntfy /usr/local/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.7.0_linux_amd64/{client,server}/*.yml /etc/ntfy
-    sudo ntfy serve
-    ```
-
-=== "armv6"
-    ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv6.tar.gz
-    tar zxvf ntfy_2.7.0_linux_armv6.tar.gz
-    sudo cp -a ntfy_2.7.0_linux_armv6/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.7.0_linux_armv6/{client,server}/*.yml /etc/ntfy
-    sudo ntfy serve
-    ```
-
-=== "armv7/armhf"
-    ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv7.tar.gz
-    tar zxvf ntfy_2.7.0_linux_armv7.tar.gz
-    sudo cp -a ntfy_2.7.0_linux_armv7/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.7.0_linux_armv7/{client,server}/*.yml /etc/ntfy
-    sudo ntfy serve
-    ```
-
-=== "arm64"
-    ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_arm64.tar.gz
-    tar zxvf ntfy_2.7.0_linux_arm64.tar.gz
-    sudo cp -a ntfy_2.7.0_linux_arm64/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.7.0_linux_arm64/{client,server}/*.yml /etc/ntfy
-    sudo ntfy serve
-    ```
-
-## Debian/Ubuntu repository
-Installation via Debian repository:
-
-=== "x86_64/amd64"
-    ```bash
-    sudo mkdir -p /etc/apt/keyrings
-    curl -fsSL https://archive.heckel.io/apt/pubkey.txt | sudo gpg --dearmor -o /etc/apt/keyrings/archive.heckel.io.gpg
-    sudo apt install apt-transport-https
-    sudo sh -c "echo 'deb [arch=amd64 signed-by=/etc/apt/keyrings/archive.heckel.io.gpg] https://archive.heckel.io/apt debian main' \
-        > /etc/apt/sources.list.d/archive.heckel.io.list"  
-    sudo apt update
-    sudo apt install ntfy
-    sudo systemctl enable ntfy
-    sudo systemctl start ntfy
-    ```
-
-=== "armv7/armhf"
-    ```bash
-    sudo mkdir -p /etc/apt/keyrings
-    curl -fsSL https://archive.heckel.io/apt/pubkey.txt | sudo gpg --dearmor -o /etc/apt/keyrings/archive.heckel.io.gpg
-    sudo apt install apt-transport-https
-    sudo sh -c "echo 'deb [arch=armhf signed-by=/etc/apt/keyrings/archive.heckel.io.gpg] https://archive.heckel.io/apt debian main' \
-        > /etc/apt/sources.list.d/archive.heckel.io.list"
-    sudo apt update
-    sudo apt install ntfy
-    sudo systemctl enable ntfy
-    sudo systemctl start ntfy
-    ```
-
-=== "arm64"
-    ```bash
-    sudo mkdir -p /etc/apt/keyrings
-    curl -fsSL https://archive.heckel.io/apt/pubkey.txt | sudo gpg --dearmor -o /etc/apt/keyrings/archive.heckel.io.gpg
-    sudo apt install apt-transport-https
-    sudo sh -c "echo 'deb [arch=arm64 signed-by=/etc/apt/keyrings/archive.heckel.io.gpg] https://archive.heckel.io/apt debian main' \
-        > /etc/apt/sources.list.d/archive.heckel.io.list"
-    sudo apt update
-    sudo apt install ntfy
-    sudo systemctl enable ntfy
-    sudo systemctl start ntfy
-    ```
-
-Manually installing the .deb file:
-
-=== "x86_64/amd64"
-    ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_amd64.deb
-    sudo dpkg -i ntfy_*.deb
-    sudo systemctl enable ntfy
-    sudo systemctl start ntfy
-    ```
-
-=== "armv6"
-    ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv6.deb
-    sudo dpkg -i ntfy_*.deb
-    sudo systemctl enable ntfy
-    sudo systemctl start ntfy
-    ```
-
-=== "armv7/armhf"
-    ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv7.deb
-    sudo dpkg -i ntfy_*.deb
-    sudo systemctl enable ntfy
-    sudo systemctl start ntfy
-    ```
-
-=== "arm64"
-    ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_arm64.deb
-    sudo dpkg -i ntfy_*.deb
-    sudo systemctl enable ntfy
-    sudo systemctl start ntfy
-    ```
-
-## Fedora/RHEL/CentOS
-
-=== "x86_64/amd64"
-    ```bash
-    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_amd64.rpm
-    sudo systemctl enable ntfy 
-    sudo systemctl start ntfy
-    ```
-
-=== "armv6"
-    ```bash
-    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv6.rpm
-    sudo systemctl enable ntfy
-    sudo systemctl start ntfy
-    ```
-
-=== "armv7/armhf"
-    ```bash
-    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv7.rpm
-    sudo systemctl enable ntfy 
-    sudo systemctl start ntfy
-    ```
-
-=== "arm64"
-    ```bash
-    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_arm64.rpm
-    sudo systemctl enable ntfy 
-    sudo systemctl start ntfy
-    ```
-
-## Arch Linux
-ntfy can be installed using an [AUR package](https://aur.archlinux.org/packages/ntfysh-bin/). 
-You can use an [AUR helper](https://wiki.archlinux.org/title/AUR_helpers) like `paru`, `yay` or others to download, 
-build and install ntfy and keep it up to date.
-```
-paru -S ntfysh-bin
-```
-
-Alternatively, run the following commands to install ntfy manually:
-```
-curl https://aur.archlinux.org/cgit/aur.git/snapshot/ntfysh-bin.tar.gz | tar xzv
-cd ntfysh-bin
-makepkg -si
-```
-
-## NixOS / Nix
-ntfy is packaged in nixpkgs as `ntfy-sh`. It can be installed by adding the package name to the configuration file and calling `nixos-rebuild`. Alternatively, the following command can be used to install ntfy in the current user environment:
-```
-nix-env -iA ntfy-sh
-```
-
-NixOS also supports [declarative setup of the ntfy server](https://search.nixos.org/options?channel=unstable&show=services.ntfy-sh.enable&from=0&size=50&sort=relevance&type=packages&query=ntfy). 
-
-## macOS
-The [ntfy CLI](subscribe/cli.md) (`ntfy publish` and `ntfy subscribe` only) is supported on macOS as well. 
-To install, please [download the tarball](https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_darwin_all.tar.gz), 
-extract it and place it somewhere in your `PATH` (e.g. `/usr/local/bin/ntfy`). 
-
-If run as `root`, ntfy will look for its config at `/etc/ntfy/client.yml`. For all other users, it'll look for it at 
-`~/Library/Application Support/ntfy/client.yml` (sample included in the tarball).
-
-```bash
-curl -L https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_darwin_all.tar.gz > ntfy_2.7.0_darwin_all.tar.gz
-tar zxvf ntfy_2.7.0_darwin_all.tar.gz
-sudo cp -a ntfy_2.7.0_darwin_all/ntfy /usr/local/bin/ntfy
-mkdir ~/Library/Application\ Support/ntfy 
-cp ntfy_2.7.0_darwin_all/client/client.yml ~/Library/Application\ Support/ntfy/client.yml
-ntfy --help
-```
-
-!!! info
-    Only the ntfy CLI is supported on macOS. ntfy server is currently not supported, but you can build and run it for 
-    development as well. Check out the [build instructions](develop.md) for details.
-
-## Homebrew
-To install the [ntfy CLI](subscribe/cli.md) (`ntfy publish` and `ntfy subscribe` only) via Homebrew (Linux and macOS),
-simply run:
-```
-brew install ntfy
-```
-
-
-## Windows
-The [ntfy CLI](subscribe/cli.md) (`ntfy publish` and `ntfy subscribe` only) is supported on Windows as well.
-To install, please [download the latest ZIP](https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_windows_amd64.zip),
-extract it and place the `ntfy.exe` binary somewhere in your `%Path%`. 
-
-The default path for the client config file is at `%AppData%\ntfy\client.yml` (not created automatically, sample in the ZIP file).
-
-Also available in [Scoop's](https://scoop.sh) Main repository:
-
-`scoop install ntfy`
-
-!!! info
-    There is currently no installer for Windows, and the binary is not signed. If this is desired, please create a
-    [GitHub issue](https://github.com/binwiederhier/ntfy/issues) to let me know.
-
-## Docker
-The [ntfy image](https://hub.docker.com/r/binwiederhier/ntfy) is available for amd64, armv6, armv7 and arm64. It should 
-be pretty straight forward to use.
-
-The server exposes its web UI and the API on port 80, so you need to expose that in Docker. To use the persistent 
-[message cache](config.md#message-cache), you also need to map a volume to `/var/cache/ntfy`. To change other settings, 
-you should map `/etc/ntfy`, so you can edit `/etc/ntfy/server.yml`.
-
-!!! info
-    Note that the Docker image **does not contain a `/etc/ntfy/server.yml` file**. If you'd like to use a config file, 
-    please manually create one outside the image and map it as a volume, e.g. via `-v /etc/ntfy:/etc/ntfy`. You may
-    use the [`server.yml` file on GitHub](https://github.com/binwiederhier/ntfy/blob/main/server/server.yml) as a template.
-
-Basic usage (no cache or additional config):
-```
-docker run -p 80:80 -it binwiederhier/ntfy serve
-```
-
-With persistent cache (configured as command line arguments):
-```bash
-docker run \
-  -v /var/cache/ntfy:/var/cache/ntfy \
-  -p 80:80 \
-  -it \
-  binwiederhier/ntfy \
-    serve \
-    --cache-file /var/cache/ntfy/cache.db
-```
-
-With other config options, timezone, and non-root user (configured via `/etc/ntfy/server.yml`, see [configuration](config.md) for details):
-```bash
-docker run \
-  -v /etc/ntfy:/etc/ntfy \
-  -e TZ=UTC \
-  -p 80:80 \
-  -u UID:GID \
-  -it \
-  binwiederhier/ntfy \
-  serve
-```
-
-Using docker-compose with non-root user and healthchecks enabled:
-```yaml
-version: "2.3"
-
-services:
-  ntfy:
-    image: binwiederhier/ntfy
-    container_name: ntfy
-    command:
-      - serve
-    environment:
-      - TZ=UTC    # optional: set desired timezone
-    user: UID:GID # optional: replace with your own user/group or uid/gid
-    volumes:
-      - /var/cache/ntfy:/var/cache/ntfy
-      - /etc/ntfy:/etc/ntfy
-    ports:
-      - 80:80
-    healthcheck: # optional: remember to adapt the host:port to your environment
-        test: ["CMD-SHELL", "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1"]
-        interval: 60s
-        timeout: 10s
-        retries: 3
-        start_period: 40s
-    restart: unless-stopped
-```
-
-If using a non-root user when running the docker version, be sure to chown the server.yml, user.db, and cache.db files and attachments directory to the same uid/gid.
-
-Alternatively, you may wish to build a customized Docker image that can be run with fewer command-line arguments and without delivering the configuration file separately.
-```
-FROM binwiederhier/ntfy
-COPY server.yml /etc/ntfy/server.yml
-ENTRYPOINT ["ntfy", "serve"]
-```
-This image can be pushed to a container registry and shipped independently. All that's needed when running it is mapping ntfy's port to a host port.
-
-## Kubernetes
-
-The setup for Kubernetes is very similar to that for Docker, and requires a fairly minimal deployment or pod definition to function. There
-are a few options to mix and match, including a deployment without a cache file, a stateful set with a persistent cache, and a standalone
-unmanned pod.
-
-
-=== "deployment"
-    ```yaml
-    apiVersion: apps/v1
-    kind: Deployment
-    metadata:
-      name: ntfy
-    spec:
-      selector:
-        matchLabels:
-          app: ntfy
-      template:
-        metadata:
-          labels:
-            app: ntfy
-        spec:
-          containers:
-          - name: ntfy
-            image: binwiederhier/ntfy
-            args: ["serve"]
-            resources:
-              limits:
-                memory: "128Mi"
-                cpu: "500m"
-            ports:
-            - containerPort: 80
-              name: http
-            volumeMounts:
-            - name: config
-              mountPath: "/etc/ntfy"
-              readOnly: true
-          volumes:
-            - name: config
-              configMap:
-                name: ntfy
-    ---
-    # Basic service for port 80
-    apiVersion: v1
-    kind: Service
-    metadata:
-      name: ntfy
-    spec:
-      selector:
-        app: ntfy
-      ports:
-      - port: 80
-        targetPort: 80
-    ```
-
-=== "stateful set"
-    ```yaml
-    apiVersion: apps/v1
-    kind: StatefulSet
-    metadata:
-      name: ntfy
-    spec:
-      selector:
-        matchLabels:
-          app: ntfy
-      serviceName: ntfy
-      template:
-        metadata:
-          labels:
-            app: ntfy
-        spec:
-          containers:
-          - name: ntfy
-            image: binwiederhier/ntfy
-            args: ["serve", "--cache-file", "/var/cache/ntfy/cache.db"]
-            ports:
-            - containerPort: 80
-              name: http
-            volumeMounts:
-            - name: config
-              mountPath: "/etc/ntfy"
-              readOnly: true
-            - name: cache
-              mountPath: "/var/cache/ntfy"
-          volumes:
-            - name: config
-              configMap:
-                name: ntfy
-      volumeClaimTemplates:
-      - metadata:
-          name: cache
-        spec:
-          accessModes: [ "ReadWriteOnce" ]
-          resources:
-            requests:
-              storage: 1Gi
-    ```
-
-=== "pod"
-    ```yaml
-    apiVersion: v1
-    kind: Pod
-    metadata:
-      labels:
-        app: ntfy
-    spec:
-      containers:
-      - name: ntfy
-        image: binwiederhier/ntfy
-        args: ["serve"]
-        resources:
-          limits:
-            memory: "128Mi"
-            cpu: "500m"
-        ports:
-        - containerPort: 80
-          name: http
-        volumeMounts:
-        - name: config
-          mountPath: "/etc/ntfy"
-          readOnly: true
-      volumes:
-        - name: config
-          configMap:
-            name: ntfy
-    ```
-
-Configuration is relatively straightforward. As an example, a minimal configuration is provided.
-
-=== "resource definition"
-    ```yaml
-    apiVersion: v1
-    kind: ConfigMap
-    metadata:
-      name: ntfy
-    data:
-      server.yml: |
-        # Template: https://github.com/binwiederhier/ntfy/blob/main/server/server.yml
-        base-url: https://ntfy.sh
-    ```
-
-=== "from-file"
-    ```bash
-    kubectl create configmap ntfy --from-file=server.yml 
-    ```
-
-## Kustomize
-
-ntfy can be deployed in a Kubernetes cluster with [Kustomize](https://github.com/kubernetes-sigs/kustomize), a tool used
-to customize Kubernetes objects using a `kustomization.yaml` file.
-
-1. Create new folder - `ntfy`
-2. Add all files listed below 
-    1. `kustomization.yaml` - stores all configmaps and resources used in a deployment
-    2. `ntfy-deployment.yaml` - define deployment type and its parameters
-    3. `ntfy-pvc.yaml` - describes how [persistent volumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) will be created 
-    4. `ntfy-svc.yaml` - expose application to the internal kubernetes network
-    5. `ntfy-ingress.yaml` - expose service to outside the network using [ingress controller](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/)
-    6. `server.yaml` - simple server configuration
-3. Replace **TESTNAMESPACE** within `kustomization.yaml` with designated namespace 
-4. Replace **ntfy.test** within `ntfy-ingress.yaml` with desired DNS name
-5. Apply configuration to cluster set in current context: 
-
-```bash
-kubectl apply -k /ntfy
-```
-
-=== "kustomization.yaml"
-    ```yaml
-    apiVersion: kustomize.config.k8s.io/v1beta1
-    kind: Kustomization
-    resources:
-      - ntfy-deployment.yaml # deployment definition
-      - ntfy-svc.yaml # service connecting pods to cluster network
-      - ntfy-pvc.yaml # pvc used to store cache and attachment
-      - ntfy-ingress.yaml # ingress definition
-    configMapGenerator: # will parse config from raw config to configmap,it allows for dynamic reload of application if additional app is deployed ie https://github.com/stakater/Reloader
-        - name: server-config
-          files: 
-            - server.yml
-    namespace: TESTNAMESPACE # select namespace for whole application 
-    ```
-=== "ntfy-deployment.yaml"
-    ```yaml
-    apiVersion: apps/v1
-    kind: Deployment
-    metadata:
-      name: ntfy-deployment
-      labels:
-        app: ntfy-deployment
-    spec:
-      revisionHistoryLimit: 1
-      replicas: 1
-      selector:
-        matchLabels:
-          app: ntfy-pod
-      template:
-        metadata:
-          labels:
-            app: ntfy-pod
-        spec:
-          containers:
-            - name: ntfy 
-              image: binwiederhier/ntfy:v1.28.0 # set deployed version
-              args: ["serve"]
-              env:  #example of adjustments made in environmental variables
-                - name: TZ # set timezone
-                  value: XXXXXXX
-                - name: NTFY_DEBUG # enable/disable debug
-                  value: "false"
-                - name: NTFY_LOG_LEVEL # adjust log level
-                  value: INFO
-                - name: NTFY_BASE_URL # add base url
-                  value: XXXXXXXXXX 
-              ports: 
-                - containerPort: 80
-                  name: http-ntfy
-              resources:
-                limits:
-                  memory: 300Mi
-                  cpu:  200m
-                requests:
-                      cpu: 150m
-                      memory: 150Mi
-              volumeMounts:
-                  - mountPath: /etc/ntfy/server.yml
-                    subPath: server.yml
-                    name: config-volume # generated vie configMapGenerator from kustomization file
-                  - mountPath: /var/cache/ntfy
-                    name: cache-volume #cache volume mounted to persistent volume
-            volumes:
-              - name: config-volume
-                configMap:  # uses configmap generator to parse server.yml to configmap
-                  name: server-config
-              - name: cache-volume
-                persistentVolumeClaim: # stores /cache/ntfy in defined pv
-                  claimName: ntfy-pvc
-    ```
-  
-=== "ntfy-pvc.yaml"
-    ```yaml
-    apiVersion: v1
-    kind: PersistentVolumeClaim
-    metadata:
-      name: ntfy-pvc
-    spec:
-      accessModes:
-        - ReadWriteOnce
-      storageClassName: local-path # adjust storage if needed
-      resources:
-        requests:
-          storage: 1Gi
-    ```
-
-=== "ntfy-svc.yaml"
-    ```yaml
-    apiVersion: v1
-    kind: Service
-    metadata:
-      name: ntfy-svc  
-    spec:
-      type: ClusterIP
-      selector:
-        app: ntfy-pod
-      ports:
-        - name: http-ntfy-out
-          protocol: TCP
-          port: 80
-          targetPort:  http-ntfy
-    ```
-
-=== "ntfy-ingress.yaml"
-    ```yaml
-    apiVersion: networking.k8s.io/v1
-    kind: Ingress
-    metadata:
-      name: ntfy-ingress
-    spec:
-      rules:
-        - host: ntfy.test #select own
-          http:
-            paths:
-              - path: /
-                pathType: Prefix
-                backend:
-                  service:
-                    name:  ntfy-svc
-                    port:
-                      number: 80
-    ```
-
-=== "server.yml"
-    ```yaml
-    cache-file: "/var/cache/ntfy/cache.db"
-    attachment-cache-dir: "/var/cache/ntfy/attachments"
-    ```

docs/integrations.md

@@ -1,244 +0,0 @@
-# Integrations + community projects
-
-There are quite a few projects that work with ntfy, integrate ntfy, or have been built around ntfy. It's super exciting to see what you guys have come up with. Feel free to [create a pull request on GitHub](https://github.com/binwiederhier/ntfy/issues) to add your own project here.
-
-I've added a ⭐ to projects or posts that have a significant following, or had a lot of interaction by the community.
-
-## Official integrations
-
-- [Healthchecks.io](https://healthchecks.io/) ⭐ - Online service for monitoring regularly running tasks such as cron jobs
-- [Apprise](https://github.com/caronc/apprise/wiki/Notify_ntfy) ⭐ - Push notifications that work with just about every platform
-- [Uptime Kuma](https://uptime.kuma.pet/) ⭐ - A self-hosted monitoring tool
-- [Robusta](https://docs.robusta.dev/master/catalog/sinks/webhook.html) ⭐ - open source platform for Kubernetes troubleshooting
-- [borgmatic](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#third-party-monitoring-services) ⭐ - configuration-driven backup software for servers and workstations
-- [Radarr](https://radarr.video/) ⭐ - Movie collection manager for Usenet and BitTorrent users
-- [Sonarr](https://sonarr.tv/) ⭐ - PVR for Usenet and BitTorrent users
-- [Gatus](https://gatus.io/) ⭐ - Automated service health dashboard
-- [Automatisch](https://automatisch.io/) ⭐ - Open source Zapier alternative / workflow automation tool
-- [FlexGet](https://flexget.com/Plugins/Notifiers/ntfysh) ⭐ - Multipurpose automation tool for all of your media
-- [Shoutrrr](https://containrrr.dev/shoutrrr/v0.7/services/ntfy/) ⭐ - Notification library for gophers and their furry friends.
-- [Netdata](https://learn.netdata.cloud/docs/alerts-and-notifications/notifications/agent-alert-notifications/ntfy) ⭐ - Real-time performance monitoring
-- [Deployer](https://github.com/deployphp/deployer) ⭐ - PHP deployment tool
-- [Scrt.link](https://scrt.link/) - Share a secret
-- [Platypush](https://docs.platypush.tech/platypush/plugins/ntfy.html) - Automation platform aimed to run on any device that can run Python
-- [diun](https://crazymax.dev/diun/) - Docker Image Update Notifier
-- [Cloudron](https://www.cloudron.io/store/sh.ntfy.cloudronapp.html) - Platform that makes it easy to manage web apps on your server
-- [Xitoring](https://xitoring.com/docs/notifications/notification-roles/ntfy/) - Server and Uptime monitoring
-- [changedetection.io](https://changedetection.io) ⭐ - Website change detection and notification
-
-## Integration via HTTP/SMTP/etc.
-
-- [Watchtower](https://containrrr.dev/watchtower/) ⭐ - Automating Docker container base image updates (see [integration example](examples.md#watchtower-shoutrrr))
-- [Jellyfin](https://jellyfin.org/) ⭐ - The Free Software Media System (see [integration example](examples.md#))
-- [Overseer](https://docs.overseerr.dev/using-overseerr/notifications/webhooks) ⭐ - a request management and media discovery tool for Plex (see [integration example](examples.md#jellyseerroverseerr-webhook))
-- [Tautulli](https://github.com/Tautulli/Tautulli) ⭐ - Monitoring and tracking tool for Plex (integration [via webhook](https://github.com/Tautulli/Tautulli/wiki/Notification-Agents-Guide#webhook))
-- [Mailrise](https://github.com/YoRyan/mailrise) - An SMTP gateway (integration via [Apprise](https://github.com/caronc/apprise/wiki/Notify_ntfy))
-
-## [UnifiedPush](https://unifiedpush.org/users/apps/) integrations
-
-- [Element](https://f-droid.org/packages/im.vector.app/) ⭐ - Matrix client
-- [SchildiChat](https://schildi.chat/android/) ⭐ - Matrix client
-- [Tusky](https://tusky.app/) ⭐ - Fediverse client
-- [Fedilab](https://fedilab.app/) - Fediverse client
-- [FindMyDevice](https://gitlab.com/Nulide/findmydevice/) - Find your Device with an SMS or online with the help of FMDServer
-- [Tox Push Message App](https://github.com/zoff99/tox_push_msg_app) - Tox Push Message App
-
-## Libraries 
-
-- [ntfy-php-library](https://github.com/VerifiedJoseph/ntfy-php-library) - PHP library for sending messages using a ntfy server (PHP)
-- [ntfy-notifier](https://github.com/DAcodedBEAT/ntfy-notifier) - Symfony Notifier integration for ntfy (PHP)
-- [ntfpy](https://github.com/Nevalicjus/ntfpy) - API Wrapper for ntfy.sh (Python)
-- [pyntfy](https://github.com/DP44/pyntfy) - A module for interacting with ntfy notifications (Python)
-- [vntfy](https://github.com/lmangani/vntfy) - Barebone V client for ntfy (V)
-- [ntfy-middleman](https://github.com/nachotp/ntfy-middleman) - Wraps APIs and send notifications using ntfy.sh on schedule (Python)
-- [ntfy-dotnet](https://github.com/nwithan8/ntfy-dotnet) - .NET client library to interact with a ntfy server (C# / .NET)
-- [node-ntfy-publish](https://github.com/cityssm/node-ntfy-publish) - A Node package to publish notifications to an ntfy server (Node)
-- [ntfy](https://github.com/jonocarroll/ntfy) - Wraps the ntfy API with pipe-friendly tooling (R)
-- [ntfy-for-delphi](https://github.com/hazzelnuts/ntfy-for-delphi) - A friendly library to push instant notifications ntfy (Delphi)
-- [ntfy](https://github.com/ffflorian/ntfy) - Send notifications over ntfy (JS)
-- [ntfy_dart](https://github.com/jr1221/ntfy_dart) - Dart wrapper around the ntfy API (Dart)
-- [gotfy](https://github.com/AnthonyHewins/gotfy) - A Go wrapper for the ntfy API (Go)
-- [symfony/ntfy-notifier](https://symfony.com/components/NtfyNotifier) ⭐ - Symfony Notifier integration for ntfy (PHP)
-- [ntfy-java](https://github.com/MaheshBabu11/ntfy-java/) - A Java package to interact with a ntfy server (Java)
-
-## CLIs + GUIs
-
-- [ntfy.sh.sh](https://github.com/mininmobile/ntfy.sh.sh) - Run scripts on ntfy.sh events
-- [ntfy Desktop client](https://codeberg.org/zvava/ntfy-desktop) - Cross-platform desktop application for ntfy
-- [ntfy svelte front-end](https://github.com/novatorem/Ntfy) - Front-end built with svelte
-- [wio-ntfy-ticker](https://github.com/nachotp/wio-ntfy-ticker) - Ticker display for a ntfy.sh topic
-- [ntfysh-windows](https://github.com/lucas-bortoli/ntfysh-windows) - A ntfy client for Windows Desktop
-- [ntfyr](https://github.com/haxwithaxe/ntfyr) - A simple commandline tool to send notifications to ntfy
-- [ntfy.py](https://github.com/ioqy/ntfy-client-python) - ntfy.py is a simple nfty.sh client for sending notifications
-
-## Projects + scripts 
-
-- [Grafana-to-ntfy](https://github.com/kittyandrew/grafana-to-ntfy) - Grafana-to-ntfy alerts channel (Rust)
-- [Grafana-ntfy-webhook-integration](https://github.com/academo/grafana-alerting-ntfy-webhook-integration) - Integrates Grafana alerts webhooks (Go)
-- [Grafana-to-ntfy](https://gitlab.com/Saibe1111/grafana-to-ntfy) - Grafana-to-ntfy alerts channel (Node Js)
-- [ntfy-long-zsh-command](https://github.com/robfox92/ntfy-long-zsh-command) - Notifies you once a long-running command completes (zsh)
-- [ntfy-shellscripts](https://github.com/nickexyz/ntfy-shellscripts) - A few scripts for the ntfy project (Shell)
-- [QuickStatus](https://github.com/corneliusroot/QuickStatus) - A shell script to alert to any immediate problems upon login (Shell)
-- [ntfy.el](https://github.com/shombando/ntfy) - Send notifications from Emacs (Emacs)
-- [backup-projects](https://gist.github.com/anthonyaxenov/826ba65abbabd5b00196bc3e6af76002) - Stupidly simple backup script for own projects (Shell)
-- [grav-plugin-whistleblower](https://github.com/Himmlisch-Studios/grav-plugin-whistleblower) - Grav CMS plugin to get notifications via ntfy (PHP)
-- [ntfy-server-status](https://github.com/filip2cz/ntfy-server-status) -  Checking if server is online and reporting through ntfy (C)
-- [borg-based backup](https://github.com/davidhi7/backup) - Simple borg-based backup script with notifications based on ntfy.sh or Discord webhooks (Python/Shell)
-- [ntfy.sh *arr script](https://github.com/agent-squirrel/nfty-arr-script) - Quick and hacky script to get sonarr/radarr to notify the ntfy.sh service (Shell)
-- [website-watcher](https://github.com/muety/website-watcher) - A small tool to watch websites for changes (with XPath support) (Python)
-- [siteeagle](https://github.com/tpanum/siteeagle) - A small Python script to monitor websites and notify changes (Python)
-- [send_to_phone](https://github.com/whipped-cream/send_to_phone) - Scripts to upload a file to Transfer.sh and ping ntfy with the download link (Python)
-- [ntfy Discord bot](https://github.com/R0dn3yS/ntfy-bot) - WIP ntfy discord bot (TypeScript)
-- [ntfy Discord bot](https://github.com/binwiederhier/ntfy-bot) - ntfy Discord bot (Go)
-- [ntfy Discord bot](https://github.com/jr1221/ntfy_discord_bot) - An advanced modal-based bot for interacting with the ntfy.sh API (Dart)
-- [Bettarr Notifications](https://github.com/NiNiyas/Bettarr-Notifications) - Better Notifications for Sonarr and Radarr (Python)
-- [Notify me the intruders](https://github.com/nothingbutlucas/notify_me_the_intruders) - Notify you if they are intruders or new connections on your network (Shell)
-- [Send GitHub Action to ntfy](https://github.com/NiNiyas/ntfy-action) - Send GitHub Action workflow notifications to ntfy (JS)
-- [aTable/ntfy alertmanager bridge](https://github.com/aTable/ntfy_alertmanager_bridge) - Basic alertmanager bridge to ntfy (JS)
-- [~xenrox/ntfy-alertmanager](https://hub.xenrox.net/~xenrox/ntfy-alertmanager) - A bridge between ntfy and Alertmanager (Go)
-- [pinpox/alertmanager-ntfy](https://github.com/pinpox/alertmanager-ntfy) - Relay prometheus alertmanager alerts to ntfy (Go)
-- [alexbakker/alertmanager-ntfy](https://github.com/alexbakker/alertmanager-ntfy) - Service that forwards Prometheus Alertmanager notifications to ntfy (Go)
-- [restreamchat2ntfy](https://github.com/kurohuku7/restreamchat2ntfy) - Send restream.io chat to ntfy to check on the Meta Quest (JS)
-- [k8s-ntfy-deployment-service](https://github.com/Christian42/k8s-ntfy-deployment-service) - Automatic Kubernetes (k8s) ntfy deployment
-- [huginn-global-entry-notif](https://github.com/kylezoa/huginn-global-entry-notif) - Checks CBP API for available appointments with Huginn (JSON)
-- [ntfyer](https://github.com/KikyTokamuro/ntfyer) - Sending various information to your ntfy topic by time (TypeScript)
-- [git-simple-notifier](https://github.com/plamenjm/git-simple-notifier) - Script running git-log, checking for new repositories (Shell)
-- [ntfy-to-slack](https://github.com/ozskywalker/ntfy-to-slack) - Tool to subscribe to a ntfy topic and send the messages to a Slack webhook (Go)
-- [ansible-ntfy](https://github.com/jpmens/ansible-ntfy) - Ansible action plugin to post JSON messages to ntfy (Python)
-- [ntfy-notification-channel](https://github.com/wijourdil/ntfy-notification-channel) - Laravel Notification channel for ntfy (PHP)
-- [ntfy_on_a_chip](https://github.com/gergepalfi/ntfy_on_a_chip) - ESP8266 and ESP32 client code to communicate with ntfy
-- [ntfy-sdk](https://github.com/yukibtc/ntfy-sdk) - ntfy client library to send notifications (Rust)
-- [ntfy_ynh](https://github.com/YunoHost-Apps/ntfy_ynh) - ntfy app for YunoHost 
-- [woodpecker-ntfy](https://codeberg.org/l-x/woodpecker-ntfy)- Woodpecker CI plugin for sending ntfy notfication from a pipeline (Go)
-- [drone-ntfy](https://github.com/Clortox/drone-ntfy) - Drone.io plugin for sending ntfy notifications from a pipeline (Shell)
-- [ignition-ntfy-module](https://github.com/Kyvis-Labs/ignition-ntfy-module) - Adds support for sending notifications via a ntfy server to Ignition (Java)
-- [maubot-ntfy](https://gitlab.com/999eagle/maubot-ntfy) - Matrix bot to subscribe to ntfy topics and send messages to Matrix (Python)
-- [ntfy-wrapper](https://github.com/vict0rsch/ntfy-wrapper) - Wrapper around ntfy (Python)
-- [nodebb-plugin-ntfy](https://github.com/NodeBB/nodebb-plugin-ntfy) - Push notifications for NodeBB forums
-- [n8n-ntfy](https://github.com/raghavanand98/n8n-ntfy.sh) - n8n community node that lets you use ntfy in your workflows
-- [nlog-ntfy](https://github.com/MichelMichels/nlog-ntfy) - Send NLog messages over ntfy (C# / .NET / NLog)
-- [helm-charts](https://github.com/sarab97/helm-charts) - Helm charts of some of the selfhosted services, incl. ntfy
-- [ntfy_ansible_role](https://github.com/stevenengland/ntfy_ansible_role) (on [Ansible Galaxy](https://galaxy.ansible.com/stevenengland/ntfy)) - Ansible role to install ntfy
-- [easy2ntfy](https://github.com/chromoxdor/easy2ntfy) - Gateway for ESPeasy to receive commands through ntfy and using easyfetch (HTML/JS)
-- [ntfy_lite](https://github.com/MPI-IS/ntfy_lite) - Minimalist python API for pushing ntfy notifications (Python)
-- [notify](https://github.com/guanguans/notify) - 推送通知 (PHP)
-- [zpool-events](https://github.com/maglar0/zpool-events) - Notify on ZFS pool events (Python)
-- [ntfyd](https://github.com/joachimschmidt557/ntfyd) - ntfy desktop daemon (Zig)
-- [ntfy-browser](https://github.com/johman10/ntfy-browser) - browser extension to receive notifications without having the page open (TypeScript)
-- [ntfy-electron](https://github.com/xdpirate/ntfy-electron) - Electron wrapper for the ntfy web app (JS)
-- [systemd-ntfy-poweronoff](https://github.com/stendler/systemd-ntfy-poweronoff) -  Systemd services to send notifications on system startup and shutdown (Go)
-- [msgdrop](https://github.com/jbrubake/msgdrop) - Send and receive encrypted messages (Bash)
-- [vigilant](https://github.com/VerifiedJoseph/vigilant) - Monitor RSS/ATOM and JSON feeds, and send push notifications on new entries (PHP)
-- [ansible-role-ntfy-alertmanager](https://github.com/bleetube/ansible-role-ntfy-alertmanager) - Ansible role to install xenrox/ntfy-alertmanager
-- [NtfyMe-Blender](https://github.com/NotNanook/NtfyMe-Blender) - Blender addon to send notifications to NtfyMe (Python)
-- [ntfy-ios-url-share](https://www.icloud.com/shortcuts/be8a7f49530c45f79733cfe3e41887e6) - An iOS shortcut that lets you share URLs easily and quickly.
-- [ntfy-ios-filesharing](https://www.icloud.com/shortcuts/fe948d151b2e4ae08fb2f9d6b27d680b) - An iOS shortcut that lets you share files from your share feed to a topic of your choice.
-- [systemd-ntfy](https://hackage.haskell.org/package/systemd-ntfy) - monitor a set of systemd services an send a notification to ntfy.sh whenever their status changes
-- [RouterOS Scripts](https://git.eworm.de/cgit/routeros-scripts/about/) - a collection of scripts for MikroTik RouterOS
-- [ntfy-android-builder](https://github.com/TheBlusky/ntfy-android-builder) - Script for building ntfy-android with custom Firebase configuration (Docker/Shell)
-
-## Blog + forum posts
-
-- [Installing Self Host NTFY On Linux Using Docker Container](https://www.pinoylinux.org/topicsplus/containers/installing-self-host-ntfy-on-linux-using-docker-container/) - pinoylinux.org - 9/2023
-- [Homelab Notifications with ntfy](https://blog.alexsguardian.net/posts/2023/09/12/selfhosting-ntfy/) ⭐ - alexsguardian.net - 9/2023 
-- [Why NTFY is the Ultimate Push Notification Tool for Your Needs](https://osintph.medium.com/why-ntfy-is-the-ultimate-push-notification-tool-for-your-needs-e767421c84c5) - osintph.medium.com - 9/2023
-- [Supercharge Your Alerts: Ntfy — The Ultimate Push Notification Solution](https://medium.com/spring-boot/supercharge-your-alerts-ntfy-the-ultimate-push-notification-solution-a3dda79651fe) - spring-boot.medium.com - 9/2023
-- [Deploy Ntfy using Docker](https://www.linkedin.com/pulse/deploy-ntfy-mohamed-sharfy/) - linkedin.com - 9/2023
-- [Send Notifications With Ntfy for New WordPress Posts](https://www.activepieces.com/blog/ntfy-notifications-for-wordpress-new-posts) - activepieces.com - 9/2023
-- [Get Ntfy Notifications About New Zendesk Ticket](https://www.activepieces.com/blog/ntfy-notifications-about-new-zendesk-tickets) - activepieces.com - 9/2023
-- [Set reminder for recurring events using ntfy & Cron](https://www.youtube.com/watch?v=J3O4aQ-EcYk) - youtube.com - 9/2023
-- [ntfy - Installation and full configuration setup](https://www.youtube.com/watch?v=QMy14rGmpFI) - youtube.com - 9/2023
-- [How to install Ntfy.sh on Portainer / Docker Compose](https://www.youtube.com/watch?v=utD9GNbAwyg) - youtube.com - 9/2023
-- [ntfy - Push-Benachrichtigungen // Push Notifications](https://www.youtube.com/watch?v=LE3vRPPqZOU) - youtube.com - 9/2023
-- [Podman Update Notifications via Ntfy](https://rair.dev/podman-upadte-notifications-ntfy/) - rair.dev - 9/2023
-- [NetworkChunk - how did I NOT know about this?](https://www.youtube.com/watch?v=poDIT2ruQ9M) ⭐ - youtube.com - 8/2023
-- [NTFY - Command-Line Notifications](https://academy.networkchuck.com/blog/ntfy/) - academy.networkchuck.com - 8/2023
-- [Open Source Push Notifications! Get notified of any event you can imagine. Triggers abound!](https://www.youtube.com/watch?v=WJgwWXt79pE) ⭐ - youtube.com - 8/2023
-- [How to install and self host an Ntfy server on Linux](https://linuxconfig.org/how-to-install-and-self-host-an-ntfy-server-on-linux) - linuxconfig.org - 7/2023
-- [Basic website monitoring using cronjobs and ntfy.sh](https://burkhardt.dev/2023/website-monitoring-cron-ntfy/) - burkhardt.dev - 6/2023 
-- [Pingdom alternative in one line of curl through ntfy.sh](https://piqoni.bearblog.dev/uptime-monitoring-in-one-line-of-curl/) - bearblog.dev - 6/2023 
-- [#OpenSourceDiscovery 78: ntfy.sh](https://opensourcedisc.substack.com/p/opensourcediscovery-78-ntfysh) - opensourcedisc.substack.com - 6/2023 
-- [ntfy: des notifications instantanées](https://blogmotion.fr/diy/ntfy-notification-push-domotique-20708) - blogmotion.fr - 5/2023
-- [桌面通知：ntfy](https://www.cnblogs.com/xueweihan/archive/2023/05/04/17370060.html) - cnblogs.com - 5/2023 
-- [ntfy.sh - Open source push notifications via PUT/POST](https://lobste.rs/s/5drapz/ntfy_sh_open_source_push_notifications) - lobste.rs - 5/2023 
-- [Install ntfy Inside Docker Container in Linux](https://lindevs.com/install-ntfy-inside-docker-container-in-linux) - lindevs.com - 4/2023 
-- [ntfy.sh](https://neo-sahara.com/wp/2023/03/25/ntfy-sh/) - neo-sahara.com - 3/2023 
-- [Using Ntfy to send and receive push notifications - Samuel Rosa de Oliveria - Delphicon 2023](https://www.youtube.com/watch?v=feu0skpI9QI) - youtube.com - 3/2023 
-- [ntfy: własny darmowy system powiadomień](https://sprawdzone.it/ntfy-wlasny-darmowy-system-powiadomien/) - sprawdzone.it - 3/2023 
-- [Deploying ntfy on railway](https://www.youtube.com/watch?v=auJICXtxoNA) - youtube.com - 3/2023
-- [Start-Job,Variables, and ntfy.sh](https://klingele.dev/2023/03/01/start-jobvariables-and-ntfy-sh/) - klingele.dev - 3/2023 
-- [enviar notificaciones automáticas usando ntfy.sh](https://osiux.com/2023-02-15-send-automatic-notifications-using-ntfy.html) - osiux.com - 2/2023 
-- [Carnet IP动态解析以及通过ntfy推送IP信息](https://blog.wslll.cn/index.php/archives/201/) - blog.wslll.cn - 2/2023 
-- [Open-Source-Brieftaube: ntfy verschickt Push-Meldungen auf Smartphone und PC](https://www.heise.de/news/Open-Source-Brieftaube-ntfy-verschickt-Push-Meldungen-auf-Smartphone-und-PC-7521583.html) ⭐ - heise.de - 2/2023 
-- [Video: Simple Push Notifications ntfy](https://www.youtube.com/watch?v=u9EcWrsjE20) ⭐ - youtube.com - 2/2023
-- [Use ntfy.sh with Home Assistant](https://diecknet.de/en/2023/02/12/ntfy-sh-with-homeassistant/) - diecknet.de - 2/2023 
-- [On installe Ntfy sur Synology Docker](https://www.maison-et-domotique.com/140356-serveur-notification-jeedom-ntfy-synology-docker/) - maison-et-domotique.co - 1/2023 
-- [January 2023 Developer Update](https://community.nodebb.org/topic/16908/january-2023-developer-update) - nodebb.org - 1/2023
-- [Comment envoyer des notifications push sur votre téléphone facilement et gratuitement?](https://korben.info/notifications-push-telephone.html) - 1/2023
-- [UnifiedPush: a decentralized, open-source push notification protocol](https://f-droid.org/en/2022/12/18/unifiedpush.html) ⭐ - 12/2022
-- [ntfy setup instructions](https://docs.benjamin-altpeter.de/network/vms/1001029-ntfy/) - benjamin-altpeter.de - 12/2022
-- [Ntfy Self-Hosted Push Notifications](https://lachlanlife.net/posts/2022-12-ntfy/) - lachlanlife.net - 12/2022 
-- [NTFY - système de notification hyper simple et complet](https://www.youtube.com/watch?v=UieZYWVVgA4) - youtube.com - 12/2022
-- [ntfy.sh](https://paramdeo.com/til/ntfy-sh) - paramdeo.com - 11/2022
-- [Using ntfy to warn me when my computer is discharging](https://ulysseszh.github.io/programming/2022/11/28/ntfy-warn-discharge.html) - ulysseszh.github.io - 11/2022
-- [Enabling SSH Login Notifications using Ntfy](https://paramdeo.com/blog/enabling-ssh-login-notifications-using-ntfy) - paramdeo.com - 11/2022
-- [ntfy - Push Notification Service](https://dizzytech.de/posts/ntfy/) - dizzytech.de - 11/2022 
-- [Console #132](https://console.substack.com/p/console-132) ⭐ - console.substack.com - 11/2022
-- [How to make my phone buzz*](https://evbogue.com/howtomakemyphonebuzz) - evbogue.com - 11/2022
-- [MeshCentral - Ntfy Push Notifications ](https://www.youtube.com/watch?v=wyE4rtUd4Bg) - youtube.com - 11/2022
-- [Changelog | Tracking layoffs, tech worker demand still high, ntfy, ...](https://changelog.com/news/tracking-layoffs-tech-worker-demand-still-high-ntfy-devenv-markdoc-mike-bifulco-Y1jW) ⭐ - changelog.com - 11/2022
-- [Pointer | Issue #367](https://www.pointer.io/archives/a9495a2a6f/) - pointer.io - 11/2022
-- [Envie Push Notifications por POST (de graça e sem cadastro)](https://www.tabnews.com.br/filipedeschamps/envie-push-notifications-por-post-de-graca-e-sem-cadastro) - tabnews.com.br - 11/2022
-- [Push Notifications for KDE](https://volkerkrause.eu/2022/11/12/kde-unifiedpush-push-notifications.html) - volkerkrause.eu - 11/2022
-- [TLDR Newsletter Daily Update 2022-11-09](https://tldr.tech/tech/newsletter/2022-11-09) ⭐ - tldr.tech - 11/2022
-- [Ntfy.sh – Send push notifications to your phone via PUT/POST](https://news.ycombinator.com/item?id=33517944) ⭐ - news.ycombinator.com - 11/2022
-- [Ntfy et Jeedom : un plugin](https://lunarok-domotique.com/2022/11/ntfy-et-jeedom/) - lunarok-domotique.com - 11/2022
-- [Crea tu propio servidor de notificaciones con Ntfy](https://blog.parravidales.es/crea-tu-propio-servidor-de-notificaciones-con-ntfy/) - blog.parravidales.es - 11/2022
-- [unRAID Notifications with ntfy.sh](https://lder.dev/posts/ntfy-Notifications-With-unRAID/) - lder.dev - 10/2022
-- [Zero-cost push notifications to your phone or desktop via PUT/POST ](https://lobste.rs/s/41dq13/zero_cost_push_notifications_your_phone) - lobste.rs - 10/2022
-- [A nifty push notification system: ntfy](https://jpmens.net/2022/10/30/a-nifty-push-notification-system-ntfy/) - jpmens.net - 10/2022 
-- [Alarmanlage der dritten Art (YouTube video)](https://www.youtube.com/watch?v=altb5QLHbaU&feature=youtu.be) - youtube.com - 10/2022
-- [Neue Services: Ntfy, TikTok und RustDesk](https://adminforge.de/tools/neue-services-ntfy-tiktok-und-rustdesk/) - adminforge.de - 9/2022
-- [Ntfy, le service de notifications qu’il vous faut](https://www.cachem.fr/ntfy-le-service-de-notifications-quil-vous-faut/) - cachem.fr - 9/2022
-- [NAS Synology et notifications avec ntfy](https://www.cachem.fr/synology-notifications-ntfy/) - cachem.fr - 9/2022 
-- [Self hosted Mobile Push Notifications using NTFY | Thejesh GN](https://thejeshgn.com/2022/08/23/self-hosted-mobile-push-notifications-using-ntfy/) - thejeshgn.com - 8/2022
-- [Fedora Magazine | 4 cool new projects to try in Copr](https://fedoramagazine.org/4-cool-new-projects-to-try-in-copr-for-august-2022/) - fedoramagazine.org - 8/2022
-- [Docker로 오픈소스 푸시알람 프로젝트 ntfy.sh 설치 및 사용하기.(Feat. Uptimekuma)](https://svrforum.com/svr/398979) - svrforum.com - 8/2022
-- [Easy notifications from R](https://sometimesir.com/posts/easy-notifications-from-r/) - sometimesir.com - 6/2022
-- [ntfy is finally coming to iOS, and Matrix/UnifiedPush gateway support](https://www.reddit.com/r/selfhosted/comments/vdzvxi/ntfy_is_finally_coming_to_ios_with_full/) ⭐ - reddit.com - 6/2022
-- [Install guide (with Docker)](https://chowdera.com/2022/150/202205301257379077.html) - chowdera.com - 5/2022
-- [无需注册的通知服务ntfy](https://blog.csdn.net/wbsu2004/article/details/125040247) - blog.csdn.net - 5/2022
-- [Updated review post (Jan-Lukas Else)](https://jlelse.blog/thoughts/2022/04/ntfy) - jlelse.blog - 4/2022
-- [Using ntfy and Tasker together](https://lachlanlife.net/posts/2022-04-tasker-ntfy/) - lachlanlife.net - 4/2022 
-- [Reddit feature update post](https://www.reddit.com/r/selfhosted/comments/uetlso/ntfy_is_a_tool_to_send_push_notifications_to_your/) ⭐ - reddit.com - 4/2022
-- [無料で簡単に通知の送受信ができつつオープンソースでセルフホストも可能な「ntfy」を使ってみた](https://gigazine.net/news/20220404-ntfy-push-notification/) - gigazine.net - 4/2022
-- [Pocketmags ntfy review](https://pocketmags.com/us/linux-format-magazine/march-2022/articles/1104187/ntfy) - pocketmags.com - 3/2022
-- [Reddit web app release post](https://www.reddit.com/r/selfhosted/comments/tc0p0u/say_hello_to_the_brand_new_ntfysh_web_app_push/) ⭐ - reddit.com- 3/2022
-- [Lemmy post (Jakob)](https://lemmy.eus/post/15541) - lemmy.eus - 1/2022
-- [Reddit UnifiedPush release post](https://www.reddit.com/r/selfhosted/comments/s5jylf/my_open_source_notification_android_app_and/) ⭐ - reddit.com - 1/2022
-- [ntfy: send notifications from your computer to your phone](https://rs1.es/tutorials/2022/01/19/ntfy-send-notifications-phone.html) - rs1.es - 1/2022
-- [Short ntfy review (Jan-Lukas Else)](https://jlelse.blog/links/2021/12/ntfy-sh) - jlelse.blog - 12/2021
-- [Free MacroDroid webhook alternative (FrameXX)](https://www.macrodroidforum.com/index.php?threads/ntfy-sh-free-macrodroid-webhook-alternative.1505/) - macrodroidforum.com - 12/2021
-- [ntfy otro sistema de notificaciones pub-sub simple basado en HTTP](https://ugeek.github.io/blog/post/2021-11-05-ntfy-sh-otro-sistema-de-notificaciones-pub-sub-simple-basado-en-http.html) - ugeek.github.io - 11/2021
-- [Show HN: A tool to send push notifications to your phone, written in Go](https://news.ycombinator.com/item?id=29715464) ⭐ - news.ycombinator.com - 12/2021
-- [Reddit selfhostable post](https://www.reddit.com/r/selfhosted/comments/qxlsm9/my_open_source_notification_android_app_and/) ⭐ - reddit.com - 11/2021
-
-
-## Alternative ntfy servers
-
-Here's a list of public ntfy servers. As of right now, there is only one official server. The others are provided by the
-ntfy community. Thanks to everyone running a public server. **You guys rock!**
-
-| URL                                               | Country            |
-|---------------------------------------------------|--------------------|
-| [ntfy.sh](https://ntfy.sh/) (*Official*)          | 🇺🇸 United States |
-| [ntfy.tedomum.net](https://ntfy.tedomum.net/)     | 🇫🇷 France        |
-| [ntfy.jae.fi](https://ntfy.jae.fi/)               | 🇫🇮 Finland       |
-| [ntfy.adminforge.de](https://ntfy.adminforge.de/) | 🇩🇪 Germany       |
-| [ntfy.envs.net](https://ntfy.envs.net)            | 🇩🇪 Germany       |
-| [ntfy.mzte.de](https://ntfy.mzte.de/)             | 🇩🇪 Germany       |
-| [ntfy.hostux.net](https://ntfy.hostux.net/)       | 🇫🇷 France        |
-| [ntfy.fossman.de](https://ntfy.fossman.de/)       | 🇩🇪 Germany       |
-
-Please be aware that **server operators can log your messages**. The project also cannot guarantee the reliability
-and uptime of third party servers, so use of each server is **at your own discretion**.

docs/known-issues.md

@@ -1,43 +0,0 @@
-# Known issues
-This is an incomplete list of known issues with the ntfy server, web app, Android app, and iOS app. You can find a complete
-list [on GitHub](https://github.com/binwiederhier/ntfy/labels/%F0%9F%AA%B2%20bug), but I thought it may be helpful
-to have the prominent ones here to link to.
-
-## iOS app not refreshing (see [#267](https://github.com/binwiederhier/ntfy/issues/267))
-For some (many?) users, the iOS app is not refreshing the view when new notifications come in. Until you manually
-swipe down, you do not see the newly arrived messages, even though the popup appeared before.
-
-This is caused by some weirdness between the Notification Service Extension (NSE), SwiftUI and Core Data. I am entirely
-clueless on how to fix it, sadly, as it is ephemeral and not clear to me what is causing it.
-
-Please send experienced iOS developers my way to help me figure this out.
-
-## iOS app not receiving notifications (anymore)
-If notifications do not show up at all anymore, there are a few causes for it (that I know of):
-
-**Firebase+APNS are being weird and buggy**:    
-If this is the case, usually it helps to **remove the topic/subscription and re-add it**. That will force Firebase to 
-re-subscribe to the Firebase topic.
-
-**Self-hosted only: No `upstream-base-url` set, or `base-url` mismatch**:   
-To make self-hosted servers work with the iOS
-app, I had to do some horrible things (see [iOS instant notifications](config.md#ios-instant-notifications) for details).
-Be sure that in your selfhosted server:
-
-* Set `upstream-base-url: "https://ntfy.sh"` (**not your own hostname!**)
-* Ensure that the URL you set in `base-url` **matches exactly** what you set the Default Server in iOS to 
-
-## iOS app seeing "New message", but not real message content
-If you see `New message` notifications on iOS, your iPhone can likely not talk to your self-hosted server. Be sure that
-your iOS device and your ntfy server are either on the same network, or that your phone can actually reach the server.
-
-Turn on tracing/debugging on the server (via `log-level: trace` or `log-level: debug`, see [troubleshooting](troubleshooting.md)),
-and read docs on [iOS instant notifications](https://docs.ntfy.sh/config/#ios-instant-notifications).
-
-## Safari does not play sounds for web push notifications
-Safari does not support playing sounds for web push notifications, and treats them all as silent. This will be fixed with
-iOS 17 / Safari 17, which will be released later in 2023.
-
-## PWA on iOS sometimes crashes with an IndexedDB error (see [#787](https://github.com/binwiederhier/ntfy/issues/787))
-When resuming the installed PWA from the background, it sometimes crashes with an error from IndexedDB/Dexie, due to a
-[WebKit bug]( https://bugs.webkit.org/show_bug.cgi?id=197050). A reload will fix it until a permanent fix is found.

docs/privacy.md

@@ -1,12 +0,0 @@
-# Privacy policy
-
-I love free software, and I'm doing this because it's fun. I have no bad intentions, and **I will
-never monetize or sell your information, and this service and software will always stay free and open.**
-
-Neither the server nor the app record any personal information, or share any of the messages and topics with
-any outside service. All data is exclusively used to make the service function properly. The only external service
-I use is Firebase Cloud Messaging (FCM) service, which is required to provide instant Android notifications (see
-[FAQ](faq.md) for details). To avoid FCM altogether, download the F-Droid version.
-
-For debugging purposes, the ntfy server may temporarily log request paths, remote IP addresses or even topics 
-or messages, though typically this is turned off.

docs/static/css/extra.css

@@ -1,216 +0,0 @@
-:root > * {
-    --md-primary-fg-color:        #338574;
-    --md-primary-fg-color--light: #338574;
-    --md-primary-fg-color--dark:  #338574;
-    --md-footer-bg-color:         #353744;
-    --md-text-font:               "Roboto";
-    --md-code-font:               "Roboto Mono";
-}
-
-.md-header__button.md-logo :is(img, svg) {
-    width: unset !important;
-}
-
-.md-header__topic:first-child {
-    font-weight: 400;
-}
-
-.md-typeset h4 {
-    font-weight: 500 !important;
-    margin: 0 !important;
-    font-size: 1.1em !important;
-}
-
-.admonition {
-    font-size: .74rem !important;
-}
-
-article {
-    padding-bottom: 50px;
-}
-
-figure img, figure video {
-    border-radius: 7px;
-}
-
-header {
-    background: linear-gradient(150deg, rgba(51,133,116,1) 0%, rgba(86,189,168,1) 100%);
-}
-
-body[data-md-color-scheme="default"] header {
-    filter: drop-shadow(0 5px 10px #ccc);
-}
-
-body[data-md-color-scheme="slate"] header {
-    filter: drop-shadow(0 5px 10px #333);
-}
-
-body[data-md-color-scheme="default"] figure img,
-body[data-md-color-scheme="default"] figure video,
-body[data-md-color-scheme="default"] .screenshots img,
-body[data-md-color-scheme="default"] .screenshots video {
-    filter: drop-shadow(3px 3px 3px #ccc);
-}
-
-body[data-md-color-scheme="slate"] figure img,
-body[data-md-color-scheme="slate"] figure video,
-body[data-md-color-scheme="slate"] .screenshots img,
-body[data-md-color-scheme="slate"] .screenshots video {
-    filter: drop-shadow(3px 3px 3px #353744);
-}
-
-figure video {
-    width: 100%;
-    max-height: 450px;
-}
-
-.remove-md-box {
-    background: none;
-    border: none;
-    margin: 0 auto;
-}
-
-.remove-md-box td {
-    padding: 0 10px;
-}
-
-.emoji-table .c {
-    vertical-align: middle !important;
-}
-
-.emoji-table .e {
-    font-size: 2.5em;
-    padding: 0 2px !important;
-    text-align: center !important;
-    vertical-align: middle !important;
-}
-
-/* Lightbox; thanks to https://yossiabramov.com/blog/vanilla-js-lightbox */
-
-.screenshots {
-    text-align: center;
-}
-
-.screenshots img {
-    max-height: 230px;
-    max-width: 300px;
-    margin: 3px;
-    border-radius: 5px;
-    filter: drop-shadow(2px 2px 2px #ddd);
-}
-
-.screenshots .nowrap {
-    white-space: nowrap;
-}
-
-.lightbox {
-    opacity: 0;
-    visibility: hidden;
-    position: fixed;
-    left:0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    z-index: -1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    transition: all 0.15s ease-in;
-}
-
-.lightbox.show {
-    background-color: rgba(0,0,0, 0.75);
-    opacity: 1;
-    visibility: visible;
-    z-index: 1000;
-}
-
-.lightbox img {
-    max-width: 90%;
-    max-height: 90%;
-    filter: drop-shadow(5px 5px 10px #222);
-    border-radius: 5px;
-}
-
-.lightbox .close-lightbox {
-    cursor: pointer;
-    position: absolute;
-    top: 30px;
-    right: 30px;
-    width: 20px;
-    height: 20px;
-}
-
-.lightbox .close-lightbox::after,
-.lightbox .close-lightbox::before {
-    content: '';
-    width: 3px;
-    height: 20px;
-    background-color: #ddd;
-    position: absolute;
-    border-radius: 5px;
-    transform: rotate(45deg);
-}
-
-.lightbox .close-lightbox::before {
-    transform: rotate(-45deg);
-}
-
-.lightbox .close-lightbox:hover::after,
-.lightbox .close-lightbox:hover::before {
-    background-color: #fff;
-}
-
-/* roboto-300 - latin */
-@font-face {
-    font-display: swap;
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 300;
-    src: url('../fonts/roboto-v30-latin-300.woff2') format('woff2');
-}
-
-/* roboto-regular - latin */
-@font-face {
-    font-display: swap;
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 400;
-    src: url('../fonts/roboto-v30-latin-regular.woff2') format('woff2');
-}
-
-/* roboto-italic - latin */
-@font-face {
-    font-display: swap;
-    font-family: 'Roboto';
-    font-style: italic;
-    font-weight: 400;
-    src: url('../fonts/roboto-v30-latin-italic.woff2') format('woff2');
-}
-
-/* roboto-500 - latin */
-@font-face {
-    font-display: swap;
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 500;
-    src: url('../fonts/roboto-v30-latin-500.woff2') format('woff2');
-}
-
-/* roboto-700 - latin */
-@font-face {
-    font-display: swap;
-    font-family: 'Roboto';
-    font-style: normal;
-    font-weight: 700;
-    src: url('../fonts/roboto-v30-latin-700.woff2') format('woff2');
-}
-
-/* roboto-mono - latin */
-@font-face {
-    font-display: swap;
-    font-family: 'Roboto Mono';
-    font-style: normal;
-    font-weight: 400;
-    src: url('../fonts/roboto-mono-v22-latin-regular.woff2') format('woff2');
-}