diff --git a/cmd/webpush.go b/cmd/webpush.go index bd44f5aa..a5f66e60 100644 --- a/cmd/webpush.go +++ b/cmd/webpush.go @@ -11,9 +11,9 @@ import ( "github.com/urfave/cli/v2/altsrc" ) -var flagsWebpush = append( +var flagsWebPush = append( []cli.Flag{}, - altsrc.NewStringFlag(&cli.StringFlag{Name: "key-file", Aliases: []string{"f"}, Usage: "write vapid keys to this file"}), + altsrc.NewStringFlag(&cli.StringFlag{Name: "output-file", Aliases: []string{"f"}, Usage: "write VAPID keys to this file"}), ) func init() { @@ -33,7 +33,7 @@ var cmdWebPush = &cli.Command{ Usage: "Generate VAPID keys to enable browser background push notifications", UsageText: "ntfy webpush keys", Category: categoryServer, - Flags: flagsWebpush, + Flags: flagsWebPush, }, }, } @@ -44,16 +44,16 @@ func generateWebPushKeys(c *cli.Context) error { return err } - if keyFile := c.String("key-file"); keyFile != "" { + if outputFIle := c.String("output-file"); outputFIle != "" { contents := fmt.Sprintf(`--- web-push-public-key: %s web-push-private-key: %s `, publicKey, privateKey) - err = os.WriteFile(keyFile, []byte(contents), 0660) + err = os.WriteFile(outputFIle, []byte(contents), 0660) if err != nil { return err } - _, err = fmt.Fprintf(c.App.ErrWriter, `Web Push keys written to %s.`, keyFile) + _, err = fmt.Fprintf(c.App.ErrWriter, `Web Push keys written to %s.`, outputFIle) } else { _, err = fmt.Fprintf(c.App.ErrWriter, `Web Push keys generated. Add the following lines to your config file: diff --git a/docs/integrations.md b/docs/integrations.md index ad84cb48..2dc210d4 100644 --- a/docs/integrations.md +++ b/docs/integrations.md @@ -9,9 +9,9 @@ I've added a ⭐ to projects or posts that have a significant following, or had - [Integration via HTTP/SMTP/etc.](#integration-via-httpsmtpetc) - [UnifiedPush integrations](#unifiedpush-integrations) - [Libraries](#libraries) -- [CLIs + GUIs](#clis--guis) -- [Projects + scripts](#projects--scripts) -- [Blog + forum posts](#blog--forum-posts) +- [CLIs + GUIs](#clis-guis) +- [Projects + scripts](#projects-scripts) +- [Blog + forum posts](#blog-forum-posts) - [Alternative ntfy servers](#alternative-ntfy-servers) ## Official integrations diff --git a/docs/releases.md b/docs/releases.md index 65af14d5..03bdd1d0 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -1377,19 +1377,31 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release **Features:** -* Add username/password auth to email publishing ([#1164](https://github.com/binwiederhier/ntfy/pull/1164), thanks to [@bishtawi](https://github.com/bishtawi)) +* Add username/password auth to email publishing ([#1164](https://github.com/binwiederhier/ntfy/pull/1164), thanks to [@bishtawi](https://github.com/bishtawi) for implementing) +* Write VAPID keys to file in `ntfy webpush --output-file` ([#1138](https://github.com/binwiederhier/ntfy/pull/1138), thanks to [@nogweii](https://github.com/nogweii) for implementing) **Bug fixes + maintenance:** -* Add `Date` header to outgoing emails to avoid rejection ([#1141](https://github.com/binwiederhier/ntfy/pull/1141), thanks to [@pcouy](https://github.com/pcouy)) * Security updates for dependencies and Docker images ([#1341](https://github.com/binwiederhier/ntfy/pull/1341)) +* Add `Date` header to outgoing emails to avoid rejection ([#1141](https://github.com/binwiederhier/ntfy/pull/1141), thanks to [@pcouy](https://github.com/pcouy)) * Fix IP address parsing when behind a proxy ([#1266](https://github.com/binwiederhier/ntfy/pull/1266), thanks to [@mmatuska](https://github.com/mmatuska)) * Make sure UnifiedPush messages are not treated as attachments ([#1312](https://github.com/binwiederhier/ntfy/pull/1312), thanks to [@vkrause](https://github.com/vkrause)) * Add OCI image version to Docker image ([#1307](https://github.com/binwiederhier/ntfy/pull/1307), thanks to [@jlssmt](https://github.com/jlssmt)) +* WebSocket returning incorrect HTTP error code ([#1338](https://github.com/binwiederhier/ntfy/pull/1338) / [#1337](https://github.com/binwiederhier/ntfy/pull/1337), thanks to [@wunter8](https://github.com/wunter8) for debugging and implementing) **Documentation:** -* Lots of new integrations: [ntfy-me-mcp](https://github.com/gitmotion/ntfy-me-mcp), [UptimeObserver](https://uptimeobserver.com), [alertmanager-ntfy-relay](https://github.com/therobbielee/alertmanager-ntfy-relay), [Monibot](https://monibot.io/), ... Amazing! +* Lots of new integrations and projects. Amazing! + * [ntfy-me-mcp](https://github.com/gitmotion/ntfy-me-mcp) + * [UptimeObserver](https://uptimeobserver.com) + * [alertmanager-ntfy-relay](https://github.com/therobbielee/alertmanager-ntfy-relay) + * [Monibot](https://monibot.io/) + * [Daily_Fact_Ntfy](https://github.com/thiswillbeyourgithub/Daily_Fact_Ntfy) + * [EasyMorph](https://help.easymorph.com/doku.php?id=transformations:sendntfymessage) + * [ntfy-run](https://github.com/quantum5/ntfy-run) + * [Clipboard IO](https://github.com/jim3692/clipboard-io) + * [ntfy-me-mcp](https://github.com/gitmotion/ntfy-me-mcp) + * [InvaderInformant](https://github.com/patricksthannon/InvaderInformant) * Various docs updates ([#1161](https://github.com/binwiederhier/ntfy/pull/1161), thanks to [@OneWeekNotice](https://github.com/OneWeekNotice)) * Typo in config docs ([#1177](https://github.com/binwiederhier/ntfy/pull/1177), thanks to [@hoho4190](https://github.com/hoho4190)) * Typo in CLI docs ([#1172](https://github.com/binwiederhier/ntfy/pull/1172), thanks to [@anirvan](https://github.com/anirvan))