cleanup: reorder and remove unused code

pkg/cli/generate.go

@@ -20,16 +20,6 @@ func generate() action {
 
 			fmt.Printf("Service: %s\n", serviceSchema)
 
-			//logger := DiscardLogger
-			//if verbose {
-			//	logger = log.New(os.Stderr, "SHOUTRRR ", log.LstdFlags)
-			//}
-			//
-			//opts := PluginOpts {
-			//	Verbose: verbose,
-			//	Logger: logger,
-			//}
-
 			serviceRouter := router.ServiceRouter{}
 
 			service, err := serviceRouter.Locate(serviceSchema)
@@ -46,7 +36,7 @@ func generate() action {
 			return 1
 		},
 		FlagSet: *flag.NewFlagSet("generate", flag.ExitOnError),
-		Usage: "%s send [OPTIONS] <URL> <Message [...]>\n",
+		Usage: "%s generate [OPTIONS] <service>\n",
 	}
 
 	// action.FlagSet.BoolVar(&verbose, "verbose", false, "display additional output")

pkg/cli/main.go

@@ -20,7 +20,6 @@ func usage(syntax string) {
 
 func main() {
 
-
 	if len(os.Args) < 2 {
 		showMainUsage()
 		return

pkg/cli/send.go

@@ -3,43 +3,36 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/containrrr/shoutrrr"
-	"github.com/containrrr/shoutrrr/pkg/services"
 	"log"
 	"os"
 	"strings"
+
+	"github.com/containrrr/shoutrrr"
+	"github.com/containrrr/shoutrrr/pkg/util"
 )
 
 var verbose bool
 
 func send() action {
-
-
 	action := action{
 		run: func(flags *flag.FlagSet) int {
 
 			if flags.NArg() < 2 {
 				return ExitCodeUsage
 			}
 
-			fmt.Printf("Args: %d\n", flags.NArg())
-
-			// Arg #0 is always the action verb
 			url := flags.Arg(0)
-
 			fmt.Printf("Url: %s\n", url)
 
 			message := strings.Join(flags.Args()[1:], " ")
-
 			fmt.Printf("Message: %s\n", message)
 
-
 			var logger *log.Logger
 
 			if verbose {
 				logger = log.New(os.Stderr, "SHOUTRRR ", log.LstdFlags)
 			}  else {
-				logger = services.DiscardLogger
+				logger = util.DiscardLogger
 			}
 
 			shoutrrr.SetLogger(logger)

pkg/cli/verify.go

@@ -8,30 +8,14 @@ import (
 
 
 func verify() action {
-
-	action := action{
+	return action{
 		run: func(flags *flag.FlagSet) int {
 
-			if flags.NArg() < 1 {
+			url := flags.Arg(0)
+			if url == "" {
 				return ExitCodeUsage
 			}
 
-			//fmt.Printf("Args: %d\n", flags.NArg())
-
-			// Arg #0 is always the action verb
-			url := flags.Arg(0)
-
-			//fmt.Printf("Url: %s\n", url)
-
-			//logger := DiscardLogger
-			//if verbose {
-			//	logger = log.New(os.Stderr, "SHOUTRRR ", log.LstdFlags)
-			//}
-			//
-			//opts := PluginOpts {
-			//	Verbose: verbose,
-			//	Logger: logger,
-			//}
 
 			if err := shoutrrr.Verify(url); err != nil {
 				fmt.Printf("error verifying URL: %s", err)
@@ -44,8 +28,4 @@ func verify() action {
 		FlagSet: *flag.NewFlagSet("verify", flag.ExitOnError),
 		Usage: "%s send [OPTIONS] <URL> <Message [...]>\n",
 	}
-
-	// action.FlagSet.BoolVar(&verbose, "verbose", false, "display additional output")
-
-	return action
 }

pkg/format/formatter.go

@@ -2,11 +2,12 @@ package format
 
 import (
 	"fmt"
-	"github.com/containrrr/shoutrrr/pkg/types"
-	"github.com/containrrr/shoutrrr/pkg/util"
 	"reflect"
 	"strings"
 	"unsafe"
+
+	"github.com/containrrr/shoutrrr/pkg/types"
+	"github.com/containrrr/shoutrrr/pkg/util"
 )
 
 // GetConfigMap returns a string map of a given Config struct

pkg/router/router.go

@@ -2,6 +2,10 @@ package router
 
 import (
 	"fmt"
+	"log"
+	"net/url"
+	"strings"
+
 	"github.com/containrrr/shoutrrr/pkg/services/discord"
 	"github.com/containrrr/shoutrrr/pkg/services/ifttt"
 	"github.com/containrrr/shoutrrr/pkg/services/pushover"
@@ -10,9 +14,6 @@ import (
 	"github.com/containrrr/shoutrrr/pkg/services/teams"
 	"github.com/containrrr/shoutrrr/pkg/services/telegram"
 	"github.com/containrrr/shoutrrr/pkg/types"
-	"log"
-	"net/url"
-	"strings"
 )
 
 // ServiceRouter is responsible for routing a message to a specific notification service using the notification URL

pkg/services/standard/queued_sender.go → pkg/util/queue/queued_sender.go

@@ -10,6 +10,7 @@ import (
 // QueuedSender implements the standard queue sender interface
 type QueuedSender struct {
 	queue []string
+	sender *types.Sender
 }
 
 // Enqueuef adds a formatted message to an internal queue and sends it when SendQueued is invoked
@@ -22,11 +23,16 @@ func (qs *QueuedSender) Enqueue(message string) {
 	qs.queue = append(qs.queue, message)
 }
 
+func Connect(qs *QueuedSender, sender *types.Sender) {
+	qs.sender = sender
+}
+
 // Flush sends all messages that have been queued up as a combined message. This method should be deferred!
 func (qs *QueuedSender) Flush(params *map[string]string) {
 	var anonService interface{} = qs
-	service := anonService.(types.Service)
-
-	// Since this method is supposed to be deferred we just have to ignore errors
-	_ = service.Send(strings.Join(qs.queue, "\n"), params)
+	service, ok := anonService.(types.Service)
+	if ok {
+		// Since this method is supposed to be deferred we just have to ignore errors
+		_ = service.Send(strings.Join(qs.queue, "\n"), params)
+	}
 }