Actually apply the pre-commit fixers to the codebase.

This can be redone manually with
`pre-commit run --all`

While the pre-commit hook could be merged to run locally,
it is much cleaner to align all the files to best-practice
syntax in a single commit. It is also required for server-side
validation.

cmd/access.go

@@ -5,6 +5,7 @@ package cmd
 import (
 	"errors"
 	"fmt"
+
 	"github.com/urfave/cli/v2"
 	"heckel.io/ntfy/auth"
 	"heckel.io/ntfy/util"
@@ -50,7 +51,7 @@ Arguments:
                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-write (alias: rw)
                - read-only (aliases: read, ro)
                - write-only (aliases: write, wo)
                - deny (alias: none)
@@ -60,7 +61,7 @@ Examples:
   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 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

cmd/access_test.go

@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"fmt"
+	"testing"
+
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
 	"heckel.io/ntfy/server"
 	"heckel.io/ntfy/test"
-	"testing"
 )
 
 func TestCLI_Access_Show(t *testing.T) {

cmd/app.go

@@ -2,10 +2,11 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/urfave/cli/v2"
 	"github.com/urfave/cli/v2/altsrc"
 	"heckel.io/ntfy/log"
-	"os"
 )
 
 const (

cmd/app_test.go

@@ -3,11 +3,12 @@ package cmd
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/client"
 	"os"
 	"strings"
 	"testing"
+
+	"github.com/urfave/cli/v2"
+	"heckel.io/ntfy/client"
 )
 
 // This only contains helpers so far

cmd/config_loader.go

@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"fmt"
+	"os"
+
 	"github.com/urfave/cli/v2"
 	"github.com/urfave/cli/v2/altsrc"
 	"gopkg.in/yaml.v2"
 	"heckel.io/ntfy/util"
-	"os"
 )
 
 // initConfigFileInputSourceFunc is like altsrc.InitInputSourceWithContext and altsrc.NewYamlSourceFromFlagFunc, but checks

cmd/config_loader_test.go

@@ -1,10 +1,11 @@
 package cmd
 
 import (
-	"github.com/stretchr/testify/require"
 	"os"
 	"path/filepath"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestNewYamlSourceFromFile(t *testing.T) {

cmd/publish.go

@@ -3,16 +3,17 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/client"
-	"heckel.io/ntfy/log"
-	"heckel.io/ntfy/util"
 	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"time"
+
+	"github.com/urfave/cli/v2"
+	"heckel.io/ntfy/client"
+	"heckel.io/ntfy/log"
+	"heckel.io/ntfy/util"
 )
 
 func init() {
@@ -72,11 +73,11 @@ Examples:
   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 
+  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, 
+
+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,

cmd/publish_test.go

@@ -2,14 +2,15 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/test"
-	"heckel.io/ntfy/util"
 	"os"
 	"os/exec"
 	"strconv"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/require"
+	"heckel.io/ntfy/test"
+	"heckel.io/ntfy/util"
 )
 
 func TestCLI_Publish_Subscribe_Poll_Real_Server(t *testing.T) {

cmd/serve.go

@@ -86,7 +86,7 @@ var cmdServe = &cli.Command{
 	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 
+The command will load the configuration from /etc/ntfy/server.yml. Config options can
 be overridden using the command line options.
 
 Examples:

cmd/subscribe.go

@@ -3,16 +3,17 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/client"
-	"heckel.io/ntfy/log"
-	"heckel.io/ntfy/util"
 	"os"
 	"os/exec"
 	"os/user"
 	"path/filepath"
 	"sort"
 	"strings"
+
+	"github.com/urfave/cli/v2"
+	"heckel.io/ntfy/client"
+	"heckel.io/ntfy/log"
+	"heckel.io/ntfy/util"
 )
 
 func init() {
@@ -44,20 +45,20 @@ var cmdSubscribe = &cli.Command{
 	Category:  categoryClient,
 	Flags:     flagsSubscribe,
 	Before:    initLogFunc,
-	Description: `Subscribe to a topic from a ntfy server, and either print or execute a command for 
+	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. 
+  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:
@@ -78,10 +79,10 @@ ntfy subscribe TOPIC COMMAND
     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 
+  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: 
+  Examples:
     ntfy sub --from-config                           # Read topics from config file
     ntfy sub --config=myclient.yml --from-config     # Read topics from alternate config file
 

cmd/user.go

@@ -50,11 +50,11 @@ granted otherwise by the auth-default-access setting). An admin user has read an
 topics.
 
 Examples:
-  ntfy user add phil                     # Add regular user phil  
+  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 may set the NTFY_PASSWORD environment variable to pass the password. This is useful if
 you are creating users via scripts.
 `,
 		},
@@ -79,13 +79,13 @@ Example:
 			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. 
+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 
+You may set the NTFY_PASSWORD environment variable to pass the new password. This is
 useful if you are updating users via scripts.
 
 `,
@@ -104,12 +104,12 @@ 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 
+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 
+  ntfy user change-role phil admin   # Make user phil an admin
+  ntfy user change-role phil user    # Remove admin role from user phil
 `,
 		},
 		{
@@ -120,7 +120,7 @@ Example:
 			Description: `Shows a list of all configured users, including the everyone ('*') user.
 
 This is a server-only command. It directly reads from the user.db as defined in the server config
-file server.yml. The command only works if 'auth-file' is properly defined. 
+file server.yml. The command only works if 'auth-file' is properly defined.
 
 This command is an alias to calling 'ntfy access' (display access control list).
 `,
@@ -132,18 +132,18 @@ This is a server-only command. It directly manages the user.db as defined in the
 file server.yml. The command only works if 'auth-file' is properly defined. Please also refer
 to the related command 'ntfy access'.
 
-The command allows you to add/remove/change users in the ntfy user database, as well as change 
+The command allows you to add/remove/change users in the ntfy user database, as well as change
 passwords or roles.
 
 Examples:
-  ntfy user list                               # Shows list of users (alias: 'ntfy access')                      
-  ntfy user add phil                           # Add regular user phil  
+  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 
+  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.

cmd/user_test.go

@@ -1,12 +1,13 @@
 package cmd
 
 import (
+	"path/filepath"
+	"testing"
+
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
 	"heckel.io/ntfy/server"
 	"heckel.io/ntfy/test"
-	"path/filepath"
-	"testing"
 )
 
 func TestCLI_User_Add(t *testing.T) {