From 521aacd133743b9addf7e2b617a9c404f7130282 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Tue, 30 Dec 2025 10:51:29 -0500
Subject: [PATCH] Final name: mailpopbox-router

---
 cmd/{mailbox-shuffler => mailpopbox-router}/config.go           | 0
 cmd/{mailbox-shuffler => mailpopbox-router}/config_test.go      | 0
 cmd/{mailbox-shuffler => mailpopbox-router}/dest.go             | 2 +-
 .../mailpopbox-router.go}                                       | 2 +-
 cmd/{mailbox-shuffler => mailpopbox-router}/monitor.go          | 2 +-
 cmd/{mailbox-shuffler => mailpopbox-router}/oauth.go            | 0
 cmd/{mailbox-shuffler => mailpopbox-router}/source.go           | 0
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename cmd/{mailbox-shuffler => mailpopbox-router}/config.go (100%)
 rename cmd/{mailbox-shuffler => mailpopbox-router}/config_test.go (100%)
 rename cmd/{mailbox-shuffler => mailpopbox-router}/dest.go (99%)
 rename cmd/{mailbox-shuffler/mailbox-shuffler.go => mailpopbox-router/mailpopbox-router.go} (98%)
 rename cmd/{mailbox-shuffler => mailpopbox-router}/monitor.go (96%)
 rename cmd/{mailbox-shuffler => mailpopbox-router}/oauth.go (100%)
 rename cmd/{mailbox-shuffler => mailpopbox-router}/source.go (100%)

diff --git a/cmd/mailbox-shuffler/config.go b/cmd/mailpopbox-router/config.go
similarity index 100%
rename from cmd/mailbox-shuffler/config.go
rename to cmd/mailpopbox-router/config.go
diff --git a/cmd/mailbox-shuffler/config_test.go b/cmd/mailpopbox-router/config_test.go
similarity index 100%
rename from cmd/mailbox-shuffler/config_test.go
rename to cmd/mailpopbox-router/config_test.go
diff --git a/cmd/mailbox-shuffler/dest.go b/cmd/mailpopbox-router/dest.go
similarity index 99%
rename from cmd/mailbox-shuffler/dest.go
rename to cmd/mailpopbox-router/dest.go
index e82647d..2ef508c 100644
--- a/cmd/mailbox-shuffler/dest.go
+++ b/cmd/mailpopbox-router/dest.go
@@ -57,7 +57,7 @@ func (d *gmailDestination) Connect(ctx context.Context) (DestinationConnection,
 	}
 
 	auth := option.WithHTTPClient(d.auth.MakeClient(ctx, tokenQ.Token))
-	svc, err := gmail.NewService(ctx, auth, option.WithUserAgent("mailbox-shuffler"))
+	svc, err := gmail.NewService(ctx, auth, option.WithUserAgent("mailpopbox-router"))
 	if err != nil {
 		return nil, err
 	}
diff --git a/cmd/mailbox-shuffler/mailbox-shuffler.go b/cmd/mailpopbox-router/mailpopbox-router.go
similarity index 98%
rename from cmd/mailbox-shuffler/mailbox-shuffler.go
rename to cmd/mailpopbox-router/mailpopbox-router.go
index b2c7a5a..1a4ce0f 100644
--- a/cmd/mailbox-shuffler/mailbox-shuffler.go
+++ b/cmd/mailpopbox-router/mailpopbox-router.go
@@ -53,7 +53,7 @@ func main() {
 		os.Exit(4)
 	}
 
-	log.Info("starting mailbox-shuffler")
+	log.Info("Starting mailpopbox-router")
 
 	if err := config.Validate(); err != nil {
 		log.Fatal("Invalid config", zap.Error(err))
diff --git a/cmd/mailbox-shuffler/monitor.go b/cmd/mailpopbox-router/monitor.go
similarity index 96%
rename from cmd/mailbox-shuffler/monitor.go
rename to cmd/mailpopbox-router/monitor.go
index 2110ebe..b1af1ea 100644
--- a/cmd/mailbox-shuffler/monitor.go
+++ b/cmd/mailpopbox-router/monitor.go
@@ -120,7 +120,7 @@ func (m *Monitor) transferMessageTo(msg Message, dst DestinationConnection) erro
 
 func getReceivedInfo(cfg MonitorConfig, t time.Time) []byte {
 	line := fmt.Sprintf(
-		"Received: from <%s> (via %s)\r\n        by mailpopbox-shuffler at %s\r\n        for <%s> (via %s)\r\n",
+		"Received: from <%s> (via %s)\r\n        by mailpopbox-router at %s\r\n        for <%s> (via %s)\r\n",
 		cfg.Source.Email, cfg.Source.Type,
 		t.Format(time.RFC1123Z),
 		cfg.Destination.Email, cfg.Destination.Type)
diff --git a/cmd/mailbox-shuffler/oauth.go b/cmd/mailpopbox-router/oauth.go
similarity index 100%
rename from cmd/mailbox-shuffler/oauth.go
rename to cmd/mailpopbox-router/oauth.go
diff --git a/cmd/mailbox-shuffler/source.go b/cmd/mailpopbox-router/source.go
similarity index 100%
rename from cmd/mailbox-shuffler/source.go
rename to cmd/mailpopbox-router/source.go
-- 
2.43.5